datacatalog-importer 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/datacatalog-importer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datacatalog-importer}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2010-03-16}
+  s.date = %q{2010-03-17}
   s.description = %q{This framework makes it easier to write importers for the National Data Catalog.}
   s.email = %q{djames@sunlightfoundation.com}
   s.extra_rdoc_files = [

data/lib/pusher.rb

@@ -91,23 +91,22 @@ module DataCatalog
           puts "Updating Organization: #{name}"
           DataCatalog::Organization.update(docs[0].id, data)
         else
-          multiple_matches("Organization", data, n)
+          error("Cannot find unique Source with url : #{url}", {
+            :error => "#{n} matches: " + docs.map { |x| x.id }.join(" ")
+          })
         end
       end
       
       def find_organization_by(field, name)
-        verify_one_result(field, name, "Organization") do
-          DataCatalog::Organization.all(field => name)
-        end
-      end
-      
-      def verify_one_result(field, name, model)
-        docs = yield
+        docs = DataCatalog::Organization.all(field => name)
         n = docs.length
         case n
         when 0 then nil
         when 1 then docs[0]
-        else multiple_matches(model, { field => name }, n)
+        else
+          error("Cannot find unique Organization with #{field} : #{name}", {
+            :error => "#{n} matches: " + docs.map { |x| x.id }.join(" ")
+          })
         end
       end
       
@@ -122,7 +121,9 @@ module DataCatalog
           begin
             DataCatalog::Source.create(data)
           rescue DataCatalog::BadRequest => e
-            create_failed("Source", data[:title], data, e)
+            error("Cannot create Source", {
+              :params => data
+            })
           end
         when 1
           puts "Updating Source: #{data[:title]}"
@@ -130,10 +131,14 @@ module DataCatalog
             id = docs[0].id
             DataCatalog::Source.update(id, data)
           rescue DataCatalog::BadRequest => e
-            update_failed("Source", data, id, e)
+            error("Cannot update Source with id : #{id}", {
+              :params => data
+            })
           end
         else
-          multiple_matches("Source", data, n)
+          error("Cannot find unique Source with url : #{data[:url]}", {
+            :error => "#{n} matches: " + docs.map { |x| x.id }.join(" ")
+          })
         end
       end
       
@@ -153,7 +158,9 @@ module DataCatalog
           puts "- Updating Download: #{data[:format]}"
           DataCatalog::Download.update(docs[0].id, data)
         else
-          multiple_matches("Download", data, n)
+          error("Cannot find unique Download with source_id : #{source.id} and format : #{data[:format]}", {
+            :error => "#{n} matches: " + docs.map { |x| x.id }.join(" ")
+          })
         end
       end
       
@@ -175,7 +182,7 @@ module DataCatalog
         keys.each do |key|
           value = hash[key]
           organization = if value
-            attempts << "#{key}:#{value}"
+            attempts << "#{key} : #{value}"
             find_organization_by(key, value)
           end
           break if organization
@@ -189,47 +196,15 @@ module DataCatalog
         true # return value not important
       end
       
-      # ---
-      
-      def create_failed(model, text, data, error)
-        puts "- Failed. #{error}"
-        puts "  Uploading Report to API."
-        DataCatalog::Report.create({
-          :status => "new",
-          :text   => "Cannot create #{model} : #{text}",
-          :object => {
-            :error  => error,
-            :params => data,
-          },
-        })
-        nil
-      end
-      
-      def update_failed(model, data, id, error)
-        puts "- Failed. #{error}"
-        puts "  Uploading Report to API."
-        DataCatalog::Report.create({
-          :status => "new",
-          :text   => "Cannot update #{model} of id : #{id}",
-          :object => {
-            :error  => error,
-            :params => data,
-          },
-        })
-        nil
-      end  
+      protected
       
-      def multiple_matches(model, data, n)
-        puts "- Failed. #{n} matches for #{model}."
+      def error(text, object)
+        puts "- Failure: #{text}"
         puts "  Uploading Report to API."
         DataCatalog::Report.create({
           :status => "new",
-          :text   => "Multiple matches for url : #{data[:url]}",
-          :object => {
-            :error  => "Cannot automatically update #{model} since there " +
-              "are #{n} matches for url : #{data[:url]}",
-            :params => data,
-          },
+          :text   => text,
+          :object => object,
         })
         nil
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - David James
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 -04:00
+date: 2010-03-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency