superseeder 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97a6296fbe351e30095171481204fe80f479b2cc
-  data.tar.gz: 2e8a79f1306ead367c883fa2df6b9742e3e2fe5f
+  metadata.gz: 3ade07004cde17170806d4cb3bff23d87a17da13
+  data.tar.gz: 9c810fdd2b4b7e16d630d1b8e6b5f032c02f96b5
 SHA512:
-  metadata.gz: 7ae0c68644a4d3af686323348260cceebcb643415e78af3e0040070bd97ad36f7268d81cc324e1bd0adb389d8e66dbbaf7646ca41ca753559f1cb2d34dec1f6f
-  data.tar.gz: 343063dca35d9c4005642c17bb0fea1dd6e4eb446493abda9cc681788d5b1b31c44cf3158ef6dabe5e208f960017e56ff642f1d7b3f144e9692a6e4b0dffa873
+  metadata.gz: f58e4f861140b8f6ba728afa18fcbbd797a00d69ff586e188d14437d57e722118d98e9a174819db6e2eec5b5d1f80c5d15dfefe7b5b3540ae216e55db14e41f2
+  data.tar.gz: 2dace6f39aab70880d6640a5b7ee683d1b7ec8ae428cc3c63a67db614f9561cf6158cdd5db79518b70a283cb321bfecf42ddd155437883dd7455d8b0cb422a16

data/lib/superseeder/formats/roo.rb

@@ -28,9 +28,24 @@ module Superseeder
             yield row, opts
           else
             instance = row['_type'].blank? ? self : row['_type'].constantize
-            instance = if opts[:update_by]
-                         i = instance.find_by(opts[:update_by] => row[update])
-                         i || instance.new
+            update_by = opts[:update_by]
+            instance = if update_by
+                         if update_by.kind_of? Proc
+                           i = update_by.call(instance, row)
+                           i || instance.new
+                         end
+                         if update_by.kind_of? Array
+                           i = self.all
+                           update_by.each do |u|
+                             i = i.where u => row[u]
+                           end
+                           i = i.entries
+                           raise ArgumentError.new ":update_by => #{update_by} yielded more than one record!" if i.length > 1
+                           i.first || instance.new
+                         else
+                           i = instance.find_by update_by => row[update_by]
+                           i || instance.new
+                         end
                        else
                          instance.new
                        end

data/lib/superseeder/version.rb

@@ -1,3 +1,3 @@
 module Superseeder
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superseeder
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Olivier Milla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -226,3 +226,4 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/application.rb
 - test/test_helper.rb
+has_rdoc: