jsonb_accessor 1.3.4 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b40b7c775b9275c1fe7b6f3f3a8c0b7988dcd995da1b5bd594d0c3469ca372
-  data.tar.gz: 68dcf83030c07a537adee9030fd0f209f276e1e80f118c2d3ecc982694be466b
+  metadata.gz: b9c291219f0d8fa746d82718410e4eb6743a2e53b0c7f55b2d4770b0ab40b4de
+  data.tar.gz: 92cb5a1e680f3bcab2aff0ad1c459e1f67714083337a1cf0675837aba3f01a65
 SHA512:
-  metadata.gz: 9a136d5a27d25f8ffb29e2f2f06ffb43417b91544836dda70dd40583786512d29d302251c39eb877772e382da5ef4af28afc970a31ae295b5d01933d5f5e33bd
-  data.tar.gz: 411147569acaf3f9052e4ccae17063b3b0eaeb00c2738933a520a635861b054889b31b534b8959ae5d38bc3f5709dc0c3ccc9b20f45cf0f1f066b0aa60469e77
+  metadata.gz: cf6c29dba63cdc774387bc4e8146b7884188ef6219e29a901367cc380da7257501401a4788534016ea6c8c95a1a2cfb526e8657ae6f8606caa4e91748c4358dd
+  data.tar.gz: f8805f9278ca28e29b2521b3283e132e2264687a5dfaee01c18de82ede3de38465228092a96571bbb66d24a24cd3a01b5d61732ef2cbacca75fc02679860eb39

data/.github/workflows/ci.yml

@@ -11,12 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-
+    
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7.2
         bundler-cache: true
+        
     - name: Rubocop
       run: bundle exec rubocop
 

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 ## [Unreleased]
 
