wicked 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.3 (4/01/2012)
+
+* previous_wizard_path introduced
+
 ## 0.1.2 (3/16/2012)
 
 * next_wizard_path takes options (thanks @Flink)

data/README.md

@@ -53,7 +53,7 @@ You can also use the old way of inheriting from `Wicked::WizardController`.
 
 ```
 
-The wizard is set to call steps in order in the show action, you can specify custom logic in your show using a case statement like below. To send someone to the first step in this wizard we can direct them to `after_signup_path(:confirm_password)`. 
+The wizard is set to call steps in order in the show action, you can specify custom logic in your show using a case statement like below. To send someone to the first step in this wizard we can direct them to `after_signup_path(:confirm_password)`.
 
 ```ruby
   class AfterSignupController < ApplicationController
@@ -158,6 +158,7 @@ View/URL Helpers
   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
 
   # These only work while in a Wizard, and are not absolute paths
   # You can have multiple wizards in a project with multiple `wizard_path` calls
@@ -175,6 +176,17 @@ Controller Tidbits:
   render_wizard(@user)         # Shows next_step if @user.save, otherwise renders current step
 ```
 
+Testing with RSpec
+
+```ruby
+  # Test find_friends block of show action
+  get :show, :id => :find_friends   
+
+  # Test find_friends block of update action
+  put :update, {'id' => 'find_friends', "user" => {"id"=>@user.id.to_s}}  
+
+```
+
 Finally:
 
 Don't forget to create your named views

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

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

@@ -6,6 +6,10 @@ module Wicked::Controller::Concerns::Path
     wizard_path(@next_step, options)
   end
 
+  def previous_wizard_path(options = {})
+    wizard_path(@previous_step, options)
+  end
+
   def controller
     params[:controller]
   end

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

@@ -29,11 +29,20 @@ module Wicked::Controller::Concerns::Steps
     self.class.steps
   end
 
+  def previous_step(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 ||= nil
+    step
+  end
+
 
-  def next_step(current_step)
+  def next_step(current_step = nil)
+    return @next_step if current_step == nil
     index = steps.index(current_step)
-    step = steps.at(index + 1) if index.present?
-    step ||= :finish
+    step  = steps.at(index + 1) if index.present?
+    step  ||= :finish
     step
   end
 

data/lib/wicked/wizard.rb

@@ -9,15 +9,16 @@ module Wicked
 
     included do
       # Give our Views helper methods!
-      helper_method :wizard_path, :next_wizard_path
+      helper_method :wizard_path, :next_wizard_path, :previous_wizard_path
       # Set @step and @next_step variables
       before_filter :setup_wizard
     end
 
     private
     def setup_wizard
-      @step      = params[:id].try(:to_sym) || steps.first
-      @next_step = next_step(@step)
+      @step          = params[:id].try(:to_sym) || steps.first
+      @previous_step = previous_step(@step)
+      @next_step     = next_step(@step)
     end
     public
   end

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

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

data/test/integration/helpers_test.rb

@@ -6,21 +6,28 @@ class HelpersTest < ActiveSupport::IntegrationCase
     step = :first
     visit(bar_path(step))
     click_link 'skip'
-    assert has_content?(:third)
+    assert has_content?('second')
   end
 
   test 'wizard_path' do
     step = :first
     visit(bar_path(step))
     click_link 'current'
-    assert has_content?(step)
+    assert has_content?(step.to_s)
   end
 
   test 'wizard_path with symbol arg' do
     step = :first
     visit(bar_path(step))
     click_link 'last'
-    assert has_content?(:last_step)
+    assert has_content?('last_step')
+  end
+
+  test 'previous_wizard_path' do
+    step = :second
+    visit(bar_path(step))
+    click_link 'previous'
+    assert has_content?("first")
   end
 
 end

data/test/integration/navigation_test.rb

@@ -5,19 +5,19 @@ class InheritNavigationTest < ActiveSupport::IntegrationCase
   test 'show first' do
     step = :first
     visit(foo_path(step))
-    assert has_content?(step)
+    assert has_content?(step.to_s)
   end
 
   test 'show second' do
     step = :second
     visit(foo_path(step))
-    assert has_content?(step)
+    assert has_content?(step.to_s)
   end
 
   test 'skip first' do
     step = :first
-    visit(foo_path(step, :skip_step => 'true'))
-    assert has_content?(:second)
+    visit(foo_path(step.to_s, :skip_step => 'true'))
+    assert has_content?('second')
   end
 
   test 'invalid step' do
@@ -41,19 +41,19 @@ class IncludeNavigationTest < ActiveSupport::IntegrationCase
   test 'show first' do
     step = :first
     visit(bar_path(step))
-    assert has_content?(step)
+    assert has_content?(step.to_s)
   end
 
   test 'show second' do
     step = :second
     visit(bar_path(step))
-    assert has_content?(step)
+    assert has_content?(step.to_s)
   end
 
   test 'skip first' do
     step = :first
     visit(bar_path(step, :skip_step => 'true'))
-    assert has_content?(:second)
+    assert has_content?(:second.to_s)
   end
 
   test 'invalid step' do

data/wicked.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wicked"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["schneems"]
-  s.date = "2012-03-16"
+  s.date = "2012-04-01"
   s.description = "Wicked is a Rails engine for producing easy wizard controllers"
   s.email = "richard.schneeman@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wicked
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000Z
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70303085319860 !ruby/object:Gem::Requirement
+  requirement: &70359853035280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70303085319860
+  version_requirements: *70359853035280
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70303085319260 !ruby/object:Gem::Requirement
+  requirement: &70359853033100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70303085319260
+  version_requirements: *70359853033100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70303085318660 !ruby/object:Gem::Requirement
+  requirement: &70359853030180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70303085318660
+  version_requirements: *70359853030180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70303085318040 !ruby/object:Gem::Requirement
+  requirement: &70359853028820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70303085318040
+  version_requirements: *70359853028820
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70303085317560 !ruby/object:Gem::Requirement
+  requirement: &70359853060960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303085317560
+  version_requirements: *70359853060960
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70303085317080 !ruby/object:Gem::Requirement
+  requirement: &70359853059300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70303085317080
+  version_requirements: *70359853059300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70303085316500 !ruby/object:Gem::Requirement
+  requirement: &70359853058200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303085316500
+  version_requirements: *70359853058200
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70303085316000 !ruby/object:Gem::Requirement
+  requirement: &70359853056860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303085316000
+  version_requirements: *70359853056860
 description: Wicked is a Rails engine for producing easy wizard controllers
 email: richard.schneeman@gmail.com
 executables: []
@@ -182,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2913474337156723270
+      hash: 192248127634563940
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: