ika 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b679ead83c1241604f025295599823f7c68ee35
-  data.tar.gz: 25912adcc7557199a593c5a1e1d5b0a8131021b6
+  metadata.gz: b34bad1546023a0d1f4e1bdd9af0ae68473bbf36
+  data.tar.gz: 2de9d79ec32e2ea76245d2084cd59434a2248890
 SHA512:
-  metadata.gz: 762e15750fe49a33caa15cf7cd1e7225f26fb61265776ae39b3ec6e7fea832a778e6d15332d90583516dfd3754d67ff5310fede62098d82402b008c052e30335
-  data.tar.gz: a5256e9347cad3333c4a104612cf5ed6343f0670282eacd09d857a8d2e02e5147519f9e5e9ebcd3d177cfcf5281a99b2d7a9e58c8e75c48bb65eebba0b4bf349
+  metadata.gz: f023cacba74e3c8a8e606c1c6e5984678c13fcef1df440c3e6f0accaa69a62ea0830a44383904993545ba6c806079091dcfee54aa9d58d7aa9c10e92fc790b36
+  data.tar.gz: 0d59771a41c0250942857b65bc298b26f4c95747c8288d663ce391b03e7bda6eaa0e484d185e36ad709452ec9c8f5e5a0588c9822a0e098229eee7ee7cf5dc3c

data/lib/ika/version.rb

@@ -1,3 +1,3 @@
 module Ika
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
 end

data/lib/ika.rb

@@ -17,6 +17,7 @@ module Ika
         objects = JSON.parse(json_or_array)
         objects = [objects] unless objects.is_a?(Array)
       end
+      json_or_array = nil
 
       ActiveRecord::Base.transaction do
         if options && options[:sync]
@@ -55,6 +56,7 @@ module Ika
                 object_params[key] = object[key]
               end
             end
+            object.delete(key) if key != 'id'
           end
           if record_exists
             exist_object.attributes = object_params
@@ -63,6 +65,7 @@ module Ika
             new(object_params).save!(validate: false)
           end
           remove_target_ids -= [object['id'].to_i]
+          object.delete('id')
         end
         where(id: remove_target_ids).destroy_all
       end
@@ -72,12 +75,12 @@ module Ika
       ika_import(json_or_array, options)
     end
 
-    def ika_export(options = {}, object = nil)
+    def ika_export(options = {}, objects = nil)
       CarrierWave::Uploader::Base.json_with_raw_data = true
       all_symbol = true
       options[:include] ||= []
       options[:include] = [options[:include]] unless options[:include].is_a?(Array)
-      objects = self.includes(options[:include]) unless objects
+      objects ||= self.includes(options[:include])
       options[:include].each do |opt|
         all_symbol = false unless opt.is_a?(Symbol)
       end
@@ -106,12 +109,12 @@ module Ika
       JSON.generate(whole_obj_arr)
     end
 
-    def export(options = {}, object = nil)
-      ika_export(options, object)
+    def export(options = {}, objects = nil)
+      ika_export(options, objects)
     end
   end
 
-  def ika_export(options = {}, object = nil)
+  def ika_export(options = {}, objects = nil)
     CarrierWave::Uploader::Base.json_with_raw_data = true
     objects ||= self
     all_symbol = true
@@ -141,8 +144,8 @@ module Ika
     JSON.generate(obj_hash)
   end
 
-  def export(options = {}, object = nil)
-    ika_export(options, object)
+  def export(options = {}, objects = nil)
+    ika_export(options, objects)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ika
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Makoto NAKAYA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails