wicked 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d57c6303ec9b5b9ade82da9eb85f17bbc3456c8
-  data.tar.gz: 5020cb0b2f0af4813cd9d035a15b6c55305c8461
+  metadata.gz: 22f6f41073e2bea73b0a1310eb93b7cca68d9787
+  data.tar.gz: aceb9c69831a4ebe134fb61fe3968a909c404491
 SHA512:
-  metadata.gz: d52c329c13d8fd610ed2bdef74cb5e25c19c923da18ec8d7977007b3afd1635ddecac017d1fd4598fae61e3a7dbc3ff8e5edb3af63f6b2a1324927b09d4305de
-  data.tar.gz: 618e15b7c0a1b59614ba9fe9f0513527b53f56f370dbecf499efe611ef5df8c774d222485c3d1e83ce3552d7b72104068a5caf6e43125c6896367f1c9ab2771e
+  metadata.gz: 8101763f8b5ff60c28a458e61d4270fdcf1a9ce70a8c10dcaaad52263918fd30f6ae7a619b9a75d967fb44e5ea539623c037ae9b8ac0920744162389cb7d9964
+  data.tar.gz: 66fffeef5ea6e6847bfafc6f5ed809525ca97f342f22c0588ac86b53a9162fb2cb541c8dc7bb3bceef95f61bf957cbfafd27609b7ad01a61fb4069e92a103736

data/.gitignore

