assimilate 0.2 → 0.2.1

data/lib/assimilate/command.rb

@@ -31,6 +31,10 @@ class Assimilate::Command
       opts.on("--domain STRING", String, "Domain value to apply to each record") do |s|
         @options[:domain] = s
       end
+
+      opts.on("--compare FIELDNAME", String, "(*extend* only) Optional field to check whether an update is current (e.g. timestamp)") do |f|
+        @options[:compare] = f
+      end
     end
   end
 

data/lib/assimilate/extender.rb

@@ -37,7 +37,7 @@ class Assimilate::Extender
   # if there is a field to compare on (i.e. a timestamp), then apply the update if the timestamp is newer;
   # otherwise (no timestamp) compare the hashes and apply if there are any differences.
   def apply_this_update(current_record, new_data)
-    if @comparison_field
+    if @comparison_field && current_record[@keyfield]
       is_newer(current_record[@keyfield], new_data)
     else
       current_record[@keyfield] != new_data

data/lib/assimilate/version.rb

@@ -1,3 +1,3 @@
 module Assimilate
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

data/spec/lib/extend_spec.rb

@@ -74,7 +74,7 @@ describe "loading extended data" do
     before(:all) do
       reset_catalog
       import_base_data("20120501")
-      import_extended_data("20120505", "logs1.csv")
+      import_extended_data("20120505", "logs1.csv", :compare => 'timestamp')
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assimilate
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2157154580 !ruby/object:Gem::Requirement
+  requirement: &2156667700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157154580
+  version_requirements: *2156667700
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2157154080 !ruby/object:Gem::Requirement
+  requirement: &2156665740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157154080
+  version_requirements: *2156665740
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156541740 !ruby/object:Gem::Requirement
+  requirement: &2156664520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156541740
+  version_requirements: *2156664520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156539660 !ruby/object:Gem::Requirement
+  requirement: &2156663400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *2156539660
+  version_requirements: *2156663400
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156536900 !ruby/object:Gem::Requirement
+  requirement: &2157692120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156536900
+  version_requirements: *2157692120
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2156535700 !ruby/object:Gem::Requirement
+  requirement: &2157691660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *2156535700
+  version_requirements: *2157691660
 description: Ingest updates from CSV and apply to set of hashes
 email:
 - jmay@pobox.com