attr_json 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f8a06eaf0058564901292a35bf15fd56c24b0eb8cb784ab1b1e9adc94b87e5
-  data.tar.gz: eb4917f0eb8304b8261536ae75a5abd64dfc29aed52d82c190bb9b48a738ff08
+  metadata.gz: 3cd2566fed014325bee56f5c062080d3c929a790dbb3b287e92b086c2fa3180f
+  data.tar.gz: ffa8e7b471dce27a2708b12e6a2bf27edb5b20d1345656ca026ecc4b263a01a7
 SHA512:
-  metadata.gz: 599a5e752e187a9e511b766efffda2bbf546c6940f42e58c2f0cb883ef835c017e4ec8b9a4fbc2a3236fde733ae6c77c8d27e4728b0fff53dc993b209a3d7882
-  data.tar.gz: 84dac19bcebedf7979ad3299b28ecc175fec59887cc9e6d761d708f0dbb240f8443aba52aca89a434ab8040f5ff64288ce4a428a659c61e8ff11d128399b5974
+  metadata.gz: f8db6d4211a2dd9f4b9d8a5482b723597958082617e139157c325e8e3b9dddf15216d21bd56daece5d5b3674acdc8e099a22998ad452473a4bf0834774b7a21f
+  data.tar.gz: 13e2cd5b4b10f67f4ecfc1be8732c6a33a7f7a7fdb561b6d8f4f89ae39c74e4b0b153ae10fdf5d650a239534f5b28cd33750aaff90009eeec8877677e765a935

data/.github/workflows/ci.yml

@@ -54,15 +54,22 @@ jobs:
             ruby: 2.7
 
           - gemfile: rails_6_1
-            ruby: 3.0
+            ruby: '3.0'
 
           - gemfile: rails_7_0
-            ruby: 3.0
+            ruby: '3.0'
+
+          - gemfile: rails_7_0
+            ruby: 3.1
+
+          - gemfile: rails_7_0
+            ruby: 3.2
+
 
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

data/.github/workflows/future_rails_ci.yml

@@ -45,12 +45,12 @@ jobs:
         include:
 
           - gemfile: rails_edge
-            ruby: 2.7
+            ruby: '3.1'
 
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

data/Appraisals

@@ -37,6 +37,11 @@ appraise "rails-6-1" do
 
   gem "rails", "~> 6.1.0"
   gem "pg", "~> 1.0"
+
+  # sprockets-rails is already a rails 6.1 dependency, but combustion is failing
+  # to require it, this is one way to get it required.
+  # https://github.com/pat/combustion/issues/128
+  gem "sprockets-rails"
 end
 
 appraise "rails-7-0" do
@@ -44,21 +49,14 @@ appraise "rails-7-0" do
 
   gem "rails", "~> 7.0.0"
   gem "pg", "~> 1.0"
-
-  # to make our integration tests using simple_form work as-is,
-  # this works. Don't totally underestand the actual simple_form
-  # setup paths in Rails 7....
-  gem "sprockets-rails"
 end
 
 appraise "rails-edge" do
-  gem 'combustion', "~> 1.0"
+  # need combustion edge to work with rails edge, will no longer
+  # be true on next combustion release, probably no later than Rails 7.1
+  # https://github.com/pat/combustion/pull/126
+  gem 'combustion', "~> 1.0", github: "pat/combustion"
 
   gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
   gem "pg", "~> 1.0"
-
-  # We do some tests using cocoon, currently via sprockets-rails,
-  # which is not automatically available in Rails 7.  Not sure
-  # the future of cocoon in general. https://github.com/nathanvda/cocoon/issues/555
-  gem "sprockets-rails"
 end

data/CHANGELOG.md

@@ -4,10 +4,24 @@ 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/v1.4.0...HEAD)
+## [Unreleased](https://github.com/jrochkind/attr_json/compare/v1.4.1...HEAD)
 
 
+## [1.5.0](https://github.com/jrochkind/attr_json/compare/v1.4.1...v1.5.0)
 
