store_attribute 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5b686f8993ef12feb2c0a1b36dcf90fbf0a7225b
-  data.tar.gz: 5498a60d8e4ac7ce66e4316b5fe2dfb50856c662
+SHA256:
+  metadata.gz: 26bfe00fc2e06215356a2e050700f0d257e56401249c97487e26f58133f4ea0e
+  data.tar.gz: 5e9ba6def76cf0f0aa77130db602929da9725f1483508e244557e90e8bd22892
 SHA512:
-  metadata.gz: b41a03c88333430a322a2b0147b445284c4335063fcfaccaae53200b8438cad9a22996b1951df936da18fbbde23bd57d06847a49042971346896e181a9729e86
-  data.tar.gz: eb62f09e1f44a05d3d29540ac9b7f4751d226c0b4f37e6c92cc7b1c285c7cf993e16585e3f33edae18d2170f6544ac30f810590d8ac3a0fd23f1df124fed1ec6
+  metadata.gz: 3de11ae80f51e606826b3dbbdd92afa4a7443ec24ef595c616908adb23f2588908052f5db52d963164843aa0868c30747b54921e9fdac2b7deaede4b770413b3
+  data.tar.gz: 6032541f1dd51712f9755b9ca8ccfa25b145c670d319a3dde909917fb0b7447069600a3fdd7c8fce40e131733fa6495e7be420f7a77aa5f60a88c36c28301f3a

data/.rubocop.yml

@@ -1,51 +1,54 @@
+require:
+  - standard/cop/semantic_blocks
+  - rubocop-md
+
+inherit_gem:
+  standard: config/base.yml
+
 AllCops:
-  # Include gemspec and Rakefile
-  Include:
-    - 'lib/**/*.rb'
-    - 'lib/**/*.rake'
-    - 'spec/**/*.rb'
   Exclude:
-    - 'bin/**/*'
-    - 'spec/dummy/**/*'
+    - 'bin/*'
     - 'tmp/**/*'
+    - 'Gemfile'
+    - 'vendor/**/*'
+    - 'gemfiles/**/*'
     - 'bench/**/*'
   DisplayCopNames: true
-  StyleGuideCopsOnly: false
+  TargetRubyVersion: 2.4
 
-Style/AccessorMethodName:
+Standard/SemanticBlocks:
   Enabled: false
 
-Style/TrivialAccessors:
-  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: true
 
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*.rb'
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: no_comma
 
-Style/StringLiterals: 
-  Enabled: false
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: no_comma
 
-Style/SpaceInsideStringInterpolation:
-  EnforcedStyle: no_space
+Layout/AlignParameters:
+  EnforcedStyle: with_first_parameter
 
-Style/BlockDelimiters:
+Lint/Void:
   Exclude:
-    - 'spec/**/*.rb'
+    - '**/*.md'
 
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-Metrics/MethodLength:
+# See https://github.com/rubocop-hq/rubocop/issues/4222
+Lint/AmbiguousBlockAssociation:
   Exclude:
-    - 'spec/**/*.rb'
+    - 'spec/**/*'
+    - '**/*.md'
 
-Metrics/LineLength:
-  Max: 100
+Lint/DuplicateMethods:
   Exclude:
-    - 'spec/**/*.rb'
+    - '**/*.md'
 
-Rails/Date:
-  Enabled: false
+Naming/FileName:
+  Exclude:
+   - '**/*.md'
 
-Rails/TimeZone:
-  Enabled: false
+Layout/InitialIndentation:
+  Exclude:
+    - 'CHANGELOG.md'

data/.travis.yml

@@ -10,5 +10,12 @@ before_script:
 
 matrix:
   include:
-    - rvm: 2.3.0
-      gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: 2.6.2
+      gemfile: gemfiles/rails6.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/railsmaster.gemfile
+  allow_failures:
+    - rvm: ruby-head
+      gemfile: gemfiles/railsmaster.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.1.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+ (6 is supported)
+gem "store_attribute", "~> 0.5.0"
+
+# for Rails 4.2
+gem "store_attribute", "~> 0.4.0"
 ```
 
 ### Usage
@@ -20,14 +26,14 @@ 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:
 - `store_name` The name of the store.
 - `name` The name of the accessor to the store.
 - `type` A symbol such as `:string` or `:integer`, or a type object to be used for the accessor.
-- `options` A hash of cast type options such as `precision`, `limit`, `scale`.
+- `options` (optional) A hash of cast type options such as `precision`, `limit`, `scale`.
 
 Type casting occurs every time you write data through accessor or update store itself
 and when object is loaded from database.
@@ -43,10 +49,10 @@ class MegaUser < User
   store_attribute :settings, :active, :boolean
 end
 
-u = MegaUser.new(active: false, login_at: '2015-01-01 00:01', ratio: "63.4608")
+u = MegaUser.new(active: false, login_at: "2015-01-01 00:01", ratio: "63.4608")
 
 u.login_at.is_a?(DateTime) # => true
-u.login_at = DateTime.new(2015,1,1,11,0,0)
+u.login_at = DateTime.new(2015, 1, 1, 11, 0, 0)
 u.ratio # => 63
 u.active # => false
 # And we also have a predicate method
@@ -54,17 +60,17 @@ u.active? # => false
 u.reload
 
 # After loading record from db store contains casted data
-u.settings['login_at'] == DateTime.new(2015,1,1,11,0,0) # => true
+u.settings["login_at"] == DateTime.new(2015, 1, 1, 11, 0, 0) # => true
 
 # If you update store explicitly then the value returned
 # by accessor isn't type casted
-u.settings['ration'] = "3.141592653"
+u.settings["ratio"] = "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
+u.settings["ratio"] # => 3
 ```
 
 You can also specify type using usual `store_accessor` method:
@@ -81,4 +87,4 @@ Or through `store`:
 class User < ActiveRecord::Base
   store :settings, accessors: [:color, :homepage, login_at: :datetime], coder: JSON
 end
-```
+```

data/Rakefile

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
-require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
 
-task :default => :spec
+task default: [:rubocop, :spec]

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

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

data/gemfiles/rails6.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', '6.0.0.beta3'
+
+gemspec path: '..'

data/gemfiles/{rails-edge.gemfile → railsmaster.gemfile}

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

data/lib/store_attribute.rb

@@ -1,2 +1,4 @@
-require 'store_attribute/version'
-require 'store_attribute/active_record'
+# frozen_string_literal: true
+
+require "store_attribute/version"
+require "store_attribute/active_record"

data/lib/store_attribute/active_record.rb

@@ -1 +1,3 @@
-require 'store_attribute/active_record/store'
+# frozen_string_literal: true
+
+require "store_attribute/active_record/store"

data/lib/store_attribute/active_record/store.rb

@@ -1,9 +1,12 @@
-require 'active_record/store'
-require 'store_attribute/active_record/type/typed_store'
+# frozen_string_literal: true
+
+require "active_record/store"
+require "store_attribute/active_record/type/typed_store"
 
 module ActiveRecord
   module Store
     module ClassMethods # :nodoc:
+      alias _orig_store store
       # Defines store on this model.
       #
       # +store_name+ The name of the store.
@@ -21,9 +24,11 @@ module ActiveRecord
       #     store :settings, accessors: [:color, :homepage, login_at: :datetime], coder: JSON
       #   end
       def store(store_name, options = {})
-        serialize store_name, IndifferentCoder.new(options[:coder])
-        store_accessor(store_name, *options[:accessors]) if options.key?(:accessors)
+        accessors = options.delete(:accessors)
+        _orig_store(store_name, options)
+        store_accessor(store_name, *accessors) if accessors
       end
+
       # Adds additional accessors to an existing store on this model.
       #
       # +store_name+ The name of the store.

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

@@ -1,22 +1,9 @@
-require 'active_record/type'
+# frozen_string_literal: true
+
+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,26 +20,26 @@ module ActiveRecord
       end
 
       def add_typed_key(key, type, **options)
-        type = Type.lookup_type(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 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)
+            hash[key] = type.deserialize(hash[key]) if hash.key?(key)
           end
         end
         hash
       end
 
