attr_json 2.0.0.rc1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11d5f5f1403cf8388ab7b5b14494a68ff5bdb11c1cd739ae81f78da5b97dbbbc
-  data.tar.gz: d787c2b06cc01478cd764201a204e85312bc9204f8c54b9bdbe2c5e597ac00b1
+  metadata.gz: cd9c25a736bb3b1ce26527c555718efcff2967204d853962048ffc2471af243c
+  data.tar.gz: dc022d69b43b4576d2939bb90f2e172b65b8dd45708b361758554561dc61f44f
 SHA512:
-  metadata.gz: 8dd9c059292d1fba076323f101f0a3445986db3b41ef6099a4f33a583dd1c8bb1dc58e42fba1f35d74fe87eeb1f3fe4253959377cb98c322fa9e22a99c5d43db
-  data.tar.gz: d145d01c73273d4fd1f089b95287fb67adb3c1f6ed12a5c5317a879f230430b760b3abbdf0c27626a2560e612a6823e239ab849ec557a2b412564e2a6bd5ef1c
+  metadata.gz: 6457f06b9aed14481b7dd1543929d7010b54d232473f64cde811452083279ab72bbeb92f7a972e903d8994f21f3e263c5163044aa363db4c35a7eadd42710f24
+  data.tar.gz: 8dd0bad4eb89aad50ceb084ecb48a08d0f4b19d67f9421250fb808a2238c159fce891d1e07d37568b6ba6c65c284a9b2b600e1156cf32334a2c7d518d468994d

data/.github/workflows/ci.yml

@@ -29,6 +29,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - gemfile: rails_6_0
+            ruby: 2.7
+
+          - gemfile: rails_6_0
+            ruby: '3.0'
+
           - gemfile: rails_6_1
             ruby: 2.7
 

data/Appraisals

@@ -3,6 +3,7 @@ appraise "rails-6-0" do
 
   gem "rails", ">= 6.0.0", "< 6.1"
   gem "pg", "~> 1.0"
+  gem "rspec-rails", "~> 5.0"
 end
 
 appraise "rails-6-1" do
@@ -32,4 +33,9 @@ appraise "rails-edge" do
 
   gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
   gem "pg", "~> 1.0"
+
+  # Edge rails, future Rails 7.1 currently allows rack 3 -- but rails itself
+  # and some of our other dependencies may not actually work with rack 3 yet,
+  # let's test under rack 2. (Nothing in this gem deals with levels as low as rack)
+  gem "rack", "~> 2.0"
 end

data/CHANGELOG.md

@@ -4,13 +4,41 @@ 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/v3.0.0...HEAD)
+## [Unreleased](https://github.com/jrochkind/attr_json/compare/v2.0.1...HEAD)
 
+### Fixed
+
+*
+
+*
+
+*
+
+### Added
+
+*
+
+*
+
+*
+
+## [2.0.1](https://github.com/jrochkind/attr_json/compare/v2.0.0...v2.0.1)
+
+
+### Fixed
+
+* You can now do a specified ActiveRecord `.select` without your json containers, to fetch an object with other attributes that you can access. https://github.com/jrochkind/attr_json/pull/193
+
+### Changed
+
+* Refactor #attr_json_sync_to_rails_attributes for slightly improved performance. https://github.com/jrochkind/attr_json/pull/192
+
+* Safety guard in sync_to_rails_attributes against unknown edge case where container is nil https://github.com/jrochkind/attr_json/pull/194
 
 
-## [3.0.0.rc1](https://github.com/jrochkind/attr_json/compare/v1.5.0...v3.0.0.rc1)
+## [2.0.0](https://github.com/jrochkind/attr_json/compare/v1.5.0...v2.0.0)
 
-While it has some backwards incompat changes, this is expected not to be a challenging upgrade, please let us know by filing an issue if it's giving you troubles, maybe we can make things easier for you. No changes to data stored in your DB should be needed when upgrading, the persisted data should be compatible between 2.x and 3.x.
+While it has some backwards incompat changes, this is expected not to be a challenging upgrade, please let us know by filing an issue if it's giving you troubles, maybe we can make things easier for you. No changes to data stored in your DB should be needed when upgrading, the persisted data should be compatible between 1.x and 2.x.
 
 ### Removed
 

data/README.md

@@ -256,6 +256,11 @@ m.attr_jsons_before_type_cast
 
 You can nest AttrJson::Model objects inside each other, as deeply as you like.
 
