effective_resources 1.8.27 → 1.8.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49b0e10cdea6482347d89604f85458147fe74f06ecbf0085a3ed9b8a2b68ecdd
-  data.tar.gz: dcfc9bd5423907bf6a5cd9b4a1a1ac191ea49bd774033a51d209064de38db017
+  metadata.gz: 2cac8ab4956bad6e580c5edfe77d2040d13430b327acff13874f0d447e2cb154
+  data.tar.gz: 9d2aeb097b2a71715aec44af86b49628549c0083ecd757f742047ae17842207b
 SHA512:
-  metadata.gz: b5795d6c0d9565e2df3777b51ca4a074cbb1aa9eeef0f68f7a16914319dcf4860456c576548be7496af848272d3f4c579fe03057a5c126db2b89f0a621670f03
-  data.tar.gz: fb53b1dc820211022a2ba9c4730613c94ae40aa5c7dfdcdf216e5a92930001a7ae032fc77ae3b81e39f718f995f8cdadc72f7a4a31b9da380ceaa2aaf64a42b6
+  metadata.gz: c04ecb8170f56016f354a93dd1be925ac08cef0f9dc77b93027457fa30b3382907943083877f47daa6dc000e700be9594a69e52a69fe63a0846a1d988413876c
+  data.tar.gz: 73e362b25cc6acbc6c9abf0c8e8c87ad1a9b19d4a2d4c4e5f0a21cdc9f4071e8084ec15685fcb29a8d96bd1d9241c36f4d2569c79244247c3df8cd77eca2c333

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_helper.rb

@@ -59,6 +59,8 @@ module EffectiveResourcesHelper
   # locals: {} render locals
   # you can also pass all action names and true/false such as edit: true, show: false
   def render_resource_actions(resource, atts = {}, &block)
+    return ''.html_safe if resource.blank?
+
     unless resource.kind_of?(ActiveRecord::Base) || resource.kind_of?(Class) || resource.kind_of?(Array) || resource.class.ancestors.include?(ActiveModel::Model)
       raise 'expected first argument to be an ActiveRecord::Base object or Array of objects'
     end

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.27'.freeze
+  VERSION = '1.8.31'.freeze
 end

metadata

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