spicerack 0.25.1 → 0.25.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6587267192854028eb32a5c72e3e10b1cc26fb3916188db4f63dd63d3b1d1dda
-  data.tar.gz: 16772d83f89184b5abd70c8d8ecf6a401394a9805138d15ab0170dcc72862282
+  metadata.gz: 3cfb6a17458b48287381371a6e44d136dc14a8f4e0bd5f603c23e1924498f540
+  data.tar.gz: 5f8ba478c03f48a472f91204036335bf422ae92cacbd5a894eb3d2a25196d56d
 SHA512:
-  metadata.gz: 6827d51cff1f0c5aa1fcacf46edd0ec7b165d8932960f51823733a2060436f504baff9abfe0bcef879e6be6b43f7113eec5014b2ed6696eef577cd11bef825b3
-  data.tar.gz: c89f4b299347a0135372315086e2b1e7be2d93d54bc42e7853bd1c57869f24bbc4c891384af044de2314c82f5c7b46902ad2d0fd430375fdcbebc3c2465f6396
+  metadata.gz: 4e4be218c9d409619a1997e39edf2864c66b379be63eaeb308a157b89d7aafef7173b04a4e206a31178f8891a24307babc07c99e266fd06ce356f3a031821d2e
+  data.tar.gz: fd4eac37af22f80cbcde47d02a6b0ae9c574f4abe4f5a591389c2665830dc200c8e3630e4b9a926cf146f7cfcd2c6c4da843be2dd0e334d2906cb944c873f02b

data/lib/spicerack/hash_model.rb

@@ -3,6 +3,7 @@
 require "active_model"
 
 module Spicerack
+  # Provides on-demand synchronization between a `data' object and ActiveModel::Attributes
   module HashModel
     extend ActiveSupport::Concern
 
@@ -23,6 +24,7 @@ module Spicerack
       private
 
       def field(name, type = Type::Value.new, **options)
+        name = name.to_s
         _fields << name
         attribute(name, type, **options)
         define_field_methods(name)
@@ -30,12 +32,36 @@ module Spicerack
 
       def define_field_methods(name)
         define_method("#{name}?".to_sym) { data[name].present? }
-        define_method("#{name}=".to_sym) { |value| data[name] = value }
+        define_method("#{name}=".to_sym) do |value|  
+          data[name] = value
+          synchronize_attribute_from_datastore(name)
+        end
         define_method(name) do
-          write_attribute(name, data[name] || attribute(name))
+          synchronize_attribute_from_datastore(name)
           attribute(name)
         end
       end
     end
+      
+    private
+
+    # The data object can be anything from a normal hash to a hash-like object backed by redis.
+    def synchronize_attribute_from_datastore(name)
+      value_from_datastore = data[name]
+      value_from_attribute = attribute(name)
+      return if value_from_datastore == value_from_attribute
+      
+      value = value_from_datastore || value_from_attribute
+      
+      # Otherwise, the dataset is value takes priority and is written as the attribute value
+      # ActiveModel changed the interface to this method between Rails 6.0 and 6.1
+      # This method is a patch which allows this class to work with either version
+      # Once support for pre rails 6.0 is sunset this should likely be removed
+      if respond_to?(:_write_attribute, true)
+        _write_attribute(name, value)
+      else
+        write_attribute(name, value)
+      end
+    end
   end
 end

data/lib/spicerack/rspec/custom_matchers/define_field.rb

@@ -20,7 +20,7 @@ RSpec::Matchers.define :define_field do |field, type = nil, default: nil|
   match do
     expect(test_subject.attribute_types[field.to_s].type).to eq type unless type.nil?
     expect(test_subject._default_attributes[field.to_s].value).to eq default unless default.nil?
-    expect(test_subject._fields).to include field
+    expect(test_subject._fields).to include field.to_s
   end
   description { "define field #{field}" }
   failure_message { "expected #{test_subject} to define field #{field} #{with_details(type, default)}" }

data/lib/spicerack/version.rb

@@ -2,5 +2,5 @@
 
 module Spicerack
   # This constant is managed by spicerack
-  VERSION = "0.25.1"
+  VERSION = "0.25.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spicerack
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.6
 platform: ruby
 authors:
 - Eric Garside
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: around_the_world
@@ -20,70 +20,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
 - !ruby/object:Gem::Dependency
   name: redis_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
 - !ruby/object:Gem::Dependency
   name: short_circu_it
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
 - !ruby/object:Gem::Dependency
   name: technologic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
 - !ruby/object:Gem::Dependency
   name: tablesalt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -146,20 +146,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -208,28 +208,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
 - !ruby/object:Gem::Dependency
   name: spicerack-styleguide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.6
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement