ika 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9d601e456604b7ef58cdc9b299c8be7039e2859
-  data.tar.gz: 4083a46fa4be849c07adbf671946cc66beddb4ac
+  metadata.gz: 445850d5ed265759a2d0fbf1e139ea2af728b2d2
+  data.tar.gz: ae8be98de4260f41331a00be42991cb6b7922a4e
 SHA512:
-  metadata.gz: 33ce07999c380e9b01f8a01d94b33996e1dc15ddd63b528d32edb1c87a2d9b98fc6cb9689e7e901eceb6b92d29811a760aa4b0c1c768e249398b15276fa2baa9
-  data.tar.gz: 22f9e29e4f51c65fa5784e06e529b4a7a7c2931c82e1473592e91910aa1046c1874640a4026b9ac1d0f0ae5598a13f85620152a09f59a34cc9f014d7056839b7
+  metadata.gz: b05f0fa66d21a8521298d4118ff59e615712c5c9bd5c546d0d9106c0d1f44e55f04eade81b7edf01b7f490a010ee15d4d226dc1b457e7cc6a667c59b5bb00106
+  data.tar.gz: 5e49528daa04168f46033066a439f0a0fffe1a89d11066e7e9ed17f6b4a79c3c349d5a7bfea7675d61331f6ac4a22189e7b737a35ed8417cfeff3136ac991926

data/README.md

@@ -76,13 +76,10 @@ User.exist?(id: 2)
 
 ## Others
 
+* **DO NOT USE sync mode if you are using `include` option.**
 * If the same id exists, Ika uses `UPDATE`.
 * Uploaded files by `carrierwave` will be checked their md5 hash and do nothing if they exist and md5 is matched.
 
-## Not yet implemented features
-
-* Sync mode (If class method `import` is called with sync mode, delete all data that are not contained exporting json) 
-
 ## License
 
 Copyright (c) 2015 Aqutras

data/lib/ika/version.rb

@@ -1,3 +1,3 @@
 module Ika
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/ika.rb

@@ -34,11 +34,16 @@ module Ika
             else
               if new.try(key.to_sym).class.superclass == CarrierWave::Uploader::Base
                 need_update = true
-                if File.exist?('public' + object[key]['url'])
-                  md5 = Digest::MD5.file('public' + object[key]['url'])
-                  need_update = false if md5 == object[key]['md5'] && record_exists == true
+                obj_url = object[key]['url'] || object[key][:url]
+                obj_md5 = object[key]['md5'] || object[key][:md5]
+                obj_data = object[key]['data'] || object[key][:data]
+                obj_name = object[key]['name'] || object[key][:name]
+                if obj_url && File.exist?('public' + obj_url)
+                  md5 = Digest::MD5.file('public' + obj_url)
+                  need_update = false if md5 == obj_md5 && record_exists == true
+                elsif obj_url
+                  object_params[key] = base64_conversion(obj_data, obj_name) if need_update
                 end
-                object_params[key] = base64_conversion(object[key]['data'], object[key]['name']) if need_update
               else
                 object_params[key] = object[key]
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ika
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Makoto NAKAYA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails