wicked 0.1.4 → 0.1.5

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.5 (05/13/2012)
+
+* rename `controller` to `wizard_controller` to avoid collisions with other controller based gems (thanks @lucatironi)
+
 ## 0.1.4 (4/01/2012)
 
 * expose `steps` and `wizard_steps` to view

data/Gemfile

@@ -5,9 +5,9 @@ gem "rails"         , ">= 3.0.7"
 
 
 
-group :development do
+group :development, :test do
+  gem 'rake'
   gem 'jeweler',  "~> 1.6.4"
-  gem "bundler",  "~> 1.0.0"
   gem "rcov",     ">= 0"
   gem "capybara", ">= 0.4.0"
   gem "sqlite3"

data/Gemfile.lock

@@ -104,10 +104,10 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 3.0.7)
-  bundler (~> 1.0.0)
   capybara (>= 0.4.0)
   jeweler (~> 1.6.4)
   launchy
   rails (>= 3.0.7)
+  rake
   rcov
   sqlite3

data/README.md

@@ -1,5 +1,7 @@
 # Wicked
 
+[![Build Status](https://secure.travis-ci.org/schneems/wicked.png)](http://travis-ci.org/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).
 
 ## Why
@@ -16,6 +18,14 @@ Add this to your Gemfile
 
 Then run `bundle install` and you're ready to start
 
+## Quicklinks
+
+* Deal with validation in a Wizard using [Partial Validation of Active Record Objects](https://github.com/schneems/wicked/wiki/Partial-Validation-of-Active-Record-Objects)
+* [Show Current Wizard Progress to User](https://github.com/schneems/wicked/wiki/Show-Current-Wizard-Progress-to-User)
+* [Example App](https://github.com/schneems/wicked_example)
+* [Screencast](http://schneems.com/post/18437886598/wizard-ify-your-rails-controllers-with-wicked)
+* [Watch Railscasts episode: #346 Wizard Forms with Wicked](http://railscasts.com/episodes/346-wizard-forms-with-wicked)
+
 ## How
 
 We are going to build an 'after signup' wizard. First create a controller:
@@ -72,6 +82,8 @@ 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`
+
 You'll need to call `render_wizard` at the end of your action to get the correct views to show up.
 
 By default the wizard will render a view with the same name as the step. So for our controller `AfterSignupController` with a view path of `/views/after_signup/` if call the :confirm_password step, our wizard will render `/views/after_signup/confirm_password.html.erb`
@@ -172,6 +184,7 @@ Controller Tidbits:
   steps  :first, :second       # Sets the order of steps
   step                         # Gets symbol of current step
   next_step                    # Gets symbol of next step
+  skip_step                    # Tells render_wizard to skip to the next logical step
   render_wizard                # Renders the current step
   render_wizard(@user)         # Shows next_step if @user.save, otherwise renders current step
 ```
@@ -180,10 +193,10 @@ Testing with RSpec
 
 ```ruby
   # Test find_friends block of show action
-  get :show, :id => :find_friends   
+  get :show, :id => :find_friends
 
   # Test find_friends block of update action
-  put :update, {'id' => 'find_friends', "user" => {"id"=>@user.id.to_s}}  
+  put :update, {'id' => 'find_friends', "user" => {"id"=>@user.id.to_s}}
 
 ```
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

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

@@ -10,18 +10,18 @@ module Wicked::Controller::Concerns::Path
     wizard_path(@previous_step, options)
   end
 
-  def controller
+  def wicked_controller
     params[:controller]
   end
 
-  def action
+  def wicked_action
     params[:action]
   end
 
 
   def wizard_path(goto_step = nil, options = {})
     options = {
-                 :controller => controller,
+                 :controller => wicked_controller,
                  :action     => 'show',
                  :id         => goto_step || params[:id],
                  :only_path  => true

data/test/dummy/config/database.yml

@@ -2,7 +2,7 @@
 #   gem install sqlite3
 development:
   adapter: sqlite3
-  database: db/development.sqlite3
+  database: ":memory:"
   pool: 5
   timeout: 5000
 
@@ -11,12 +11,12 @@ development:
 # Do not set this db to the same as development or production.
 test:
   adapter: sqlite3
-  database: db/test.sqlite3
+  database: ":memory:"
   pool: 5
   timeout: 5000
 
 production:
   adapter: sqlite3
-  database: db/production.sqlite3
+  database: ":memory:"
   pool: 5
   timeout: 5000

data/wicked.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wicked"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["schneems"]
-  s.date = "2012-04-01"
+  s.date = "2012-05-13"
   s.description = "Wicked is a Rails engine for producing easy wizard controllers"
   s.email = "richard.schneeman@gmail.com"
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rvmrc",
+    ".travis.yml",
     "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
@@ -90,8 +91,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.7"])
       s.add_runtime_dependency(%q<rails>, [">= 3.0.7"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
@@ -99,8 +100,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activesupport>, [">= 3.0.7"])
       s.add_dependency(%q<rails>, [">= 3.0.7"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -109,8 +110,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>, [">= 3.0.7"])
     s.add_dependency(%q<rails>, [">= 3.0.7"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wicked
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000Z
+date: 2012-05-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70096851450500 !ruby/object:Gem::Requirement
+  requirement: &70203143251220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70096851450500
+  version_requirements: *70203143251220
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70096851449960 !ruby/object:Gem::Requirement
+  requirement: &70203143250680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +32,32 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70096851449960
+  version_requirements: *70203143250680
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70096851449340 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70203143250120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096851449340
+  version_requirements: *70203143250120
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70096851448840 !ruby/object:Gem::Requirement
+  name: jeweler
+  requirement: &70203143249620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70096851448840
+  version_requirements: *70203143249620
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70096851448300 !ruby/object:Gem::Requirement
+  requirement: &70203143249040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096851448300
+  version_requirements: *70203143249040
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70096851447660 !ruby/object:Gem::Requirement
+  requirement: &70203143248540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70096851447660
+  version_requirements: *70203143248540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70096851447120 !ruby/object:Gem::Requirement
+  requirement: &70203143248020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096851447120
+  version_requirements: *70203143248020
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70096851446500 !ruby/object:Gem::Requirement
+  requirement: &70203143247540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096851446500
+  version_requirements: *70203143247540
 description: Wicked is a Rails engine for producing easy wizard controllers
 email: richard.schneeman@gmail.com
 executables: []
@@ -107,6 +107,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .rvmrc
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -182,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4278521625544091201
+      hash: -1157435944984008571
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: