X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=vendor%2Fplugins%2Fpettan_importer%2Flib%2Fpettan_importer.rb;fp=vendor%2Fplugins%2Fpettan_importer%2Flib%2Fpettan_importer.rb;h=3418ec2771d97074d27158334692834eae93b382;hb=b638fe84dd0496dbda6a15cbb20bf62aab60cb63;hp=0a8da8d4bbb11297ce029db228d30b69cca8a57d;hpb=67262b46bb43c231fbb2d829d8e75cf6ff705a23;p=pettanr%2Fpettanr.git

diff --git a/vendor/plugins/pettan_importer/lib/pettan_importer.rb b/vendor/plugins/pettan_importer/lib/pettan_importer.rb
index 0a8da8d4..3418ec27 100644
--- 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?