datacatalog-importer 0.1.9 → 0.1.10

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/djsun/datacatalog-importer"
     gem.authors = ["David James"]
     gem.add_dependency "nokogiri", ">= 1.4.1"
+    gem.add_dependency "datacatalog", ">= 0.4.12"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification...
     # see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/datacatalog-importer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datacatalog-importer}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
@@ -52,13 +52,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.1"])
+      s.add_runtime_dependency(%q<datacatalog>, [">= 0.4.12"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
+      s.add_dependency(%q<datacatalog>, [">= 0.4.12"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
+    s.add_dependency(%q<datacatalog>, [">= 0.4.12"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/lib/pusher.rb

@@ -1,4 +1,6 @@
+gem 'datacatalog', '>= 0.4.12'
 require 'datacatalog'
+require 'frequency'
 require File.dirname(__FILE__) + '/shared'
 
 module DataCatalog
@@ -112,7 +114,7 @@ module DataCatalog
       
       # Important: do not modify data
       def create_or_update_source(data)
-        data = data.reject { |k, v| LOOKUP_KEYS.include?(k) }
+        data = clean_source_data(data)
         docs = DataCatalog::Source.all(:url => data[:url])
         n = docs.length
         case n
@@ -122,7 +124,8 @@ module DataCatalog
             DataCatalog::Source.create(data)
           rescue DataCatalog::BadRequest => e
             error("Cannot create Source", {
-              :params => data
+              :params => data,
+              :errors => e.errors,
             })
           end
         when 1
@@ -132,7 +135,8 @@ module DataCatalog
             DataCatalog::Source.update(id, data)
           rescue DataCatalog::BadRequest => e
             error("Cannot update Source with id : #{id}", {
-              :params => data
+              :params => data,
+              :errors => e.errors,
             })
           end
         else
@@ -197,6 +201,15 @@ module DataCatalog
       end
       
       protected
+
+      # Important: do not modify data
+      def clean_source_data(data)
+        data = data.reject { |k, v| LOOKUP_KEYS.include?(k) }
+        
+        frequency = Frequency.new(data[:frequency])
+        data[:frequency] = "other" unless frequency.valid?
+        data
+      end
       
       def error(text, object)
         puts "- Failure: #{text}"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - David James
@@ -32,9 +32,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: datacatalog
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 12
+        version: 0.4.12
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,7 +58,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: This framework makes it easier to write importers for the National Data Catalog.
 email: djames@sunlightfoundation.com
 executables: []