attr_json 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb4f8078039ec81cc25e7a95318ff5e42cb5bf85a955b40326f60f9022af16a2
-  data.tar.gz: 635f08ce5fa34ce45dfdd5256ae0e81fdcc2d455f4525bad5f71f5b0c4391c6b
+  metadata.gz: 158f20e87ae0be8aae9c5421c587380d5c9404c1df7271634fd20c607f10c823
+  data.tar.gz: 470d5fc5cdd5f8a2c797765f0a3cefe1c138026c8684ea9fb20c1883ed1566ca
 SHA512:
-  metadata.gz: 22c35f674c7b5f3a4e91f348d20439df3e8fe175ca5d3c8938720a5e71739df2474cdddd5fdab5f0527f8751ed0fb6dee11ba7f75889c143daca92bd84afc86b
-  data.tar.gz: 636628f0083dd61c869de5b9eb65a0c11988560e26d5dcd8e822759788bdac4bdb3c6f0359e2257867ac91a61721fda32df54a36f51a001450ef883289be433a
+  metadata.gz: 3e33cf6fb2b71be270c938395b6c453a8311519f0a875372534677c2f7bc9a2a15311dec666ab7d93b4a7fe0f4da36996cded7862fd9cf1b01a89100ce3bfaf6
+  data.tar.gz: d4eed5840a55e7d98158e1bd3b70b9f082b114f6dc389d532547d93d776684602ba896c297abc0f124d10a24821ad4eb13ef0036c1d9ac0771b198d30b868a2e

data/.github/workflows/ci.yml

@@ -62,10 +62,16 @@ jobs:
           - gemfile: rails_7_1
             ruby: 3.2
 
+          - gemfile: rails_7_1
+            ruby: 3.3
+
+          - gemfile: rails_7_2
+            ruby: 3.3
+
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

data/.github/workflows/future_rails_ci.yml

@@ -45,7 +45,7 @@ jobs:
         include:
 
           - gemfile: rails_edge
-            ruby: '3.1'
+            ruby: '3.3'
 
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
 

data/Appraisals

@@ -37,6 +37,14 @@ appraise "rails-7-1" do
   gem "pg", "~> 1.0"
 end
 
+appraise "rails-7-2" do
+  gem 'combustion', "~> 1.0"
+
+  gem "rails", "~> 7.2.0"
+  gem "pg", "~> 1.0"
+end
+
+
 appraise "rails-edge" do
   # need combustion edge to work with rails edge, will no longer
   # be true on next combustion release, probably no later than Rails 7.1

data/CHANGELOG.md

@@ -4,7 +4,8 @@ Notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/jrochkind/attr_json/compare/v2.3.0...HEAD)
+
+## [Unreleased](https://github.com/jrochkind/attr_json/compare/v2.3.1...HEAD)
 
 ### Fixed
 
@@ -30,6 +31,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 *
 
+## [2.3.1](https://github.com/jrochkind/attr_json/compare/v2.3.1...v2.4.0)
+
+### Added
+
+* Allow Rails 7.2 in gemspec (no code changes required to support) https://github.com/jrochkind/attr_json/pull/228
+
+
+## [2.3.1](https://github.com/jrochkind/attr_json/compare/v2.3.0...v2.3.1)
+
+### Fixed
+
+* Keep nested model validation working in Rails post-7.1, by no longer trying to re-use ActiveRecord::Validations::AssociatedValidator, instead supplying our own custom code. https://github.com/jrochkind/attr_json/pull/220
+
+* Validate PolymorphicModel instances. https://github.com/jrochkind/attr_json/pull/225 Thanks @LyricL-Gitster
+
+
 ## [2.3.0]((https://github.com/jrochkind/attr_json/compare/v2.2.0...v2.3.0))
 
 

data/README.md

@@ -1,6 +1,6 @@
 # AttrJson
-[![CI Status](https://github.com/jrochkind/attr_json/workflows/CI/badge.svg?branch=master)](https://github.com/jrochkind/attr_json/actions?query=workflow%3ACI+branch%3Amaster)
-[![CI Status](https://github.com/jrochkind/attr_json/workflows/CI%20on%20Future%20Rails%20Versions/badge.svg?branch=master)](https://github.com/jrochkind/attr_json/actions?query=workflow%3A%22CI+on+Future+Rails+Versions%22+branch%3Amaster)
+[![CI Status](https://github.com/jrochkind/attr_json/workflows/CI/badge.svg?branch=master)](https://github.com/jrochkind/attr_json/actions/workflows/ci.yml?query=workflow%3ACI+branch%3Amaster)
+[![CI Status](https://github.com/jrochkind/attr_json/workflows/CI%20on%20Future%20Rails%20Versions/badge.svg?branch=master)](https://github.com/jrochkind/attr_json/actions/workflows/future_rails_ci.yml?query=workflow%3ACI+branch%3Amaster)
 [![Gem Version](https://badge.fury.io/rb/attr_json.svg)](https://badge.fury.io/rb/attr_json)
 
 ActiveRecord attributes stored serialized in a json column, super smooth. For Rails 6.0.x through 7.0.x. Ruby 2.7+.

data/attr_json.gemspec

@@ -47,7 +47,7 @@ attributes use as much of the existing ActiveRecord architecture as we can.}
   # dependency included just as it is here, should never be released
   # from an env tht has any of these variables set.
   unless ENV['APPRAISAL_INITIALIZED'] || ENV["TRAVIS"] || ENV['CI']
-    spec.add_runtime_dependency "activerecord", ">= 6.0.0", "< 7.2"
+    spec.add_runtime_dependency "activerecord", ">= 6.0.0", "< 7.3"
   end
 
   spec.add_development_dependency "bundler"

data/gemfiles/rails_7_2.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "combustion", "~> 1.0"
+gem "rails", "~> 7.2.0"
+gem "pg", "~> 1.0"
+gem "rspec-rails", "~> 6.0"
+gem "simple_form", ">= 4.0"
+gem "cocoon", ">= 1.2"
+gem "jquery-rails"
+gem "coffee-rails"
+gem "sprockets-rails"
+gem "capybara", "~> 3.0"
+gem "selenium-webdriver"
+gem "byebug"
+
+gemspec path: "../"

data/lib/attr_json/model/nested_model_validator.rb

@@ -0,0 +1,27 @@
+module AttrJson
+  module Model
+    # Used to validate an attribute in an AttrJson::Model whose values are other models, when
+    # you want validation errors on the nested models to post up.
+    #
+    # This is based on ActiveRecord's own ActiveRecord::Validations::AssociatedValidator, and actually forked
+    # from it at https://github.com/rails/rails/blob/e37adfed4eff3b43350ec87222a922e9c72d9c1b/activerecord/lib/active_record/validations/associated.rb
+    #
+    # We used to simply use an ActiveRecord::Validations::AssociatedValidator, but as of https://github.com/jrochkind/attr_json/pull/220 (e1e798142d)
+    # it got ActiveRecord-specific functionality that no longer worked with our use case.
+    #
+    # No problem, the implementation is simple, we can provide it here, based on the last version that did work.
+    class NestedModelValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        if Array(value).reject { |r| valid_object?(r) }.any?
+          record.errors.add(attribute, :invalid, **options.merge(value: value))
+        end
+      end
+
+      private
+        def valid_object?(record)
+          #(record.respond_to?(:marked_for_destruction?) && record.marked_for_destruction?) || record.valid?
+          record.valid?
+        end
+    end
+  end
+end

data/lib/attr_json/model.rb

@@ -8,6 +8,7 @@ require 'attr_json/attribute_definition/registry'
 
 require 'attr_json/type/model'
 require 'attr_json/model/cocoon_compat'
+require 'attr_json/model/nested_model_validator'
 
 require 'attr_json/serialization_coder_from_type'
 
@@ -207,8 +208,8 @@ module AttrJson
       # @option options [String,Symbol] :store_key (nil) Serialize to JSON using
       #   given store_key, rather than name as would be usual.
       #
-      # @option options [Boolean] :validate (true) Create an ActiveRecord::Validations::AssociatedValidator so
-      #   validation errors on the attributes post up to self.
+      # @option options [Boolean] :validate (true) Mak validation errors on the attributes post up
+      #   to self, using something similar to an ActiveRecord::Validations::AssociatedValidator
       def attr_json(name, type, **options)
         options.assert_valid_keys(*(AttributeDefinition::VALID_OPTIONS - [:container_attribute] + [:validate]))
 
@@ -219,10 +220,9 @@ module AttrJson
         )
 
         # By default, automatically validate nested models
-        if type.kind_of?(AttrJson::Type::Model) && options[:validate] != false
-          # Yes. we're passing an ActiveRecord::Validations validator, but
-          # it works fine for ActiveModel. If this changes in the future, tests will catch.
-          self.validates_with ActiveRecord::Validations::AssociatedValidator, attributes: [name.to_sym]
+        if (type.kind_of?(AttrJson::Type::Model) || type.kind_of?(AttrJson::Type::PolymorphicModel)) && options[:validate] != false
+          # Post validations up with something based on ActiveRecord::Validations::AssociatedValidator
+          self.validates_with ::AttrJson::Model::NestedModelValidator, attributes: [name.to_sym]
         end
 
         _attr_jsons_module.module_eval do

data/lib/attr_json/version.rb

@@ -1,3 +1,3 @@
 module AttrJson
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_json
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2024-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,7 @@ files:
 - gemfiles/rails_6_1.gemfile
 - gemfiles/rails_7_0.gemfile
 - gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_2.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/attr_json.rb
 - lib/attr_json/attribute_definition.rb
@@ -172,6 +173,7 @@ files:
 - lib/attr_json/config.rb
 - lib/attr_json/model.rb
 - lib/attr_json/model/cocoon_compat.rb
+- lib/attr_json/model/nested_model_validator.rb
 - lib/attr_json/nested_attributes.rb
 - lib/attr_json/nested_attributes/builder.rb
 - lib/attr_json/nested_attributes/multiparameter_attribute_writer.rb
@@ -207,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: ActiveRecord attributes stored serialized in a json column, super smooth.