effective_resources 1.8.28 → 1.8.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 841e6d1f903229208d1ad3b881b7fe32b75a851a28a3b2d0b8cea6062fac9afb
-  data.tar.gz: ddea9ed6121e5b34c35227bff21714f15a245bd73018531a265d281a289bcbae
+  metadata.gz: d4947c3721a74b21dbbda376785836f0ee3555615d56ff0f4850525b17f49d8c
+  data.tar.gz: c70ce7a422d7c99e0ec304955cb33d528ad9d7ab0466222e94d8ec9a958442a0
 SHA512:
-  metadata.gz: bd5f342a636e0beb84070ed95f0580dd94c1e8ec9a5ca1a6d6f8b155eef1198bf2dffb16f5da707727f33b3706467890581a8d560a5f027ebff7c6b6679f073d
-  data.tar.gz: 48cc4045db4e741cfe9c457cee3d7b38d464e4631d347a9e1dea118b7de62aa768145682f7c9accc1b0e5d9c36b60b289ee105f9e8e150b6fbcecc72492e97a7
+  metadata.gz: 690b5ebefd83b651f35e586d596ebc470c05beb4bc871e71cbc711ad331ddf004cf2a22d825c37d03d25ce5edc290c14fe00d8785b2881a6557f21edf6b34c73
+  data.tar.gz: 0c727005edcc162ffe64c8368fd5ba95ca2ff84e5d0073f24177cf521a9540343bd82897efee8d43c09917d111a74b58e51b767c434bd4f044963fc3b4c2b3c5

data/README.md

@@ -352,6 +352,8 @@ Here's `views/things/start.html.haml`:
 
 You can also call `render_wizard_sidebar(resource)` without the block syntax.
 
+If you add `f.hidden_field(:skip_to_step, value: 'stepc')` you can control the next step.
+
 ## Testing
 
 Run tests by:

data/app/controllers/concerns/effective/wizard_controller/actions.rb

@@ -5,10 +5,13 @@ module Effective
       def new
         Rails.logger.info 'Processed by Effective::WizardController#new'
 
-        self.resource ||= resource_scope.new
+        self.resource ||= (find_wizard_resource || resource_scope.new)
         EffectiveResources.authorize!(self, :new, resource)
 
-        redirect_to resource_wizard_path(:new, resource.first_uncompleted_step || resource_wizard_steps.first)
+        redirect_to resource_wizard_path(
+          (resource.to_param || :new),
+          (resource.first_uncompleted_step || resource_wizard_steps.first)
+        )
       end
 
       def show

data/app/controllers/concerns/effective/wizard_controller/save.rb

@@ -9,7 +9,7 @@ module Effective
         if save_resource(resource, action)
           flash[:success] ||= options.delete(:success) || resource_flash(:success, resource, action)
 
-          @skip_to ||= resource.required_steps.find { |s| s == next_step } || resource.first_uncompleted_step
+          @skip_to ||= skip_to_step(resource)
           @redirect_to ||= resource_wizard_path(resource, @skip_to) if was_new_record
 
           redirect_to(@redirect_to || wizard_path(@skip_to))
@@ -19,6 +19,14 @@ module Effective
         end
       end
 
+      private
+
+      def skip_to_step(resource)
+        resource.skip_to_step ||
+        resource.required_steps.find { |s| s == next_step } ||
+        resource.first_uncompleted_step
+      end
+
     end
   end
 end

data/app/helpers/effective_resources_wizard_helper.rb

@@ -2,8 +2,10 @@
 
 module EffectiveResourcesWizardHelper
 
-  def render_wizard_sidebar(resource, numbers: true, &block)
-    sidebar = content_tag(:div, class: 'nav list-group wizard-sidebar') do
+  def render_wizard_sidebar(resource, numbers: true, horizontal: false, &block)
+    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|
         render_wizard_sidebar_item(resource, nav_step, (index + 1 if numbers))
       end.join.html_safe

data/app/models/concerns/acts_as_slugged.rb

@@ -2,7 +2,7 @@
 #
 # This module automatically generates slugs based on the :to_s field using a before_validation filter
 #
-# Mark your model with 'acts_as_sluggable' make sure you have a string field :slug
+# Mark your model with 'acts_as_slugged' make sure you have a string field :slug
 
 module ActsAsSlugged
   extend ActiveSupport::Concern

data/app/models/concerns/acts_as_wizard.rb

@@ -25,6 +25,8 @@ module ActsAsWizard
     acts_as_wizard_options = @acts_as_wizard_options
 
     attr_accessor :current_step
+    attr_accessor :skip_to_step
+
     attr_accessor :current_user
 
     if Rails.env.test? # So our tests can override the required_steps method

data/app/models/concerns/has_many_rich_texts.rb

@@ -39,9 +39,9 @@ module HasManyRichTexts
   end
 
   def method_missing(method, *args, &block)
-    method = method.to_s
-    super unless method.start_with?('rich_text_')
+    return super unless method.to_s.start_with?('rich_text_')
 
+    method = method.to_s
     name = method.chomp('=').sub('rich_text_', '')
 
     if method.end_with?('=')

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.28'.freeze
+  VERSION = '1.8.32'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.28
+  version: 1.8.32
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails