wicked 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.2
+* Forward params passed to the index action
+* bug fix: 1.8.7 hash ordering
+
 ## 0.3.1
 * Prettier code, thanks code climate
 

data/README.md

@@ -1,8 +1,6 @@
 # Wicked
 
-[![Build Status](https://secure.travis-ci.org/schneems/wicked.png)](http://travis-ci.org/schneems/wicked)
-
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/schneems/wicked)
+[![Build Status](https://secure.travis-ci.org/schneems/wicked.png)](http://travis-ci.org/schneems/wicked) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/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).
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/wicked/wizard.rb

@@ -17,12 +17,17 @@ module Wicked
       before_filter :setup_wizard
     end
 
+    # forward to first step with whatever params are provided
     def index
-      redirect_to wizard_path(steps.first)
+      redirect_to wizard_path(steps.first, clean_params)
     end
 
     private
 
+    def clean_params
+      params.except(:action, :controller)
+    end
+
     def check_redirect_to_first_last!(step)
       redirect_to wizard_path(steps.first) if step == :wizard_first
       redirect_to wizard_path(steps.last)  if step == :wizard_last

data/lib/wicked/wizard/translated.rb

@@ -14,10 +14,10 @@ module Wicked
       # {:uno=>"first", :dos=>"second"}
       #
       def wizard_translations
-        @wizard_translations ||= steps.inject({}) do |hash, step|
+        @wizard_translations ||= steps.inject(ActiveSupport::OrderedHash.new) do |hash, step|
           step        = step.to_s.split(".").last
           translation = I18n.t("wicked.#{step}").to_sym
-          hash[translation] = step
+          hash[translation] = step.to_sym
           hash
         end
       end

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

@@ -0,0 +1,7 @@
+class PagesController < ApplicationController
+
+  def index
+
+  end
+
+end

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

@@ -1,5 +1,7 @@
 first
 
+
+<%= "params[:foo] #{params[:foo]}" %>
 <%= link_to 'last', wizard_path(:last_step) %>
 <%= link_to 'current', wizard_path %>
 <%= link_to 'skip', next_wizard_path %>

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

@@ -0,0 +1,3 @@
+home
+
+<%= "params[:foo] #{params[:foo]}" %>

data/test/dummy/config/routes.rb

@@ -1,6 +1,5 @@
 Dummy::Application.routes.draw do
   resources :i18n
-  resources :foo
   resources :bar
   resources :jump
   resources :step_positions
@@ -54,7 +53,7 @@ Dummy::Application.routes.draw do
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  # root :to => "welcome#index"
+  root :to => "pages#index"
 
   # See how all your routes lay out with "rake routes"
 

data/test/integration/i18n_test.rb

@@ -6,11 +6,6 @@ class I18nTest < ActiveSupport::IntegrationCase
     step = :uno
     visit(i18n_path(step, :locale => :es))
     assert has_content?('uno')
-
-    ## Needed to keep travis build working on 1.8.7 idk why
-    i18n_path(:dos)
-    page.html
-
     assert has_link?('hello', :href => i18n_path(:dos))
   end
 
@@ -18,11 +13,6 @@ class I18nTest < ActiveSupport::IntegrationCase
     step = :first
     visit(i18n_path(step, :locale => :en))
     assert has_content?('first')
-
-    ## Needed to keep travis build working on 1.8.7 idk why
-    i18n_path(:second)
-    page.html
-
     assert has_link?('hello', :href => i18n_path(:second))
   end
 end

data/test/integration/navigation_test.rb

@@ -1,48 +1,16 @@
 require 'test_helper'
 
-class InheritNavigationTest < ActiveSupport::IntegrationCase
-
-  test 'default index' do
-    visit(foo_index_path)
-    assert has_content?('first')
-  end
-
-  test 'show first' do
-    step = :first
-    visit(foo_path(step))
-    assert has_content?(step.to_s)
-  end
-
-  test 'show second' do
-    step = :second
-    visit(foo_path(step))
-    assert has_content?(step.to_s)
-  end
-
-  test 'skip first' do
-    step = :first
-    visit(foo_path(step.to_s, :skip_step => 'true'))
-    assert has_content?('second')
+class IncludeNavigationTest < ActiveSupport::IntegrationCase
+  test 'index forwards to first step by default' do
+    visit(bar_index_path)
+    assert has_content?("first")
   end
 
-  test 'invalid step' do
-    step = :notastep
-    assert_raise(ActionView::MissingTemplate) do
-      visit(foo_path(step))
-    end
+  test 'index forwards params to first step' do
+    visit(bar_index_path(:foo =>  "first"))
+    assert has_content?("params[:foo] first")
   end
 
-  test 'finish' do
-    step = :finish
-    visit(foo_path(step))
-    assert has_content?('home')
-  end
-
-end
-
-
-class IncludeNavigationTest < ActiveSupport::IntegrationCase
-
   test 'show first' do
     step = :first
     visit(bar_path(step))

data/wicked.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wicked"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["schneems"]
-  s.date = "2012-11-12"
+  s.date = "2012-11-30"
   s.description = "Wicked is a Rails engine for producing easy wizard controllers"
   s.email = "richard.schneeman@gmail.com"
   s.extra_rdoc_files = [
@@ -36,24 +36,22 @@ 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/foo_controller.rb",
     "test/dummy/app/controllers/i18n_controller.rb",
     "test/dummy/app/controllers/jump_controller.rb",
+    "test/dummy/app/controllers/pages_controller.rb",
     "test/dummy/app/controllers/steps_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/i18n/first.html.erb",
     "test/dummy/app/views/i18n/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/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",
     "test/dummy/app/views/step_positions/last_step.html.erb",
@@ -78,7 +76,6 @@ Gem::Specification.new do |s|
     "test/dummy/public/422.html",
     "test/dummy/public/500.html",
     "test/dummy/public/favicon.ico",
-    "test/dummy/public/index.html",
     "test/dummy/public/javascripts/application.js",
     "test/dummy/public/javascripts/controls.js",
     "test/dummy/public/javascripts/dragdrop.js",
@@ -100,7 +97,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.10"
+  s.rubygems_version = "1.8.24"
   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.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70119200321980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70119200321980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70119200321480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70119200321480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70119200320960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119200320960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70119200320460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70119200320460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70119200319960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119200319960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70119200319440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70119200319440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70119200318900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119200318900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70119200318400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119200318400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
-  requirement: &70119200317880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119200317880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wicked is a Rails engine for producing easy wizard controllers
 email: richard.schneeman@gmail.com
 executables: []
@@ -137,24 +182,22 @@ files:
 - test/dummy/Rakefile
 - 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/i18n_controller.rb
 - test/dummy/app/controllers/jump_controller.rb
+- test/dummy/app/controllers/pages_controller.rb
 - test/dummy/app/controllers/steps_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/i18n/first.html.erb
 - test/dummy/app/views/i18n/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/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
 - test/dummy/app/views/step_positions/last_step.html.erb
@@ -179,7 +222,6 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/public/index.html
 - test/dummy/public/javascripts/application.js
 - test/dummy/public/javascripts/controls.js
 - test/dummy/public/javascripts/dragdrop.js
@@ -212,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3821284544051991557
+      hash: 2016572717015383667
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -221,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Use Wicked to turn your controller into a wizard

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

@@ -1,13 +0,0 @@
-## This controller uses inheritance
-
-class FooController < Wicked::WizardController
-  steps :first, :second, :last_step
-
-  def show
-    skip_step if params[:skip_step]
-    render_wizard
-  end
-
-  def update
-  end
-end

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

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

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

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

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

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

data/test/dummy/public/index.html

@@ -1 +0,0 @@
-home