wicked 0.1.6.pre → 0.1.6

data/CHANGELOG.md

@@ -1,6 +1,7 @@
-## 0.1.6pre (05/13/2012)
+## 0.1.6 (06/02/2012)
 
 * remove `WizardController#_reset_invocation_response`
+* bug fix for when jump_to is used in conjunction with passing a resource to render_wizard (thanks @fschwahn)
 
 ## 0.1.5 (05/13/2012)
 

data/README.md

@@ -82,7 +82,7 @@ The wizard is set to call steps in order in the show action, you can specify cus
   end
 ```
 
-**Note:** Wicked uses the `:id` parameter to control the flow of steps, if you need to have an id parameter, please use nested routes see [Partial Validation of Active Record Objects](https://github.com/schneems/wicked/wiki/Partial-Validation-of-Active-Record-Objects) for an example. It will need to be prefixed, for example a Product's `:id`` would be `:product_id`
+**Note:** Wicked uses the `:id` parameter to control the flow of steps, if you need to have an id parameter, please use nested routes see [Partial Validation of Active Record Objects](https://github.com/schneems/wicked/wiki/Partial-Validation-of-Active-Record-Objects) for an example. It will need to be prefixed, for example a Product's `:id` would be `:product_id`
 
 You'll need to call `render_wizard` at the end of your action to get the correct views to show up.
 

data/VERSION

@@ -1 +1 @@
-0.1.6.pre
+0.1.6

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

@@ -1,12 +1,24 @@
 module Wicked::Controller::Concerns::RenderRedirect
   extend ActiveSupport::Concern
 
+
   def render_wizard(resource = nil)
-    @skip_to = @next_step if resource && resource.save
-    if @skip_to.present?
+    process_resource!(resource)
+
+    if @skip_to
       redirect_to wizard_path @skip_to
     else
-      render_step  @step
+      render_step @step
+    end
+  end
+
+  def process_resource!(resource)
+    if resource
+      if resource.save
+        @skip_to ||= @next_step
+      else
+        @skip_to = nil
+      end
     end
   end
 

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

@@ -0,0 +1,22 @@
+## This controller uses includes
+
+class JumpController < ApplicationController
+  include Wicked::Wizard
+  steps :first, :second, :last_step
+
+  def show
+    skip_step if params[:skip_step]
+    jump_to :last_step if params[:jump_to]
+    if params[:resource]
+      value = params[:resource][:save] == 'true'
+      @bar  = Bar.new(value)
+      render_wizard(@bar)
+    else
+      render_wizard
+    end
+  end
+
+  def update
+  end
+
+end

data/test/dummy/app/models/bar.rb

@@ -0,0 +1,9 @@
+class Bar
+  def initialize(value)
+    @value = value
+  end
+
+  def save
+    @value
+  end
+end

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

@@ -0,0 +1 @@
+last_step

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

@@ -0,0 +1 @@
+first

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

@@ -0,0 +1 @@
+last_step

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

@@ -0,0 +1 @@
+second

data/test/dummy/config/routes.rb

@@ -1,6 +1,7 @@
 Dummy::Application.routes.draw do
   resources :foo
   resources :bar
+  resources :jump
 
   # The priority is based upon order of creation:
   # first created -> highest priority.

data/test/integration/jump_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class JumpNavigationTest < ActiveSupport::IntegrationCase
+  test 'consider jump_to when calling render_wizard with resource' do
+    step = :first
+    visit(jump_path(step, :resource => {:save => true}, :jump_to => :last_step))
+    assert has_content?('last_step')
+  end
+
+  test 'disregard jump_to when saving the resource fails' do
+    step = :first
+    visit(jump_path(step, :resource => {:save => false}, :jump_to => :last_step))
+    assert has_content?('first')
+    assert !has_content?('last_step')
+  end
+end

data/test/integration/navigation_test.rb

@@ -83,5 +83,6 @@ class IncludeNavigationTest < ActiveSupport::IntegrationCase
     visit(bar_path(step))
     assert has_content?('home')
   end
-
 end
+
+

data/wicked.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wicked"
-  s.version = "0.1.6.pre"
+  s.version = "0.1.6"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["schneems"]
-  s.date = "2012-05-13"
+  s.date = "2012-06-02"
   s.description = "Wicked is a Rails engine for producing easy wizard controllers"
   s.email = "richard.schneeman@gmail.com"
   s.extra_rdoc_files = [
@@ -36,13 +36,18 @@ Gem::Specification.new do |s|
     "test/dummy/app/controllers/application_controller.rb",
     "test/dummy/app/controllers/bar_controller.rb",
     "test/dummy/app/controllers/foo_controller.rb",
+    "test/dummy/app/controllers/jump_controller.rb",
     "test/dummy/app/helpers/application_helper.rb",
+    "test/dummy/app/models/bar.rb",
     "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/foo/first.html.erb",
     "test/dummy/app/views/foo/last_step.html.erb",
     "test/dummy/app/views/foo/second.html.erb",
+    "test/dummy/app/views/jump/first.html.erb",
+    "test/dummy/app/views/jump/last_step.html.erb",
+    "test/dummy/app/views/jump/second.html.erb",
     "test/dummy/app/views/layouts/application.html.erb",
     "test/dummy/config.ru",
     "test/dummy/config/application.rb",
@@ -73,6 +78,7 @@ Gem::Specification.new do |s|
     "test/dummy/public/stylesheets/.gitkeep",
     "test/dummy/script/rails",
     "test/integration/helpers_test.rb",
+    "test/integration/jump_test.rb",
     "test/integration/navigation_test.rb",
     "test/support/integration_case.rb",
     "test/test_helper.rb",

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: wicked
 version: !ruby/object:Gem::Version
-  version: 0.1.6.pre
-  prerelease: 6
+  version: 0.1.6
+  prerelease: 
 platform: ruby
 authors:
 - schneems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000Z
+date: 2012-06-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70197506430280 !ruby/object:Gem::Requirement
+  requirement: &70351864816900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70197506430280
+  version_requirements: *70351864816900
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70197506429740 !ruby/object:Gem::Requirement
+  requirement: &70351864816420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70197506429740
+  version_requirements: *70351864816420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70197506429260 !ruby/object:Gem::Requirement
+  requirement: &70351864815860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197506429260
+  version_requirements: *70351864815860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70197506428760 !ruby/object:Gem::Requirement
+  requirement: &70351864815340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70197506428760
+  version_requirements: *70351864815340
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70197506428220 !ruby/object:Gem::Requirement
+  requirement: &70351864814820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197506428220
+  version_requirements: *70351864814820
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70197506427700 !ruby/object:Gem::Requirement
+  requirement: &70351864814340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70197506427700
+  version_requirements: *70351864814340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70197506427200 !ruby/object:Gem::Requirement
+  requirement: &70351864813820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197506427200
+  version_requirements: *70351864813820
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70197506426700 !ruby/object:Gem::Requirement
+  requirement: &70351864813300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197506426700
+  version_requirements: *70351864813300
 description: Wicked is a Rails engine for producing easy wizard controllers
 email: richard.schneeman@gmail.com
 executables: []
@@ -126,13 +126,18 @@ files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/bar_controller.rb
 - test/dummy/app/controllers/foo_controller.rb
+- test/dummy/app/controllers/jump_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/bar.rb
 - 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/foo/first.html.erb
 - test/dummy/app/views/foo/last_step.html.erb
 - test/dummy/app/views/foo/second.html.erb
+- test/dummy/app/views/jump/first.html.erb
+- test/dummy/app/views/jump/last_step.html.erb
+- test/dummy/app/views/jump/second.html.erb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
@@ -163,6 +168,7 @@ files:
 - test/dummy/public/stylesheets/.gitkeep
 - test/dummy/script/rails
 - test/integration/helpers_test.rb
+- test/integration/jump_test.rb
 - test/integration/navigation_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
@@ -183,13 +189,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3750481941390121000
+      hash: -1992748704531741576
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10