activerecord-typedstore 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17f01f8701f6af429d7fb15bfbcf9cf202f1d82cbe0f6878aa4a503ed69fc0e8
-  data.tar.gz: e5e1dd4100a034b074fe2682e485ae1365c8bcbe9c4bb7bc96f697a5042c0f62
+  metadata.gz: 5f56fb7b6456937890a85e139a296727a04b2c87a2452f45810782849378357a
+  data.tar.gz: 17e694f93e4db21a4b5a08c7795285fd10aaf9bc203f74376a14356873c84802
 SHA512:
-  metadata.gz: f1703f9023ab91ac749d74335276a0824d3072060eac8a68270f2b52e41198dfeebecffd54738cd4b097fe97948371479e2db1c1fa8ebc30ca07eeeaf63bac91
-  data.tar.gz: 8e48b1f137a374053092ccf52f3411759fcf421d1e4d8cf8b7f47b3c25d935aaf958f568ee35423381171aca879bf68a7b943493cf4947a8d3af19f66d54616f
+  metadata.gz: 02d3ce60427903e2c039818c4c77368a42b20c4f9fbf5bf167357e0e932d01c717f5eea6172ea03170b018a468b6b8f0a00d59fd49073a38eb620a27e05870c3
+  data.tar.gz: 96ff55688ac6c1b2d9f56d9a45e796b4c633e6d3d1dd89cdbdb14025044d97c9f5deefce7a53494f35ff5a227f340e8ec9d9fba70b7d861fe488ee6f52ad98fe

data/.github/workflows/ruby.yml

@@ -5,43 +5,26 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }}
+    name: ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / TZ ${{ matrix.timezone_aware }}
     strategy:
+      fail-fast: false
       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
+        ruby: ['2.7', '3.0', '3.1']
+        rails: ['6.1', '7.0', 'edge']
         timezone_aware: [0, 1]
     env:
-      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
+      BUNDLE_GEMFILE: gemfiles/Gemfile.ar-${{ matrix.rails }}
       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
+      - name: Check out code
+        uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Ruby Tests
+        run: bundle exec rake

data/README.md

@@ -1,8 +1,5 @@
 # ActiveRecord::TypedStore
 
-[![Build Status](https://secure.travis-ci.org/byroot/activerecord-typedstore.png)](http://travis-ci.org/byroot/activerecord-typedstore)
-[![Code Climate](https://codeclimate.com/github/byroot/activerecord-typedstore.png)](https://codeclimate.com/github/byroot/activerecord-typedstore)
-[![Coverage Status](https://coveralls.io/repos/byroot/activerecord-typedstore/badge.png)](https://coveralls.io/r/byroot/activerecord-typedstore)
 [![Gem Version](https://badge.fury.io/rb/activerecord-typedstore.png)](http://badge.fury.io/rb/activerecord-typedstore)
 
 [ActiveRecord::Store](http://api.rubyonrails.org/classes/ActiveRecord/Store.html) but with typed attributes.
@@ -79,6 +76,12 @@ shop.save
 shop.reload
 shop.settings[:unknown] # => 'Hello World'
 
+# You can group attributes with a prefix or suffix
+typed_store(:browser, prefix: true) { |s| s.string :ip } # => #browser_ip
+typed_store(:browser, prefix: :web) { |s| s.string :ip } # => #web_ip
+typed_store(:browser, suffix: true) { |s| s.string :ip } # => #ip_browser
+typed_store(:browser, suffix: :web) { |s| s.string :ip } # => #ip_web
+
 # If you only want type casting and default handling without accessors
 
 # you can disable them store wide

data/activerecord-typedstore.gemspec

@@ -18,14 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 5.2'
+  spec.add_dependency 'activerecord', '>= 6.1'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '~> 10'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3'
-  spec.add_development_dependency 'coveralls', '~> 0'
   spec.add_development_dependency 'sqlite3', '~> 1'
-  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-6.1

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

data/gemfiles/{Gemfile.ar-5.2 → Gemfile.ar-7.0}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activerecord', '~> 5.2.0'
+gem 'activerecord', '~> 7.0.0'

data/gemfiles/{Gemfile.ar-master → Gemfile.ar-edge}

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

data/lib/active_record/typed_store/behavior.rb

@@ -71,5 +71,24 @@ module ActiveRecord::TypedStore
         super
       end
     end
+
+    private
+
+    def attribute_names_for_partial_inserts
+      # Contrary to all vanilla Rails types, typedstore attribute have an inherent default
+      # value that doesn't match the database column default.
+      # As such we need to insert them on partial inserts even if they weren't changed.
+      super | self.class.typed_stores.keys.map(&:to_s)
+    end
+
+    def attribute_names_for_partial_updates
+      # On partial updates we shouldn't need to force stores to be persisted. However since
+      # we weren't persisting them for a while on insertion, we now need to gracefully deal
+      # with existing records that may have been persisted with a `NULL` store
+      # We use `blank?` as an heuristic to detect these.
+      super | self.class.typed_stores.keys.map(&:to_s).select do |store|
+        @attributes.key?(store) && @attributes[store].value_before_type_cast.blank?
+      end
+    end
   end
 end

data/lib/active_record/typed_store/dsl.rb

@@ -6,10 +6,38 @@ module ActiveRecord::TypedStore
   class DSL
     attr_reader :fields, :coder
 
-    def initialize(attribute_name, options)
-      @coder = options.fetch(:coder) { default_coder(attribute_name) }
-      @accessors = options[:accessors]
-      @accessors = [] if options[:accessors] == false
+    def initialize(store_name, options)
+      @coder = options.fetch(:coder) { default_coder(store_name) }
+      @store_name = store_name
+      @prefix =
+        case options[:prefix]
+        when String, Symbol
+          "#{options[:prefix]}_"
+        when true
+          "#{store_name}_"
+        when false, nil
+          ""
+        else
+          raise ArgumentError, "Unexpected type for prefix option. Expected string, symbol, or boolean"
+        end
+      @suffix =
+        case options[:suffix]
+        when String, Symbol
+          "_#{options[:suffix]}"
+        when true
+          "_#{store_name}"
+        when false, nil
+          ""
+        else
+          raise ArgumentError, "Unexpected type for suffix option. Expected string, symbol, or boolean"
+        end
+      @accessors = if options[:accessors] == false
+        {}
+      elsif options[:accessors].is_a?(Array)
+        options[:accessors].each_with_object({}) do |accessor_name, hash|
+          hash[accessor_name] = accessor_key_for(accessor_name)
+        end
+      end
       @fields = {}
       yield self
     end
@@ -25,7 +53,9 @@ module ActiveRecord::TypedStore
     end
 
     def accessors
-      @accessors || @fields.values.select(&:accessor).map(&:name)
+      @accessors || @fields.values.select(&:accessor).each_with_object({}) do |field, hash|
+        hash[field.name] = accessor_key_for(field.name)
+      end
     end
 
     delegate :keys, to: :@fields
@@ -37,5 +67,11 @@ module ActiveRecord::TypedStore
       end
     end
     alias_method :date_time, :datetime
+
+    private
+
+    def accessor_key_for(name)
+      "#{@prefix}#{name}#{@suffix}"
+    end
   end
 end

data/lib/active_record/typed_store/extension.rb

@@ -14,9 +14,10 @@ module ActiveRecord::TypedStore
         class_attribute :typed_stores, :store_accessors, instance_accessor: false
       end
 
+      store_options = options.slice(:prefix, :suffix)
       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
+      self.store_accessors = typed_stores.each_value.flat_map { |d| d.accessors.values }.map { |a| -a.to_s }.to_set
 
       typed_klass = TypedHash.create(dsl.fields.values)
       const_set("#{store_attribute}_hash".camelize, typed_klass)
@@ -31,20 +32,20 @@ module ActiveRecord::TypedStore
           Type.new(typed_klass, dsl.coder, subtype)
         end
       end
-      store_accessor(store_attribute, dsl.accessors)
+      store_accessor(store_attribute, dsl.accessors.keys, **store_options)
 
-      dsl.accessors.each do |accessor_name|
-        define_method("#{accessor_name}_changed?") do
+      dsl.accessors.each do |accessor_name, accessor_key|
+        define_method("#{accessor_key}_changed?") do
           send("#{store_attribute}_changed?") &&
             send(store_attribute)[accessor_name] != send("#{store_attribute}_was")[accessor_name]
         end
 
-        define_method("#{accessor_name}_was") do
+        define_method("#{accessor_key}_was") do
           send("#{store_attribute}_was")[accessor_name]
         end
 
-        define_method("restore_#{accessor_name}!") do
-          send("#{accessor_name}=", send("#{accessor_name}_was"))
+        define_method("restore_#{accessor_key}!") do
+          send("#{accessor_key}=", send("#{accessor_name}_was"))
         end
       end
     end

data/lib/active_record/typed_store/type.rb

@@ -41,12 +41,7 @@ module ActiveRecord::TypedStore
 
     def changed_in_place?(raw_old_value, value)
       return false if value.nil?
-      if ActiveRecord.version.segments.first >= 5
-        raw_new_value = serialize(value)
-      else
-        # 4.2 capability
-        raw_new_value = type_cast_for_database(value)
-      end
+      raw_new_value = serialize(value)
       raw_old_value.nil? != raw_new_value.nil? || raw_old_value != raw_new_value
     end
   end

data/lib/active_record/typed_store/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module TypedStore
-    VERSION = '1.4.0'
+    VERSION = '1.5.1'
   end
 end

data/spec/active_record/typed_store_spec.rb

@@ -696,6 +696,82 @@ shared_examples 'a store' do |retain_type = true, settings_type = :text|
 
   end
 
+  describe 'with prefix true' do
+
+    it 'defines prefixed accessors' do
+      expect(model).to respond_to :prefixed_settings_language
+      expect(model).to respond_to :prefixed_settings_language=
+    end
+
+    it 'does not define unprefixed accessors' do
+      expect(model).not_to respond_to :language
+      expect(model).not_to respond_to :language=
+    end
+
+    it 'can be updated' do
+      model.update(prefixed_settings_language: 'en')
+      expect(model.reload.prefixed_settings_language).to be == 'en'
+    end
+
+  end
+
+  describe 'with custom prefix' do
+
+    it 'defines prefixed accessors' do
+      expect(model).to respond_to :custom_language
+      expect(model).to respond_to :custom_language=
+    end
+
+    it 'does not define unprefixed accessors' do
+      expect(model).not_to respond_to :language
+      expect(model).not_to respond_to :language=
+    end
+
+    it 'can be updated' do
+      model.update(custom_language: 'en')
+      expect(model.reload.custom_language).to be == 'en'
+    end
+
+  end
+
+  describe 'with suffix true' do
+
+    it 'defines suffixed accessors' do
+      expect(model).to respond_to :language_suffixed_settings
+      expect(model).to respond_to :language_suffixed_settings=
+    end
+
+    it 'does not define unprefixed accessors' do
+      expect(model).not_to respond_to :language
+      expect(model).not_to respond_to :language=
+    end
+
+    it 'can be updated' do
+      model.update(language_suffixed_settings: 'en')
+      expect(model.reload.language_suffixed_settings).to be == 'en'
+    end
+
+  end
+
+  describe 'with custom suffix' do
+
+    it 'defines suffixed accessors' do
+      expect(model).to respond_to :language_custom
+      expect(model).to respond_to :language_custom=
+    end
+
+    it 'does not define unprefixed accessors' do
+      expect(model).not_to respond_to :language
+      expect(model).not_to respond_to :language=
+    end
+
+    it 'can be updated' do
+      model.update(language_custom: 'en')
+      expect(model.reload.language_custom).to be == 'en'
+    end
+
+  end
+
   describe '`any` attributes' do
 
     it 'accept any type' do
@@ -849,7 +925,7 @@ describe YamlTypedStoreModel do
 
   it 'nested hashes are not serialized as HashWithIndifferentAccess' do
     model = described_class.create!
-    expect(model.settings_before_type_cast).not_to include('HashWithIndifferentAccess')
+    expect(model.settings_before_type_cast.to_s).not_to include('HashWithIndifferentAccess')
   end
 end
 
@@ -878,3 +954,23 @@ describe InheritedTypedStoreModel do
     expect(model.settings[:new_attribute]).to be == '42'
   end
 end
+
+describe DirtyTrackingModel do
+  it 'stores the default on creation' do
+    model = DirtyTrackingModel.create!
+    expect(model.settings_before_type_cast).to_not be_blank
+  end
+
+  it 'handles loaded records having uninitialized defaults' do
+    model = DirtyTrackingModel.create!
+    DirtyTrackingModel.update_all("settings = NULL") # bypass validation
+    model = DirtyTrackingModel.find(model.id)
+    expect(model.settings_changed?).to be false
+    expect(model.changes).to be_empty
+
+    model.update!(title: "Hello")
+
+    expect(model.settings_changed?).to be false
+    expect(model.changes).to be_empty
+  end
+end

data/spec/spec_helper.rb

@@ -2,21 +2,18 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'database_cleaner'
-
-require 'simplecov'
-require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-])
-SimpleCov.start
-
 require 'activerecord-typedstore'
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '**', '*.rb'))].each { |f| require f }
 
 Time.zone = 'UTC'
 
+if ActiveRecord.respond_to?(:yaml_column_permitted_classes)
+  ActiveRecord.yaml_column_permitted_classes |= ['Date', 'Time', 'BigDecimal']
+elsif ActiveRecord::Base.respond_to?(:yaml_column_permitted_classes)
+  ActiveRecord::Base.yaml_column_permitted_classes |= ['Date', 'Time', 'BigDecimal']
+end
+
 RSpec.configure do |config|
   config.order = 'random'
 end

data/spec/support/models.rb

@@ -1,15 +1,19 @@
 require 'active_record'
+require 'base64'
 require 'json'
 require 'yaml'
 
+ENV["RAILS_ENV"] = "test"
+
 ActiveRecord::Base.time_zone_aware_attributes = ENV['TIMEZONE_AWARE'] != '0'
+credentials = { 'database' => 'typed_store_test', 'username' => 'typed_store', 'password' => 'typed_store' }
 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' => 'root', 'password' => 'root' },
+  test: {
+    'test_sqlite3' => { 'adapter' => 'sqlite3', 'database' => '/tmp/typed_store.db' },
+  }
 }
 
-def define_columns(t)
+def define_columns(t, array: false)
   t.integer :no_default
 
   t.string :name, default: '', null: false
@@ -37,16 +41,12 @@ def define_columns(t)
   t.decimal :total_price, default: 4.2, null: false, precision: 16, scale: 2
   t.decimal :shipping_cost, precision: 16, scale: 2
 
-  t.integer :grades, array: true
-
-  if t.respond_to?(:name) && t.name =~ /sqlite|mysql/
-    # native sqlite cannot automatically cast array to yaml
+  if t.is_a?(ActiveRecord::TypedStore::DSL)
+    t.integer :grades, array: true
     t.string :tags, array: true, null: false, default: [].to_yaml
-  else
-    t.string :tags, array: true, null: false, default: []
-  end
 
-  t.string :nickname, blank: false, default: 'Please enter your nickname'
+    t.string :nickname, blank: false, default: 'Please enter your nickname'
+  end
 end
 
 def define_store_with_no_attributes(**options)
@@ -74,37 +74,28 @@ def define_store_with_attributes(**options)
   end
 end
 
-MigrationClass = ActiveRecord::Migration["5.0"]
-class CreateAllTables < MigrationClass
-
-  def self.recreate_table(name, *args, &block)
-    execute "drop table if exists #{name}"
-    create_table(name, *args, &block)
-  end
+def define_stores_with_prefix_and_suffix(**options)
+  typed_store(:prefixed_settings, prefix: true, **options) { |t| t.any :language }
+  typed_store(:suffixed_settings, suffix: true, **options) { |t| t.any :language }
+  typed_store(:custom_prefixed_settings, prefix: :custom, **options) { |t| t.any :language }
+  typed_store(:custom_suffixed_settings, suffix: :custom, **options) { |t| t.any :language }
+end
 
+MigrationClass = ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"]
+class CreateAllTables < MigrationClass
   def self.up
-    if ENV['MYSQL']
-      ActiveRecord::Base.establish_connection(:test_mysql)
-      recreate_table(:mysql_regular_ar_models) { |t| define_columns(t); t.text :untyped_settings }
-    end
+    ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations.configs_for(env_name: "test", name: :test_sqlite3))
+    create_table(:sqlite3_regular_ar_models, force: true) { |t| define_columns(t); t.text :untyped_settings }
+    create_table(:yaml_typed_store_models, force: true) { |t| %i[settings explicit_settings partial_settings untyped_settings prefixed_settings suffixed_settings custom_prefixed_settings custom_suffixed_settings].each { |column| t.text column}; t.string :regular_column }
+    create_table(:json_typed_store_models, force: true) { |t| %i[settings explicit_settings partial_settings untyped_settings prefixed_settings suffixed_settings custom_prefixed_settings custom_suffixed_settings].each { |column| t.text column}; t.string :regular_column }
+    create_table(:marshal_typed_store_models, force: true) { |t| %i[settings explicit_settings partial_settings untyped_settings prefixed_settings suffixed_settings custom_prefixed_settings custom_suffixed_settings].each { |column| t.text column}; t.string :regular_column }
 
-    if ENV['POSTGRES']
-      ActiveRecord::Base.establish_connection(ENV['POSTGRES_URL'] || :test_postgresql)
-      recreate_table(:postgresql_regular_ar_models) { |t| define_columns(t); t.text :untyped_settings }
+    create_table(:dirty_tracking_models, force: true) do |t|
+      t.string :title
+      t.text :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
+      t.timestamps
     end
-
-    ActiveRecord::Base.establish_connection(:test_sqlite3)
-    recreate_table(:sqlite3_regular_ar_models) { |t| define_columns(t); t.text :untyped_settings }
-    recreate_table(:yaml_typed_store_models) { |t| t.text :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
-    recreate_table(:json_typed_store_models) { |t| t.text :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
-    recreate_table(:marshal_typed_store_models) { |t| t.text :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
   end
 end
 ActiveRecord::Migration.verbose = true
@@ -129,44 +120,6 @@ class ColumnCoder
 
 end
 
-module AsJson
-  extend self
-
-  def load(value)
-    value
-  end
-
-  def dump(value)
-    value.as_json
-  end
-
-end
-
-if ENV['MYSQL']
-  class MysqlRegularARModel < ActiveRecord::Base
-    establish_connection :test_mysql
-    store :untyped_settings, accessors: [:title]
-  end
-end
-
-if ENV['POSTGRES']
-  class PostgresqlRegularARModel < ActiveRecord::Base
-    establish_connection ENV['POSTGRES_URL'] || :test_postgresql
-    store :untyped_settings, accessors: [:title]
-  end
-
-  if ENV['POSTGRES_JSON']
-    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
-
 class Sqlite3RegularARModel < ActiveRecord::Base
   establish_connection :test_sqlite3
   store :untyped_settings, accessors: [:title]
@@ -176,9 +129,15 @@ class YamlTypedStoreModel < ActiveRecord::Base
   establish_connection :test_sqlite3
   store :untyped_settings, accessors: [:title]
 
+  after_update :read_active
+  def read_active
+    enabled
+  end
+
   define_store_with_attributes
   define_store_with_no_attributes
   define_store_with_partial_attributes
+  define_stores_with_prefix_and_suffix
 end
 
 class InheritedTypedStoreModel < YamlTypedStoreModel
@@ -196,6 +155,7 @@ class JsonTypedStoreModel < ActiveRecord::Base
   define_store_with_attributes(coder: ColumnCoder.new(JSON))
   define_store_with_no_attributes(coder: ColumnCoder.new(JSON))
   define_store_with_partial_attributes(coder: ColumnCoder.new(JSON))
+  define_stores_with_prefix_and_suffix(coder: ColumnCoder.new(JSON))
 end
 
 module MarshalCoder
@@ -218,6 +178,7 @@ class MarshalTypedStoreModel < ActiveRecord::Base
   define_store_with_attributes(coder: ColumnCoder.new(MarshalCoder))
   define_store_with_no_attributes(coder: ColumnCoder.new(MarshalCoder))
   define_store_with_partial_attributes(coder: ColumnCoder.new(MarshalCoder))
+  define_stores_with_prefix_and_suffix(coder: ColumnCoder.new(MarshalCoder))
 end
 
 Models = [
@@ -227,6 +188,15 @@ Models = [
   JsonTypedStoreModel,
   MarshalTypedStoreModel
 ]
-Models << MysqlRegularARModel if defined?(MysqlRegularARModel)
-Models << PostgresqlRegularARModel if defined?(PostgresqlRegularARModel)
-Models << PostgresJsonTypedStoreModel if defined?(PostgresJsonTypedStoreModel)
+
+class DirtyTrackingModel < ActiveRecord::Base
+  after_update :read_active
+
+  typed_store(:settings) do |f|
+    f.boolean :active, default: false, null: false
+  end
+
+  def read_active
+    active
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -94,34 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !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: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -151,11 +109,9 @@ files:
 - README.md
 - Rakefile
 - activerecord-typedstore.gemspec
-- gemfiles/Gemfile.ar-5.0
-- gemfiles/Gemfile.ar-5.2
-- gemfiles/Gemfile.ar-6.0
 - gemfiles/Gemfile.ar-6.1
-- gemfiles/Gemfile.ar-master
+- gemfiles/Gemfile.ar-7.0
+- gemfiles/Gemfile.ar-edge
 - lib/active_record/typed_store.rb
 - lib/active_record/typed_store/behavior.rb
 - lib/active_record/typed_store/dsl.rb
@@ -190,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Add type casting and full method attributes support to АctiveRecord store

data/gemfiles/Gemfile.ar-5.0

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'sqlite3', '~> 1.3.0'
-gem 'activerecord', '~> 5.0.0'

data/gemfiles/Gemfile.ar-6.0

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