datacatalog-importer 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/datacatalog-importer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datacatalog-importer}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2010-03-05}
+  s.date = %q{2010-03-12}
   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

@@ -43,8 +43,13 @@ module DataCatalog
         read_data(:source) do |data|
           link_to_existing_organization!(data, :organization_id)
           source = create_or_update_source(data)
-          data[:downloads].each do |download_data|
-            create_or_update_download(source, download_data)
+          if source
+            downloads = data[:downloads]
+            if downloads
+              downloads.each do |download_data|
+                create_or_update_download(source, download_data)
+              end
+            end
           end
         end
       end
@@ -82,7 +87,7 @@ module DataCatalog
           puts "Updating Organization: #{name}"
           DataCatalog::Organization.update(docs[0].id, data)
         else
-          multiple_matches("Organization", n, data)
+          multiple_matches("Organization", data, n)
         end
       end
       
@@ -95,8 +100,7 @@ module DataCatalog
         when 1
           docs[0]
         else
-          multiple_matches("Organization", n, { field => name })
-          nil
+          multiple_matches("Organization", { field => name }, n)
         end
       end
       
@@ -105,18 +109,26 @@ module DataCatalog
         data = data.reject do |key, value|
           [:organization, :downloads].include?(key)
         end
-        puts "data[:url] : #{data[:url]}"
         docs = DataCatalog::Source.all(:url => data[:url])
         n = docs.length
         case n
         when 0
           puts "Creating Source: #{data[:title]}"
-          DataCatalog::Source.create(data)
+          begin
+            DataCatalog::Source.create(data)
+          rescue DataCatalog::BadRequest => e
+            create_failed("Source", data[:title], data, e)
+          end
         when 1
           puts "Updating Source: #{data[:title]}"
-          DataCatalog::Source.update(docs[0].id, data)
+          begin
+            id = docs[0].id
+            DataCatalog::Source.update(id, data)
+          rescue DataCatalog::BadRequest => e
+            update_failed("Source", data, id, e)
+          end
         else
-          multiple_matches("Source", n, data)
+          multiple_matches("Source", data, n)
         end
       end
       
@@ -136,7 +148,7 @@ module DataCatalog
           puts "- Updating Download: #{data[:format]}"
           DataCatalog::Download.update(docs[0].id, data)
         else
-          multiple_matches("Download", n, data)
+          multiple_matches("Download", data, n)
         end
       end
       
@@ -149,29 +161,64 @@ module DataCatalog
         raise "Could not find :organization key" unless organization_hash
         name = organization_hash[:name]
         url  = organization_hash[:url]
-        organization = if url
-          find_organization_by(:url, url)
+
+        organization, error_message = if url
+          [find_organization_by(:url, url), "url : #{url}"]
         elsif name
-          find_organization_by(:name, name)  
+          [find_organization_by(:name, name), "name : #{name}"]
         end
-        
+
         if organization
           data[organization_id_key] = organization.id
         else
-          puts " - Could not find organization named: #{name}"
+          puts "  - Could not find organization with #{error_message}"
         end
+        true # return value not important
       end
       
       # ---
       
-      def multiple_matches(model, n, data)
-        puts "? : #{n} matches for #{model}"
+      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  
+      
+      def multiple_matches(model, data, n)
+        puts "  - Failed. #{n} matches for #{model}."
+        puts "    Uploading Report to API."
         DataCatalog::Report.create({
           :status => "new",
-          :text   => "Cannot automatically update #{model}; there " +
-                     "are #{n} matches for url : #{data[:url]}",
-          :object => data.inspect,
+          :text   => "Multiple matches for url : #{data[:url]}",
+          :object => {
+            :error  => "Cannot automatically update #{model}since there " +
+              "are #{n} matches for url : #{data[:url]}",
+            :params => data,
+          },
         })
+        nil
       end
       
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - David James
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -05:00
+date: 2010-03-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency