attr_json 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda561b590231ab664acf2eb3cc4301d314cb046c137a4634e7ffbf69fcab023
-  data.tar.gz: 3387445db5a9df2fe905bc58ad03bff68c6d3e8950a20d49df9abb1407e3f911
+  metadata.gz: 5fe1578a0dc062b2ca3c3b315da1e9c9e82b3a87a94e64db26f74a14e7b68335
+  data.tar.gz: f96ef69f875ba8652e7cb4c8366ff79a52eeeb7ad6531635ea2f3223dd6b3451
 SHA512:
-  metadata.gz: 17f38aa4781d512e6082861b2fea83eff7c679be24ae78a1d86143399ca3185c535400521fe3dac9e4064f82cd4d0626bd9426af5bddafd6dbc6353a513959b9
-  data.tar.gz: b8e05ea5e8cf5f9ec0c91ec4d2d3b6929f63325478b855a377abbcba0124a4c0450437c91b283a2257400d371c10a7781a8e49d3b319a7eb6c74218e9562a516
+  metadata.gz: c7f3df2f9f3072ec540a4dd4addeed8184c9f3da79fcf6c4d5939f5675729eee509e0362b1f603ef85fd1ea1606f1f6f8d79d1aeb5f90d073731d12281dfb473
+  data.tar.gz: 04b86f78256f0e53470aafe49168a2dcd019f45536485ad00f148998d5b4102981f25d35249e055561d137ee60a01e0a4a714792e00ac3bbb7d484dda27685d7

data/Gemfile

@@ -30,7 +30,7 @@ gem 'cocoon', ">= 1.2"
 gem 'jquery-rails'
 
 gem 'capybara', "~> 3.0"
-gem "chromedriver-helper"
+gem 'webdrivers', '~> 3.0'
 gem "selenium-webdriver"
 
 gem "byebug"

data/README.md

@@ -285,6 +285,20 @@ always mean 'contains' -- the previous query needs a `my_labels.hello`
 which is a hash that includes the key/value, `lang: en`, it can have
 other key/values in it too.  String values will need to match exactly.
 
+<a name="arbitrary-json-data"></a>
+## Storing Arbitrary JSON data
+
+Arbitrary JSON data (hashes, arrays, primitives of any depth) can be stored within attributes by using the rails built in `ActiveModel::Type::Value` as the attribute type. This is basically a "no-op" value type -- JSON alone will be used to serialize/deserialize whatever values you put there, because of the json type on the container field.
+
+```ruby
+class MyModel < ActiveRecord::Base
+  include AttrJson::Record
+
+  attr_json :arbitrary_hash, ActiveModel::Type::Value.new
+end
+
+```
+
 
 <a name="forms"></a>
 ## Forms and Form Builders
@@ -450,3 +464,5 @@ There is a `./bin/console` that will give you a console in the context of attr_j
 * Didn't actually notice existing [json_attributes](https://github.com/joel/json_attributes)
   until I was well on my way here. I think it's not updated for Rails5 or type-aware,
   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.

data/gemfiles/rails_5_0.gemfile

@@ -11,7 +11,7 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "capybara", "~> 3.0"
-gem "chromedriver-helper"
+gem "webdrivers", "~> 3.0"
 gem "selenium-webdriver"
 gem "byebug"
 gem "rails-ujs", require: false

data/gemfiles/rails_5_1.gemfile

@@ -11,7 +11,7 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "capybara", "~> 3.0"
-gem "chromedriver-helper"
+gem "webdrivers", "~> 3.0"
 gem "selenium-webdriver"
 gem "byebug"
 

data/gemfiles/rails_5_2.gemfile

@@ -11,7 +11,7 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "capybara", "~> 3.0"
-gem "chromedriver-helper"
+gem "webdrivers", "~> 3.0"
 gem "selenium-webdriver"
 gem "byebug"
 

data/gemfiles/rails_6_0.gemfile

@@ -11,7 +11,7 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "capybara", "~> 3.0"
-gem "chromedriver-helper"
+gem "webdrivers", "~> 3.0"
 gem "selenium-webdriver"
 gem "byebug"
 

data/gemfiles/rails_edge_6.gemfile

@@ -11,7 +11,7 @@ gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "capybara", "~> 3.0"
-gem "chromedriver-helper"
+gem "webdrivers", "~> 3.0"
 gem "selenium-webdriver"
 gem "byebug"
 gem "coffee-rails"

data/lib/attr_json/record.rb

@@ -26,6 +26,37 @@ module AttrJson
       self.attr_json_registry = AttrJson::AttributeDefinition::Registry.new
     end
 
+    protected
+
+    # adapted from ActiveRecord query_attribute method
+    # https://github.com/rails/rails/blob/v5.2.3/activerecord/lib/active_record/attribute_methods/query.rb#L12
+    #
+    # Sadly we could not re-use Rails code here, becuase the built-in method assumes attribute
+    # can be obtained with `self[attr_name]`, which you can not with attr_json (is that bad?), as
+    # well as `self.class.columns_hash[attr_name]` which you definitely can not (which is probably not bad),
+    # and has no way to use the value-translation semantics independently of that. May be a problem if
+    # ActiveRecord changes it's query method semantics in the future, will have to be sync'd here.
+    #
+    # Used to implement query methods on attr_json attributes, like `attr_json :foo, :string`, method `#foo?`
+    def self.attr_json_query_method(record, attribute)
+      value = record.send(attribute)
+
+      case value
+      when true
+        true
+      when false, nil, ActiveModel::Type::Boolean::FALSE_VALUES
+        false
+      else
+        if value.respond_to?(:to_i) && ( Numeric === value || value !~ /[^0-9]/ )
+          !value.to_i.zero?
+        elsif value.respond_to?(:zero?)
+          !value.zero?
+        else
+          !value.blank?
+        end
+      end
+    end
+
     class_methods do
       # Access or set class-wide json_attribute_config. Inherited by sub-classes,
       # but setting on sub-classes is unique to subclass. Similar to how
@@ -133,30 +164,27 @@ module AttrJson
         end
 
         _attr_jsons_module.module_eval do
+          # For getter and setter, we used to use read_store_attribute/write_store_attribute
+          # copied from Rails store_accessor implementation.
+          # https://github.com/rails/rails/blob/74c3e43fba458b9b863d27f0c45fd2d8dc603cbc/activerecord/lib/active_record/store.rb#L90-L96
+          #
+          # But in fact just getting/setting in the hash provided to us by ActiveRecord json type
+          # container works BETTER for dirty tracking. We had a test that only passed doing it
+          # this simple way.
+
           define_method("#{name}=") do |value|
             attribute_def = self.class.attr_json_registry.fetch(name.to_sym)
-            # write_store_attribute copied from Rails store_accessor implementation.
-            # https://github.com/rails/rails/blob/74c3e43fba458b9b863d27f0c45fd2d8dc603cbc/activerecord/lib/active_record/store.rb#L90-L96
-
-            # special handling for nil, sorry, because if name key was previously
-            # not present, write_store_attribute by default will decide there was
-            # no change and refuse to make the change. TODO messy.
-            if value.nil? && !public_send(attribute_def.container_attribute).has_key?(attribute_def.store_key)
-               public_send :"#{attribute_def.container_attribute}_will_change!"
-               public_send(attribute_def.container_attribute)[attribute_def.store_key] = nil
-            else
-              # use of `write_store_attribute` is copied from Rails store_accessor implementation.
-              # https://github.com/rails/rails/blob/74c3e43fba458b9b863d27f0c45fd2d8dc603cbc/activerecord/lib/active_record/store.rb#L90-L96
-              write_store_attribute(attribute_def.container_attribute, attribute_def.store_key, attribute_def.cast(value))
-            end
+            public_send(attribute_def.container_attribute)[attribute_def.store_key] = attribute_def.cast(value)
           end
 
           define_method("#{name}") do
             attribute_def = self.class.attr_json_registry.fetch(name.to_sym)
+            public_send(attribute_def.container_attribute)[attribute_def.store_key]
+          end
 
-            # use of `read_store_attribute` is copied from Rails store_accessor implementation.
-            # https://github.com/rails/rails/blob/74c3e43fba458b9b863d27f0c45fd2d8dc603cbc/activerecord/lib/active_record/store.rb#L90-L96
-            read_store_attribute(attribute_def.container_attribute, attribute_def.store_key)
+          define_method("#{name}?") do
+            # implementation of `query_store_attribute` is based on Rails `query_attribute` implementation
+            AttrJson::Record.attr_json_query_method(self, name)
           end
         end
 

data/lib/attr_json/version.rb

@@ -1,3 +1,3 @@
 module AttrJson
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_json
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord