store_attribute 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b686f8993ef12feb2c0a1b36dcf90fbf0a7225b
-  data.tar.gz: 5498a60d8e4ac7ce66e4316b5fe2dfb50856c662
+  metadata.gz: 2fe7ad4819867227ad87556c1656e53d18405c15
+  data.tar.gz: bd6ccc0ef54fe3ea63a5deddae91712b34b9e937
 SHA512:
-  metadata.gz: b41a03c88333430a322a2b0147b445284c4335063fcfaccaae53200b8438cad9a22996b1951df936da18fbbde23bd57d06847a49042971346896e181a9729e86
-  data.tar.gz: eb62f09e1f44a05d3d29540ac9b7f4751d226c0b4f37e6c92cc7b1c285c7cf993e16585e3f33edae18d2170f6544ac30f810590d8ac3a0fd23f1df124fed1ec6
+  metadata.gz: 09cfe9e9d985bd9d510ca0a5a7d0e5b1be2c02cae61bb99e6954c080c28fccf44d0d82a001e892ee71fc7908e0ce45792831fbbd05a7d397c1f154b6bea90c6b
+  data.tar.gz: 144699139f1f6dbc55c8bd86c4b7cb3335cbcc0d37991cb006a4ac5802bceefdd2b26aa8de7b73f42df00a5280eeada3e50096c1f0bb8cb6519de8916493ebe0

data/.gitignore

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

data/.travis.yml

@@ -10,5 +10,5 @@ before_script:
 
 matrix:
   include:
-    - rvm: 2.3.0
-      gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.3.1
+      gemfile: gemfiles/rails5.gemfile

data/Gemfile

@@ -7,5 +7,5 @@ local_gemfile = 'Gemfile.local'
 if File.exist?(local_gemfile)
   eval(File.read(local_gemfile)) # rubocop:disable Lint/Eval
 else
-  gem 'activerecord', '~>4.2'
+  gem 'activerecord', '5.0.0'
 end

data/README.md

@@ -4,15 +4,21 @@
 
 ActiveRecord extension which adds typecasting to store accessors.
 
-Compatible with **Rails** ~> 4.2.
+Compatible with Rails 4.2 and Rails 5.
 
+<a href="https://evilmartians.com/">
+<img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54"></a>
 
 ### Install
 
 In your Gemfile:
 
 ```ruby
-gem "store_attribute", "~>0.4.0" # version 0.4.x is for Rails 4.2.x and 0.5.x is for Rails 5
+# for Rails 5
+gem "store_attribute", "~>0.5.0"
+
+# for Rails 4.2
+gem "store_attribute", "~>0.4.0" 
 ```
 
 ### Usage
@@ -20,7 +26,7 @@ gem "store_attribute", "~>0.4.0" # version 0.4.x is for Rails 4.2.x and 0.5.x is
 You can use `store_attribute` method to add additional accessors with a type to an existing store on a model.
 
 ```ruby
-  .store_attribute(store_name, name, type, options = {})
+  store_attribute(store_name, name, type, options = {})
 ```
 
 Where:
@@ -62,7 +68,7 @@ u.settings['ration'] = "3.141592653"
 u.ratio # => "3.141592653"
 
 # On the other hand, writing through accessor set correct data within store
-u.ratio = "3.14.1592653"
+u.ratio = "3.141592653"
 u.ratio # => 3
 u.settings['ratio'] # => 3
 ```
@@ -81,4 +87,4 @@ Or through `store`:
 class User < ActiveRecord::Base
   store :settings, accessors: [:color, :homepage, login_at: :datetime], coder: JSON
 end
-```
+```

data/gemfiles/{rails42.gemfile → rails5.gemfile}

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', "~>4.2"
+gem 'rails', '~>5.0.0'
 
 gemspec path: '..'

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

@@ -2,21 +2,6 @@ require 'active_record/type'
 
 module ActiveRecord
   module Type # :nodoc:
-    BASE_TYPES = {
-      boolean: ::ActiveRecord::Type::Boolean,
-      integer: ::ActiveRecord::Type::Integer,
-      string: ::ActiveRecord::Type::String,
-      float: ::ActiveRecord::Type::Float,
-      date: ::ActiveRecord::Type::Date,
-      datetime: ::ActiveRecord::Type::DateTime,
-      decimal: ::ActiveRecord::Type::Decimal
-    }.freeze
-
-    def self.lookup_type(type, options)
-      BASE_TYPES[type.to_sym].try(:new, options) ||
-        ActiveRecord::Base.connection.type_map.lookup(type.to_s, options)
-    end
-
     class TypedStore < DelegateClass(ActiveRecord::Type::Value) # :nodoc:
       # Creates +TypedStore+ type instance and specifies type caster
       # for key.
@@ -33,38 +18,30 @@ module ActiveRecord
       end
 
       def add_typed_key(key, type, **options)
-        type = Type.lookup_type(type, options) if type.is_a?(Symbol)
+        type = ActiveModel::Type.lookup(type, options) if type.is_a?(Symbol)
         @accessor_types[key.to_s] = type
       end
 
-      def type_cast_from_database(value)
+      def deserialize(value)
         hash = super
-        if hash
-          accessor_types.each do |key, type|
-            hash[key] = type.type_cast_from_database(hash[key]) if hash.key?(key)
-          end
-        end
-        hash
+        cast(hash)
       end
 
-      def type_cast_for_database(value)
-        if value.is_a?(Hash)
-          typed_casted = {}
+      def serialize(value)
+        if value
           accessor_types.each do |key, type|
             k = key_to_cast(value, key)
-            typed_casted[k] = type.type_cast_for_database(value[k]) unless k.nil?
+            value[k] = type.serialize(value[k]) unless k.nil?
           end
-          super(value.merge(typed_casted))
-        else
-          super(value)
         end
+        super(value)
       end
 
-      def type_cast_from_user(value)
+      def cast(value)
         hash = super
         if hash
           accessor_types.each do |key, type|
-            hash[key] = type.type_cast_from_user(hash[key]) if hash.key?(key)
+            hash[key] = type.cast(hash[key]) if hash.key?(key)
           end
         end
         hash
@@ -75,7 +52,7 @@ module ActiveRecord
       end
 
       def write(object, attribute, key, value)
-        value = type_for(key).type_cast_from_user(value) if typed?(key)
+        value = type_for(key).cast(value) if typed?(key)
         store_accessor.write(object, attribute, key, value)
       end
 

data/lib/store_attribute/version.rb

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

data/spec/cases/store_attribute_spec.rb

@@ -140,32 +140,9 @@ 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,13 +30,4 @@ 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/store_attribute/typed_store_spec.rb

@@ -14,51 +14,51 @@ describe ActiveRecord::Type::TypedStore do
   context "with json store" do
     subject { described_class.new(json_type) }
 
-    describe "#type_cast_from_user" do
+    describe "#cast" do
       it "without key types", :aggregate_failures do
-        expect(subject.type_cast_from_user([1, 2])).to eq [1, 2]
-        expect(subject.type_cast_from_user('a' => 'b')).to eq('a' => 'b')
+        expect(subject.cast([1, 2])).to eq [1, 2]
+        expect(subject.cast('a' => 'b')).to eq('a' => 'b')
       end
 
       it "with type keys" do
         subject.add_typed_key('date', :date)
 
         date = ::Date.new(2016, 6, 22)
-        expect(subject.type_cast_from_user(date: '2016-06-22')).to eq('date' => date)
+        expect(subject.cast(date: '2016-06-22')).to eq('date' => date)
       end
     end
 
-    describe "#type_cast_from_database" do
+    describe "#deserialize" do
       it "without key types", :aggregate_failures do
-        expect(subject.type_cast_from_database('[1,2]')).to eq [1, 2]
-        expect(subject.type_cast_from_database('{"a":"b"}')).to eq('a' => 'b')
+        expect(subject.deserialize('[1,2]')).to eq [1, 2]
+        expect(subject.deserialize('{"a":"b"}')).to eq('a' => 'b')
       end
 
       it "with type keys" do
         subject.add_typed_key('date', :date)
 
         date = ::Date.new(2016, 6, 22)
-        expect(subject.type_cast_from_database('{"date":"2016-06-22"}')).to eq('date' => date)
+        expect(subject.deserialize('{"date":"2016-06-22"}')).to eq('date' => date)
       end
     end
 
-    describe "#type_cast_for_database" do
+    describe "#serialize" do
       it "without key types", :aggregate_failures do
-        expect(subject.type_cast_for_database([1, 2])).to eq '[1,2]'
-        expect(subject.type_cast_for_database('a' => 'b')).to eq '{"a":"b"}'
+        expect(subject.serialize([1, 2])).to eq '[1,2]'
+        expect(subject.serialize('a' => 'b')).to eq '{"a":"b"}'
       end
 
       it "with type keys" do
         subject.add_typed_key('date', :date)
 
         date = ::Date.new(2016, 6, 22)
-        expect(subject.type_cast_for_database(date: date)).to eq '{"date":"2016-06-22"}'
+        expect(subject.serialize(date: date)).to eq '{"date":"2016-06-22"}'
       end
 
       it "with type key with option" do
         subject.add_typed_key('val', :integer, limit: 1)
 
-        expect { subject.type_cast_for_database(val: 1024) }.to raise_error(RangeError)
+        expect { subject.serialize(val: 1024) }.to raise_error(RangeError)
       end
     end
 
@@ -69,8 +69,8 @@ describe ActiveRecord::Type::TypedStore do
 
         date = ::Date.new(2016, 6, 22)
 
-        expect(type.type_cast_from_user(date: '2016-06-22', val: '1.2')).to eq('date' => date, 'val' => '1.2')
-        expect(new_type.type_cast_from_user(date: '2016-06-22', val: '1.2')).to eq('date' => date, 'val' => 1)
+        expect(type.cast(date: '2016-06-22', val: '1.2')).to eq('date' => date, 'val' => '1.2')
+        expect(new_type.cast(date: '2016-06-22', val: '1.2')).to eq('date' => date, 'val' => 1)
       end
     end
   end
@@ -83,12 +83,12 @@ describe ActiveRecord::Type::TypedStore do
 
       date = ::Date.new(2016, 6, 22)
 
-      expect(subject.type_cast_from_user(date: '2016-06-22')).to eq('date' => date)
-      expect(subject.type_cast_from_user('date' => '2016-06-22')).to eq('date' => date)
-      expect(subject.type_cast_from_database("---\n:date: 2016-06-22\n")).to eq('date' => date)
-      expect(subject.type_cast_from_database("---\ndate: 2016-06-22\n")).to eq('date' => date)
-      expect(subject.type_cast_for_database(date: date)).to eq "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\ndate: 2016-06-22\n"
-      expect(subject.type_cast_for_database('date' => date)).to eq "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\ndate: 2016-06-22\n"
+      expect(subject.cast(date: '2016-06-22')).to eq('date' => date)
+      expect(subject.cast('date' => '2016-06-22')).to eq('date' => date)
+      expect(subject.deserialize("---\n:date: 2016-06-22\n")).to eq('date' => date)
+      expect(subject.deserialize("---\ndate: 2016-06-22\n")).to eq('date' => date)
+      expect(subject.serialize(date: date)).to eq "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\ndate: 2016-06-22\n"
+      expect(subject.serialize('date' => date)).to eq "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\ndate: 2016-06-22\n"
     end
   end
 end

data/spec/support/money_type.rb

@@ -1,5 +1,5 @@
 class MoneyType < ActiveRecord::Type::Integer
-  def type_cast_from_user(value)
+  def cast(value)
     if !value.is_a?(Numeric) && value.include?('$')
       price_in_dollars = value.delete('$').to_f
       super(price_in_dollars * 100)
@@ -9,4 +9,4 @@ class MoneyType < ActiveRecord::Type::Integer
   end
 end
 
-ActiveRecord::Base.connection.type_map.register_type('money_type', MoneyType.new)
+ActiveModel::Type.register(:money_type, MoneyType)

data/spec/support/user.rb

@@ -6,8 +6,6 @@ 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

data/store_attribute.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($/)
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "activerecord", ">=4.2.0"
+  s.add_runtime_dependency "activerecord", "~>5.0.0"
 
   s.add_development_dependency "pg", "~>0.18"
   s.add_development_dependency "rake", "~> 10.1"
   s.add_development_dependency "simplecov", ">= 0.3.8"
   s.add_development_dependency "pry-byebug"
-  s.add_development_dependency "rspec", "~> 3.4.0"
+  s.add_development_dependency "rspec", "~> 3.5.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: store_attribute
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 description: ActiveRecord extension which adds typecasting to store accessors
 email:
 - dementiev.vm@gmail.com
@@ -113,8 +113,7 @@ files:
 - bench/setup.rb
 - bin/console
 - bin/setup
-- gemfiles/rails-edge.gemfile
-- gemfiles/rails42.gemfile
+- gemfiles/rails5.gemfile
 - lib/store_attribute.rb
 - lib/store_attribute/active_record.rb
 - lib/store_attribute/active_record/store.rb

data/gemfiles/rails-edge.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rack', github: "rack/rack"
-gem 'arel', github: 'rails/arel'
-gem 'rails', github: 'rails/rails'
-
-gemspec path: '..'