@@ -11,3 +11,4 @@ Gemfile.lock
 .ruby-version
 .ruby-gemset
 gemfiles/*.lock
+*.gem

data/.travis.yml

@@ -6,12 +6,14 @@ rvm:
   - ruby-head
   - jruby-19mode
 
+sudo: false
+
 gemfile:
-  - gemfiles/3.0.gemfile
   - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile
 
 matrix:
   allow_failures:
@@ -20,6 +22,4 @@ matrix:
     - gemfile: gemfiles/3.0.gemfile
       rvm: 2.1.1
     - rvm: ruby-head
-    - env: "RAILS_VERSION=3.0.7"
-      rvm: 2.1.1
 

data/Appraisals

@@ -1,8 +1,3 @@
-appraise "3.0" do
-  gem "rails", "~> 3.0.7"
-  gemspec
-end
-
 appraise "3.1" do
   gem "rails", "~> 3.1.0"
   gemspec
@@ -22,3 +17,9 @@ appraise "4.1" do
   gem "rails", "~> 4.1.0"
   gemspec
 end
+
+
+appraise "4.2" do
+  gem "rails", "~> 4.2"
+  gemspec
+end

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Master
 
+## 1.2.1 (8/28/2015)
+
+* [#186] Do not require use of ApplicationController with wicked.
+
+
 ## 1.1.1 (2/23/2015)
 
 * [#159] Default wizard index actions now work when using `default_url_options`

data/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 # Put all runtime dependencies in wicked.gemspec
 # Put development requirements for different platforms here
 # Put more specific gem declarations in different gemfiles/*.gemfile files
-gemspec :path => File.expand_path("../.", __FILE__)
+gemspec :path => ::File.expand_path("../.", __FILE__)
 
 group :development, :test do
   gem "sqlite3", :platform => [:ruby, :mswin, :mingw]

data/README.md

@@ -129,6 +129,7 @@ end
 
 We're passing `render_wizard` our `@user` object here. If you pass an object into `render_wizard` it will show the next step if the object saves or re-render the previous view if it does not save.
 
+Note that `render_wizard` does attempt to save the passed object. This means that in the above example, the object will be saved twice. This will cause any callbacks to run twice also. If this is undesirable for your use case, then calling `assign_attributes` (which does not save the object) instead of `update_attributes` might work better.
 
 To get to this update action, you simply need to submit a form that PUT's to the same url
 
@@ -194,13 +195,15 @@ wizard_steps                 # Gets ordered list of steps
 
 **Redirect options**
 
-Both `skip_step` and `jump_to` will cause a redirect. If you want to pass params to the step you are skipping to you can pass it into those.
+Both `skip_step` and `jump_to` will cause a redirect.
 
 ```
 skip_step(foo: "bar")
 ```
 
-and
+*Note that unlike you would do when making a call to Rails' `redirect_to`, you should not call `return` immediately after `skip_step` and `jump_to`, since the actual redirection is done in the render_wizard call.*
+
+If you want to pass params to the step you are skipping to you can pass it into those:
 
 ```
 jump_to(:specific_step, foo: "bar")
@@ -409,28 +412,44 @@ the first step you've specified. This might be useful for redirecting a
 user to a step when you're not already in a Wicked controller. If you
 change the constants, they are expected to be strings (not symbols).
 
-## About
+## Support
+
+Most problems using this library are general problems using Ruby/Rails. If you cannot get something to work correctly please open up a question on [stack overflow](http://stackoverflow.com/). If you've not posted there before, provide a description of the problem you're having and usually some example code and a copy of your rails logs helps.
+
+If you've found a bug, please open a ticket on the issue tracker with a small example app that reproduces the behavior.
 
-Please poke around the source code, if you see easier ways to get a Rails controller to do what I want, let me know.
+## About
 
-If you have a question file an issue or, find me on the Twitters [@schneems](http://twitter.com/schneems).
+Made by [@schneems](http://twitter.com/schneems).
 
 This project rocks and uses MIT-LICENSE.
 
 ## Compatibility
 
-This gem works with Rails 3.0, 3.1, 3.2, 4.0 and 4.1, and is compatible with Ruby 1.9.3, 2.0.0, 2.1.1 or JRuby (with some exceptions).
-
-Refer to the Travis CI test matrix for test using your version of Ruby and Rails.
+Refer to the Travis CI test matrix for test using your version of Ruby and Rails. If there is a newer Ruby or Rails you don't see on there, please add an entry to the Apprasials file, then run `$ apprasials install` and update the `.travis.yml` file and send me a pull request.
 
-Exceptions: Rails 3.0 support is only for Ruby 1.9.3 or JRuby, not Ruby 2.0.0 or newer.
+Note: Rails 3.0 support is only for Ruby 1.9.3 or JRuby, not Ruby 2.0.0 or newer.
 
 ## Running Gem Tests
 
-Run tests with `rake`.
+First install all gemfiles:
+
+```
+$ appraisal install
+```
+
+Then to run tests against all the appraisal gemfiles, use:
+
+```
+$ appraisal rake test
+```
+
+To run tests against one specific gemfile,
+use
 
-To run tests against all the appraisal gemfiles, use `appraisal rake`. To run tests against one specific gemfile,
-use `appraisal 4.1 rake`.
+```
+$ appraisal 4.1 rake test
+```
 
 Note that Rails 3.0 tests don't pass in Ruby 2.0.0 or newer, so during development it may be easier to disable this
 gemfile if you are using a current version of Ruby.

data/Rakefile

@@ -2,6 +2,8 @@
 require 'rubygems'
 require 'bundler'
 
+require 'bundler/gem_tasks'
+
 begin
   Bundler.setup(:default, :development, :test)
 rescue Bundler::BundlerError => e

data/gemfiles/3.1.gemfile

@@ -2,6 +2,11 @@
 
 source "https://rubygems.org"
 
-eval Pathname.new(__FILE__).join("../../Gemfile").read
-
 gem "rails", "~> 3.1.0"
+
+group :development, :test do
+  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
+end
+
+gemspec :path => "../"

data/gemfiles/3.2.gemfile

@@ -2,6 +2,11 @@
 
 source "https://rubygems.org"
 
-eval Pathname.new(__FILE__).join("../../Gemfile").read
-
 gem "rails", "~> 3.2.15"
+
+group :development, :test do
+  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
+end
+
+gemspec :path => "../"

data/gemfiles/4.0.gemfile

@@ -2,7 +2,11 @@
 
 source "https://rubygems.org"
 
-eval Pathname.new(__FILE__).join("../../Gemfile").read
-
 gem "rails", "~> 4.0.0"
 
+group :development, :test do
+  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
+end
+
+gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -2,6 +2,11 @@
 
 source "https://rubygems.org"
 
-eval Pathname.new(__FILE__).join("../../Gemfile").read
-
 gem "rails", "~> 4.1.0"
+
+group :development, :test do
+  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
+end
+
+gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2"
+
+group :development, :test do
+  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", :platform => :jruby
+end
+
+gemspec :path => "../"

data/lib/wicked.rb

@@ -13,6 +13,7 @@ module Wicked
   end
   module Wizard
   end
+  autoload :WizardController, "wicked/wizard_controller"
 end
 
 class WickedError < StandardError; end
@@ -24,4 +25,3 @@ require 'wicked/controller/concerns/path'
 require 'wicked/wizard'
 require 'wicked/wizard/translated'
 require 'wicked/engine'
-

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

@@ -81,7 +81,6 @@ module Wicked::Controller::Concerns::Steps
     index =  steps.index(current_step)
     step  =  steps.at(index - 1) if index.present? && index != 0
     step ||= steps.first
-    step
   end
 
 
@@ -90,7 +89,6 @@ module Wicked::Controller::Concerns::Steps
     index = steps.index(current_step)
     step  = steps.at(index + 1) if index.present?
     step  ||= Wicked::FINISH_STEP
-    step
   end
 
   private
@@ -104,8 +102,7 @@ module Wicked::Controller::Concerns::Steps
   end
 
   def current_and_given_step_exists?(step_name)
-    return false if current_step_index.nil? || steps.index(step_name).nil?
-    return true
+    current_step_index.present? && steps.index(step_name).present?
   end
 end
 

data/lib/wicked/version.rb

@@ -1,3 +1,3 @@
 module Wicked
-  VERSION = "1.1.1"
+  VERSION = "1.2.1"
 end

data/test/dummy/config/application.rb

@@ -43,5 +43,6 @@ module Dummy
     config.filter_parameters += [:password]
 
     config.eager_load = false
+    config.secret_key_base = 'foo'
   end
 end

data/wicked.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency             "rails",    [">= 3.0.7"]
+  gem.add_dependency             "railties", [">= 3.0.7"]
+  gem.add_development_dependency "rails",    [">= 3.0.7"]
   gem.add_development_dependency "capybara", [">= 0"]
+  gem.add_development_dependency "appraisal"
+  gem.add_development_dependency "test-unit"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: wicked
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.7
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wicked is a Rails engine for producing easy wizard controllers
 email:
 - richard.schneeman+rubygems@gmail.com
@@ -55,13 +97,11 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- VERSION
-- app/controllers/wicked/wizard_controller.rb
-- gemfiles/3.0.gemfile
 - gemfiles/3.1.gemfile
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
 - lib/wicked.rb
 - lib/wicked/controller/concerns/path.rb
 - lib/wicked/controller/concerns/render_redirect.rb
@@ -70,6 +110,7 @@ files:
 - lib/wicked/version.rb
 - lib/wicked/wizard.rb
 - lib/wicked/wizard/translated.rb
+- lib/wicked/wizard_controller.rb
 - test/controllers/bar_controller_test.rb
 - test/controllers/updates_controller_test.rb
 - test/dummy/Rakefile
@@ -182,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Use Wicked to turn your controller into a wizard
@@ -278,4 +319,3 @@ test_files:
 - test/support/integration_case.rb
 - test/test_helper.rb
 - test/wicked_test.rb
-has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-1.1.1

data/gemfiles/3.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-eval Pathname.new(__FILE__).join("../../Gemfile").read
-
-gem "rails", "~> 3.0.7"