-      def type_cast_for_database(value)
+      def serialize(value)
         if value.is_a?(Hash)
           typed_casted = {}
           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?
+            typed_casted[k] = type.serialize(value[k]) unless k.nil?
           end
           super(value.merge(typed_casted))
         else
@@ -60,11 +47,11 @@ module ActiveRecord
         end
       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 +62,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,5 @@
+# frozen_string_literal: true
+
 module StoreAttribute # :nodoc:
-  VERSION = "0.4.1".freeze
+  VERSION = "0.5.3"
 end

data/spec/cases/store_attribute_spec.rb

@@ -1,11 +1,13 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 describe StoreAttribute do
   before do
     @connection = ActiveRecord::Base.connection
 
     @connection.transaction do
-      @connection.create_table('users') do |t|
+      @connection.create_table("users") do |t|
         t.jsonb :jparams, default: {}, null: false
         t.text :custom
         t.hstore :hdata, default: {}, null: false
@@ -16,23 +18,23 @@ describe StoreAttribute do
   end
 
   after do
-    @connection.drop_table 'users', if_exists: true
+    @connection.drop_table "users", if_exists: true
   end
 
   let(:time) { DateTime.new(2015, 2, 14, 17, 0, 0) }
-  let(:time_str) { '2015-02-14 17:00' }
-  let(:time_str_utc) { '2015-02-14 17:00:00 UTC' }
+  let(:time_str) { "2015-02-14 17:00" }
+  let(:time_str_utc) { "2015-02-14 17:00:00 UTC" }
 
   context "hstore" do
     it "typecasts on build" do
-      user = User.new(visible: 't', login_at: time_str)
+      user = User.new(visible: "t", login_at: time_str)
       expect(user.visible).to eq true
       expect(user).to be_visible
       expect(user.login_at).to eq time
     end
 
     it "typecasts on reload" do
-      user = User.new(visible: 't', login_at: time_str)
+      user = User.new(visible: "t", login_at: time_str)
       user.save!
       user = User.find(user.id)
 
@@ -54,8 +56,8 @@ describe StoreAttribute do
       expect(user.login_at).to eq time
 
       ron = RawUser.find(user.id)
-      expect(ron.hdata['visible']).to eq 'false'
-      expect(ron.hdata['login_at']).to eq time_str_utc
+      expect(ron.hdata["visible"]).to eq "false"
+      expect(ron.hdata["login_at"]).to eq time_str_utc
     end
 
     it "handles options" do
@@ -63,8 +65,8 @@ describe StoreAttribute do
     end
 
     it "YAML roundtrip" do
-      user = User.create!(visible: '0', login_at: time_str)
-      dumped = YAML.load(YAML.dump(user))
+      user = User.create!(visible: "0", login_at: time_str)
+      dumped = YAML.load(YAML.dump(user)) # rubocop:disable Security/YAMLLoad
 
       expect(dumped.visible).to be false
       expect(dumped.login_at).to eq time
@@ -74,26 +76,26 @@ describe StoreAttribute do
   context "jsonb" do
     it "typecasts on build" do
       jamie = User.new(
-        active: 'true',
+        active: "true",
         salary: 3.1999,
-        birthday: '2000-01-01'
+        birthday: "2000-01-01"
       )
       expect(jamie).to be_active
       expect(jamie.salary).to eq 3
       expect(jamie.birthday).to eq Date.new(2000, 1, 1)
-      expect(jamie.jparams['birthday']).to eq Date.new(2000, 1, 1)
-      expect(jamie.jparams['active']).to eq true
+      expect(jamie.jparams["birthday"]).to eq Date.new(2000, 1, 1)
+      expect(jamie.jparams["active"]).to eq true
     end
 
     it "typecasts on reload" do
-      jamie = User.create!(jparams: { 'active' => '1', 'birthday' => '01/01/2000', 'salary' => '3.14' })
+      jamie = User.create!(jparams: {"active" => "1", "birthday" => "01/01/2000", "salary" => "3.14"})
       jamie = User.find(jamie.id)
 
       expect(jamie).to be_active
       expect(jamie.salary).to eq 3
       expect(jamie.birthday).to eq Date.new(2000, 1, 1)
