wicked 0.3.2 → 0.3.3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.3
+* warn users users who forgot to set steps
+
 ## 0.3.2
 * Forward params passed to the index action
 * bug fix: 1.8.7 hash ordering

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

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

@@ -74,6 +74,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?
     index = steps.index(current_step)
     step  = steps.at(index + 1) if index.present?
     step  ||= :finish

data/test/dummy/app/controllers/nested/builder_controller.rb

@@ -0,0 +1,18 @@
+## This controller uses includes
+
+class Nested::BuilderController < ApplicationController
+  include Wicked::Wizard
+
+  steps :first, :second, :last_step
+
+  # nested_builder GET    /nested/:nested_id/builder/:id(.:format)      {:action=>"show", :controller=>"builder"}
+  def show
+    raise "no nested_id: #{params.inspect}" unless params[:nested_id].present?
+    raise "no id: #{params.inspect}"        unless params[:id].present?
+
+    render_wizard
+  end
+
+  def update
+  end
+end

data/test/dummy/app/views/nested/builder/first.html.erb

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

data/test/dummy/app/views/nested/builder/last_step.html.erb

@@ -0,0 +1,5 @@
+last
+
+<%= "params[:nested_id] #{params[:nested_id]}" %>
+
+<%= link_to 'next', next_wizard_path %>

data/test/dummy/app/views/nested/builder/second.html.erb

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

data/test/dummy/config/routes.rb

@@ -4,6 +4,10 @@ Dummy::Application.routes.draw do
   resources :jump
   resources :step_positions
 
+  resources :nested do
+    resources :builder, :controller => 'nested/builder'
+  end
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/test/integration/nested_builder_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class NestedBuilderTest < ActiveSupport::IntegrationCase
+
+  test 'can use nested ids' do
+    visit nested_builder_path(:last_step, :nested_id => "foo")
+    assert has_content?("last")
+    assert has_content?("params[:nested_id] foo")
+  end
+
+  test 'forwards nested ids' do
+    visit nested_builder_path(:last_step, :nested_id => "foo")
+    assert has_content?("last")
+    click_link 'next'
+    assert has_content?("home")
+  end
+
+end

data/wicked.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wicked"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["schneems"]
-  s.date = "2012-11-30"
+  s.date = "2012-12-22"
   s.description = "Wicked is a Rails engine for producing easy wizard controllers"
   s.email = "richard.schneeman@gmail.com"
   s.extra_rdoc_files = [
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "test/dummy/app/controllers/bar_controller.rb",
     "test/dummy/app/controllers/i18n_controller.rb",
     "test/dummy/app/controllers/jump_controller.rb",
+    "test/dummy/app/controllers/nested/builder_controller.rb",
     "test/dummy/app/controllers/pages_controller.rb",
     "test/dummy/app/controllers/steps_controller.rb",
     "test/dummy/app/helpers/application_helper.rb",
@@ -51,6 +52,9 @@ Gem::Specification.new do |s|
     "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/app/views/nested/builder/first.html.erb",
+    "test/dummy/app/views/nested/builder/last_step.html.erb",
+    "test/dummy/app/views/nested/builder/second.html.erb",
     "test/dummy/app/views/pages/index.html.erb",
     "test/dummy/app/views/step_positions/_step_position.html.erb",
     "test/dummy/app/views/step_positions/first.html.erb",
@@ -88,6 +92,7 @@ Gem::Specification.new do |s|
     "test/integration/i18n_test.rb",
     "test/integration/jump_test.rb",
     "test/integration/navigation_test.rb",
+    "test/integration/nested_builder_test.rb",
     "test/integration/steps_test.rb",
     "test/support/integration_case.rb",
     "test/test_helper.rb",
@@ -97,7 +102,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/schneems/wicked"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.10"
   s.summary = "Use Wicked to turn your controller into a wizard"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wicked
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70141352669580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.7
+  version_requirements: *70141352669580
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70141352669060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.7
+  version_requirements: *70141352669060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70141352668580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70141352668580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70141352668060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.4
+  version_requirements: *70141352668060
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70141352667560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70141352667560
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70141352667080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+  version_requirements: *70141352667080
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70141352666580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70141352666580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70141352666060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70141352666060
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70141352665540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,12 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70141352665540
 description: Wicked is a Rails engine for producing easy wizard controllers
 email: richard.schneeman@gmail.com
 executables: []
@@ -184,6 +139,7 @@ files:
 - test/dummy/app/controllers/bar_controller.rb
 - test/dummy/app/controllers/i18n_controller.rb
 - test/dummy/app/controllers/jump_controller.rb
+- test/dummy/app/controllers/nested/builder_controller.rb
 - test/dummy/app/controllers/pages_controller.rb
 - test/dummy/app/controllers/steps_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -197,6 +153,9 @@ files:
 - 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/app/views/nested/builder/first.html.erb
+- test/dummy/app/views/nested/builder/last_step.html.erb
+- test/dummy/app/views/nested/builder/second.html.erb
 - test/dummy/app/views/pages/index.html.erb
 - test/dummy/app/views/step_positions/_step_position.html.erb
 - test/dummy/app/views/step_positions/first.html.erb
@@ -234,6 +193,7 @@ files:
 - test/integration/i18n_test.rb
 - test/integration/jump_test.rb
 - test/integration/navigation_test.rb
+- test/integration/nested_builder_test.rb
 - test/integration/steps_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
@@ -254,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2016572717015383667
+      hash: -1133389636491458885
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -263,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Use Wicked to turn your controller into a wizard