activerecord-typedstore 1.1.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5f09b64721a41a7eae679a4ae848813504913d1d87815c035352da6b3134eb
-  data.tar.gz: bc9d48e95b48f9ad9d5b7e02f1edd9a1ce1004e8c93bfb6d18fc4d944d63c161
+  metadata.gz: 922ee9aa28151d4d9682563fb960a01e3f0b483d1c9d1e9168c095391b87344e
+  data.tar.gz: 1116257100c7775ec75c3742666c9ab35454ceca71bef07781fe8581edaeeeec
 SHA512:
-  metadata.gz: bbd034206f96e1063bdb078417b685148346edeeb36968068bd54a2a8e95321ec56d5aa69b50851238607a862a01cba1a1770ac541e283eba12735c11dd84f5a
-  data.tar.gz: f04cdc9a39338b8b0fcc164da82f4b472acbf7e59543e6f8ebf5b51300e5bf55f4cb01d602a7dfc083833fef38069ed468049a49be3b6ff45b84dac7e0f86952
+  metadata.gz: 0c01c5370bc89c17b38a7f9a928e96064cececa214eb9e43a90a10b0ee8e990d18fbea8d18f1c45e1b1f3a9446d17174e79fe5483b1ae5a89ac5f5e994e618a8
+  data.tar.gz: 99fc46ff54dd8ba238ef3bda41d2861d200fb8f11f41a5b07d0c5846d747435c3424a5f550c168c6f73a36c78638f6affbf95636f4a75c56af40ad8d42685268

data/.travis.yml

@@ -1,22 +1,33 @@
+sudo: false
 language: ruby
+cache: bundler
+
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
 
 rvm:
-  - 2.3.5
-  - 2.4.2
+  - "2.5"
+  - "2.6"
 gemfile:
-  - 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-master
 
 env:
-  - TIMEZONE_AWARE=1 POSTGRES=1 MYSQL=1
-  - TIMEZONE_AWARE=0 POSTGRES=1 MYSQL=1
+  - TIMEZONE_AWARE=1 POSTGRES=1 MYSQL=1 POSTGRES_JSON=1
+  - TIMEZONE_AWARE=0 POSTGRES=1 MYSQL=1 POSTGRES_JSON=1
 
-addons:
-  postgresql: 9.3
+matrix:
+  exclude:
+    - rvm: "2.6"
+      gemfile: 'gemfiles/Gemfile.6-0'
+    - rvm: "2.6"
+      gemfile: 'gemfiles/Gemfile.ar-master'
 
-sudo: false
-cache: bundler
+services:
+  - mysql
+  - postgresql
 
 before_script:
   - mysql -e 'create database typed_store_test;'

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 Postgres JSON or 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
 
@@ -123,21 +123,7 @@ typed_store :settings, coder: Base64MarshalCoder do |s|
 end
 ```
 
-If you want to use Postgres HStore or JSON column types, then you need a very simple coder:
-```ruby
-module DumbCoder
-  extend self
-
-  def load(data)
-    data || {}
-  end
-
-  def dump(data)
-    data || {}
-  end
-
-end
-```
+If you want to use JSON column or Postgres HStore types, then you can pass in `ActiveRecord::TypedStore::IdentityCoder` as the coder.
 
 ## HStore limitations
 
@@ -148,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-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.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/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
@@ -29,7 +31,7 @@ module ActiveRecord::TypedStore
     delegate :keys, to: :@fields
 
     NO_DEFAULT_GIVEN = Object.new
-    [:string, :text, :integer, :float, :datetime, :date, :boolean, :decimal, :any].each do |type|
+    [:string, :text, :integer, :float, :time, :datetime, :date, :boolean, :decimal, :any].each do |type|
       define_method(type) do |name, **options|
         @fields[name] = Field.new(name, type, options)
       end

data/lib/active_record/typed_store/extension.rb

@@ -1,122 +1,50 @@
+# 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|
           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
@@ -39,6 +41,7 @@ module ActiveRecord::TypedStore
       string: ::ActiveRecord::Type::String,
       float: ::ActiveRecord::Type::Float,
       date: ::ActiveRecord::Type::Date,
+      time: ::ActiveRecord::Type::Time,
       datetime: ::ActiveRecord::Type::DateTime,
       decimal: ::ActiveRecord::Type::Decimal,
       any: ::ActiveRecord::Type::Value,

data/lib/active_record/typed_store/identity_coder.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ActiveRecord::TypedStore
+  module IdentityCoder
+    extend self
+
+    def load(data)
+      data || {}
+    end
+
+    def dump(data)
+      data || {}
+    end
+  end
+end

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)

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.1.3'
+    VERSION = '1.3.1'
   end
 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
 
@@ -426,68 +417,64 @@ shared_examples 'any model' do
 
   end
 
-  describe 'datetime attributes' do
-
-    let(:datetime) { DateTime.new(1984, 6, 8, 13, 57, 12) }
-    let(:datetime_string) { '1984-06-08 13:57:12' }
-    let(:time) { datetime_string.respond_to?(:in_time_zone) ? datetime_string.in_time_zone : Time.parse(datetime_string) }
+  describe 'time attributes' do
+    let(:time) { Time.new(1984, 6, 8, 13, 57, 12) }
+    let(:time_string) { '1984-06-08 13:57:12' }
+    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
+      it 'has the defined default as initial value' do
+        model.save
+        expect(model.reload.published_at).to be == time
+      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 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 = datetime_string
+          model.remind_at = time_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
+        it 'properly cast assigned value to time' do
+          model.remind_at = time_string
+          expect(model.remind_at).to be == time
         end
+      end
+    end
+  end
 
-        if ActiveRecord::Base.time_zone_aware_attributes
+  describe 'datetime attributes' do
 
-          it 'properly cast assigned value to time' do
-            model.remind_at = datetime_string
-            expect(model.remind_at).to be == time
-          end
+    let(:datetime) { DateTime.new(1984, 6, 8, 13, 57, 12) }
+    let(:datetime_string) { '1984-06-08 13:57:12' }
+    let(:time) { datetime_string.respond_to?(:in_time_zone) ? datetime_string.in_time_zone : Time.parse(datetime_string) }
 
-        else
+    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
 
-          it 'properly cast assigned value to datetime' do
-            model.remind_at = datetime_string
-            expect(model.remind_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
-
       end
-
     end
 
     it 'nillify unparsable datetimes' do
@@ -513,7 +500,7 @@ shared_examples 'any model' do
 
 end
 
-shared_examples 'a store' do |retain_type=true|
+shared_examples 'a store' do |retain_type = true, settings_type = :text|
   let(:model) { described_class.new }
 
   describe "without connection" do
@@ -537,7 +524,7 @@ shared_examples 'a store' do |retain_type=true|
   describe 'model.typed_stores' do
     it "can access keys" do
       stores = model.class.typed_stores
-      expect(stores[:settings].keys).to eq [:no_default, :name, :email, :cell_phone, :public, :enabled, :age, :max_length, :rate, :price, :published_on, :remind_on, :published_at, :remind_at, :total_price, :shipping_cost, :grades, :tags, :nickname, :author, :source, :signup, :country]
+      expect(stores[:settings].keys).to eq [:no_default, :name, :email, :cell_phone, :public, :enabled, :age, :max_length, :rate, :price, :published_on, :remind_on, :published_at_time, :remind_at_time, :published_at, :remind_at, :total_price, :shipping_cost, :grades, :tags, :nickname, :author, :source, :signup, :country]
     end
 
     it "can access keys even when accessors are not defined" do
@@ -617,7 +604,7 @@ shared_examples 'a store' do |retain_type=true|
     end
 
     it 'delegates internal methods to the underlying type' do
-      expect(model.class.type_for_attribute("settings").type).to eq :text
+      expect(model.class.type_for_attribute("settings").type).to eq settings_type
     end
   end
 
@@ -844,18 +831,9 @@ 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'
+  it_should_behave_like 'a store', true, :json
   it_should_behave_like 'a model supporting arrays'
 end if defined?(PostgresJsonTypedStoreModel)
 

data/spec/support/models.rb

@@ -2,12 +2,6 @@ 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' },
@@ -34,6 +28,9 @@ def define_columns(t)
   t.date :published_on, default: '1984-06-08', null: false
   t.date :remind_on
 
+  t.time :published_at_time, default: '1984-06-08 13:57:12', null: false
+  t.time :remind_at_time
+
   t.datetime :published_at, default: '1984-06-08 13:57:12', null: false
   t.datetime :remind_at
 
@@ -77,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)
@@ -95,14 +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']
-          execute "create extension if not exists json"
-          recreate_table(:postgres_json_typed_store_models) { |t| t.json :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
 
@@ -161,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]
 
@@ -171,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: false)
-          define_store_with_no_attributes(coder: false)
-          define_store_with_partial_attributes(coder: false)
-        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
 
@@ -265,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.1.3
+  version: 1.3.1
 platform: ruby
 authors:
 - Jean Boussier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2020-07-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
@@ -157,14 +151,16 @@ files:
 - 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-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
+- lib/active_record/typed_store/identity_coder.rb
 - lib/active_record/typed_store/type.rb
 - lib/active_record/typed_store/typed_hash.rb
 - lib/active_record/typed_store/version.rb
@@ -178,7 +174,7 @@ homepage: https://github.com/byroot/activerecord-typedstore
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -193,9 +189,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-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/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