activerecord-typedstore 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa72e9f075af5501961f90eac06098f00a6c2f6a
-  data.tar.gz: a32a4b9b052cd8174756e9adf3062e5fd002da7b
+SHA256:
+  metadata.gz: 17f01f8701f6af429d7fb15bfbcf9cf202f1d82cbe0f6878aa4a503ed69fc0e8
+  data.tar.gz: e5e1dd4100a034b074fe2682e485ae1365c8bcbe9c4bb7bc96f697a5042c0f62
 SHA512:
-  metadata.gz: 131bed9f1753d59907ad67582491a8b3dec85b597b15a3b458eecdf1ee33292bb75be81657e8778b2b49d3b7462aeff5e3671d411f6ea9def139cf1444738ee6
-  data.tar.gz: d3ec0ae6531e13aa6a7217ee202f8d1342425a259217fe7d3b5e7c190987786becd6fcfea9e087a93442476918e5fe93010a6d9fc5aa7f3fd7c988529c6fb543
+  metadata.gz: f1703f9023ab91ac749d74335276a0824d3072060eac8a68270f2b52e41198dfeebecffd54738cd4b097fe97948371479e2db1c1fa8ebc30ca07eeeaf63bac91
+  data.tar.gz: 8e48b1f137a374053092ccf52f3411759fcf421d1e4d8cf8b7f47b3c25d935aaf958f568ee35423381171aca879bf68a7b943493cf4947a8d3af19f66d54616f

data/.github/workflows/ruby.yml

@@ -0,0 +1,47 @@
+name: Ruby
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby: [2.6, 2.7]
+        gemfile: [Gemfile.ar-5.2, Gemfile.ar-6.0, Gemfile.ar-6.1, Gemfile.ar-master]
+        exclude:
+          - ruby: 2.6
+            gemfile: Gemfile.ar-6.0
+          - ruby: 2.6
+            gemfile: Gemfile.ar-6.1
+          - ruby: 2.6
+            gemfile: Gemfile.ar-master
+        timezone_aware: [0, 1]
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
+      TIMEZONE_AWARE: ${{ matrix.timezone_aware }}
+      POSTGRES: 1
+      MYSQL: 1
+      POSTGRES_JSON: 1
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Start MySQL and create DB
+      run: |
+        sudo systemctl start mysql.service
+        mysql -uroot -proot -e 'create database typed_store_test;'
+    - name: Start PostgresQL and create DB
+      run: |
+        sudo sed -i s/md5/trust/g /etc/postgresql/*/main/pg_hba.conf
+        sudo systemctl start postgresql.service
+        sudo -u postgres createuser --createdb --superuser ${USER}
+        createdb typed_store_test
+        echo "POSTGRES_URL=postgres://localhost/typed_store_test" >> $GITHUB_ENV
+    - name: Ruby Tests
+      run: bundle exec rake

data/README.md

@@ -94,10 +94,10 @@ end
 
 ```
 
-Type casting rules and attribute behavior are exactly the same as a for real database columns.
-Actually the only difference is that you wont be able to query on these attributes (unless you use JSON or Postgres HStore types) and that you don't need to do a migration to add / remove an attribute.
+Type casting rules and attribute behavior are exactly the same as for real database columns.
+Actually the only difference is that you won't be able to query on these attributes (unless you use JSON or Postgres HStore types) and that you don't need to do a migration to add / remove an attribute.
 
-If not, please fill an issue.
+If not, then please fill in an issue.
 
 ## Serialization methods
 
@@ -134,7 +134,7 @@ Since HStore can only store strings:
   - `any` attributes will be converted to string
 
 If you use HStore because you need to be able to query the store from SQL, and any of these limitations are an issue for you,
-than you could probably use the JSON column type, which do not suffer from these limitations and is also queriable. 
+then you could probably use the JSON column type, which do not suffer from these limitations and is also queriable. 
 
 ## Contributing
 

data/activerecord-typedstore.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 4.2', '< 5.3'
+  spec.add_dependency 'activerecord', '>= 5.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10'
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'coveralls', '~> 0'
   spec.add_development_dependency 'sqlite3', '~> 1'
-  spec.add_development_dependency 'pg', '~> 0.18'
+  spec.add_development_dependency 'pg', ENV.fetch('PG_VERSION', '~> 0.18')
   spec.add_development_dependency 'mysql2', '> 0.3'
   spec.add_development_dependency 'database_cleaner', '~> 1'
 end

data/gemfiles/Gemfile.ar-5.0

@@ -1,11 +1,6 @@
 source 'https://rubygems.org'
 
+gemspec path: '..'
+
+gem 'sqlite3', '~> 1.3.0'
 gem 'activerecord', '~> 5.0.0'
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', ['>= 0.3.13', '< 0.5']
-gem 'database_cleaner'
-gem 'coveralls', require: false

data/gemfiles/Gemfile.ar-5.2

@@ -1,11 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', ['>= 5.2.0.beta1', '< 5.3']
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', ['>= 0.3.13', '< 0.5']
-gem 'database_cleaner'
-gem 'coveralls', require: false
+gemspec path: '..'
+
+gem 'activerecord', '~> 5.2.0'

data/gemfiles/Gemfile.ar-6.0

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord', '~> 6.0.0'

data/gemfiles/Gemfile.ar-6.1

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+ENV['PG_VERSION'] = '~> 1.1'
+gemspec path: '..'
+
+gem 'activerecord', '~> 6.1.0'

data/gemfiles/Gemfile.ar-master

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+ENV['PG_VERSION'] = '~> 1.1'
+gemspec path: '..'
+
+gem 'activerecord', github: 'rails/rails'

data/lib/active_record/typed_store/behavior.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module ActiveRecord::TypedStore
+  module Behavior
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def define_attribute_methods
+        super
+        define_typed_store_attribute_methods
+      end
+
+      def undefine_attribute_methods # :nodoc:
+        super if @typed_store_attribute_methods_generated
+        @typed_store_attribute_methods_generated = false
+      end
+
+      def define_typed_store_attribute_methods
+        return if @typed_store_attribute_methods_generated
+        store_accessors.each do |attribute|
+          define_attribute_method(attribute)
+          undefine_before_type_cast_method(attribute)
+        end
+        @typed_store_attribute_methods_generated = true
+      end
+
+      def undefine_before_type_cast_method(attribute)
+        # because it mess with ActionView forms, see #14.
+        method = "#{attribute}_before_type_cast"
+        undef_method(method) if method_defined?(method)
+      end
+    end
+
+    def changes
+      changes = super
+      self.class.store_accessors.each do |attr|
+        if send("#{attr}_changed?")
+          changes[attr] = [send("#{attr}_was"), send(attr)]
+        end
+      end
+      changes
+    end
+
+    def clear_attribute_change(attr_name)
+      return if self.class.store_accessors.include?(attr_name.to_s)
+      super
+    end
+
+    def read_attribute(attr_name)
+      if self.class.store_accessors.include?(attr_name.to_s)
+        return public_send(attr_name)
+      end
+      super
+    end
+
+    def attribute?(attr_name)
+      if self.class.store_accessors.include?(attr_name.to_s)
+        value = public_send(attr_name)
+
+        case value
+        when true        then true
+        when false, nil  then false
+        else
+          if value.respond_to?(:zero?)
+            !value.zero?
+          else
+            !value.blank?
+          end
+        end
+      else
+        super
+      end
+    end
+  end
+end

data/lib/active_record/typed_store/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/typed_store/field'
 
 module ActiveRecord::TypedStore

data/lib/active_record/typed_store/extension.rb

@@ -1,122 +1,51 @@
+# frozen_string_literal: true
+
 require 'active_record/typed_store/dsl'
+require 'active_record/typed_store/behavior'
 require 'active_record/typed_store/type'
 require 'active_record/typed_store/typed_hash'
+require 'active_record/typed_store/identity_coder'
 
 module ActiveRecord::TypedStore
   module Extension
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :typed_stores
-      self.typed_stores = {}
-    end
-
-    module ClassMethods
-      def store_accessors
-        typed_stores.each_value.flat_map(&:accessors)
+    def typed_store(store_attribute, options={}, &block)
+      unless self < Behavior
+        include Behavior
+        class_attribute :typed_stores, :store_accessors, instance_accessor: false
       end
 
-      def typed_store(store_attribute, options={}, &block)
-        dsl = DSL.new(store_attribute, options, &block)
-        self.typed_stores = self.typed_stores.merge(store_attribute => dsl)
+      dsl = DSL.new(store_attribute, options, &block)
+      self.typed_stores = (self.typed_stores || {}).merge(store_attribute => dsl)
+      self.store_accessors = typed_stores.each_value.flat_map(&:accessors).map { |a| -a.to_s }.to_set
 
-        typed_klass = TypedHash.create(dsl.fields.values)
-        const_set("#{store_attribute}_hash".camelize, typed_klass)
+      typed_klass = TypedHash.create(dsl.fields.values)
+      const_set("#{store_attribute}_hash".camelize, typed_klass)
 
-        decorate_attribute_type(store_attribute, :typed_store) do |subtype|
+      if ActiveRecord.version >= Gem::Version.new('6.1.0.alpha')
+        attribute(store_attribute) do |subtype|
+          subtype = subtype.subtype if subtype.is_a?(Type)
           Type.new(typed_klass, dsl.coder, subtype)
         end
-        store_accessor(store_attribute, dsl.accessors)
-
-        dsl.accessors.each do |accessor_name|
-          define_method("#{accessor_name}_changed?") do
-            send("#{store_attribute}_changed?") &&
-              send(store_attribute)[accessor_name] != send("#{store_attribute}_was")[accessor_name]
-          end
-
-          define_method("#{accessor_name}_was") do
-            send("#{store_attribute}_was")[accessor_name]
-          end
-
-          define_method("restore_#{accessor_name}!") do
-            send("#{accessor_name}=", send("#{accessor_name}_was"))
-          end
+      else
+        decorate_attribute_type(store_attribute, :typed_store) do |subtype|
+          Type.new(typed_klass, dsl.coder, subtype)
         end
       end
+      store_accessor(store_attribute, dsl.accessors)
 
-      def define_attribute_methods
-        super
-        define_typed_store_attribute_methods
-      end
-
-      def undefine_attribute_methods # :nodoc:
-        super if @typed_store_attribute_methods_generated
-        @typed_store_attribute_methods_generated = false
-      end
-
-      def define_typed_store_attribute_methods
-        return if @typed_store_attribute_methods_generated
-        store_accessors.each do |attribute|
-          define_attribute_method(attribute.to_s)
-          undefine_before_type_cast_method(attribute)
+      dsl.accessors.each do |accessor_name|
+        define_method("#{accessor_name}_changed?") do
+          send("#{store_attribute}_changed?") &&
+            send(store_attribute)[accessor_name] != send("#{store_attribute}_was")[accessor_name]
         end
-        @typed_store_attribute_methods_generated = true
-      end
 
-      def undefine_before_type_cast_method(attribute)
-        # because it mess with ActionView forms, see #14.
-        method = "#{attribute}_before_type_cast"
-        undef_method(method) if method_defined?(method)
-      end
-    end
-
-    def changes
-      changes = super
-      self.class.store_accessors.each do |attr|
-        if send("#{attr}_changed?")
-          changes[attr] = [send("#{attr}_was"), send(attr)]
+        define_method("#{accessor_name}_was") do
+          send("#{store_attribute}_was")[accessor_name]
         end
-      end
-      changes
-    end
-
-    def clear_attribute_change(attr_name)
-      return if self.class.store_accessors.include?(normalize_attribute(attr_name))
-      super
-    end
-
-    def read_attribute(attr_name)
-      if self.class.store_accessors.include?(normalize_attribute(attr_name))
-        return public_send(attr_name)
-      end
-      super
-    end
 
-    def query_attribute(attr_name)
-      if self.class.store_accessors.include?(attr_name.to_sym)
-        value = public_send(attr_name)
-
-        case value
-        when true        then true
-        when false, nil  then false
-        else
-          if value.respond_to?(:zero?)
-            !value.zero?
-          else
-            !value.blank?
-          end
+        define_method("restore_#{accessor_name}!") do
+          send("#{accessor_name}=", send("#{accessor_name}_was"))
         end
-      else
-        super
-      end
-    end
-
-    def normalize_attribute(attr)
-      case attr
-      when Symbol
-        attr
-      else
-        attr.to_s.to_sym
       end
     end
   end

data/lib/active_record/typed_store/field.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::TypedStore
   class Field
     attr_reader :array, :blank, :name, :default, :type, :null, :accessor, :type_sym

data/lib/active_record/typed_store/identity_coder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::TypedStore
   module IdentityCoder
     extend self

data/lib/active_record/typed_store/type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::TypedStore
   class Type < ActiveRecord::Type::Serialized
     def initialize(typed_hash_klass, coder, subtype)
@@ -21,8 +23,8 @@ module ActiveRecord::TypedStore
       define_method(method) do |value|
         return if value.nil?
 
-        if value.respond_to?(:to_h)
-          super(value.to_h)
+        if value.respond_to?(:to_hash)
+          super(value.to_hash)
         else
           raise ArgumentError, "ActiveRecord::TypedStore expects a hash as a column value, #{value.class} received"
         end

data/lib/active_record/typed_store/typed_hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::TypedStore
   class TypedHash < HashWithIndifferentAccess
 
@@ -15,6 +17,9 @@ module ActiveRecord::TypedStore
       end
     end
 
+    delegate :with_indifferent_access, to: :to_h
+    delegate :slice, :except, :without, to: :with_indifferent_access
+
     def initialize(constructor={})
       super()
       update(defaults_hash)

data/lib/active_record/typed_store/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module TypedStore
-    VERSION = '1.2.0'
+    VERSION = '1.4.0'
   end
 end

data/lib/active_record/typed_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 
 module ActiveRecord
@@ -7,5 +9,5 @@ end
 
 ActiveSupport.on_load(:active_record) do
   require 'active_record/typed_store/extension'
-  ::ActiveRecord::Base.send :include, ActiveRecord::TypedStore::Extension
+  ::ActiveRecord::Base.extend(ActiveRecord::TypedStore::Extension)
 end

data/lib/activerecord-typedstore.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'active_record/typed_store'

data/spec/active_record/typed_store/typed_hash_spec.rb

@@ -201,7 +201,27 @@ describe ActiveRecord::TypedStore::TypedHash do
         hash.merge!(source: '')
         expect(hash[:source]).to be == 'web'
       end
+
+    end
+
+    describe '#except' do
+
+      it 'does not set the default for ignored keys' do
+        hash = hash_class.new(source: 'foo')
+        expect(hash.except(:source)).to_not have_key(:source)
+      end
+
     end
+
+    describe '#slice' do
+
+      it 'does not set the default for ignored keys' do
+        hash = hash_class.new(source: 'foo')
+        expect(hash.slice(:not_source)).to_not have_key(:source)
+      end
+
+    end
+
   end
 
   context 'unknown columns' do

data/spec/active_record/typed_store_spec.rb

@@ -70,20 +70,11 @@ shared_examples 'any model' do
       }.to change { !!model.age_changed? }.from(true).to(false)
     end
 
-    if AR_VERSION >= AR_4_2
-      it 'can be restored individually' do
-        model.age = 24
-        expect {
-          model.restore_age!
-        }.to change { model.age }.from(24).to(12)
-      end
-    else
-      it 'can be reset individually' do
-        model.age = 24
-        expect {
-          model.reset_age!
-        }.to change { model.age }.from(24).to(12)
-      end
+    it 'can be restored individually' do
+      model.age = 24
+      expect {
+        model.restore_age!
+      }.to change { model.age }.from(24).to(12)
     end
 
     it 'does not dirty track assigning the same boolean' do
@@ -339,13 +330,13 @@ shared_examples 'any model' do
   describe 'decimal attributes' do
 
     it 'has the defined default as initial value' do
-      expect(model.total_price).to be == BigDecimal.new('4.2')
+      expect(model.total_price).to be == BigDecimal('4.2')
       expect(model.total_price).to be_a BigDecimal
     end
 
     it 'properly cast assigned value to decimal' do
       model.shipping_cost = 4.2
-      expect(model.shipping_cost).to be == BigDecimal.new('4.2')
+      expect(model.shipping_cost).to be == BigDecimal('4.2')
       expect(model.shipping_cost).to be_a BigDecimal
     end
 
@@ -357,7 +348,7 @@ shared_examples 'any model' do
 
     it 'retreive a BigDecimal instance' do
       model.update(shipping_cost: 4.2)
-      expect(model.reload.shipping_cost).to be == BigDecimal.new('4.2')
+      expect(model.reload.shipping_cost).to be == BigDecimal('4.2')
       expect(model.reload.shipping_cost).to be_a BigDecimal
     end
 
@@ -367,17 +358,17 @@ shared_examples 'any model' do
     end
 
     it 'positive values are considered present' do
-      model.shipping_cost = BigDecimal.new('4.2')
+      model.shipping_cost = BigDecimal('4.2')
       expect(model.shipping_cost?).to be true
     end
 
     it 'negative values are considered present' do
-      model.shipping_cost = BigDecimal.new('-4.2')
+      model.shipping_cost = BigDecimal('-4.2')
       expect(model.shipping_cost?).to be true
     end
 
     it '0 is not considered present' do
-      model.shipping_cost = BigDecimal.new('0')
+      model.shipping_cost = BigDecimal('0')
       expect(model.shipping_cost?).to be false
     end
 
@@ -432,48 +423,26 @@ shared_examples 'any model' do
     let(:time) { time_string.respond_to?(:in_time_zone) ? time_string.in_time_zone : Time.parse(time_string) }
 
     context "with ActiveRecord #{ActiveRecord::VERSION::STRING}" do
-      if AR_VERSION < AR_4_0
-        it 'has the defined default as initial value' do
-          model.save
-          expect(model.published_at).to be == time
-        end
+      it 'has the defined default as initial value' do
+        model.save
+        expect(model.reload.published_at).to be == time
+      end
+
+      it 'retreive a time instance' do
+        model.update(published_at: time)
+        expect(model.reload.published_at).to be == time
+      end
 
+      if ActiveRecord::Base.time_zone_aware_attributes
         it 'properly cast assigned value to time' do
           model.remind_at = time_string
           expect(model.remind_at).to be == time
         end
-        it 'properly cast assigned value to time on save' do
+      else
+        it 'properly cast assigned value to time' do
           model.remind_at = time_string
-          model.save
-          model.reload
           expect(model.remind_at).to be == time
         end
-        it 'retreive a Time instance' do
-          model.update(published_at: time)
-          expect(model.reload.published_at).to be == time
-        end
-      else
-        it 'has the defined default as initial value' do
-          model.save
-          expect(model.reload.published_at).to be == time
-        end
-
-        it 'retreive a time instance' do
-          model.update(published_at: time)
-          expect(model.reload.published_at).to be == time
-        end
-
-        if ActiveRecord::Base.time_zone_aware_attributes
-          it 'properly cast assigned value to time' do
-            model.remind_at = time_string
-            expect(model.remind_at).to be == time
-          end
-        else
-          it 'properly cast assigned value to time' do
-            model.remind_at = time_string
-            expect(model.remind_at).to be == time
-          end
-        end
       end
     end
   end
@@ -485,61 +454,27 @@ shared_examples 'any model' do
     let(:time) { datetime_string.respond_to?(:in_time_zone) ? datetime_string.in_time_zone : Time.parse(datetime_string) }
 
     context "with ActiveRecord #{ActiveRecord::VERSION::STRING}" do
+      it 'has the defined default as initial value' do
+        model.save
+        expect(model.reload.published_at).to be == datetime
+      end
 
-      if AR_VERSION < AR_4_0
-
-        it 'has the defined default as initial value' do
-          model.save
-          expect(model.published_at).to be == time
-        end
+      it 'retreive a DateTime instance' do
+        model.update(published_at: datetime)
+        expect(model.reload.published_at).to be == datetime
+      end
 
+      if ActiveRecord::Base.time_zone_aware_attributes
         it 'properly cast assigned value to time' do
           model.remind_at = datetime_string
           expect(model.remind_at).to be == time
         end
-
-        it 'properly cast assigned value to time on save' do
-          model.remind_at = datetime_string
-          model.save
-          model.reload
-          expect(model.remind_at).to be == time
-        end
-
-        it 'retreive a Time instance' do
-          model.update(published_at: datetime)
-          expect(model.reload.published_at).to be == time
-        end
-
       else
-
-        it 'has the defined default as initial value' do
-          model.save
-          expect(model.reload.published_at).to be == datetime
-        end
-
-        it 'retreive a DateTime instance' do
-          model.update(published_at: datetime)
-          expect(model.reload.published_at).to be == datetime
-        end
-
-        if ActiveRecord::Base.time_zone_aware_attributes
-
-          it 'properly cast assigned value to time' do
-            model.remind_at = datetime_string
-            expect(model.remind_at).to be == time
-          end
-
-        else
-
-          it 'properly cast assigned value to datetime' do
-            model.remind_at = datetime_string
-            expect(model.remind_at).to be == datetime
-          end
-
+        it 'properly cast assigned value to datetime' do
+          model.remind_at = datetime_string
+          expect(model.remind_at).to be == datetime
         end
-
       end
-
     end
 
     it 'nillify unparsable datetimes' do
@@ -788,6 +723,11 @@ shared_examples 'a store' do |retain_type = true, settings_type = :text|
       expect(model.explicit_settings[:signup][:counter]).to be_nil
     end
 
+    it 'coerce hashes to HashWithIndifferentAccess' do # this is actually Rails behavior
+      model.signup[:metadata] = { "signed_up_at" => Time.now }
+      expect(model.signup[:metadata]).to be_a ActiveSupport::HashWithIndifferentAccess
+    end
+
   end
 end
 
@@ -896,15 +836,6 @@ describe PostgresqlRegularARModel do
   it_should_behave_like 'a model supporting arrays', true
 end if defined?(PostgresqlRegularARModel)
 
-describe PostgresHstoreTypedStoreModel do
-  if AR_VERSION >= AR_4_1
-    pending('TODO: Rails edge HStore compatibiliy')
-  else
-    it_should_behave_like 'any model'
-    it_should_behave_like 'a store', false
-  end
-end if defined?(PostgresHstoreTypedStoreModel)
-
 describe PostgresJsonTypedStoreModel do
   it_should_behave_like 'any model'
   it_should_behave_like 'a store', true, :json
@@ -915,6 +846,11 @@ describe YamlTypedStoreModel do
   it_should_behave_like 'any model'
   it_should_behave_like 'a store'
   it_should_behave_like 'a model supporting arrays'
+
+  it 'nested hashes are not serialized as HashWithIndifferentAccess' do
+    model = described_class.create!
+    expect(model.settings_before_type_cast).not_to include('HashWithIndifferentAccess')
+  end
 end
 
 describe JsonTypedStoreModel do
@@ -928,3 +864,17 @@ describe MarshalTypedStoreModel do
   it_should_behave_like 'a store'
   it_should_behave_like 'a model supporting arrays'
 end
+
+describe InheritedTypedStoreModel do
+  let(:model) { described_class.new }
+
+  it 'can be serialized' do
+    model.update(new_attribute: "foobar")
+    expect(model.reload.new_attribute).to be == "foobar"
+  end
+
+  it 'is casted' do
+    model.update(new_attribute: 42)
+    expect(model.settings[:new_attribute]).to be == '42'
+  end
+end

data/spec/support/models.rb

@@ -2,17 +2,11 @@ require 'active_record'
 require 'json'
 require 'yaml'
 
-AR_VERSION = Gem::Version.new(ActiveRecord::VERSION::STRING)
-AR_4_0 = Gem::Version.new('4.0')
-AR_4_1 = Gem::Version.new('4.1.0.beta')
-AR_4_2 = Gem::Version.new('4.2.0-rc1')
-AR_5_0 = Gem::Version.new('5.0.0')
-
 ActiveRecord::Base.time_zone_aware_attributes = ENV['TIMEZONE_AWARE'] != '0'
 ActiveRecord::Base.configurations = {
   'test_sqlite3' => { 'adapter' => 'sqlite3', 'database' => '/tmp/typed_store.db' },
   'test_postgresql' => { 'adapter' => 'postgresql', 'database' => 'typed_store_test', 'username' => 'postgres' },
-  'test_mysql' => { 'adapter' => 'mysql2', 'database' => 'typed_store_test', 'username' => 'travis' },
+  'test_mysql' => { 'adapter' => 'mysql2', 'database' => 'typed_store_test', 'username' => 'root', 'password' => 'root' },
 }
 
 def define_columns(t)
@@ -80,7 +74,7 @@ def define_store_with_attributes(**options)
   end
 end
 
-MigrationClass = AR_VERSION >= AR_5_0 ? ActiveRecord::Migration["5.0"] : ActiveRecord::Migration
+MigrationClass = ActiveRecord::Migration["5.0"]
 class CreateAllTables < MigrationClass
 
   def self.recreate_table(name, *args, &block)
@@ -98,13 +92,11 @@ class CreateAllTables < MigrationClass
       ActiveRecord::Base.establish_connection(ENV['POSTGRES_URL'] || :test_postgresql)
       recreate_table(:postgresql_regular_ar_models) { |t| define_columns(t); t.text :untyped_settings }
 
-      if AR_VERSION >= AR_4_0
-        execute "create extension if not exists hstore"
-        recreate_table(:postgres_hstore_typed_store_models) { |t| t.hstore :settings; t.text :untyped_settings }
+      execute "create extension if not exists hstore"
+      recreate_table(:postgres_hstore_typed_store_models) { |t| t.hstore :settings; t.text :untyped_settings }
 
-        if ENV['POSTGRES_JSON']
-          recreate_table(:postgres_json_typed_store_models) { |t| t.json :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
-        end
+      if ENV['POSTGRES_JSON']
+        recreate_table(:postgres_json_typed_store_models) { |t| t.json :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
       end
     end
 
@@ -163,9 +155,8 @@ if ENV['POSTGRES']
     store :untyped_settings, accessors: [:title]
   end
 
-  if AR_VERSION >= AR_4_0
-
-    class PostgresHstoreTypedStoreModel < ActiveRecord::Base
+  if ENV['POSTGRES_JSON']
+    class PostgresJsonTypedStoreModel < ActiveRecord::Base
       establish_connection ENV['POSTGRES_URL'] || :test_postgresql
       store :untyped_settings, accessors: [:title]
 
@@ -173,35 +164,6 @@ if ENV['POSTGRES']
       define_store_with_no_attributes(coder: ColumnCoder.new(AsJson))
       define_store_with_partial_attributes(coder: ColumnCoder.new(AsJson))
     end
-
-    if ENV['POSTGRES_JSON']
-
-      if AR_VERSION >= AR_4_2
-
-        class PostgresJsonTypedStoreModel < ActiveRecord::Base
-          establish_connection ENV['POSTGRES_URL'] || :test_postgresql
-          store :untyped_settings, accessors: [:title]
-
-          define_store_with_attributes(coder: ColumnCoder.new(AsJson))
-          define_store_with_no_attributes(coder: ColumnCoder.new(AsJson))
-          define_store_with_partial_attributes(coder: ColumnCoder.new(AsJson))
-        end
-
-      else
-
-        class PostgresJsonTypedStoreModel < ActiveRecord::Base
-          establish_connection ENV['POSTGRES_URL'] || :test_postgresql
-          store :untyped_settings, accessors: [:title]
-
-          define_store_with_attributes(coder: ColumnCoder.new(AsJson))
-          define_store_with_no_attributes(coder: ColumnCoder.new(AsJson))
-          define_store_with_partial_attributes(coder: ColumnCoder.new(AsJson))
-        end
-
-      end
-
-    end
-
   end
 end
 
@@ -267,5 +229,4 @@ Models = [
 ]
 Models << MysqlRegularARModel if defined?(MysqlRegularARModel)
 Models << PostgresqlRegularARModel if defined?(PostgresqlRegularARModel)
-Models << PostgresHstoreTypedStoreModel if defined?(PostgresHstoreTypedStoreModel)
 Models << PostgresJsonTypedStoreModel if defined?(PostgresJsonTypedStoreModel)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jean Boussier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,34 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -149,19 +143,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - activerecord-typedstore.gemspec
-- gemfiles/Gemfile.ar-4.2
 - gemfiles/Gemfile.ar-5.0
-- gemfiles/Gemfile.ar-5.1
 - gemfiles/Gemfile.ar-5.2
+- gemfiles/Gemfile.ar-6.0
+- gemfiles/Gemfile.ar-6.1
+- gemfiles/Gemfile.ar-master
 - lib/active_record/typed_store.rb
+- lib/active_record/typed_store/behavior.rb
 - lib/active_record/typed_store/dsl.rb
 - lib/active_record/typed_store/extension.rb
 - lib/active_record/typed_store/field.rb
@@ -179,7 +175,7 @@ homepage: https://github.com/byroot/activerecord-typedstore
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,9 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Add type casting and full method attributes support to АctiveRecord store
 test_files:

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.3.5
-  - 2.4.2
-gemfile:
-  - gemfiles/Gemfile.ar-4.2
-  - gemfiles/Gemfile.ar-5.0
-  - gemfiles/Gemfile.ar-5.1
-
-env:
-  - TIMEZONE_AWARE=1 POSTGRES=1 MYSQL=1
-  - TIMEZONE_AWARE=0 POSTGRES=1 MYSQL=1
-  - TIMEZONE_AWARE=1 POSTGRES=1 POSTGRES_JSON=1
-  - TIMEZONE_AWARE=0 POSTGRES=1 POSTGRES_JSON=1
-
-addons:
-  postgresql: 9.3
-
-sudo: false
-cache: bundler
-
-before_script:
-  - mysql -e 'create database typed_store_test;'
-  - psql -c 'create database typed_store_test;' -U postgres

data/gemfiles/Gemfile.ar-4.2

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.2.1'
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', ['>= 0.3.13', '< 0.5']
-gem 'database_cleaner'
-gem 'coveralls', require: false

data/gemfiles/Gemfile.ar-5.1

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 5.1.0'
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', ['>= 0.3.13', '< 0.5']
-gem 'database_cleaner'
-gem 'coveralls', require: false