jsonb_accessor 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0206aa16a6170326c1c5683a894715d6466cce4fb4b53f0bbd4326619608aed
-  data.tar.gz: e806fe994b60d0e9a4f8d46bda8df39a44266292010f2b4706bd2be3dfe46d44
+  metadata.gz: 5b446e2b5fcf294a928c055c00334951830d068f7161437ec8fcab443cf2cee5
+  data.tar.gz: 443355750846f163a89307f662cd06d5034b5b922e7305209e8101b879f75b3e
 SHA512:
-  metadata.gz: 443182674b5fd917ea91c8a7813756e43b85678343833845db054a4814ccbb9e20598794c2ee44ad44715258a5e957a1fe2cbcdbf2758b2a01200adf266c7381
-  data.tar.gz: 7f604bebd874c410c78e554c4e724f18d0c816fe035ebc1d8e470cede3d8d3497f9443a4a25a4d611f0395eb5215063e211aada8ef9d8df8e4ee7502b352eb81
+  metadata.gz: 98019ca7f52229b5ca88a11b29ece4919bdd308a4c101dbc3a1b53ffa9d783ab90d9c09219be7ff7de37641a4545593851ed60da69cfc57dd53dfe6b7ee04238
+  data.tar.gz: 0e7b87df70bc3fdd71f4e384857970863b89bf60931c623b15b0983e554875cc1581672977bb274f0104fb393052d81447e05db4759826f83255d8cf03f355bd

data/lib/jsonb_accessor/macro.rb

@@ -71,17 +71,26 @@ module JsonbAccessor
           end
 
           # Overrides the jsonb attribute setter to make sure the jsonb fields are kept in sync.
-          define_method("#{jsonb_attribute}=") do |given_value|
-            value = given_value || {}
+          define_method("#{jsonb_attribute}=") do |value|
+            value ||= {}
             names_to_store_keys = self.class.public_send(store_key_mapping_method_name)
+            store_keys_to_names = names_to_store_keys.invert
 
-            empty_store_key_attributes = names_to_store_keys.values.each_with_object({}) { |name, defaults| defaults[name] = nil }
-            empty_named_attributes = names_to_store_keys.keys.each_with_object({}) { |name, defaults| defaults[name] = nil }
+            # this is the raw hash we want to save in the jsonb_attribute
+            value_with_store_keys = value.transform_keys do |k|
+              names_to_store_keys[k.to_s] || k
+            end
+            write_attribute(jsonb_attribute, value_with_store_keys)
 
-            store_key_attributes = ::JsonbAccessor::QueryHelper.convert_keys_to_store_keys(value, names_to_store_keys)
-            write_attribute(jsonb_attribute, empty_store_key_attributes.merge(store_key_attributes).compact)
+            # this maps attributes to values
+            value_with_named_keys = value.transform_keys do |k|
+              store_keys_to_names[k.to_s] || k
+            end
 
-            empty_named_attributes.merge(value).each { |name, attribute_value| write_attribute(name, attribute_value) }
+            empty_named_attributes = names_to_store_keys.transform_values { nil }
+            empty_named_attributes.merge(value_with_named_keys).each do |name, attribute_value|
+              write_attribute(name, attribute_value)
+            end
           end
         end
         include setters

data/lib/jsonb_accessor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonbAccessor
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonb_accessor
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Michael Crismali