wicked 0.3.3 → 0.3.4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.4
+* Dynamic steps officially supported and tested
+
 ## 0.3.3
 * warn users users who forgot to set steps
 

data/README.md

@@ -292,6 +292,27 @@ Now you can change the values in the URL's to whatever you want without changing
 
 Custom crafted wizard urls: just another way Wicked makes your app a little more saintly.
 
+## Dynamic Step Names
+
+If you wish to set the order of your steps dynamically you can do this with a `prepend_before_filter` and `self.steps =` like this:
+
+```
+  include Wicked::Wizard
+  prepend_before_filter :set_steps
+
+  # ...
+
+  private
+  def set_steps
+    if params[:flow] == "twitter"
+      self.steps = [:ask_twitter, :ask_email]
+    elsif params[:flow] == "facebook"
+      self.steps = [:ask_facebook, :ask_email]
+    end
+  end
+```
+
+
 ## About
 
 Please poke around the source code, if you see easier ways to get a Rails controller do do what I want, let me know.

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

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

@@ -64,7 +64,7 @@ module Wicked::Controller::Concerns::Steps
   alias :steps_list   :steps
 
   def previous_step(current_step = nil)
-    return @previous_step if current_step == nil
+    return @previous_step if current_step.nil?
     index =  steps.index(current_step)
     step  =  steps.at(index - 1) if index.present? && index != 0
     step ||= steps.first
@@ -73,8 +73,7 @@ module Wicked::Controller::Concerns::Steps
 
 
   def next_step(current_step = nil)
-    return @next_step if current_step == nil
-    raise "Wicked Wizard steps not set, but expected" if steps.blank?
+    return @next_step if current_step.nil?
     index = steps.index(current_step)
     step  = steps.at(index + 1) if index.present?
     step  ||= :finish

data/lib/wicked/wizard/translated.rb

@@ -42,6 +42,7 @@ module Wicked
       #
       def setup_wizard_translated
         step_name      = setup_step_from(params[:id])
+        check_steps!(step_name)
         self.steps     = wizard_translations.keys        # must come before setting previous/next steps
         @previous_step = previous_step(step_name)
         @next_step     = next_step(step_name)

data/lib/wicked/wizard.rb

@@ -34,13 +34,19 @@ module Wicked
     end
 
     def setup_step_from(the_step)
-      the_step = the_step.try(:to_sym) || steps.first
+      the_step = the_step.try(:to_sym) || steps.try(:first)
       check_redirect_to_first_last!(the_step)
       return the_step
     end
 
+    def check_steps!(the_step)
+      return false if step.nil?
+      raise "Wicked Wizard steps expected but not yet set, if setting via `before_filter` use `prepend_before_filter`" if steps.nil?
+    end
+
     def setup_wizard
       @step          = setup_step_from(params[:id])
+      check_steps!(@step)
       @previous_step = previous_step(@step)
       @next_step     = next_step(@step)
     end

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

@@ -0,0 +1,16 @@
+class DynamicStepsController < ApplicationController
+  include Wicked::Wizard
+  prepend_before_filter :set_steps
+
+  def show
+    render_wizard
+  end
+
+
+  private
+  def set_steps
+    self.steps = if params[:steps]
+      params[:steps].map(&:to_sym)
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+<%= step.inspect %>
+<br />
+<%= wizard_steps.inspect %>

data/test/dummy/config/routes.rb

@@ -3,6 +3,7 @@ Dummy::Application.routes.draw do
   resources :bar
   resources :jump
   resources :step_positions
+  resources :dynamic_steps
 
   resources :nested do
     resources :builder, :controller => 'nested/builder'

data/test/integration/dynamic_steps_test.rb

@@ -0,0 +1,10 @@
+require 'test_helper'
+
+class DynamicStepsTest < ActiveSupport::IntegrationCase
+  test 'set dynamic steps from params' do
+    steps = [:first, :second]
+    visit dynamic_steps_path(:steps => steps)
+    assert has_content?(steps.first.inspect)
+    assert has_content?(steps.inspect)
+  end
+end

data/wicked.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wicked"
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["schneems"]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "test/dummy/Rakefile",
     "test/dummy/app/controllers/application_controller.rb",
     "test/dummy/app/controllers/bar_controller.rb",
+    "test/dummy/app/controllers/dynamic_steps_controller.rb",
     "test/dummy/app/controllers/i18n_controller.rb",
     "test/dummy/app/controllers/jump_controller.rb",
     "test/dummy/app/controllers/nested/builder_controller.rb",
@@ -46,6 +47,7 @@ Gem::Specification.new do |s|
     "test/dummy/app/views/bar/first.html.erb",
     "test/dummy/app/views/bar/last_step.html.erb",
     "test/dummy/app/views/bar/second.html.erb",
+    "test/dummy/app/views/dynamic_steps/first.html.erb",
     "test/dummy/app/views/i18n/first.html.erb",
     "test/dummy/app/views/i18n/second.html.erb",
     "test/dummy/app/views/jump/first.html.erb",
@@ -88,6 +90,7 @@ Gem::Specification.new do |s|
     "test/dummy/public/javascripts/rails.js",
     "test/dummy/public/stylesheets/.gitkeep",
     "test/dummy/script/rails",
+    "test/integration/dynamic_steps_test.rb",
     "test/integration/helpers_test.rb",
     "test/integration/i18n_test.rb",
     "test/integration/jump_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wicked
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-12-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70141352669580 !ruby/object:Gem::Requirement
+  requirement: &70241592223140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70141352669580
+  version_requirements: *70241592223140
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70141352669060 !ruby/object:Gem::Requirement
+  requirement: &70241592222660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70141352669060
+  version_requirements: *70241592222660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70141352668580 !ruby/object:Gem::Requirement
+  requirement: &70241592222140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141352668580
+  version_requirements: *70241592222140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70141352668060 !ruby/object:Gem::Requirement
+  requirement: &70241592221620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70141352668060
+  version_requirements: *70241592221620
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70141352667560 !ruby/object:Gem::Requirement
+  requirement: &70241592221140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141352667560
+  version_requirements: *70241592221140
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70141352667080 !ruby/object:Gem::Requirement
+  requirement: &70241592220640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70141352667080
+  version_requirements: *70241592220640
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70141352666580 !ruby/object:Gem::Requirement
+  requirement: &70241592220080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141352666580
+  version_requirements: *70241592220080
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70141352666060 !ruby/object:Gem::Requirement
+  requirement: &70241592219520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141352666060
+  version_requirements: *70241592219520
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
-  requirement: &70141352665540 !ruby/object:Gem::Requirement
+  requirement: &70241592218960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141352665540
+  version_requirements: *70241592218960
 description: Wicked is a Rails engine for producing easy wizard controllers
 email: richard.schneeman@gmail.com
 executables: []
@@ -137,6 +137,7 @@ files:
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/bar_controller.rb
+- test/dummy/app/controllers/dynamic_steps_controller.rb
 - test/dummy/app/controllers/i18n_controller.rb
 - test/dummy/app/controllers/jump_controller.rb
 - test/dummy/app/controllers/nested/builder_controller.rb
@@ -147,6 +148,7 @@ files:
 - test/dummy/app/views/bar/first.html.erb
 - test/dummy/app/views/bar/last_step.html.erb
 - test/dummy/app/views/bar/second.html.erb
+- test/dummy/app/views/dynamic_steps/first.html.erb
 - test/dummy/app/views/i18n/first.html.erb
 - test/dummy/app/views/i18n/second.html.erb
 - test/dummy/app/views/jump/first.html.erb
@@ -189,6 +191,7 @@ files:
 - test/dummy/public/javascripts/rails.js
 - test/dummy/public/stylesheets/.gitkeep
 - test/dummy/script/rails
+- test/integration/dynamic_steps_test.rb
 - test/integration/helpers_test.rb
 - test/integration/i18n_test.rb
 - test/integration/jump_test.rb
@@ -214,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1133389636491458885
+      hash: 3202762565792531616
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: