effective_resources 2.17.5 → 2.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8d215c9f3f4da7bf1e7776c8a313f7e75c8e2cc611ec5bfa7aab447c9153b70
-  data.tar.gz: 6c6775a3ae086b767a3a2277afa1bbb874001a9c0ea4de7c5c13939791b1619c
+  metadata.gz: 1d6cd13282f95cf3ec83e83274b89a6b2efa95750d85ff9b0c2bfed5d46eefe2
+  data.tar.gz: fd91b723775200c44d90440fdd661a6882f759af1ac6d2dbf28ca0b1c15f1075
 SHA512:
-  metadata.gz: ebb84318ad63c0cd8cdedf95bab1f72784a10d9e0cd80cdf3dd667c9fbc51bbdb7325686a614c963940ca92bd1bc39f2fa498e1c4733833d8c3b63ed663fc9a0
-  data.tar.gz: b58c8776531032a60c827a5e78224ebaf23778de79dc0bf2fc86c94dbc949da231606dfc71628ea5abd11083594ba99dfa6ee1f06de7e4dd3ca9096cc20bfcbb
+  metadata.gz: 49a7b12ff5a0902003b80966d3fa5102ccb31210315fb90e0e00d39161ff4ae23e42985bfc23d3a09e1e5d8ef5214cdf727543633b0a482af0c63f252ba5b5b6
+  data.tar.gz: 11dfc8a21c8c83553451a0ea6507ea54ccaee9707aa4b3718ee9a15f4febcd11cb7ae9e668916c18efb8e16e9ab416046852fae90f4f7be3b34b9107fc43916e

data/app/models/concerns/acts_as_statused.rb

@@ -34,7 +34,11 @@ module ActsAsStatused
       status_steps           :text, permitted: false
     end
 
-    serialize :status_steps, Hash
+    if EffectiveResources.serialize_with_coder?
+      serialize :status_steps, type: Hash, coder: YAML, default: Hash.new
+    else
+      serialize :status_steps, Hash
+    end
 
     const_set(:STATUSES, acts_as_statused_options[:statuses])
 

data/app/models/concerns/acts_as_tokened.rb

@@ -41,7 +41,7 @@ module ActsAsTokened
 
   # Instance Methods
   def to_param
-    token
+    token if persisted?
   end
 
   def to_global_id(**params)

data/app/models/concerns/acts_as_wizard.rb

@@ -55,7 +55,11 @@ module ActsAsWizard
       wizard_steps           :text, permitted: false
     end
 
-    serialize :wizard_steps, Hash
+    if EffectiveResources.serialize_with_coder?
+      serialize :wizard_steps, type: Hash, coder: YAML, default: Hash.new
+    else
+      serialize :wizard_steps, Hash
+    end
 
     before_save(if: -> { current_step.present? }) do
       wizard_steps[current_step.to_sym] ||= Time.zone.now

data/lib/effective_resources/effective_gem.rb

@@ -28,7 +28,7 @@ module EffectiveGem
   module ClassMethods
     def config(namespace = nil)
       namespace ||= Tenant.current if defined?(Tenant)
-      @config.dig(namespace) || @config.dig(:effective)
+      (@config[namespace] if namespace) || @config[:effective]
     end
 
     def setup(namespace = nil, &block)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.17.5'.freeze
+  VERSION = '2.18.1'.freeze
 end

data/lib/effective_resources.rb

@@ -16,6 +16,11 @@ module EffectiveResources
 
   include EffectiveGem
 
+  # We use the newer syntax for serialize calls in rails 7+
+  def self.serialize_with_coder?
+    Gem::Version.new(Gem.loaded_specs['rails'].version.to_s) >= Gem::Version.new('7')
+  end
+
   def self.authorized?(controller, action, resource)
     @exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
 
@@ -120,7 +125,7 @@ module EffectiveResources
     end
   end
 
-  def self.advance_date(date, business_days: 1, holidays: [:ca, :observed])
+  def self.advance_date(date, business_days: 1, holidays: [:us, :observed])
     raise('business_days must be an integer <= 365') unless business_days.kind_of?(Integer) && business_days <= 365
 
     business_days.times do
@@ -133,7 +138,7 @@ module EffectiveResources
     date
   end
 
-  def self.business_day?(date, holidays: [:ca, :observed])
+  def self.business_day?(date, holidays: [:us, :observed])
     require 'holidays' unless defined?(Holidays)
     date.wday != 0 && date.wday != 6 && Holidays.on(date, *holidays).blank?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.17.5
+  version: 2.18.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +140,16 @@ dependencies:
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-smtp
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Make any controller an effective resource controller.