spicerack 0.25.3 → 0.25.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfda9212fbb28605aa0117ae3636c5f1bb244a90847aed48781a399b5bcd5222
-  data.tar.gz: 29a3a0ca7297be6ae910fbf211a274d80d010467ff0de53bcfae6df3e6273075
+  metadata.gz: afaac8e845d5f7e66aa9af978a299d7fbaf35da838835a5548221f0857036454
+  data.tar.gz: 87687c5774201a62f0f1f9e0afc31564900917f2729ab9a0cca9f7d491ee3fae
 SHA512:
-  metadata.gz: 385d1dea3ddd6ec85aae6182f3b9409b220a437dbe564405019df7c7eaa596c972b6f08f5e17a1817e09d4fe83678dc903775c3b44e3143f4e2bafcd0877890f
-  data.tar.gz: a344da11aca2dcf17a6f1cb84381339a42272c0401c62f34aa72f4da0be43f967ba66af3957999eb3280a53aae7bb8ae3d95186b020750dc02334a30265851a3
+  metadata.gz: 3b6a85beebfee388ec90192f4822d6dee67e6c9b1284143ae3fd803f13ecf556d14e6cca506611e1892a780c1ddf0eab46cc8e3e2392f39c580680763f3a9eeb
+  data.tar.gz: 1961e87e73b9e113d0086e8ce85345030ae813f4dee57bfcbddd327b9d5cbdb2625821f452a25feab994642d660a2176df37a32fc4a4c0ce47b3d1ac87dd390b

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/objects/output.rb

@@ -36,10 +36,15 @@ module Spicerack
         end
 
         def ensure_validation_before(method)
-          around_method method do |*arguments|
+          around_method method do |*args, **opts|
             raise NotValidatedError unless validated?
 
-            super(*arguments)
+            # TODO: replace with `super(...)` when <= 2.6 support is dropped
+            if RUBY_VERSION < "2.7" && opts.blank?
+              super(*args)
+            else
+              super(*args, **opts)
+            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.3"
+  VERSION = "0.25.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spicerack
 version: !ruby/object:Gem::Version
-  version: 0.25.3
+  version: 0.25.8
 platform: ruby
 authors:
 - Eric Garside
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-04-12 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.3
+        version: 0.25.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
 - !ruby/object:Gem::Dependency
   name: redis_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
 - !ruby/object:Gem::Dependency
   name: short_circu_it
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
 - !ruby/object:Gem::Dependency
   name: technologic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
 - !ruby/object:Gem::Dependency
   name: tablesalt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -208,28 +208,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
 - !ruby/object:Gem::Dependency
   name: spicerack-styleguide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.3
+        version: 0.25.8
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement