activerecord-archiver 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72dfa5f71ad5437d192444235c123b54138d6084
-  data.tar.gz: c338aaffb0254810abee254e666aeaa4b4aef923
+  metadata.gz: deb91c95d7c5e133554018262c2d5bb8ef928126
+  data.tar.gz: d43388d052fef1228384bb2c510c2108b7bc8924
 SHA512:
-  metadata.gz: b7e432e8b835befe4f49345f0d0bdbe8b7f2d03de578acb426c9b6c9b653512862f2e615321b2332af5e52dd43277ffc6aa981323d1ec37f54db922b6b0ca9c8
-  data.tar.gz: 555a568642af8949346b6278c8883602bc357118ed7a5dfb740792d8405704ad5aa2e20580e4663cd83dbba07023208629ca3eec158ad365f99734ffb360b2ad
+  metadata.gz: f15f61ec60073da124467322e4c706641e587e678e1c730e1028f48c390d236fffcfd1ea9e38568f512d24f53df4b7a26b5d4c579e11c6ae963b95805ef80891
+  data.tar.gz: 1b9966bae6b81b0a16ba804aa1e23fc326cdc1fd97b3fdb2b4a8e4db9ebe12bfdd44db52017eeabd3e2682e4dcfffd20af53f241372dccc6a53128cc5a011ee3

data/lib/activerecord-archiver/archiver.rb

@@ -25,7 +25,8 @@ class ActiveRecordArchiver
   
   def self.relation_index record, attribute
     relevant_records = @models_hash[relation_model(record.class, attribute)].first
-    relevant_records.present? && relevant_records.map(&:id).index(record.send(attribute).id)
+    relevant_records.present? and
+      relevant_records.compact.map(&:id).index(record.send(attribute).try(:id))
   end
   
   def self.relation_id model, key, value
@@ -40,8 +41,12 @@ class ActiveRecordArchiver
   def self.insertable_hash model, hash
     ret = {}
     hash.each_pair do |key, value|
-      if column(model, key)
-        ret[column(model, key)] = value
+      if (col = column(model, key))
+        if col.type == :datetime and value.present?
+          ret[col] = DateTime.parse(value).to_s(:db)
+        else
+          ret[col] = value
+        end
       elsif belongs_to?(model, key)
         foreign_key = relation_foreign_key(model, key)
         if !hash.include?(foreign_key) and column_required(model, foreign_key)
@@ -66,8 +71,8 @@ class ActiveRecordArchiver
   end
   
   def self.assert_instance_of instance, klass
-    unless instance.class <= klass
-      raise "Object #{instance} is not an instance of the #{klass} model"
+    unless instance.is_a?(klass)
+      raise "Object #{instance.inspect} is not an instance of the #{klass.inspect} model"
     end
   end
   
@@ -114,4 +119,16 @@ class ActiveRecordArchiver
       end
     end.compact
   end
+  
+  def self.without_foreign_key_constraints
+    conn = ActiveRecord::Base.connection
+    if (conn.instance_of?(ActiveRecord::ConnectionAdapters::MysqlAdapter) or
+        conn.instance_of?(ActiveRecord::ConnectionAdapters::Mysql2Adapter))
+      conn.execute('SET foreign_key_checks = 0')
+      yield
+      conn.execute('SET foreign_key_checks = 1')
+    else
+      yield
+    end
+  end
 end

data/lib/activerecord-archiver/export.rb

@@ -43,11 +43,10 @@ class ActiveRecordArchiver
     result = {}
     
     # serialize
-    @models_hash.each_pair do |model, pair|
-      records, attributes = pair
-      
+    @models_hash.each_pair do |model, (records, attributes)|
+      next unless records.compact.present?
       result[model.to_s] = []
-      records.each do |record|
+      [*records].each do |record|
         
         assert_instance_of record, model
         
@@ -92,17 +91,19 @@ class ActiveRecordArchiver
       if collection.is_a? ActiveRecord::Base
         options[[collection]] = options[collection]
         options.delete(collection)
+      elsif !collection.compact.present?
+        options.delete(collection)
       end
     end
     
-    models = options.each_pair.map do |collection, _|
-      collection.first.class
+    models = options.keys.map do |collection|
+      collection.first.class.base_class
     end
     
     models_hash = {}
     
     options.each_pair do |collection, cols|
-      models_hash[collection.first.class] =
+      models_hash[collection.first.class.base_class] =
         [collection,
          if cols.is_a? Array then cols
          elsif cols == :all or cols.is_a? Hash
@@ -114,4 +115,4 @@ class ActiveRecordArchiver
     
     models_hash
   end
-end
+end

data/lib/activerecord-archiver/import.rb

@@ -16,34 +16,33 @@ Effects:
 
 class ActiveRecordArchiver
   def self.import json
-    
     @data = JSON.parse json
     
     ActiveRecord::Base.transaction do
-      
-      # insert records
-      @data.each_pair do |model_name, records|
-        model = model_name.constantize
-        
-        assert_model model
+      without_foreign_key_constraints do
         
-        records.each do |record|
-          record[:id] = model.all.insert(insertable_hash(model, record))
+        # insert records
+        @data.each_pair do |model_name, records|
+          model = model_name.constantize
+          
+          assert_model model
+          
+          records.each do |record|
+            record[:id] = model.all.insert(insertable_hash(model, record))
+          end
         end
-      end
-      
-      # add relations
-      @data.each_pair do |model_name, records|
-        model = model_name.constantize
         
-        records.each do |record|
-          if (update_hash = relations_update_hash(model, record))
-            instance = model.find(record[:id])
-            instance.update update_hash
+        # add relations
+        @data.each_pair do |model_name, records|
+          model = model_name.constantize
+          
+          records.each do |record|
+            if (update_hash = relations_update_hash(model, record))
+              model.where(:id => record[:id]).update_all(update_hash)
+            end
           end
         end
       end
-      
     end
     
     true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-archiver
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sam Auciello