+## [1.3.6] - 2022-09-23
+### Fixed
+
+- Bug fix: Datetime values were not properly deserialized [#155](https://github.com/madeintandem/jsonb_accessor/pull/155)
+
+## [1.3.5] - 2022-07-23
+### Fixed
+
+- Bug fix: Attributes defined outside of jsonb_accessor are not written [#149](https://github.com/madeintandem/jsonb_accessor/pull/149)
+
 ## [1.3.4] - 2022-02-02
 ### Fixed
 

data/README.md

@@ -25,7 +25,7 @@ It also adds generic scopes for querying `jsonb` columns.
 Add this line to your application's `Gemfile`:
 
 ```ruby
-gem "jsonb_accessor", "~> 1"
+gem "jsonb_accessor"
 ```
 
 And then execute:

data/lib/jsonb_accessor/attribute_query_methods.rb

@@ -11,13 +11,13 @@ module JsonbAccessor
 
       # <jsonb_attribute>_where scope
       klass.define_singleton_method "#{jsonb_attribute}_where" do |attributes|
-        store_key_attributes = ::JsonbAccessor::Helpers.convert_keys_to_store_keys(attributes, all.model.public_send(store_key_mapping_method_name))
+        store_key_attributes = JsonbAccessor::Helpers.convert_keys_to_store_keys(attributes, all.model.public_send(store_key_mapping_method_name))
         jsonb_where(jsonb_attribute, store_key_attributes)
       end
 
       # <jsonb_attribute>_where_not scope
       klass.define_singleton_method "#{jsonb_attribute}_where_not" do |attributes|
-        store_key_attributes = ::JsonbAccessor::Helpers.convert_keys_to_store_keys(attributes, all.model.public_send(store_key_mapping_method_name))
+        store_key_attributes = JsonbAccessor::Helpers.convert_keys_to_store_keys(attributes, all.model.public_send(store_key_mapping_method_name))
         jsonb_where_not(jsonb_attribute, store_key_attributes)
       end
 

data/lib/jsonb_accessor/helpers.rb

@@ -19,5 +19,19 @@ module JsonbAccessor
     def convert_store_keys_to_keys(attributes, store_key_mapping)
       convert_keys_to_store_keys(attributes, store_key_mapping.invert)
     end
+
+    def deserialize_value(value, attribute_type)
+      return value if value.blank?
+
+      if attribute_type == :datetime
+        value = if active_record_default_timezone == :utc
+                  Time.find_zone("UTC").parse(value).in_time_zone
+                else
+                  Time.zone.parse(value)
+                end
+      end
+
+      value
+    end
   end
 end

data/lib/jsonb_accessor/macro.rb

@@ -38,7 +38,7 @@ module JsonbAccessor
         end
 
         # Get store keys to default values mapping
-        store_keys_and_defaults = ::JsonbAccessor::Helpers.convert_keys_to_store_keys(names_and_defaults, public_send(store_key_mapping_method_name))
+        store_keys_and_defaults = JsonbAccessor::Helpers.convert_keys_to_store_keys(names_and_defaults, public_send(store_key_mapping_method_name))
 
         # Define jsonb_defaults_mapping_for_<jsonb_attribute>
         defaults_mapping_method_name = "jsonb_defaults_mapping_for_#{jsonb_attribute}"
@@ -69,7 +69,7 @@ module JsonbAccessor
               attribute_value = public_send(name)
               # Rails always saves time based on `default_timezone`. Since #as_json considers timezone, manual conversion is needed
               if attribute_value.acts_like?(:time)
-                attribute_value = (::JsonbAccessor::Helpers.active_record_default_timezone == :utc ? attribute_value.utc : attribute_value.in_time_zone).strftime("%F %R:%S.%L")
+                attribute_value = (JsonbAccessor::Helpers.active_record_default_timezone == :utc ? attribute_value.utc : attribute_value.in_time_zone).strftime("%F %R:%S.%L")
               end
 
               new_values = (public_send(jsonb_attribute) || {}).merge(store_key => attribute_value)
@@ -83,17 +83,16 @@ module JsonbAccessor
             names_to_store_keys = self.class.public_send(store_key_mapping_method_name)
 
             # this is the raw hash we want to save in the jsonb_attribute
-            value_with_store_keys = ::JsonbAccessor::Helpers.convert_keys_to_store_keys(value, names_to_store_keys)
+            value_with_store_keys = JsonbAccessor::Helpers.convert_keys_to_store_keys(value, names_to_store_keys)
             write_attribute(jsonb_attribute, value_with_store_keys)
 
             # this maps attributes to values
-            value_with_named_keys = ::JsonbAccessor::Helpers.convert_store_keys_to_keys(value, names_to_store_keys)
+            value_with_named_keys = JsonbAccessor::Helpers.convert_store_keys_to_keys(value, names_to_store_keys)
 
             empty_named_attributes = names_to_store_keys.transform_values { nil }
             empty_named_attributes.merge(value_with_named_keys).each do |name, attribute_value|
-              # Undefined keys: There might be things in the JSON that haven't been defined using jsonb_accessor
-              # It should still be possible to save arbitrary data in the JSON
-              next unless has_attribute? name
+              # Only proceed if this attribute has been defined using `jsonb_accessor`.
+              next unless names_to_store_keys.key?(name)
 
               write_attribute(name, attribute_value)
             end
@@ -110,12 +109,15 @@ module JsonbAccessor
             name = names_and_store_keys.key(store_key)
             next unless name
 
-            write_attribute(name, value)
+            write_attribute(
+              name,
+              JsonbAccessor::Helpers.deserialize_value(value, self.class.type_for_attribute(name).type)
+            )
             clear_attribute_change(name) if persisted?
           end
         end
 
-        ::JsonbAccessor::AttributeQueryMethods.new(self).define(store_key_mapping_method_name, jsonb_attribute)
+        JsonbAccessor::AttributeQueryMethods.new(self).define(store_key_mapping_method_name, jsonb_attribute)
       end
     end
   end

data/lib/jsonb_accessor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonb_accessor
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors:
 - Michael Crismali
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord