effective_resources 1.18.2 → 1.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0823eab342743da2a61c1b174cad39ffc77c6602c8422488bd32c113148b066f'
-  data.tar.gz: 3958c07bc7d38c1c3de867e699b899fddc1833e029b7b639635a08b9a92b9bdc
+  metadata.gz: 567d72c04873550e68210d5d632d9f6b28581fd9ad7ecafd3869c474e8e01d98
+  data.tar.gz: f573678744280a397793530d76f74a9509191b1bb872a29464148591005d3f9e
 SHA512:
-  metadata.gz: 180567d91706dee43b3ae5ab9e09e9f1abe0f1f352daa1bbf69ed3110564814ddacbc542d8293d5df8093dc94a36d8547a6f4814e307b6966f5ca7e49e7a34a9
-  data.tar.gz: 9852aac45f8341b0e27509d1b82c59f5d739eb3d1194daad74f6f1c1a4e7a29a0705a90dedd15945fa2af14c6cc546429d6f07db559d8785b182fa0a6a2d0c3b
+  metadata.gz: 28c8e863d89bc6ffe40b1df04d373e4f500adc1afe913750962a2e7cb7804257ece906f9da25972825f365ba883398279fd17000d87841279a04d53ceddbb029
+  data.tar.gz: 7f93cb245d4b556bca714a46b4bcf760ed0a30b29bbd7eddc681657216989f777b71b6ff0db88f7afb6e433e08b84dea7a63a706bda2c5ebe3a1885388ef6fe1

data/app/helpers/effective_resources_helper.rb

@@ -218,6 +218,9 @@ module EffectiveResourcesHelper
 
     if lookup_context.exists?(file, [path], :partial)
       render(partial, atts)
+    else
+      Rails.logger.info "Skipped Render (effective_resources) render_if_exists: #{partial}"
+      nil
     end
   end
 

data/app/helpers/effective_resources_wizard_helper.rb

@@ -6,7 +6,7 @@ module EffectiveResourcesWizardHelper
     klasses = ['wizard-sidebar', 'list-group', ('list-group-horizontal' if horizontal)].compact.join(' ')
 
     sidebar = content_tag(:div, class: klasses) do
-      resource.required_steps.map.with_index do |nav_step, index|
+      resource.sidebar_steps.map.with_index do |nav_step, index|
         render_wizard_sidebar_item(resource, nav_step, (index + 1 if numbers))
       end.join.html_safe
     end

data/app/models/concerns/acts_as_tokened.rb

@@ -28,7 +28,10 @@ module ActsAsTokened
     def find(*args)
       return super unless args.length == 1
       return super if block_given?
-      return find_by_id(args.first) if @_effective_reloading
+
+      if self.class.instance_variable_get(:@_effective_reloading) || (respond_to?(:klass) && klass.instance_variable_get(:@_effective_reloading))
+        return find_by_id(args.first)
+      end
 
       find_by_token(args.first) || raise(::ActiveRecord::RecordNotFound.new("Couldn't find #{name} with 'token'=#{args.first}"))
     end

data/app/models/concerns/acts_as_wizard.rb

@@ -78,6 +78,10 @@ module ActsAsWizard
       steps
     end
 
+    def sidebar_steps
+      required_steps
+    end
+
     # For use in the summary partials. Does not include summary.
     def render_steps
       blacklist = [:start, :billing, :checkout, :submitted, :summary]

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.18.2'.freeze
+  VERSION = '1.18.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  version: 1.18.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails