store_attribute 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36243b5e350010855d95f5104c95dead8d0f6f8a
-  data.tar.gz: d28d7d37b5db4a62a7ee363acdfb7b2d18e599c1
+  metadata.gz: 5b686f8993ef12feb2c0a1b36dcf90fbf0a7225b
+  data.tar.gz: 5498a60d8e4ac7ce66e4316b5fe2dfb50856c662
 SHA512:
-  metadata.gz: 9cd64959ebac0572406300a1f3f350dc54232d8ed05639d03a9f941fdf8c0703d9ac2f23b40b589fca9b696da42e263f262231f84c613c04fd6a13c18ef68c17
-  data.tar.gz: 61693d8113e5f3f419e558a3f40877cdbe6ae03e1b3a7a27d5f3097d51a08540f581cd0e7f5a89ad626169fb3d4d71c6c48796df346f56e94ba2a0d88f1406e8
+  metadata.gz: b41a03c88333430a322a2b0147b445284c4335063fcfaccaae53200b8438cad9a22996b1951df936da18fbbde23bd57d06847a49042971346896e181a9729e86
+  data.tar.gz: eb62f09e1f44a05d3d29540ac9b7f4751d226c0b4f37e6c92cc7b1c285c7cf993e16585e3f33edae18d2170f6544ac30f810590d8ac3a0fd23f1df124fed1ec6

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

@@ -39,17 +39,25 @@ module ActiveRecord
 
       def type_cast_from_database(value)
         hash = super
-        type_cast_from_user(hash)
+        if hash
+          accessor_types.each do |key, type|
+            hash[key] = type.type_cast_from_database(hash[key]) if hash.key?(key)
+          end
+        end
+        hash
       end
 
       def type_cast_for_database(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.type_cast_for_database(value[k]) unless k.nil?
+            typed_casted[k] = type.type_cast_for_database(value[k]) unless k.nil?
           end
+          super(value.merge(typed_casted))
+        else
+          super(value)
         end
-        super(value)
       end
 
       def type_cast_from_user(value)

data/lib/store_attribute/version.rb

@@ -1,3 +1,3 @@
 module StoreAttribute # :nodoc:
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.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,13 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.mock_with :rspec
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  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/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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord