wicked 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 11cb28be77c99ea61096702aa91925c6fc5f70a0
-  data.tar.gz: 7bfe552498e8dc0b263b731b88f21afa203ce906
+SHA256:
+  metadata.gz: ebda68c36a8e0e08aa54c850b91c176720d5fa4897482d0312182c2bee6a418f
+  data.tar.gz: f7a27e0b7baafe854a3891d0ec185a425f6d0e57694325dd2597ca9f7f94d85b
 SHA512:
-  metadata.gz: f01bf2e83f1a848225a59fa4bf6feb18567c1e14fe116aea9ba69a292a4ca878e35eef48646a013f8a0016c22e5c19a4e474d62c4f62a4ea81b8d5fd17114187
-  data.tar.gz: c3d6640feacdee82c98b7c652fbcca9a0414b8669e9bf52e78fee80518c233266da3e99b66eeaa3f3fff2f630cedc696bec64520bf60d06752dc271f628f2c19
+  metadata.gz: bad278bb225e74a389efb8413290763b644625ff2bdc89213da99c7941b214abbdbfbc1e9e85c691a03196be064321f07d3c1222a2916c45bb6be3c425aee874
+  data.tar.gz: db3bdd321cc8902b9fa693e4884c567aa9fe474ad7fbe5cdd6f7452beec054ba9b21252441dabfd42e23adc94ee1e7fceac4bda07394d456c7cc36e65f50d82d

data/.github/workflows/check_changelog.yml

@@ -0,0 +1,13 @@
+name: Check Changelog
+
+on:
+ pull_request:
+  types: [opened, reopened, edited, synchronize]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Check that CHANGELOG is touched
+      run: |
+        cat $GITHUB_EVENT_PATH | jq .pull_request.title |  grep -i '\[\(\(changelog skip\)\|\(ci skip\)\)\]' ||  git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md

data/.gitignore