-      expect(jamie.jparams['birthday']).to eq Date.new(2000, 1, 1)
-      expect(jamie.jparams['active']).to eq true
+      expect(jamie.jparams["birthday"]).to eq Date.new(2000, 1, 1)
+      expect(jamie.jparams["active"]).to eq true
     end
 
     it "works with accessors" do
@@ -101,9 +103,9 @@ describe StoreAttribute do
       john.active = 1
 
       expect(john).to be_active
-      expect(john.jparams['active']).to eq true
+      expect(john.jparams["active"]).to eq true
 
-      john.jparams = { active: 'true', salary: '123.123', birthday: '01/01/2012' }
+      john.jparams = {active: "true", salary: "123.123", birthday: "01/01/2012"}
       expect(john).to be_active
       expect(john.birthday).to eq Date.new(2012, 1, 1)
       expect(john.salary).to eq 123
@@ -111,9 +113,9 @@ describe StoreAttribute do
       john.save!
 
       ron = RawUser.find(john.id)
-      expect(ron.jparams['active']).to eq true
-      expect(ron.jparams['birthday']).to eq '2012-01-01'
-      expect(ron.jparams['salary']).to eq 123
+      expect(ron.jparams["active"]).to eq true
+      expect(ron.jparams["birthday"]).to eq "2012-01-01"
+      expect(ron.jparams["salary"]).to eq 123
     end
 
     it "re-typecast old data" do
@@ -127,8 +129,8 @@ describe StoreAttribute do
       jamie.save!
 
       ron = RawUser.find(jamie.id)
-      expect(ron.jparams['active']).to eq true
-      expect(ron.jparams['salary']).to eq 12
+      expect(ron.jparams["active"]).to eq true
+      expect(ron.jparams["salary"]).to eq 12
     end
   end
 
@@ -139,7 +141,7 @@ describe StoreAttribute do
     end
 
     it "typecasts on reload" do
-      jamie = User.create!(custom: { price: '$12' })
+      jamie = User.create!(custom: {price: "$12"})
       expect(jamie.reload.price).to eq 1200
 
       jamie = User.find(jamie.id)
@@ -150,22 +152,22 @@ describe StoreAttribute do
 
   context "store subtype" do
     it "typecasts on build" do
-      user = User.new(inner_json: { x: 1 })
-      expect(user.inner_json).to eq('x' => 1)
+      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)
+      user.update!(inner_json: {x: 1})
+      expect(user.inner_json).to eq("x" => 1)
 
-      expect(user.reload.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.create!(inner_json: {x: 1})
       jamie = User.find(jamie.id)
-      expect(jamie.inner_json).to eq('x' => 1)
+      expect(jamie.inner_json).to eq("x" => 1)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,26 +1,30 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-if ENV['COVER']
-  require 'simplecov'
-  SimpleCov.root File.join(File.dirname(__FILE__), '..')
+if ENV["COVER"]
+  require "simplecov"
+  SimpleCov.root File.join(File.dirname(__FILE__), "..")
   SimpleCov.start
 end
 
-require 'rspec'
-require 'pry-byebug'
-require 'active_record'
-require 'pg'
-require 'store_attribute'
+require "rspec"
+require "pry-byebug"
+require "active_record"
+require "pg"
+require "store_attribute"
+
+RAILS_5_1 = ActiveRecord.version.release >= Gem::Version.new("5.1.0")
 
 ActiveRecord::Base.establish_connection(
-  adapter: 'postgresql',
-  database: 'store_attribute_test'
+  adapter: "postgresql",
+  database: "store_attribute_test"
 )
 connection = ActiveRecord::Base.connection
 
-unless connection.extension_enabled?('hstore')
-  connection.enable_extension 'hstore'
+unless connection.extension_enabled?("hstore")
+  connection.enable_extension "hstore"
   connection.commit_db_transaction
 end
 
@@ -31,12 +35,11 @@ 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.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'
+    config.default_formatter = "doc"
   end
 end

data/spec/store_attribute/typed_store_spec.rb

@@ -1,94 +1,109 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 describe ActiveRecord::Type::TypedStore do
   let(:json_type) { ActiveRecord::Type::Serialized.new(ActiveRecord::Type::Text.new, ActiveRecord::Coders::JSON) }
-  let(:yaml_type) do
-    ActiveRecord::Type::Serialized.new(
-      ActiveRecord::Type::Text.new,
-      ActiveRecord::Store::IndifferentCoder.new(
-        ActiveRecord::Coders::YAMLColumn.new(Hash)
-      )
-    )
-  end
 
   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)
+        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)
+        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)
+        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)
+        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
 
     describe ".create_from_type" do
       it "creates with valid types", :aggregate_failures do
-        type = described_class.create_from_type(json_type, 'date', :date)
-        new_type = described_class.create_from_type(type, 'val', :integer)
+        type = described_class.create_from_type(json_type, "date", :date)
+        new_type = described_class.create_from_type(type, "val", :integer)
 
         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
 
   context "with yaml coder" do
+    if RAILS_5_1
+      let(:yaml_type) do
+        ActiveRecord::Type::Serialized.new(
+          ActiveRecord::Type::Text.new,
+          ActiveRecord::Store::IndifferentCoder.new(
+            "test",
+            ActiveRecord::Coders::YAMLColumn.new("test", Hash)
+          )
+        )
+      end
+    else
+      let(:yaml_type) do
+        ActiveRecord::Type::Serialized.new(
+          ActiveRecord::Type::Text.new,
+          ActiveRecord::Store::IndifferentCoder.new(
+            ActiveRecord::Coders::YAMLColumn.new(Hash)
+          )
+        )
+      end
+    end
+
     let(:subject) { described_class.new(yaml_type) }
 
     it "works", :aggregate_failures do
-      subject.add_typed_key('date', :date)
+      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.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,7 +1,9 @@
+# frozen_string_literal: true
+
 class MoneyType < ActiveRecord::Type::Integer
-  def type_cast_from_user(value)
-    if !value.is_a?(Numeric) && value.include?('$')
-      price_in_dollars = value.delete('$').to_f
+  def cast(value)
+    if !value.is_a?(Numeric) && value.include?("$")
+      price_in_dollars = value.delete("$").to_f
       super(price_in_dollars * 100)
     else
       super
@@ -9,4 +11,4 @@ class MoneyType < ActiveRecord::Type::Integer
   end
 end
 
-ActiveRecord::Base.connection.type_map.register_type('money_type', MoneyType.new)
+ActiveRecord::Type.register(:money_type, MoneyType)

data/spec/support/user.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class RawUser < ActiveRecord::Base
-  self.table_name = 'users'
+  self.table_name = "users"
 end
 
 class User < ActiveRecord::Base

data/store_attribute.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
@@ -17,11 +19,16 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($/)
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "activerecord", ">=4.2.0"
+  s.required_ruby_version = ">= 2.4.0"
+
+  s.add_runtime_dependency "activerecord", ">= 5.0"
 
-  s.add_development_dependency "pg", "~>0.18"
-  s.add_development_dependency "rake", "~> 10.1"
+  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 "rubocop", "~> 0.65.0"
+  s.add_development_dependency "rubocop-md", "~> 0.2"
+  s.add_development_dependency "standard", "~> 0.0.36"
+  s.add_development_dependency "rspec", ">= 3.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_attribute
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.3
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
@@ -81,19 +81,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.65.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.65.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-md
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.0.36
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.0.36
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 description: ActiveRecord extension which adds typecasting to store accessors
 email:
 - dementiev.vm@gmail.com
@@ -113,8 +155,9 @@ files:
 - bench/setup.rb
 - bin/console
 - bin/setup
-- gemfiles/rails-edge.gemfile
-- gemfiles/rails42.gemfile
+- gemfiles/rails5.gemfile
+- gemfiles/rails6.gemfile
+- gemfiles/railsmaster.gemfile
 - lib/store_attribute.rb
 - lib/store_attribute/active_record.rb
 - lib/store_attribute/active_record/store.rb
@@ -138,15 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension which adds typecasting to store accessors