import format change to hash

[pettanr/pettanr.git] / vendor / plugins / pettan_importer / lib / pettan_importer.rb

diff --git a/vendor/plugins/pettan_importer/lib/pettan_importer.rb b/vendor/plugins/pettan_importer/lib/pettan_importer.rb
index 0a8da8d..3418ec2 100644 (file)
--- a/vendor/plugins/pettan_importer/lib/pettan_importer.rb
+++ b/vendor/plugins/pettan_importer/lib/pettan_importer.rb
@@ -11,9 +11,8 @@ module ActiveRecord
       
       module ClassMethods
         def each_import data
-          data = [data] if data.is_a?(Hash)
-          data.each do |d|
-            yield d
+          data.each do |n, d|
+            yield n, d
           end
         end
         
@@ -22,8 +21,8 @@ module ActiveRecord
           return false unless d
           res = []
           self.transaction do
-            self.each_import(d) do |i|
-              m = blk.call(i)
+            self.each_import(d) do |name, item|
+              m = blk.call(name, item)
               res.push(m) unless m.valid?
             end
             raise ActiveRecord::Rollback unless res.empty?