+You *can* edit nested models "in place", they will be properly saved.
+
+    m.lang_and_value.lang = "de"
+    m.save! # no problem!
+
 For use with Rails forms, you may want to use `attr_json_accepts_nested_attributes_for` (like Rails `accepts_nested_attributes_for`, see doc page on [Use with Forms and Form Builders](https://github.com/jrochkind/attr_json/blob/master/doc_src/forms.md).
 
 ### Model-type defaults
@@ -541,9 +546,9 @@ We use [appraisal](https://github.com/thoughtbot/appraisal) to test with multipl
 
 There is a `./bin/console` that will give you a console in the context of attr_json and all it's dependencies, including the combustion rails app, and the models defined there.
 
-## Acknowledements and Prior Art
+## Acknowledements, Prior Art, alternatives
 
-* The excellent work [Sean Griffin](https://twitter.com/sgrif) did on ActiveModel::Type
+* The excellent work [sgrif](https://twitter.com/sgrif) did on ActiveModel::Type
   really lays the groundwork and makes this possible. Plus many other Rails developers.
   Rails has a reputation for being composed of messy or poorly designed code, but
   it's some really nice design in Rails that allows us to do some pretty powerful
@@ -563,3 +568,5 @@ There is a `./bin/console` that will give you a console in the context of attr_j
   haven't looked at it too much.
 
 * [store_model](https://github.com/DmitryTsepelev/store_model) was created after `attr_json`, and has some overlapping functionality.
+
+* [store_attribute](https://github.com/palkan/store_attribute) is also a more recent addition. while it's not specifically about JSON, it could be used with an underlying JSON coder to give you typed json attributes.

data/gemfiles/rails_6_0.gemfile

@@ -5,14 +5,14 @@ source "https://rubygems.org"
 gem "combustion", "~> 1.0"
 gem "rails", ">= 6.0.0", "< 6.1"
 gem "pg", "~> 1.0"
-gem "rspec-rails", "~> 4.0"
+gem "rspec-rails", "~> 5.0"
 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 "webdrivers", "~> 5.0"
 gem "selenium-webdriver"
 gem "byebug"
 

data/gemfiles/rails_6_1.gemfile

@@ -5,14 +5,14 @@ source "https://rubygems.org"
 gem "combustion", "~> 1.0"
 gem "rails", "~> 6.1.0"
 gem "pg", "~> 1.0"
-gem "rspec-rails", "~> 4.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 "webdrivers", "~> 4.0"
+gem "webdrivers", "~> 5.0"
 gem "selenium-webdriver"
 gem "byebug"
 

data/gemfiles/rails_7_0.gemfile

@@ -5,14 +5,14 @@ source "https://rubygems.org"
 gem "combustion", "~> 1.0"
 gem "rails", "~> 7.0.0"
 gem "pg", "~> 1.0"
-gem "rspec-rails", "~> 4.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 "webdrivers", "~> 4.0"
+gem "webdrivers", "~> 5.0"
 gem "selenium-webdriver"
 gem "byebug"
 

data/gemfiles/rails_edge.gemfile

@@ -5,15 +5,16 @@ source "https://rubygems.org"
 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"
+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 "webdrivers", "~> 4.0"
+gem "webdrivers", "~> 5.0"
 gem "selenium-webdriver"
 gem "byebug"
+gem "rack", "~> 2.0"
 
 gemspec path: "../"

data/lib/attr_json/record.rb

@@ -48,23 +48,33 @@ module AttrJson
     # mutation of mutable object will effect both places, for instance for dirty
     # tracking.
     def attr_json_sync_to_rails_attributes
-      self.class.attr_json_registry.attribute_names.each do |attr_name|
+      self.class.attr_json_registry.definitions.group_by(&:container_attribute).each_pair do |container_attribute, definitions|
         begin
-          attribute_def = self.class.attr_json_registry.fetch(attr_name.to_sym)
-          json_value    = public_send(attribute_def.container_attribute)
-          value         = json_value[attribute_def.store_key]
+          # column may have eg been left out of an explicit 'select'
+          next unless has_attribute?(container_attribute)
 
-          if value
-            # TODO, can we just make this use the setter?
-            write_attribute(attr_name, value)
+          container_value    = public_send(container_attribute)
 
-            clear_attribute_change(attr_name) if persisted?
+          # isn't expected to be possible to be nil rather than empty hash, but
+          # if it is from some edge case, well, we don't have values to sync, fine
+          next if container_value.nil?
 
-            # writing and clearning will result in a new object stored in
-            # rails attributes, we want
-            # to make sure the exact same object is in the json attribute,
-            # so in-place mutation changes to it are reflected in both places.
-            json_value[attribute_def.store_key] = read_attribute(attr_name)
+          definitions.each do |attribute_def|
+            attr_name     = attribute_def.name
+            value         = container_value[attribute_def.store_key]
+
+            if value
+              # TODO, can we just make this use the setter?
+              write_attribute(attr_name, value)
+
+              clear_attribute_change(attr_name) if persisted?
+
+              # writing and clearning will result in a new object stored in
+              # rails attributes, we want
+              # to make sure the exact same object is in the json attribute,
+              # so in-place mutation changes to it are reflected in both places.
+              container_value[attribute_def.store_key] = read_attribute(attr_name)
+            end
           end
         rescue AttrJson::Type::Model::BadCast, AttrJson::Type::PolymorphicModel::TypeError => e
           # There was bad data in the DB, we're just going to skip the Rails attribute sync.

data/lib/attr_json/version.rb

@@ -1,3 +1,3 @@
 module AttrJson
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_json
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.1
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -202,11 +202,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: ActiveRecord attributes stored serialized in a json column, super smooth.