effective_resources 1.18.1 → 1.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0c85319423568e1dd19b9b1055bdd0c320bed118398156cc6cf8e8891c6d116
-  data.tar.gz: 6f9729378c464d1de1fcd1556dc33c5591374efccee47e14044d99f278ff6ca9
+  metadata.gz: 52171b7c3dbc8a5221069508aaaa10bc8bf4b42df0b854213340fe05380bc42d
+  data.tar.gz: 1ac01b5683863cef99f255b2db462308b7057eba78461a6b0f97ef5795efc04f
 SHA512:
-  metadata.gz: 11cedc4d9ee5dce6389bcb9e3505e6638abd6ef3ffefe2383f3ea91ea95cf1eff76c02185c563b3b595e4e0ee808828cd1f3bf6d8f758fef287b7437a9c45f45
-  data.tar.gz: d3a9a54642101af184239b0cb63c33c8a9d66431061da366f1d8dbdd99ec70d2f645248aa5f7de3e235d2c77b7cf2675b8d46168a5c2da782ac937f47853d58e
+  metadata.gz: 6d47cee77bd3f791c5b93d98d9fb7066259b3d9949924bbd284e2dac2caa263895497a2361082fecd47ec0a7a0f10c9e22bd5d53f0d9c46bd1ba24e2f524010d
+  data.tar.gz: 1f9870c37a8140e9a6d38b45d84f65649ff18f57b86d5c4817b9ca0204457d0c731edcfd8d836f19793eeef3561b63a50c2f86e4c0e70f6ef230ff9867df0d19

data/app/helpers/effective_resources_helper.rb

@@ -262,4 +262,32 @@ module EffectiveResourcesHelper
     controller.class.try(:effective_wizard_controller?) && defined?(resource) && resource.draft?
   end
 
+  def wizard_card(resource, &block)
+    raise('expected a block') unless block_given?
+    raise('expected an acts_as_wizard resource') unless resource.class.respond_to?(:acts_as_wizard?)
+
+    step = resource.render_step
+    raise('expected a render_step') unless step.present?
+
+    title = resource.wizard_step_title(step)
+    raise("expected a title for step #{step}") unless title.present?
+
+    link = if edit_effective_wizard? && resource.can_visit_step?(step)
+      link_to('Edit', wizard_path(step), title: "Edit #{title}")
+    end
+
+    content_tag(:div, class: 'card') do
+      content_tag(:div, class: 'card-body yo') do
+        content_tag(:div, class: 'row') do
+          content_tag(:div, class: 'col-sm') do
+            content_tag(:h5, title, class: 'card-title')
+          end +
+          content_tag(:div, class: 'col-sm-auto text-right') do
+            (link || '')
+          end
+        end + capture(&block)
+      end
+    end
+  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

@@ -29,6 +29,9 @@ module ActsAsWizard
 
     attr_accessor :current_user
 
+    # Used by the view when rendering each partial. Not the current step.
+    attr_accessor :render_step
+
     if Rails.env.test? # So our tests can override the required_steps method
       cattr_accessor :test_required_steps
     end
@@ -75,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.1'.freeze
+  VERSION = '1.18.4'.freeze
 end

metadata

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