+### Added
+
+* AttrJson::Model#dup will properly deep-dup attributes https://github.com/jrochkind/attr_json/pull/169
+
+* AttrJson::Model#freeze will freeze attributes -- but not deep-freeze. https://github.com/jrochkind/attr_json/pull/169
+
+* AttrJson::Model has some methods conventional in ActiveModel classes: Klass.attribute_types, Klass.attribute_names, and instance.attribute_names. https://github.com/jrochkind/attr_json/pull/169
+
+## [1.4.1](https://github.com/jrochkind/attr_json/compare/v1.4.0...v1.4.1)
+
+### Fixed
+
+* Fixed an obscure bug involving a conflict between attribute defaults and accepts_nested_attributes, in which defaults could overwrite assigned attributes. The `.fill_in_defaults` class method, which was never intended as public API and was commented accordingly, is gone. https://github.com/jrochkind/attr_json/pull/160
 
 ## [1.4.0](https://github.com/jrochkind/attr_json/compare/v1.3.0...v1.4.0)
 

data/Gemfile

@@ -19,7 +19,7 @@ gem 'combustion', '~> 1.1'
 gem 'rails'
 
 gem "pg"
-gem "rspec-rails", "~> 4.0"
+gem "rspec-rails", "~> 6.0"
 gem "simple_form", ">= 4.0"
 gem 'cocoon', ">= 1.2"
 gem 'jquery-rails'
@@ -29,8 +29,15 @@ gem 'jquery-rails'
 # don't understand, so we need to depend on it.
 gem "coffee-rails"
 
+# We do some tests using cocoon via sprockets, which needs sprockets-rails,
+# which is not automatically available in Rails 7. We add it explicitly,
+# which will duplciate dependences in rails pre-7, but add for rails 7. Not sure
+# the future of cocoon in general. https://github.com/nathanvda/cocoon/issues/555
+gem "sprockets-rails"
+
+
 gem 'capybara', "~> 3.0"
-gem 'webdrivers', '~> 4.0'
+gem 'webdrivers', '~> 5.0'
 gem "selenium-webdriver"
 
 gem "byebug"

data/README.md

@@ -4,7 +4,7 @@
 [![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 5.0 through 6.1. Ruby 2.4+.
+ActiveRecord attributes stored serialized in a json column, super smooth. For Rails 5.0 through 7.0. Ruby 2.4+.
 
 Typed and cast like Active Record. Supporting [nested models](#nested), [dirty tracking](#dirty), some [querying](#querying) (with postgres [jsonb](https://www.postgresql.org/docs/9.5/static/datatype-json.html) contains), and [working smoothy with form builders](#forms).
 
@@ -478,15 +478,15 @@ to prevent overwriting other updates from processes.
 
 ## State of Code, and To Be Done
 
-This code is solid and stable and is being used in production by at least a handful of people, including the primary maintainer, jrochkind. 
+This code is solid and stable and is being used in production by at least a handful of people, including the primary maintainer, jrochkind.
 
-The project is currently getting very little maintainance -- and is still working reliably through Rails releases. It is tested on edge rails and ruby (and has needed very few if any changes with subsequent releases), and I endeavor to keep it working as Rails keeps releasing. 
+The project is currently getting very little maintainance -- and is still working reliably through Rails releases. It is tested on edge rails and ruby (and has needed very few if any changes with subsequent releases), and I endeavor to keep it working as Rails keeps releasing.
 
-In order to keep the low-maintenace scenario sustainable, I am *very* cautious accepting new features, especially if they increase code complexity at all. Even if you have a working PR, I may be reluctant to accept it. I'm prioritizing sustainability and stability over new features, and so far this is working out well. However, discussion is always welcome! Especially when paired with code (failing tests for the bugfix or feature you want are super helpful on their own!). 
+In order to keep the low-maintenace scenario sustainable, I am *very* cautious accepting new features, especially if they increase code complexity at all. Even if you have a working PR, I may be reluctant to accept it. I'm prioritizing sustainability and stability over new features, and so far this is working out well. However, discussion is always welcome! Especially when paired with code (failing tests for the bugfix or feature you want are super helpful on their own!).
 
 We are committed to [semantic versioning](https://semver.org/) and will endeavor to release no backwards breaking changes without a major version. We are also serious about minimizing backwards incompat releases altogether (ie minimiing major version releases).
 
-Feedback of any kind of _very welcome_, please feel free to use the issue tracker. It is hard to get a sense of how many people are actually using this, which is helpful both for my own sense of reward and for anyone to get a sense of the size of the userbase -- feel free to say hi and let us know how you are using it! 
+Feedback of any kind of _very welcome_, please feel free to use the issue tracker. It is hard to get a sense of how many people are actually using this, which is helpful both for my own sense of reward and for anyone to get a sense of the size of the userbase -- feel free to say hi and let us know how you are using it!
 
 Except for the jsonb_contains stuff using postgres jsonb contains operator, I don't believe any postgres-specific features are used. It ought to work with MySQL, testing and feedback welcome. (Or a PR to test on MySQL?).  My own interest is postgres.
 

data/attr_json.gemspec

@@ -51,7 +51,6 @@ attributes use as much of the existing ActiveRecord architecture as we can.}
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", "~> 3.7"
-  spec.add_development_dependency "database_cleaner", "~> 1.5"
   spec.add_development_dependency "yard-activesupport-concern"
   spec.add_development_dependency "appraisal", "~> 2.2"
 

data/gemfiles/rails_5_0.gemfile

@@ -10,6 +10,7 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "coffee-rails"
+gem "sprockets-rails"
 gem "capybara", "~> 3.0"
 gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"

data/gemfiles/rails_5_1.gemfile

@@ -10,6 +10,7 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "coffee-rails"
+gem "sprockets-rails"
 gem "capybara", "~> 3.0"
 gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"

data/gemfiles/rails_5_2.gemfile

@@ -10,6 +10,7 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "coffee-rails"
+gem "sprockets-rails"
 gem "capybara", "~> 3.0"
 gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"

data/gemfiles/rails_6_0.gemfile

@@ -10,6 +10,7 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "coffee-rails"
+gem "sprockets-rails"
 gem "capybara", "~> 3.0"
 gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"

data/gemfiles/rails_6_1.gemfile

@@ -10,6 +10,7 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "coffee-rails"
+gem "sprockets-rails"
 gem "capybara", "~> 3.0"
 gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"

data/gemfiles/rails_7_0.gemfile

@@ -10,10 +10,10 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "coffee-rails"
+gem "sprockets-rails"
 gem "capybara", "~> 3.0"
 gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"
 gem "byebug"
-gem "sprockets-rails"
 
 gemspec path: "../"

data/gemfiles/rails_edge.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "combustion", "~> 1.0"
+gem "combustion", "~> 1.0", github: "pat/combustion"
 gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
 gem "pg", "~> 1.0"
 gem "rspec-rails", "~> 4.0"
@@ -10,10 +10,10 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "coffee-rails"
+gem "sprockets-rails"
 gem "capybara", "~> 3.0"
 gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"
 gem "byebug"
-gem "sprockets-rails"
 
 gemspec path: "../"

data/lib/attr_json/model.rb

@@ -135,6 +135,17 @@ module AttrJson
         @serialization_coder ||= AttrJson::SerializationCoderFromType.new(to_type)
       end
 
+      # like the ActiveModel::Attributes method
+      def attribute_names
+        attr_json_registry.attribute_names
+      end
+
+      # like the ActiveModel::Attributes method, hash with name keys, and ActiveModel::Type values
+      def attribute_types
+        attribute_names.collect { |name| [name.to_s, attr_json_registry.type_for_attribute(name)]}.to_h
+      end
+
+
       # Type can be an instance of an ActiveModel::Type::Value subclass, or a symbol that will
       # be looked up in `ActiveModel::Type.lookup`
       #
@@ -177,27 +188,6 @@ module AttrJson
         end
       end
 
-      # This should kind of be considered 'protected', but the semantics
-      # of how we want to call it don't give us a visibility modifier that works.
-      # Prob means refactoring called for. TODO?
-      def fill_in_defaults(hash)
-        # Only if we need to mutate it to add defaults, we'll dup it first. deep_dup not neccesary
-        # since we're only modifying top-level here.
-        duped = false
-        attr_json_registry.definitions.each do |definition|
-          if definition.has_default? && ! (hash.has_key?(definition.store_key.to_s) || hash.has_key?(definition.store_key.to_sym))
-            unless duped
-              hash = hash.dup
-              duped = true
-            end
-
-            hash[definition.store_key] = definition.provide_default!
-          end
-        end
-
-        hash
-      end
-
       private
 
       # Define an anonymous module and include it, so can still be easily
@@ -213,11 +203,15 @@ module AttrJson
     end
 
     def initialize(attributes = {})
-      if !attributes.respond_to?(:transform_keys)
-        raise ArgumentError, "When assigning attributes, you must pass a hash as an argument."
-      end
+      super
+
+      fill_in_defaults!
+    end
 
-      super(self.class.fill_in_defaults(attributes))
+    # inspired by https://github.com/rails/rails/blob/8015c2c2cf5c8718449677570f372ceb01318a32/activemodel/lib/active_model/attributes.rb
+    def initialize_dup(other) # :nodoc:
+      @attributes = @attributes.deep_dup
+      super
     end
 
     def attributes
@@ -255,6 +249,11 @@ module AttrJson
       self.class.attr_json_registry.has_attribute?(str)
     end
 
+    # like the ActiveModel::Attributes method
+    def attribute_names
+      self.class.attribute_names
+    end
+
     # Override from ActiveModel::Serialization to #serialize
     # by type to make sure any values set directly on hash still
     # get properly type-serialized.
@@ -301,8 +300,25 @@ module AttrJson
       false
     end
 
+    # like ActiveModel::Attributes at
+    # https://github.com/rails/rails/blob/8015c2c2cf5c8718449677570f372ceb01318a32/activemodel/lib/active_model/attributes.rb#L120
+    #
+    # is not a full deep freeze
+    def freeze
+      attributes.freeze unless frozen?
+      super
+    end
+
     private
 
+    def fill_in_defaults!
+      self.class.attr_json_registry.definitions.each do |definition|
+        if definition.has_default? && !attributes.has_key?(definition.name.to_s)
+          self.send("#{definition.name.to_s}=", definition.provide_default!)
+        end
+      end
+    end
+
     def _attr_json_write(key, value)
       if attribute_def = self.class.attr_json_registry[key.to_sym]
         attributes[key.to_s] = attribute_def.cast(value)

data/lib/attr_json/record/dirty.rb

@@ -270,7 +270,13 @@ module AttrJson
         # find it from currently declared attributes.
         # https://github.com/rails/rails/blob/6aa5cf03ea8232180ffbbae4c130b051f813c670/activemodel/lib/active_model/attribute_methods.rb#L463-L468
         def matched_attribute_method(method_name)
-          matches = self.class.send(:attribute_method_matchers_matching, method_name)
+          if self.class.respond_to?(:attribute_method_patterns_matching, true)
+            # Rails 7.1+
+            matches = self.class.send(:attribute_method_patterns_matching, method_name)
+          else
+            matches = self.class.send(:attribute_method_matchers_matching, method_name)
+          end
+
           matches.detect do |match|
             registry.has_attribute?(match.attr_name)
           end

data/lib/attr_json/version.rb

@@ -1,3 +1,3 @@
 module AttrJson
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_json
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -72,20 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: yard-activesupport-concern
   requirement: !ruby/object:Gem::Requirement
@@ -225,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: ActiveRecord attributes stored serialized in a json column, super smooth.