effective_resources 1.8.29 → 1.8.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01eb0c185b86003c4c06095cab5e141ab7e279479af13a8660409319f3e3bfc5
-  data.tar.gz: 2095122951bc3d297f385fb26f833847f91317bfc2106bb727ceacf7b78149da
+  metadata.gz: 60cb47028d5031c44e6a833fd1750d6e9435ace75de88ffec3756378079ba13c
+  data.tar.gz: 9ceb601f1fdf5ab0784abe83b6f7d8071f66e079d7c5a3c7352dee0dda9b1abb
 SHA512:
-  metadata.gz: 1cfa1f47ff8341bdeddbdca8cdb2ca6e7d977c726f363d3ad0f292e06eb43d17dbbd242629958ea7c5dd58347fbf66bc75ac48572b51e4ae7fd320a34542dacf
-  data.tar.gz: 0cdafa9339dfdefdcff7a8142b5e98ad6e9d48987b3508ee44076aa34ecd434f0f4388d5ac73b7a45609928dd0e94ac2b20e89063df32d08b278827170392f3e
+  metadata.gz: 9fe4309ff79c01a66217aee696f3bfa45d11d429d7a3dad84977351be8e0f9efd1091b6bc8398fcc46d131cc69a57d2251a2b365ddbd7fd4f0a4576c51ba6a5f
+  data.tar.gz: a88750936ed0d46ee4a8faa8a591fbd04dd9eef2eeedaa7f36c01a80bbeaff72690eed324974cdbaf12ed68b2f156ea91058c5250d5b415e80040f4edf0d9060

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/controllers/concerns/effective/wizard_controller.rb

@@ -62,5 +62,19 @@ module Effective
       wizard_path(step, resource_name_id => param)
     end
 
+    private
+
+    def current_step_before?(nav_step)
+      index = wizard_steps.index(nav_step) || raise("step #{nav_step} not found in wizard_steps")
+      current = wizard_steps.index(step) || raise("current step not found in wizard_steps")
+      current < index
+    end
+
+    def current_step_after?(nav_step)
+      index = wizard_steps.index(nav_step) || raise("step #{nav_step} not found in wizard_steps")
+      current = wizard_steps.index(step) || raise("current step not found in wizard_steps")
+      current > index
+    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/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.29'.freeze
+  VERSION = '1.8.33'.freeze
 end

metadata

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