activerecord-typedstore 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f56fb7b6456937890a85e139a296727a04b2c87a2452f45810782849378357a
-  data.tar.gz: 17e694f93e4db21a4b5a08c7795285fd10aaf9bc203f74376a14356873c84802
+  metadata.gz: 9cbd38a8c2df073a4576501953ef2e9debb1d4c36c673c7e5467c04a247ba9cd
+  data.tar.gz: f12be53e1013b2302706e6471bebec9abd0d9edd74efe660d0fcf6d4859368c1
 SHA512:
-  metadata.gz: 02d3ce60427903e2c039818c4c77368a42b20c4f9fbf5bf167357e0e932d01c717f5eea6172ea03170b018a468b6b8f0a00d59fd49073a38eb620a27e05870c3
-  data.tar.gz: 96ff55688ac6c1b2d9f56d9a45e796b4c633e6d3d1dd89cdbdb14025044d97c9f5deefce7a53494f35ff5a227f340e8ec9d9fba70b7d861fe488ee6f52ad98fe
+  metadata.gz: 8e9ff18057af10d974dc456f3ff66633dd2483aae664f6acab881a895ef341b8006a25641441b216189dd61f972fefad067e41351e3cd04020e51d9a7d974272
+  data.tar.gz: 230a6686e806dac2ad28892f2f2f2344f1f7b6b7627f1eb048a1e0e2cce4e4b5f6336e162aa23f37de52197ca41909fa9ac43476a828b4d3fcf5e7ffbdb0dc96

data/.github/workflows/ruby.yml

@@ -9,9 +9,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7', '3.0', '3.1']
-        rails: ['6.1', '7.0', 'edge']
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
+        rails: ['6.1', '7.0', '7.1', 'edge']
         timezone_aware: [0, 1]
+        exclude:
+          - ruby: '3.2'
+            rails: '6.1'
+          - ruby: '3.3'
+            rails: '6.1'
+          - ruby: '2.7'
+            rails: 'edge'
+          - ruby: '3.0'
+            rails: 'edge'
     env:
       BUNDLE_GEMFILE: gemfiles/Gemfile.ar-${{ matrix.rails }}
       TIMEZONE_AWARE: ${{ matrix.timezone_aware }}

data/README.md

@@ -1,6 +1,6 @@
 # ActiveRecord::TypedStore
 
-[![Gem Version](https://badge.fury.io/rb/activerecord-typedstore.png)](http://badge.fury.io/rb/activerecord-typedstore)
+[![Gem Version](https://badge.fury.io/rb/activerecord-typedstore.svg)](http://badge.fury.io/rb/activerecord-typedstore)
 
 [ActiveRecord::Store](http://api.rubyonrails.org/classes/ActiveRecord/Store.html) but with typed attributes.
 

data/gemfiles/Gemfile.ar-7.1

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

data/lib/active_record/typed_store/behavior.rb

@@ -74,20 +74,29 @@ module ActiveRecord::TypedStore
 
     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
+    if ActiveRecord.version.segments.first >= 7
+      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?
+      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|
+          has_attribute?(store) && read_attribute_before_type_cast(store).blank?
+        end
+      end
+    else
+      # Rails 6.1 capability
+      def attribute_names_for_partial_writes
+        super | self.class.typed_stores.keys.map(&:to_s).select do |store|
+          has_attribute?(store) && read_attribute_before_type_cast(store).blank?
+        end
       end
     end
   end

data/lib/active_record/typed_store/extension.rb

@@ -22,7 +22,12 @@ module ActiveRecord::TypedStore
       typed_klass = TypedHash.create(dsl.fields.values)
       const_set("#{store_attribute}_hash".camelize, typed_klass)
 
-      if ActiveRecord.version >= Gem::Version.new('6.1.0.alpha')
+      if ActiveRecord.version >= Gem::Version.new('7.2.0.alpha')
+        decorate_attributes([store_attribute]) do |name, subtype|
+          subtype = subtype.subtype if subtype.is_a?(Type)
+          Type.new(typed_klass, dsl.coder, subtype)
+        end
+      elsif 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)

data/lib/active_record/typed_store/field.rb

@@ -11,12 +11,12 @@ module ActiveRecord::TypedStore
 
       @accessor = options.fetch(:accessor, true)
       @name = name
+      @array = options.fetch(:array, false)
       if options.key?(:default)
         @default = extract_default(options[:default])
       end
       @null = options.fetch(:null, true)
       @blank = options.fetch(:blank, true)
-      @array = options.fetch(:array, false)
     end
 
     def has_default?
@@ -27,6 +27,8 @@ module ActiveRecord::TypedStore
       casted_value = type_cast(value)
       if !blank
         casted_value = default if casted_value.blank?
+      elsif array && has_default?
+        casted_value = default if value.nil?
       elsif !null
         casted_value = default if casted_value.nil?
       end

data/lib/active_record/typed_store/version.rb

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

data/spec/active_record/typed_store_spec.rb

@@ -524,7 +524,7 @@ shared_examples 'a store' do |retain_type = true, settings_type = :text|
   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_time, :remind_at_time, :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, :subjects, :nickname, :author, :source, :signup, :country]
     end
 
     it "can access keys even when accessors are not defined" do
@@ -889,9 +889,15 @@ shared_examples 'a model supporting arrays' do |pg_native=false|
       expect(model.reload.grades).to be == [[1, 2], [3, 4, 5]]
     end
 
+    it 'defaults to [] if provided default is not an array' do
+      model.update(subjects: nil)
+      expect(model.reload.subjects).to be == []
+    end
+
+    # Not sure about pg_native and if this test should be outside of this block.
     it 'retreive default if assigned null' do
       model.update(tags: nil)
-      expect(model.reload.tags).to be == []
+      expect(model.reload.tags).to be == ['article']
     end
   end
 end
@@ -958,6 +964,7 @@ end
 describe DirtyTrackingModel do
   it 'stores the default on creation' do
     model = DirtyTrackingModel.create!
+    model = DirtyTrackingModel.find(model.id)
     expect(model.settings_before_type_cast).to_not be_blank
   end
 
@@ -973,4 +980,13 @@ describe DirtyTrackingModel do
     expect(model.settings_changed?).to be false
     expect(model.changes).to be_empty
   end
+
+  it 'does not update missing attributes in partially loaded records' do
+    model = DirtyTrackingModel.create!(active: true)
+    model = DirtyTrackingModel.select(:id, :title).find(model.id)
+    model.update!(title: "Hello")
+
+    model = DirtyTrackingModel.find(model.id)
+    expect(model.active).to be true
+  end
 end

data/spec/spec_helper.rb

@@ -9,9 +9,9 @@ Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '**', '*.rb'))
 Time.zone = 'UTC'
 
 if ActiveRecord.respond_to?(:yaml_column_permitted_classes)
-  ActiveRecord.yaml_column_permitted_classes |= ['Date', 'Time', 'BigDecimal']
+  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']
+  ActiveRecord::Base.yaml_column_permitted_classes |= [Date, Time, BigDecimal]
 end
 
 RSpec.configure do |config|

data/spec/support/models.rb

@@ -43,7 +43,8 @@ def define_columns(t, array: false)
 
   if t.is_a?(ActiveRecord::TypedStore::DSL)
     t.integer :grades, array: true
-    t.string :tags, array: true, null: false, default: [].to_yaml
+    t.string :tags, array: true, null: false, default: ['article']
+    t.string :subjects, array: true, null: false, default: ['mathematics'].to_yaml
 
     t.string :nickname, blank: false, default: 'Please enter your nickname'
   end
@@ -190,7 +191,7 @@ Models = [
 ]
 
 class DirtyTrackingModel < ActiveRecord::Base
-  after_update :read_active
+  after_update :read_active, if: -> { has_attribute?(:settings) }
 
   typed_store(:settings) do |f|
     f.boolean :active, default: false, null: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -111,6 +111,7 @@ files:
 - activerecord-typedstore.gemspec
 - gemfiles/Gemfile.ar-6.1
 - gemfiles/Gemfile.ar-7.0
+- gemfiles/Gemfile.ar-7.1
 - gemfiles/Gemfile.ar-edge
 - lib/active_record/typed_store.rb
 - lib/active_record/typed_store/behavior.rb
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: Add type casting and full method attributes support to АctiveRecord store