attr_json 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f8a06eaf0058564901292a35bf15fd56c24b0eb8cb784ab1b1e9adc94b87e5
-  data.tar.gz: eb4917f0eb8304b8261536ae75a5abd64dfc29aed52d82c190bb9b48a738ff08
+  metadata.gz: 3f2658693e8b0c4d99e412e33c8d2ef67a70bb71302f0d3d079326bef2380c44
+  data.tar.gz: 6acbf7ca9e743a2a22550731baf495306bc087fd3787c02ea19435b94f96a85d
 SHA512:
-  metadata.gz: 599a5e752e187a9e511b766efffda2bbf546c6940f42e58c2f0cb883ef835c017e4ec8b9a4fbc2a3236fde733ae6c77c8d27e4728b0fff53dc993b209a3d7882
-  data.tar.gz: 84dac19bcebedf7979ad3299b28ecc175fec59887cc9e6d761d708f0dbb240f8443aba52aca89a434ab8040f5ff64288ce4a428a659c61e8ff11d128399b5974
+  metadata.gz: 9a3cf5a739623ba998162b0072b351a2ae07316691dc013c2f88820dc36d5119833d64bc89335379dbd636f65fcf4253f818649f57538c753b0a5d98fc7c5b6c
+  data.tar.gz: 79a977eb57509ad7035bb5d20e6212568d51b8062de11d536bbeae58acab8bc8db48eba181adeecff97286fa59042b6eb143359b41a7c65d73955fb18c2edc75

data/.github/workflows/ci.yml

@@ -54,15 +54,18 @@ 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
 
     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,7 +45,7 @@ jobs:
         include:
 
           - gemfile: rails_edge
-            ruby: 2.7
+            ruby: '3.0'
 
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
 

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

@@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased](https://github.com/jrochkind/attr_json/compare/v1.4.0...HEAD)
 
 
+## [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

@@ -29,6 +29,13 @@ 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 "selenium-webdriver"

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

@@ -177,27 +177,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 +192,9 @@ 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
 
-      super(self.class.fill_in_defaults(attributes))
+      fill_in_defaults!
     end
 
     def attributes
@@ -303,6 +280,14 @@ module AttrJson
 
     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.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_json
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-12-20 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.