superseeder 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ac1535106365fed57579024bed2fffd848749ce
-  data.tar.gz: ce9deb018e56f473cc7ddfbb1c84194064cb05c6
+  metadata.gz: 03b335cbdc74fa78d545de5ebda3234d44be8bbc
+  data.tar.gz: 65b97195ec9093ea27e516f22c44eafc6d19f90b
 SHA512:
-  metadata.gz: 2474335519980b1a92432b879876e62b34f29b58670758943e12535bbf2e0863c2fbdbc485170fff26e6e5989f11471d07ffbcc2fc2ef627eaee529027de6101
-  data.tar.gz: 941980a27de9ee42dd0d6e0c4a36f9a3a6eaab69b447e25334c66314180d6e1fa18e1867593f403b5e61612ba391554714fcfef8104b8397baf34ef2bd7fb396
+  metadata.gz: 0eb50168fe34841393e7b04bd7f42663d41a75c191ce66e7e0b16febb55709f047d2263e4b54d65f1927dca5ad781e1ef44d3f332002ff421aaa69a3d601b55f
+  data.tar.gz: e2031f83186272ccac6261c5ba93a57ac715d0d061d3bf2cc8773c2ee2607b5ccec5f8e53fddd6e7719a403dc216684f963d18777e8434b203aa0ae129078929

data/lib/superseeder/formats/roo.rb

@@ -17,6 +17,7 @@ module Superseeder
 
         opts = args.extract_options!
         many_sep = opts.delete(opts[:many_sep]) || ','
+        update = opts.delete :update_by
 
         s = EXTENSIONS[File.extname(path)].constantize.new path.to_s, opts
         header = s.row s.first_row
@@ -27,15 +28,18 @@ module Superseeder
           if block_given?
             yield row
           else
-            instance = if row['_type'].blank?
-                         self
+            instance = row['_type'].blank? ? self : row['_type'].constantize
+            instance = if update
+                         i = instance.find_by(update => row[update])
+                         i || instance.new
                        else
-                         row['_type'].constantize
-                       end.new
+                         instance.new
+                       end
 
             require 'superseeder/adapter'
             adapter = ::Superseeder::Adapter.new instance
 
+            save_relations = []
             # Set relations
             adapter.each_relation do |name, is_array, class_name|
               attrs = row.select{ |k, _| k =~ /\A#{name}_/ }
@@ -47,7 +51,9 @@ module Superseeder
                 end
                 vals.flatten!
                 vals.compact!
+                vals = vals | instance.send(name)
                 instance.send "#{name}=", vals
+                save_relations.concat vals if defined? Mongoid::Document && instance.kind_of?(Mongoid::Document) # Not really nice, TODO FIX through adapter
               else
                 instance.send "#{name}=", class_name.find_by(attrs)
               end
@@ -64,7 +70,9 @@ module Superseeder
             end
 
             if instance.valid?
-              instance.save
+              instance.save if instance.changed?
+              save_relations.uniq!
+              save_relations.each(&:save)
             else
               Rails.logger.debug "Skipped #{row} : #{instance.errors.full_messages}"
             end

data/lib/superseeder/version.rb

@@ -1,3 +1,3 @@
 module Superseeder
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/test/adapters/mongoid.rb

@@ -17,6 +17,8 @@ class Parking
   include Mongoid::Document
 
   field :name, :type => String
+  field :size, :type => Integer
+
   has_many :cars
 
   validates :name, :presence => true, :uniqueness => true

data/test/adapters/schema.rb

@@ -1,7 +1,8 @@
 ActiveRecord::Schema.define do
 
   create_table :parkings do |t|
-    t.string :name
+    t.string  :name
+    t.integer :size
   end
 
   create_table :cars do |t|

data/test/dummy/db/seeds/data/parkings_with_cars.csv

@@ -1,5 +1,5 @@
-name,cars_name
-North,Mustang
-East,
-South,"Corvette,BMW"
-West,
+name,cars_name,size
+North,Mustang,50
+East,,40
+South,"Corvette,BMW",30
+West,,20

data/test/dummy/db/seeds/data/parkings_without_cars.csv

@@ -1,5 +1,5 @@
-name
-North
-East
-South
-West
+name,size
+North,50
+East,40
+South,30
+West,20