store_attribute 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fe7ad4819867227ad87556c1656e53d18405c15
-  data.tar.gz: bd6ccc0ef54fe3ea63a5deddae91712b34b9e937
+  metadata.gz: cd2643cf4b1909497a0de3f0d15ed6ca51ba599e
+  data.tar.gz: 607171026ea9b9638e20a920b732bd7258db246a
 SHA512:
-  metadata.gz: 09cfe9e9d985bd9d510ca0a5a7d0e5b1be2c02cae61bb99e6954c080c28fccf44d0d82a001e892ee71fc7908e0ce45792831fbbd05a7d397c1f154b6bea90c6b
-  data.tar.gz: 144699139f1f6dbc55c8bd86c4b7cb3335cbcc0d37991cb006a4ac5802bceefdd2b26aa8de7b73f42df00a5280eeada3e50096c1f0bb8cb6519de8916493ebe0
+  metadata.gz: 79e570bd455ecf0f2f7c500725e4a243f4e0d5133c5bdfd45100e10963bbe16623c37396d4a87b7018c74472813efbcfd212cc9d7ebe83c697ca00ad053d338c
+  data.tar.gz: 0c4458f32f0a658d276218894912e3c1c53833dd0cb4e506885bcff00a824beeadda620c89a4d6c09376edd1a262b9396ad317eb275c981d4d08194eb48968da

data/.gitignore

@@ -33,4 +33,5 @@ spec/dummy/log/*.log
 spec/dummy/tmp/
 spec/dummy/.sass-cache
 Gemfile.local
-Gemfile.lock
+Gemfile.lock
+tmp/

data/lib/store_attribute/active_record/type/typed_store.rb

@@ -18,23 +18,31 @@ module ActiveRecord
       end
 
       def add_typed_key(key, type, **options)
-        type = ActiveModel::Type.lookup(type, options) if type.is_a?(Symbol)
+        type = ActiveRecord::Type.lookup(type, options) if type.is_a?(Symbol)
         @accessor_types[key.to_s] = type
       end
 
       def deserialize(value)
         hash = super
-        cast(hash)
+        if hash
+          accessor_types.each do |key, type|
+            hash[key] = type.deserialize(hash[key]) if hash.key?(key)
+          end
+        end
+        hash
       end
 
       def serialize(value)
-        if value
+        if value.is_a?(Hash)
+          typed_casted = {}
           accessor_types.each do |key, type|
             k = key_to_cast(value, key)
-            value[k] = type.serialize(value[k]) unless k.nil?
+            typed_casted[k] = type.serialize(value[k]) unless k.nil?
           end
+          super(value.merge(typed_casted))
+        else
+          super(value)
         end
-        super(value)
       end
 
       def cast(value)

data/lib/store_attribute/version.rb

@@ -1,3 +1,3 @@
 module StoreAttribute # :nodoc:
-  VERSION = "0.5.0".freeze
+  VERSION = "0.5.1".freeze
 end

data/spec/cases/store_attribute_spec.rb

@@ -140,9 +140,32 @@ describe StoreAttribute do
 
     it "typecasts on reload" do
       jamie = User.create!(custom: { price: '$12' })
+      expect(jamie.reload.price).to eq 1200
+
       jamie = User.find(jamie.id)
 
       expect(jamie.price).to eq 1200
     end
   end
+
+  context "store subtype" do
+    it "typecasts on build" do
+      user = User.new(inner_json: { x: 1 })
+      expect(user.inner_json).to eq('x' => 1)
+    end
+
+    it "typecasts on update" do
+      user = User.new
+      user.update!(inner_json: { x: 1 })
+      expect(user.inner_json).to eq('x' => 1)
+
+      expect(user.reload.inner_json).to eq('x' => 1)
+    end
+
+    it "typecasts on reload" do
+      jamie = User.create!(inner_json: { x: 1 })
+      jamie = User.find(jamie.id)
+      expect(jamie.inner_json).to eq('x' => 1)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -30,4 +30,12 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.mock_with :rspec
+
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = "tmp/rspec_examples.txt"
+
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
 end

data/spec/support/money_type.rb

@@ -9,4 +9,4 @@ class MoneyType < ActiveRecord::Type::Integer
   end
 end
 
-ActiveModel::Type.register(:money_type, MoneyType)
+ActiveRecord::Type.register(:money_type, MoneyType)

data/spec/support/user.rb

@@ -6,6 +6,8 @@ class User < ActiveRecord::Base
   store_accessor :jparams, :version, active: :boolean, salary: :integer
   store_attribute :jparams, :birthday, :date
 
+  store_attribute :jparams, :inner_json, :json
+
   store :custom, accessors: [price: :money_type]
 
   store_accessor :hdata, visible: :boolean

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_attribute
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-02 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord