datacatalog-importer 0.1.11 → 0.1.12

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/datacatalog-importer.gemspec

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

@@ -85,30 +85,34 @@ module DataCatalog
         raise "#{name} has blank URL" if url.blank?
         docs = DataCatalog::Organization.all(:url => url)
         n = docs.length
-        case n
-        when 0
+        if n == 0
           puts "Creating Organization: #{name}"
           DataCatalog::Organization.create(data)
-        when 1
+        else
+          if n > 1
+            warning("Cannot find unique Source with url : #{url}", {
+              :warning    => "#{n} matches: " + docs.map { |x| x.id }.join(" "),
+              :workaround => "Using #{docs[0].id}"
+            })
+          end
           puts "Updating Organization: #{name}"
           DataCatalog::Organization.update(docs[0].id, data)
-        else
-          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)
         docs = DataCatalog::Organization.all(field => name)
         n = docs.length
-        case n
-        when 0 then nil
-        when 1 then docs[0]
+        if n == 0
+          nil
         else
-          error("Cannot find unique Organization with #{field} : #{name}", {
-            :error => "#{n} matches: " + docs.map { |x| x.id }.join(" ")
-          })
+          if n > 1
+            warning("Cannot find unique Organization with #{field} : #{name}", {
+              :warning    => "#{n} matches: " + docs.map { |x| x.id }.join(" "),
+              :workaround => "Using #{docs[0].id}"
+            })
+          end
+          docs[0]
         end
       end
       
@@ -212,7 +216,15 @@ module DataCatalog
       end
       
       def error(text, object)
-        puts "- Failure: #{text}"
+        report("Error", text, object)
+      end
+      
+      def warning(text, object)
+        report("Warning", text, object)
+      end
+      
+      def report(type, text, object)
+        puts "- #{type} : #{text}"
         puts "  Uploading Report to API."
         DataCatalog::Report.create({
           :status => "new",

metadata

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