@@ -6,6 +6,7 @@ test/dummy/log/*.log
 test/dummy/tmp/
 .DS_Store
 .rvmrc
+.idea
 
 Gemfile.lock
 .ruby-version

data/.travis.yml

@@ -1,28 +1,17 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - 2.2.2
-  - ruby-head
-  - jruby-19mode
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 
 sudo: false
 
 gemfile:
-  - gemfiles/3.1.gemfile
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.0.gemfile
-  - gemfiles/4.1.gemfile
-  - gemfiles/4.2.gemfile
-matrix:
-  include:
-    - gemfile: gemfiles/5.0.beta2.gemfile
-      rvm: 2.2.2
-  allow_failures:
-    - gemfile: gemfiles/3.0.gemfile
-      rvm: 2.0.0
-    - gemfile: gemfiles/3.0.gemfile
-      rvm: 2.1.1
-    - rvm: ruby-head
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.1.gemfile
 
+jobs:
+  exclude:
+  - gemfile: gemfiles/rails_5.1.gemfile
+    rvm: 2.7.1

data/Appraisals

@@ -1,30 +1,11 @@
-appraise "3.1" do
-  gem "rails", "~> 3.1.0"
-  gemspec
+appraise "rails-5.1" do
+  gem "rails", "~> 5.2"
 end
 
-appraise "3.2" do
-  gem "rails", "~> 3.2.15"
-  gemspec
+appraise "rails-5.2" do
+  gem "rails", "~> 5.2"
 end
 
-appraise "4.0" do
-  gem "rails", "~> 4.0.0"
-  gemspec
-end
-
-appraise "4.1" do
-  gem "rails", "~> 4.1.0"
-  gemspec
-end
-
-
-appraise "4.2" do
-  gem "rails", "~> 4.2"
-  gemspec
-end
-
-appraise "5.0.beta2" do
-  gem "rails", "~> 5.0.0.beta2"
-  gemspec
+appraise "rails-6.0.1" do
+  gem "rails", "~> 6.0.1"
 end

data/CHANGELOG.md

@@ -1,4 +1,21 @@
-## Master
+## Unreleased
+
+## 1.4.0
+
+* Update readme to include `current_step?` (https://github.com/zombocom/wicked/pull/271)
+* Add `*_url` versions of `wizard_path`, `next_wizard_path`, and `previous_wizard_path` (https://github.com/zombocom/wicked/pull/272)
+
+## 1.3.4
+
+* Remove arity check for AR objects (https://github.com/schneems/wicked/pull/257)
+
+## 1.3.3
+
+* Support being able to set a context in validation (https://github.com/schneems/wicked/pull/236)
+
+## 1.3.2
+
+* Support for params (#222)
 
 ## 1.3.1
 

data/Gemfile

@@ -1,10 +1,6 @@
 source "https://rubygems.org"
 
-
-# Put all runtime dependencies in wicked.gemspec
-# Put development requirements for different platforms here
-# Put more specific gem declarations in different gemfiles/*.gemfile files
-gemspec :path => ::File.expand_path("../.", __FILE__)
+gemspec
 
 group :development, :test do
   gem "sqlite3", :platform => [:ruby, :mswin, :mingw]

data/README.md

@@ -4,6 +4,7 @@
 
 [![Build Status](https://travis-ci.org/schneems/wicked.svg?branch=master)](https://travis-ci.org/schneems/wicked)
 [![Code Climate](https://codeclimate.com/github/schneems/wicked/badges/gpa.svg)](https://codeclimate.com/github/schneems/wicked)
+[![Help Contribute to Open Source](https://www.codetriage.com/schneems/wicked/badges/users.svg)](https://www.codetriage.com/schneems/wicked)
 
 
 Use wicked to make your Rails controllers into step-by-step wizards. To see Wicked in action check out the example [Rails app](https://github.com/schneems/wicked_example) or [watch the screencast](http://schneems.com/post/18437886598/wizard-ify-your-rails-controllers-with-wicked).
@@ -120,11 +121,17 @@ class AfterSignupController < ApplicationController
     @user = current_user
     case step
     when :confirm_password
-      @user.update_attributes(params[:user])
+      @user.update_attributes(user_params)
     end
     sign_in(@user, bypass: true) # needed for devise
     render_wizard @user
   end
+  
+  private
+  def user_params
+    params.require(:user)
+          .permit(:email, :current_password) # ...
+  end
 end
 ```
 
@@ -170,12 +177,17 @@ Now you've got a fully functioning AfterSignup controller! If you have questions
 **View/URL Helpers:**
 
 ```ruby
-wizard_path                  # Grabs the current path in the wizard
-wizard_path(:specific_step)  # Url of the :specific_step
-next_wizard_path             # Url of the next step
-previous_wizard_path         # Url of the previous step
+wizard_path                  # relative url of the current step
+wizard_path(:specific_step)  # relative url of a :specific_step
+next_wizard_path             # relative url of the next step
+previous_wizard_path         # relative url of the previous step
+
+wizard_url                  # fully qualified url of the current step
+wizard_url(:specific_step)  # fully qualified url of a :specific_step
+next_wizard_url             # fully qualified url of the next step
+previous_wizard_url         # fully qualified url of the previous step
 
-# These only work while in a Wizard, and are not absolute paths
+# These only work while in a Wizard
 # You can have multiple wizards in a project with multiple `wizard_path` calls
 ```
 
@@ -183,19 +195,21 @@ previous_wizard_path         # Url of the previous step
 **Controller Tidbits:**
 
 ```ruby
-steps  :first, :second       # Sets the order of steps
-step                         # Gets current step
-next_step                    # Gets next step
-previous_step                # Gets previous step
-skip_step                    # Tells render_wizard to skip to the next logical step
-jump_to(:specific_step)      # Jump to :specific_step
-render_wizard                # Renders the current step
-render_wizard(@user)         # Shows next_step if @user.save, otherwise renders
-wizard_steps                 # Gets ordered list of steps
-past_step?(step)             # does step come before the current request's step in wizard_steps
-future_step?(step)           # does step come after the current request's step in wizard_steps
-previous_step?(step)         # is step immediately before the current request's step
-next_step?(step)             # is step immediately after the current request's step
+steps  :first, :second                        # Sets the order of steps
+step                                          # Gets current step
+next_step                                     # Gets next step
+previous_step                                 # Gets previous step
+skip_step                                     # Tells render_wizard to skip to the next logical step
+jump_to(:specific_step)                       # Jump to :specific_step
+render_wizard                                 # Renders the current step
+render_wizard(@user)                          # Shows next_step if @user.save, otherwise renders
+render_wizard(@user, context: :account_setup) # Shows next_step if @user.save(context: :account_setup), otherwise renders
+wizard_steps                                  # Gets ordered list of steps
+current_step?(step)                           # is step the same as the current request's step
+past_step?(step)                              # does step come before the current request's step in wizard_steps
+future_step?(step)                            # does step come after the current request's step in wizard_steps
+previous_step?(step)                          # is step immediately before the current request's step
+next_step?(step)                              # is step immediately after the current request's step
 ```
 
 **Redirect options**
@@ -243,10 +257,10 @@ end
 
 ```ruby
 # Test find_friends block of show action
-get :show, id: :find_friends
+get :show, params: { id: :find_friends }
 
 # Test find_friends block of update action
-put :update, {'id' => 'find_friends', "user" => { "id" => @user.id.to_s }}
+patch :update, params: {'id' => 'find_friends', "user" => { "id" => @user.id.to_s }}
 ```
 
 ### Internationalization of URLS (I18n)
@@ -397,6 +411,39 @@ end
 
 NOTE: The order of the `before_action` matters, when `setup_wizard` is called it will validate the presence of `self.steps`, you must call your custom step setting code before this point.
 
+## Send params to finish_wizard_path method
+
+If you wish to send parameters to the `finish_wizard_path` method that can be done by adding to your controller the method with the params argument `def finish_wizard_path(params) ... end`.
+
+In order to send the parameters to the method here is an example of the show method:
+
+```ruby
+steps :first_step, :second_step
+
+def show
+  # ...
+  render_wizard(nil, {}, { hello: 'world' })
+end
+
+def update
+  # ...
+  render_wizard(@user, {}, { hello: 'world' })
+end
+
+def finish_wizard_path(params)
+  # here you can access params and that would be equal to { hello: 'world' }
+end
+```
+
+The `wizard_path` and `next_wizard_path` methods also take parameters that can then be accessed or visible in the `show` and `update` actions of the controller. You can use the methods like so:
+
+```ruby
+next_wizard_path({ hello: 'world' })
+wizard_path(nil, { hello: 'world' })
+# the wizard_path with the step specified would look like this
+wizard_path(:wicked_finish, wizard_id: @user.id, hello: 'world')
+```
+
 ## Keywords
 
 There are a few "magical" keywords that will take you to the first step,
@@ -431,7 +478,7 @@ This project rocks and uses MIT-LICENSE.
 
 ## Compatibility
 
-Refer to the Travis CI test matrix for test using your version of Ruby and Rails. If there is a newer Ruby or Rails you don't see on there, please add an entry to the Apprasials file, then run `$ apprasials install` and update the `.travis.yml` file and send me a pull request.
+Refer to the Travis CI test matrix for test using your version of Ruby and Rails. If there is a newer Ruby or Rails you don't see on there, please add an entry to the Appraisals file, then run `$ appraisals install` and update the `.travis.yml` file and send me a pull request.
 
 Note: Rails 3.0 support is only for Ruby 1.9.3 or JRuby, not Ruby 2.0.0 or newer.
 

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2"
+
+group :development, :test do
+  gem "sqlite3", platform: [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby
+end
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2"
+
+group :development, :test do
+  gem "sqlite3", platform: [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.0.1.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.1"
+
+group :development, :test do
+  gem "sqlite3", platform: [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby
+end
+
+gemspec path: "../"

data/lib/wicked/controller/concerns/path.rb

@@ -1,15 +1,22 @@
 module Wicked::Controller::Concerns::Path
   extend ActiveSupport::Concern
 
-
   def next_wizard_path(options = {})
     wizard_path(@next_step, options)
   end
 
+  def next_wizard_url(options = {})
+    wizard_url(@next_step, options)
+  end
+
   def previous_wizard_path(options = {})
     wizard_path(@previous_step, options)
   end
 
+  def previous_wizard_url(options = {})
+    wizard_url(@previous_step, options)
+  end
+
   def wicked_controller
     params[:controller]
   end
@@ -18,7 +25,6 @@ module Wicked::Controller::Concerns::Path
     params[:action]
   end
 
-
   def wizard_path(goto_step = nil, options = {})
     options = options.respond_to?(:to_h) ? options.to_h : options
     options = { :controller => wicked_controller,
@@ -28,5 +34,8 @@ module Wicked::Controller::Concerns::Path
                }.merge options
     url_for(options)
   end
-end
 
+  def wizard_url(goto_step = nil, options = {})
+    wizard_path(goto_step, options.merge(only_path: false))
+  end
+end

data/lib/wicked/controller/concerns/render_redirect.rb

@@ -1,54 +1,61 @@
 module Wicked::Controller::Concerns::RenderRedirect
   extend ActiveSupport::Concern
 
-
-  def render_wizard(resource = nil, options = {})
-    process_resource!(resource)
+  def render_wizard(resource = nil, options = {}, params = {})
+    process_resource!(resource, options)
 
     if @skip_to
-      redirect_to wizard_path(@skip_to, @wicked_redirect_params || {}), options
+      url_params = (@wicked_redirect_params || {}).merge(params)
+      redirect_to wizard_path(@skip_to, url_params), options
     else
-      render_step wizard_value(step), options
+      render_step(wizard_value(step), options, params)
     end
   end
 
-  def process_resource!(resource)
-    if resource
-      if resource.save
-        @skip_to ||= @next_step
-      else
-        @skip_to = nil
-      end
+  def process_resource!(resource, options = {})
+    return unless resource
+
+    if options[:context]
+      did_save = resource.save(context: options[:context])
+    else
+      did_save = resource.save
+    end
+
+    if did_save
+      @skip_to ||= @next_step
+    else
+      @skip_to = nil
     end
   end
 
-  def render_step(the_step, options = {})
+  def render_step(the_step, options = {}, params = {})
     if the_step.nil? || the_step.to_s == Wicked::FINISH_STEP
-      redirect_to_finish_wizard options
+      redirect_to_finish_wizard options, params
     else
       render the_step, options
     end
   end
 
-  def redirect_to_next(next_step, options = {})
+  def redirect_to_next(next_step, options = {}, params = {})
     if next_step.nil?
-      redirect_to_finish_wizard(options)
+      redirect_to_finish_wizard(options, params)
     else
-      redirect_to wizard_path(next_step), options
+      redirect_to wizard_path(next_step, params), options
     end
   end
 
   # TODO redirect to resource if one is passed to render_wizard
-  def finish_wizard_path
-    '/'
+  def finish_wizard_path(params = {})
+    url = '/'
+    url = "#{url}?#{params.to_query}" unless params.blank?
+    url
   end
 
-  def redirect_to_finish_wizard(options = {})
-    wicked_final_redirect_path = finish_wizard_path
+  def redirect_to_finish_wizard(options = {}, params = {})
+    wicked_final_redirect_path = method(:finish_wizard_path).arity == 1 ? finish_wizard_path(params) : finish_wizard_path
     Rails.logger.debug("Wizard has finished, redirecting to finish_wizard_path: #{wicked_final_redirect_path.inspect}")
     # flash.keep is required for Rails 3 where a flash message is lost on a second redirect.
     flash.keep
     redirect_to wicked_final_redirect_path, options
   end
 end
-

data/lib/wicked/controller/concerns/steps.rb

@@ -83,7 +83,6 @@ module Wicked::Controller::Concerns::Steps
     step ||= steps.first
   end
 
-
   def next_step(current_step = nil)
     return @next_step if current_step.nil?
     index = steps.index(current_step)
@@ -91,18 +90,15 @@ module Wicked::Controller::Concerns::Steps
     step  ||= Wicked::FINISH_STEP
   end
 
-  private
-
-  def step_index_for(step_name)
+  private def step_index_for(step_name)
     steps.index(step_name)
   end
 
-  def current_step_index
+  private def current_step_index
     step_index_for(step)
   end
 
-  def current_and_given_step_exists?(step_name)
+  private def current_and_given_step_exists?(step_name)
     current_step_index.present? && steps.index(step_name).present?
   end
 end
-

data/lib/wicked/version.rb

@@ -1,3 +1,3 @@
 module Wicked
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/lib/wicked/wizard/translated.rb

@@ -57,7 +57,6 @@ module Wicked
       end
 
 
-      private
       # sets up a translated wizard controller
       # translations are expected under the 'wicked' namespace
       #
@@ -74,12 +73,10 @@ module Wicked
       #
       #     steps "wicked.first", "wicked.second"
       #
-      def setup_wizard_translated
+      private def setup_wizard_translated
         self.steps = wizard_translations.keys     # must come before setting previous/next steps
         setup_wizard
       end
-      public
     end
   end
 end
-

data/lib/wicked/wizard.rb

@@ -15,7 +15,6 @@ module Wicked
     end
 
     # Include the modules!!
-
     include Wicked::Controller::Concerns::Path
     include Wicked::Controller::Concerns::RenderRedirect
     include Wicked::Controller::Concerns::Steps
@@ -23,12 +22,12 @@ module Wicked
     included do
       include Wicked::Controller::Concerns::Action
       # Give our Views helper methods!
-      helper_method :wizard_path,     :next_wizard_path, :previous_wizard_path,
-                    :step,            :wizard_steps,     :current_step?,
-                    :past_step?,      :future_step?,     :previous_step?,
-                    :next_step?
+      helper_method :wizard_path, :wizard_url, :next_wizard_path, :next_wizard_url, :previous_wizard_path,
+                    :previous_wizard_url, :step, :wizard_steps, :current_step?, :past_step?, :future_step?,
+                    :next_step?,  :previous_step?
+
       # Set @step and @next_step variables
-      before_action :setup_wizard
+      before_action :initialize_wicked_variables, :setup_wizard
     end
 
     # forward to first step with whatever params are provided
@@ -41,14 +40,17 @@ module Wicked
       step_name
     end
 
-    private
+    private def initialize_wicked_variables
+      @skip_to = nil
+      @wicked_redirect_params = nil
+    end
 
-    def check_redirect_to_first_last!(step)
+    private def check_redirect_to_first_last!(step)
       redirect_to wizard_path(steps.first) if step.to_s == Wicked::FIRST_STEP
       redirect_to wizard_path(steps.last)  if step.to_s == Wicked::LAST_STEP
     end
 
-    def setup_step_from(the_step)
+    private def setup_step_from(the_step)
       return if steps.nil?
 
       the_step ||= steps.first
@@ -61,23 +63,21 @@ module Wicked
       the_step
     end
 
-    def check_steps!
+    private def check_steps!
       raise UndefinedStepsError if steps.nil?
     end
 
-    def set_previous_next(step)
+    private def set_previous_next(step)
       @previous_step = previous_step(step)
       @next_step     = next_step(step)
     end
 
-    def setup_wizard
+    private def setup_wizard
       check_steps!
       return if params[:id].nil?
 
       @step = setup_step_from(params[:id])
       set_previous_next(@step)
     end
-    public
   end
 end
-

data/lib/wicked/wizard_controller.rb

@@ -32,7 +32,6 @@ class Wicked::WizardController < ApplicationController
   #     @user.update_attributes(params[:user])
   #   end
   #   sign_in(@user, :bypass => true) # needed for devise
-  #   render_wizard
+  #   render_wizard @user
   # end
 end
-

data/test/dummy/app/controllers/update_params_controller.rb

@@ -0,0 +1,30 @@
+class UpdateParamsController < ApplicationController
+  include Wicked::Wizard
+
+  class Thing
+    def save
+      true
+    end
+  end
+
+  steps :first, :second, :last_step
+
+  def index
+
+  end
+
+  def show
+    render_wizard(nil, {}, { one: 'two' })
+  end
+
+  def update
+    @thing = Thing.new
+    render_wizard(@thing, { notice: "Thing was updated from step #{step}." }, { one: 'two' })
+  end
+
+  private
+
+  def finish_wizard_path(params)
+    update_params_path(params)
+  end
+end

data/test/dummy/app/views/bar/first.html.erb

@@ -4,4 +4,6 @@ first
 <%= "params[:foo] #{params[:foo]}" %>
 <%= link_to 'last', wizard_path(:last_step) %>
 <%= link_to 'current', wizard_path %>
-<%= link_to 'skip', next_wizard_path %>
+<%= link_to 'current url', wizard_url %>
+<%= link_to 'skip', next_wizard_path %>
+<%= link_to 'next url', next_wizard_url %>

data/test/dummy/app/views/bar/second.html.erb

@@ -1,3 +1,4 @@
 second
 
-<%= link_to 'previous', previous_wizard_path %>
+<%= link_to 'previous', previous_wizard_path %>
+<%= link_to 'previous url', previous_wizard_url %>

data/test/dummy/app/views/update_params/_step_position.html.erb

@@ -0,0 +1,16 @@
+<% wizard_steps.each do |s| %>
+  <%= s.inspect %>
+  <%= I18n.t("wicked.#{s}") %>
+  <p>
+    <strong><u><%= s.inspect %></u></strong><br />
+    <%= current_step?(s)  ? "#{s} step is the current step"   : "nope" %><br />
+    <%= past_step?(s)     ? "#{s} step is a past step"        : "nope" %><br />
+    <%= future_step?(s)   ? "#{s} step is a future step"      : "nope" %><br />
+    <%= previous_step?(s) ? "#{s} step was the previous step" : "nope" %><br />
+    <%= next_step?(s)     ? "#{s} step is the next step"      : "nope" %><br />
+  </p>
+<% end %>
+
+<%= form_tag update_param_path(step, {one: 'two'}), :method => :put do  %>
+  <%= submit_tag "Next" %>
+<% end %>

data/test/dummy/app/views/update_params/first.html.erb

@@ -0,0 +1 @@
+<%= render 'step_position' %>

data/test/dummy/app/views/update_params/index.html.erb

@@ -0,0 +1 @@
+Index page.

data/test/dummy/app/views/update_params/last_step.html.erb

@@ -0,0 +1 @@
+<%= render 'step_position' %>

data/test/dummy/app/views/update_params/second.html.erb

@@ -0,0 +1 @@
+<%= render 'step_position' %>

data/test/dummy/app/views/updates/_step_position.html.erb

@@ -11,6 +11,6 @@
   </p>
 <% end %>
 
-<%= form_tag update_path(step), :method => :put do  %>
+<%= form_tag update_path(step, {one: 'two'}), :method => :put do  %>
   <%= submit_tag "Next" %>
 <% end %>

data/test/dummy/config/routes.rb

@@ -9,6 +9,7 @@ Dummy::Application.routes.draw do
   resources :redirect_to_next
   resources :redirect_to_finish_flash
   resources :updates
+  resources :update_params
 
   resources :nested do
     resources :builder, :controller => 'nested/builder'

data/test/integration/helpers_test.rb

@@ -5,13 +5,23 @@ class HelpersTest < ActiveSupport::IntegrationCase
   test 'next_wizard_path' do
     step = :first
     visit(bar_path(step))
+    assert has_link?('skip', href: '/bar/second')
     click_link 'skip'
     assert_has_content?('second')
   end
 
+  test 'next_wizard_url' do
+    step = :first
+    visit(bar_path(step))
+    assert has_link?('next url', href: 'http://www.example.com/bar/second')
+    click_link 'next url'
+    assert_has_content?('second')
+  end
+
   test 'wizard_path' do
     step = :first
     visit(bar_path(step))
+    assert has_link?('current', href: '/bar/first')
     click_link 'current'
     assert_has_content?(step.to_s)
   end
@@ -23,9 +33,26 @@ class HelpersTest < ActiveSupport::IntegrationCase
     assert_has_content?('last_step')
   end
 
+  test 'wizard_url' do
+    step = :first
+    visit(bar_path(step))
+    assert has_link?('current url', href: 'http://www.example.com/bar/first')
+    click_link 'current'
+    assert_has_content?(step.to_s)
+  end
+
   test 'previous_wizard_path' do
     step = :second
     visit(bar_path(step))
+    assert has_link?('previous', href: '/bar/first')
+    click_link 'previous'
+    assert_has_content?("first")
+  end
+
+  test 'previous_wizard_url' do
+    step = :second
+    visit(bar_path(step))
+    assert has_link?('previous url', href: 'http://www.example.com/bar/first')
     click_link 'previous'
     assert_has_content?("first")
   end

data/test/integration/security_test.rb

@@ -7,7 +7,6 @@ class SecurityTest < ActiveSupport::IntegrationCase
     assert_raise(Wicked::Wizard::InvalidStepError) do
       visit(bar_path(step))
     end
-    refute has_content?('sqlite3')
   end
 
   # only works on *nix systems
@@ -18,6 +17,5 @@ class SecurityTest < ActiveSupport::IntegrationCase
     assert_raise(Wicked::Wizard::InvalidStepError) do
       visit(bar_path(step))
     end
-    refute has_content?('aardvark')
   end
 end

data/test/integration/update_params_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class UpdateParamsTest < ActiveSupport::IntegrationCase
+  test 'on first' do
+    step = :first
+    visit(update_param_path(step))
+
+    click_button("Next")
+    assert_equal page.current_path, update_param_path(:second)
+    assert_has_content?("notice:Thing was updated from step first.")
+
+    click_button("Next")
+    assert_equal page.current_path, update_param_path(:last_step)
+    assert_has_content?("notice:Thing was updated from step second.")
+
+    click_button("Next")
+    assert_equal page.current_url, update_params_url({host: 'www.example.com', one: 'two' })
+    assert_has_content?("notice:Thing was updated from step last_step.")
+  end
+end

data/test/test_helper.rb

@@ -1,15 +1,10 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
-
-
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 
-
-
-
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = "test.com"
@@ -21,10 +16,15 @@ require "capybara/rails"
 Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
 
-
-
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+# https://github.com/plataformatec/devise/blob/master/test/orm/active_record.rb
+migrate_path = File.expand_path("../rails_app/db/migrate", __FILE__)
+if Rails.version.start_with? '6'
+  ActiveRecord::MigrationContext.new(migrate_path, ActiveRecord::SchemaMigration).migrate
+elsif Rails.version.start_with? '5.2'
+  ActiveRecord::MigrationContext.new(migrate_path).migrate
+else
+  ActiveRecord::Migrator.migrate(migrate_path)
+end
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wicked
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Richard Schneeman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".github/workflows/check_changelog.yml"
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
@@ -97,12 +98,9 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/3.1.gemfile
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
-- gemfiles/4.1.gemfile
-- gemfiles/4.2.gemfile
-- gemfiles/5.0.beta2.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.1.gemfile
 - lib/wicked.rb
 - lib/wicked/controller/concerns/action.rb
 - lib/wicked/controller/concerns/path.rb
@@ -128,6 +126,7 @@ files:
 - test/dummy/app/controllers/redirect_to_next_controller.rb
 - test/dummy/app/controllers/step_positions_controller.rb
 - test/dummy/app/controllers/string_steps_controller.rb
+- test/dummy/app/controllers/update_params_controller.rb
 - test/dummy/app/controllers/updates_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/bar.rb
@@ -157,6 +156,11 @@ files:
 - test/dummy/app/views/step_positions/last_step.html.erb
 - test/dummy/app/views/step_positions/second.html.erb
 - test/dummy/app/views/string_steps/second.html.erb
+- test/dummy/app/views/update_params/_step_position.html.erb
+- test/dummy/app/views/update_params/first.html.erb
+- test/dummy/app/views/update_params/index.html.erb
+- test/dummy/app/views/update_params/last_step.html.erb
+- test/dummy/app/views/update_params/second.html.erb
 - test/dummy/app/views/updates/_step_position.html.erb
 - test/dummy/app/views/updates/first.html.erb
 - test/dummy/app/views/updates/index.html.erb
@@ -200,6 +204,7 @@ files:
 - test/integration/redirect_to_next_test.rb
 - test/integration/security_test.rb
 - test/integration/steps_test.rb
+- test/integration/update_params_test.rb
 - test/integration/updates_test.rb
 - test/support/integration_case.rb
 - test/support/wicked_controller_test_case.rb
@@ -210,7 +215,7 @@ homepage: https://github.com/schneems/wicked
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -225,9 +230,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Use Wicked to turn your controller into a wizard
 test_files:
@@ -246,6 +250,7 @@ test_files:
 - test/dummy/app/controllers/redirect_to_next_controller.rb
 - test/dummy/app/controllers/step_positions_controller.rb
 - test/dummy/app/controllers/string_steps_controller.rb
+- test/dummy/app/controllers/update_params_controller.rb
 - test/dummy/app/controllers/updates_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/bar.rb
@@ -275,6 +280,11 @@ test_files:
 - test/dummy/app/views/step_positions/last_step.html.erb
 - test/dummy/app/views/step_positions/second.html.erb
 - test/dummy/app/views/string_steps/second.html.erb
+- test/dummy/app/views/update_params/_step_position.html.erb
+- test/dummy/app/views/update_params/first.html.erb
+- test/dummy/app/views/update_params/index.html.erb
+- test/dummy/app/views/update_params/last_step.html.erb
+- test/dummy/app/views/update_params/second.html.erb
 - test/dummy/app/views/updates/_step_position.html.erb
 - test/dummy/app/views/updates/first.html.erb
 - test/dummy/app/views/updates/index.html.erb
@@ -318,6 +328,7 @@ test_files:
 - test/integration/redirect_to_next_test.rb
 - test/integration/security_test.rb
 - test/integration/steps_test.rb
+- test/integration/update_params_test.rb
 - test/integration/updates_test.rb
 - test/support/integration_case.rb
 - test/support/wicked_controller_test_case.rb

data/gemfiles/3.1.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 3.1.0"
-
-group :development, :test do
-  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
-end
-
-gemspec :path => "../"

data/gemfiles/3.2.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 3.2.15"
-
-group :development, :test do
-  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
-end
-
-gemspec :path => "../"

data/gemfiles/4.0.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.0.0"
-
-group :development, :test do
-  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
-end
-
-gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.1.0"
-
-group :development, :test do
-  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
-end
-
-gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.2"
-
-group :development, :test do
-  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
-end
-
-gemspec :path => "../"

data/gemfiles/5.0.beta2.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0.0.beta2"
-
-group :development, :test do
-  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
-end
-
-gemspec :path => "../"