ika 1.0.12 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc3a9857afd1cd1f1b3e18273b2d698df2c4e19f
-  data.tar.gz: 4153e44d62da2100bf8cef338868c3b229dc17f2
+  metadata.gz: f6ba4beaa3e44cba6dc7ae05c0cee0b2ce6f1643
+  data.tar.gz: 41df3e2109b55567e0adf4f5aa7ef8f5610245a6
 SHA512:
-  metadata.gz: 3eac737c70afa348306879f02029ee5592a3dcc8e58b74348cb75095423c652b738b1f2058111fd689b551f98ce39a176aea5ad1f2faabf436e2c59d35a7204d
-  data.tar.gz: 383ee4dfc605d8093b9cd69d2a6b0ad5673c6c78957396e76eac356c17a505f49b5058d8f8078687574d3d642b45d10d3834079b4cc04bba8a10ee6fd701fd62
+  metadata.gz: 5200687ec6745fba87492911e4226829452f847f41463132305c93a5e30b72c66cb9a85c5de7aba2b57cdb021f0ee21af4b4f9bdaa5184d646dc04bf2cc41fbb
+  data.tar.gz: b9913f5e9b904b5adacbe802ae62708bff64846c548d9bda011557b5d3aebd66fc11a12a307d56f181ea56eadeea27dfdab64d9d4821650372e50a08aa2a3616

data/README.md

@@ -74,14 +74,24 @@ User.exist?(id: 2)
 # => false
 ```
 
+## Sync mode
+
+Sync mode performs that ika deletes all data of importing models. For example, if exporting data includes that id is 1 and 2, and there are already exists data that id is 1, 2 and 3, sync importing deletes the data of id 3.
+
 ## 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.
-* If already exists `import` or `export` methods, you can use `ika_import` or `ika_export` methods.
+* If there already exists `import` or `export` methods, you can use `ika_import` or `ika_export` methods.
+
+## Contributing
+
+### Test
+
+You need to run `bundle exec rake db:create db:migrate` on `spec/dummy` before testing.
 
 ## License
 
-Copyright (c) 2015 Aqutras
+Copyright (c) 2015-2016 Aqutras
 This project rocks and uses MIT-LICENSE.

data/lib/ika.rb

@@ -1,6 +1,5 @@
-if Rails.env == 'test'
-  require 'carrierwave'
-end
+require 'oj'
+require 'carrierwave' if Rails.env == 'test'
 require 'carrierwave/serialization'
 require 'carrierwave/base64uploader'
 
@@ -14,7 +13,7 @@ module Ika
       if json_or_array.is_a?(Array)
         objects = json_or_array
       else
-        objects = JSON.parse(json_or_array)
+        objects = Oj.load(json_or_array)
         objects = [objects] unless objects.is_a?(Array)
       end
       json_or_array = nil
@@ -76,6 +75,7 @@ module Ika
     end
 
     def ika_export(options = {}, objects = nil)
+      preset_json_with_raw_data = CarrierWave::Uploader::Base.json_with_raw_data
       CarrierWave::Uploader::Base.json_with_raw_data = true
       all_symbol = true
       options[:include] ||= []
@@ -87,26 +87,26 @@ module Ika
 
       if all_symbol
         json = objects.to_json(include: options[:include])
-        CarrierWave::Uploader::Base.json_with_raw_data = false
+        CarrierWave::Uploader::Base.json_with_raw_data = preset_json_with_raw_data
         return json
       end
 
       whole_obj_arr = []
       objects.each do |object|
-        obj_arr = JSON.parse(object.to_json)
+        obj_arr = Oj.load(object.to_json)
         options[:include].each do |relation|
           if relation.is_a?(::Hash)
             relation.keys.each do |property|
-              obj_arr[property] = JSON.parse(object.try(property).export({include: relation[property]}, object.try(property)))
+              obj_arr[property.to_s] = Oj.load(object.try(property).export({include: relation[property]}, object.try(property)))
             end
           elsif relation.is_a?(Symbol)
-            obj_arr[relation] = JSON.parse(object.try(relation).present? ? object.try(relation).to_json : '[]')
+            obj_arr[relation.to_s] = Oj.load(object.try(relation).present? ? object.try(relation).to_json : '[]')
           end
         end
         whole_obj_arr.push(obj_arr)
       end
-      CarrierWave::Uploader::Base.json_with_raw_data = false
-      JSON.generate(whole_obj_arr)
+      CarrierWave::Uploader::Base.json_with_raw_data = preset_json_with_raw_data
+      Oj.dump(whole_obj_arr)
     end
 
     def export(options = {}, objects = nil)
@@ -115,6 +115,7 @@ module Ika
   end
 
   def ika_export(options = {}, objects = nil)
+    preset_json_with_raw_data = CarrierWave::Uploader::Base.json_with_raw_data
     CarrierWave::Uploader::Base.json_with_raw_data = true
     objects ||= self
     all_symbol = true
@@ -125,23 +126,27 @@ module Ika
     end
 
     if all_symbol
-      json = objects.to_json(include: options[:include])
-      CarrierWave::Uploader::Base.json_with_raw_data = false
+      if objects.attributes.keys.include? 'type'
+        json = objects.to_json(include: options[:include], methods: :type)
+      else
+        json = objects.to_json(include: options[:include])
+      end
+      CarrierWave::Uploader::Base.json_with_raw_data = preset_json_with_raw_data
       return json
     end
 
-    obj_hash = JSON.parse objects.to_json
+    obj_hash = Oj.load objects.to_json
     options[:include].each do |relation|
       if relation.is_a?(::Hash)
         relation.keys.each do |property|
-          obj_hash[property] = JSON.parse(objects.try(property).includes(relation[property]).export({include: relation[property]}, objects.try(property)))
+          obj_hash[property.to_s] = Oj.load(objects.try(property).includes(relation[property]).export({include: relation[property]}, objects.try(property)))
         end
       elsif relation.is_a?(Symbol)
-        obj_hash[relation] = JSON.parse(objects.try(relation).to_json)
+        obj_hash[relation.to_s] = Oj.load(objects.try(relation).to_json)
       end
     end
-    CarrierWave::Uploader::Base.json_with_raw_data = false
-    JSON.generate(obj_hash)
+    CarrierWave::Uploader::Base.json_with_raw_data = preset_json_with_raw_data
+    Oj.dump(obj_hash)
   end
 
   def export(options = {}, objects = nil)

data/lib/ika/version.rb

@@ -1,3 +1,3 @@
 module Ika
-  VERSION = '1.0.12'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ika
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.1.0
 platform: ruby
 authors:
 - Makoto NAKAYA
@@ -9,22 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Implement Import/Export feature to ActiveRecord models.