stepper 0.0.4 → 0.1.0

data/README.rdoc

@@ -39,14 +39,14 @@ Setup validation for each step if necessary, method should have name like <tt>va
 Now Your model ready for multistep form!
 === Configuring controller
 
-Stepper use +update+, +create+ and +new+ action.
+Stepper use +update+, +create+, +new+ and +next_step+ actions.
 
 For controller you need just add +has_steps+ method:
   class CompaniesController < ApplicationController
     has_steps
   end
 
-And you should have +show+ action because stepper redirects to it when last step finished. It will be configurable in a feature.
+And you should have +show+ action because stepper redirects to it when last step finished by default. For more options see method documentation.
 === Configuring view
 
 Add stepper helper method into the form in view that rendered by new action:

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/lib/stepper/controllers/controller_additions.rb

@@ -21,6 +21,20 @@ module Stepper
       #     has_steps
       #   end
       # In this case resource will be loaded or built into +@company+ variable
+      #
+      # You can setup redirection for each +save+, +previous_step+, +next_step+ and +finish+ step to other action than default,
+      # options should have +after+ prefix:
+      #
+      #   class CompaniesController < ApplicationController
+      #     has_steps :redirect_to => { :after_save => {:action => :new} }
+      #   end
+      #
+      # You can set proc that will be executed for current controller:
+      #
+      #   class CompaniesController < ApplicationController
+      #     has_steps :redirect_to => { :after_finish => proc{|controller, resource| controller.show_companies_url(resource)} }
+      #   end
+
       def has_steps(*args)
         include InstanceMethods
         stepper_resource_class.add_before_filter(self, *args)
@@ -67,29 +81,66 @@ module Stepper
       # controller +new+ action
       # it supports only html responce format for now
       def new
-        redirect_to :action => :show, :id => @_stepper_resource_instance.id if @_stepper_resource_instance.last_step?
+
+      end
+
+      # controller +new+ action
+      # it supports only html responce format for now
+      def next_step
+        if @_stepper_resource_instance.last_step?
+          redirect_to :action => :show, :id => @_stepper_resource_instance.id
+        else
+          render :action => :new
+        end
       end
 
       protected
+
+        # default redirection actions
+        def default_redirection
+          {
+            :next_step      => {:action => "next_step", :id => @_stepper_resource_instance.id},
+            :previous_step  => {:action => "next_step"},
+            :save           => {:action => "index"},
+            :finish         => {:action => "show", :id => @_stepper_resource_instance.id}
+          }
+        end
+
         # redirects to controller actions depends of commit value
         #   save -> index
         #   previous_step -> new
         #   next_step -> new
         #   finish -> show
+
         def redirect_steps
-          if params[:commit] == t('stepper.save').html_safe
-            redirect_to :action => "index"
-          elsif params[:commit] == t('stepper.previous_step').html_safe and params[:action] == "update"
-            redirect_to :action => "new", :id => @_stepper_resource_instance.id
-          elsif params[:commit] == t('stepper.next_step').html_safe
-            redirect_to({:action => "new", :id => @_stepper_resource_instance.id}, :notice => "Step #{@_stepper_resource_instance.stepper_current_step.humanize} was successfully created.")
-          elsif params[:commit] == t('stepper.finish').html_safe
-            redirect_to :action => "show", :id => @_stepper_resource_instance.id
-          else
-            raise Stepper::StepperException.new("Unknown commit: #{params[:commit]}")
+          options, response_status = redirect_steps_options
+          redirect_to options, response_status
+        end
+
+        def redirect_steps_options
+          case params[:commit]
+            when t('stepper.save')
+              [ extract_redirect_params(:save), {}]
+            when t('stepper.previous_step')
+              [ extract_redirect_params(:previous_step), {}]
+            when t('stepper.next_step')
+              [ extract_redirect_params(:next_step), {}]
+            when t('stepper.finish')
+              [ extract_redirect_params(:finish), {}]
+            else
+             raise Stepper::StepperException.new("Unknown commit: #{params[:commit]}")
           end
         end
 
+        def extract_redirect_params(option)
+          redirection = @_stepper_redirect_to["after_#{option.to_s}".to_sym]
+          if redirection.is_a?(Proc)
+            redirection.call(self, @_stepper_resource_instance)
+          else
+            redirection
+          end || default_redirection[option]
+        end
+
         # removes from params resource name, commit and id
         def sanitized_params
           params.except(@_stepper_name, :commit, :id)

data/lib/stepper/controllers/controller_resource.rb

@@ -1,6 +1,6 @@
 module Stepper
   class ControllerResource
-    # Sets up before filter in +controller_class+ for +create+, +update+ and +new+ actions.
+    # Sets up before filter in +controller_class+ for +create+, +update+, +new+ and +next_step+ actions.
     # First argument can be name of resource.
     # For example we have +CompaniesController+ and want to load or build resource to +@my_company+ variable:
     #   add_before_filter CompanyController, :my_company
@@ -10,8 +10,10 @@ module Stepper
     # In this case resource will be loaded or built into +@company+ variable
     #
     def self.add_before_filter(controller_class, *args)
-      resource_name = args.first
-      controller_class.send(:before_filter, :only => [:create, :update, :new]) do |controller|
+      resource_name = args.first if args.first.is_a?(Symbol) or args.first.is_a?(String)
+      options = args.extract_options!
+      controller_class.send(:before_filter, :only => [:create, :update, :new, :next_step]) do |controller|
+        controller.instance_variable_set :@_stepper_redirect_to, options[:redirect_to] || {}
         controller_resource = controller.class.stepper_resource_class.new(controller, resource_name)
         controller.instance_variable_set :@_stepper_resource_instance, controller_resource.load_resource
         controller.instance_variable_set :@_stepper_name, controller_resource.name
@@ -26,10 +28,12 @@ module Stepper
 
     def load_resource
       self.resource_instance ||= load_resource_instance
+      self.resource_instance.attributes = @params[name] unless @params[name].blank?
+      self.resource_instance
     end
 
     def load_resource_instance
-      if @params[:action] == 'create'
+      if ['create', 'new'].include? @params[:action]
         resource = resource_class.new(@params[name] || {})
       else
         resource = unless @params[:id].blank?
@@ -37,7 +41,6 @@ module Stepper
         else
           resource_class.new
         end
-        resource.attributes = @params[name] unless @params[name].blank?
       end
       resource
     end

data/lib/stepper/helper/action_view_additions.rb

@@ -20,7 +20,7 @@ module Stepper
       # If you want to have other partial for buttons than add partial to: +app/views/stepper/_fields.html.erb+
       def stepper(form)
         resource = self.instance_variable_get :@_stepper_resource_instance
-        current_step_column = resource.class._stepper_current_step_column
+        current_step_column = resource.stepper_current_step_column
         self.render(:partial => "stepper/fields",
                     :locals => { :f => form,
                                  :resource => resource,

data/lib/stepper/models/active_record_additions.rb

@@ -33,7 +33,7 @@ module Stepper
         #check options
         raise Stepper::StepperException.new("Options for has_steps must be in a hash.") unless options.is_a? Hash
         options.each do |key, value|
-          unless [:current_step_column, :steps, :inherit].include? key
+          unless [:current_step_column, :steps].include? key
             raise Stepper::StepperException.new("Unknown option for has_steps: #{key.inspect} => #{value.inspect}.")
           end
         end
@@ -41,14 +41,11 @@ module Stepper
         raise Stepper::StepperException.new(":steps condition can't be blank") if options[:steps].blank?
 
         #set current step column
-        class_attribute :_stepper_current_step_column
-        self._stepper_current_step_column = options[:current_step_column] || :current_step
+        class_attribute :stepper_current_step_column, :instance_writer => false
+        self.stepper_current_step_column = options[:current_step_column] || :current_step
 
-        class_attribute :_stepper_steps
-
-        self._stepper_steps = []
-        self._stepper_steps = self.try(:superclass).try(:_stepper_steps) if options[:inherit]
-        self._stepper_steps += options[:steps]
+        class_attribute :stepper_options, :instance_writer => false
+        self.stepper_options = options
 
         self.validate :current_step_validation
 
@@ -57,18 +54,15 @@ module Stepper
     end
 
     module InstanceMethods
-
-      # returns name of current step column
-      def stepper_current_step_column
-        self.class._stepper_current_step_column
-      end
-
-      # returns defined steps array
       def stepper_steps
-        self.class._stepper_steps
+        self.stepper_options[:steps]
       end
 
-      alias_method(:steps, :stepper_steps) unless self.respond_to? :steps
+      unless self.respond_to? :steps
+        define_method :steps do
+          self.stepper_steps
+        end
+      end
 
       # returns index of current step in steps array
       def stepper_current_step_index
@@ -80,26 +74,19 @@ module Stepper
         self.send(self.stepper_current_step_column)
       end
 
-      alias_method :current_step, :stepper_current_step unless self.respond_to? :current_step
-
       # sets up name of current step
-      # TODO: reject names that doesn't exists in steps array
       def stepper_current_step=(step)
-        self.send("#{self.stepper_current_step_column}=", step)
+        self.send("#{self.stepper_current_step_column.to_s}=", step)
       end
 
-      alias_method :current_step=, :stepper_current_step= unless self.respond_to? :current_step=
-
       # Use to check current step or given step is last step
       #   last_step?("address")
-      # TODO: reject names that doesn't exists in steps array
       def last_step?(step = stepper_current_step)
         step == self.stepper_steps.last
       end
 
       # Use to check current step or given step is first step
       #   first_step?("address")
-      # TODO: reject names that doesn't exists in steps array
       def first_step?(step = stepper_current_step)
         (step == stepper_steps.first) or stepper_current_step.blank? && step.blank?
       end

data/stepper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stepper}
-  s.version = "0.0.4"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Anton Versal}]
-  s.date = %q{2011-10-05}
+  s.date = %q{2011-10-08}
   s.description = %q{Stepper is multistep form (wizard) solution for Rails 3. Stepper allows you to split up your large form into series of pages that users can navigate through to complete the form and save it state.}
   s.email = %q{ant.ver@gmail.com}
   s.extra_rdoc_files = [
@@ -36,24 +36,29 @@ Gem::Specification.new do |s|
     "lib/stepper/railtie.rb",
     "stepper.gemspec",
     "test/controllers/controller_additions_test.rb",
+    "test/controllers/controller_create_test.rb",
+    "test/controllers/controller_invalid_params_test.rb",
     "test/controllers/controller_resource_test.rb",
     "test/controllers/controller_test.rb",
+    "test/controllers/controller_update_test.rb",
+    "test/controllers/redirect_test.rb",
     "test/helper.rb",
     "test/helpers/helper_test.rb",
     "test/integration/steps_test.rb",
     "test/models/assigns_test.rb",
     "test/models/instance_test.rb",
     "test/models/models_test.rb",
-    "test/models/sti_test.rb",
     "test/models/validation_test.rb",
     "test/rails_app/Rakefile",
     "test/rails_app/app/controllers/application_controller.rb",
     "test/rails_app/app/controllers/companies_controller.rb",
+    "test/rails_app/app/controllers/orders_controller.rb",
     "test/rails_app/app/helpers/application_helper.rb",
     "test/rails_app/app/mailers/.gitkeep",
     "test/rails_app/app/models/.gitkeep",
     "test/rails_app/app/models/big_company.rb",
     "test/rails_app/app/models/company.rb",
+    "test/rails_app/app/models/order.rb",
     "test/rails_app/app/models/users.rb",
     "test/rails_app/app/views/companies/_step1_step.html.erb",
     "test/rails_app/app/views/companies/_step2_step.html.erb",

data/test/controllers/controller_additions_test.rb

@@ -9,7 +9,7 @@ class ControllerAdditionsTest < ActiveSupport::TestCase
 
     test "should has_steps setup before filter which passes call to ControllerResource" do
       Stepper::ControllerResource.stubs(:new).with(@controller, nil).stubs(:load_resource)
-      @controller_class.stubs(:before_filter).with(:only => [:create, :update, :new])
+      @controller_class.stubs(:before_filter).with(:only => [:create, :update, :new, :next_step])
       @controller_class.has_steps
     end
 

data/test/controllers/controller_create_test.rb

@@ -0,0 +1,29 @@
+require "helper"
+class CompaniesCreateControllerTest < ActionController::TestCase
+  tests CompaniesController
+
+  setup do
+    Company.expects(:new).with({'name' => 'Hina'}).returns(mock_company)
+    mock_company.expects(:attributes=).with({'name' => 'Hina'}).returns(true)
+    mock_company.expects(:save).returns(true)
+    mock_company.stubs(:id).returns(1)
+  end
+
+  test "should redirect to next step if commit 'Next step'" do
+    mock_company.stubs(:stepper_current_step).returns("step1")
+    post(:create, {:company => {:name => "Hina"}, :commit => "Next step"})
+    assert_response :redirect
+    assert_redirected_to "http://test.host/companies/1/next_step"
+  end
+
+  test "should redirect to index if commit 'Finish later'" do
+    post(:create, {:company => {:name => "Hina"}, :commit => "Finish later"})
+    assert_response :redirect
+    assert_redirected_to "http://test.host/companies"
+  end
+
+  protected
+  def mock_company(stubs={})
+    @mock_company ||= mock(stubs)
+  end
+end

data/test/controllers/controller_invalid_params_test.rb

@@ -0,0 +1,31 @@
+require "helper"
+class CompaniesInvalidParamsControllerTest < ActionController::TestCase
+  tests CompaniesController
+
+  setup do
+    @controller.expects(:render).at_least_once
+  end
+
+  test "should create action render to new action if object.save returns false" do
+    Company.expects(:new).with({'name' => 'Hina'}).returns(mock_company)
+    mock_company.expects(:attributes=).with({'name' => 'Hina'}).returns(true)
+    mock_company.expects(:save).returns(false)
+    mock_company.expects(:previous_step!)
+    post(:create, {:company => {:name => "Hina"}, :commit => "Next step"})
+    assert_response :success
+  end
+
+  test "should update action redirect to new action if object.save returns false" do
+    Company.expects(:find).with('1').returns(mock_company)
+    mock_company.expects(:attributes=).with({"name" => "Hina"}).returns(true)
+    mock_company.expects(:save).returns(false)
+    mock_company.expects(:previous_step!)
+    post(:update, {:company => {:name => "Hina"}, :id => 1, :commit => "Next step"})
+    assert_response :success
+  end
+
+  protected
+  def mock_company(stubs={})
+    @mock_company ||= mock(stubs)
+  end
+end

data/test/controllers/controller_resource_test.rb

@@ -10,7 +10,7 @@ class ControllerResourceTest < ActiveSupport::TestCase
 
     test "should load resource into instance variable if params[:id] is specified" do
       Company.stubs(:find).with(1).returns(mock_company(:id => 1))
-      @params.merge!(:action => "new", :id => mock_company.id)
+      @params.merge!(:action => "next_step", :id => mock_company.id)
       resource = Stepper::ControllerResource.new(@controller)
       resource.load_resource
       assert_equal @controller.instance_variable_get(:@company), mock_company
@@ -18,7 +18,7 @@ class ControllerResourceTest < ActiveSupport::TestCase
 
     test "should build resource and load into instance variable if params[:id] is not specified" do
       Company.stubs(:new).returns(mock_company)
-      @params.merge!(:action => "new")
+      @params.merge!(:action => "some_action")
       resource = Stepper::ControllerResource.new(@controller)
       resource.load_resource
       assert_equal @controller.instance_variable_get(:@company), mock_company

data/test/controllers/controller_test.rb

@@ -5,6 +5,7 @@ class CompaniesControllerTest < ActionController::TestCase
 
   test "should raise error if commit is unknown" do
     Company.expects(:new).with({'name' => 'Hina'}).returns(mock_company)
+    mock_company.expects(:attributes=).with({'name' => 'Hina'}).returns(true)
     mock_company.expects(:save).returns(true)
     mock_company.stubs(:id).returns(1)
     assert_raise Stepper::StepperException do
@@ -13,24 +14,24 @@ class CompaniesControllerTest < ActionController::TestCase
   end
 
   test "should assign resource if params[:id] exists" do
-    @controller.expects(:render)
+    @controller.stubs(:render)
 
     Company.expects(:find).with('1').returns(mock_company(:last_step? => false))
-    get :new, :id => 1
+    get :next_step, :id => 1
     assert_response :success
     assert_equal assigns(:company), mock_company
   end
 
   test "should get existing assigns" do
-    @controller.expects(:render)
+    @controller.stubs(:render)
     @controller.instance_variable_set(:@company, mock_company(:last_step? => false))
-    get :new, :id => 1
+    get :next_step, :id => 1
     assert_equal assigns(:company), mock_company
   end
 
-  test "new action should redirect to show if company on at the last step" do
+  test "next_step action should redirect to show if company on at the last step" do
     @controller.instance_variable_set(:@company, mock_company(:last_step? => true, :id => "1"))
-    get :new, :id => 1
+    get :next_step, :id => 1
     assert_response :redirect
     assert_redirected_to "http://test.host/companies/1"
   end
@@ -41,106 +42,3 @@ class CompaniesControllerTest < ActionController::TestCase
     end
 end
 
-class CompaniesCreateControllerTest < ActionController::TestCase
-  tests CompaniesController
-
-  setup do
-    Company.expects(:new).with({'name' => 'Hina'}).returns(mock_company)
-    mock_company.expects(:save).returns(true)
-    mock_company.stubs(:id).returns(1)
-  end
-
-  test "should redirect to next step if commit 'Next step'" do
-    mock_company.stubs(:stepper_current_step).returns("step1")
-    post(:create, {:company => {:name => "Hina"}, :commit => "Next step"})
-    assert_response :redirect
-    assert_redirected_to "http://test.host/companies/new?id=1"
-    assert_equal flash[:notice], "Step Step1 was successfully created."
-  end
-
-  test "should redirect to index if commit 'Finish later'" do
-    post(:create, {:company => {:name => "Hina"}, :commit => "Finish later"})
-    assert_response :redirect
-    assert_redirected_to "http://test.host/companies"
-  end
-
-  protected
-  def mock_company(stubs={})
-    @mock_company ||= mock(stubs)
-  end
-end
-
-class CompaniesUpdateControllerTest < ActionController::TestCase
-  tests CompaniesController
-
-  setup do
-    Company.expects(:find).with('1').returns(mock_company)
-    mock_company.expects(:attributes=).with({'code' => '23'}).returns(true)
-    mock_company.expects(:save).returns(true)
-    mock_company.stubs(:id).returns(1)
-  end
-
-  test "should redirect to next step if commit 'Next step'" do
-    mock_company.stubs(:stepper_current_step).returns("step2")
-    put(:update, {:company => {:code => "23"}, :commit => "Next step", :id => 1})
-    assert_response :redirect
-    assert_redirected_to "http://test.host/companies/new?id=1"
-    assert_equal flash[:notice], "Step Step2 was successfully created."
-  end
-
-  test "should redirect to index if commit 'Finish later'" do
-    mock_company.stubs(:previous_step!)
-    put(:update, {:company => {:code => "23"}, :commit => "Finish later", :id => 1})
-    assert_response :redirect
-    assert_redirected_to "http://test.host/companies"
-  end
-
-  test "should redirect to previous step if commit 'Previous step'" do
-    mock_company.expects(:previous_step!).returns(mock_company).at_least(2)
-    mock_company.stubs(:current_step).returns("step2")
-    put(:update, {:company => {:code => "23"}, :commit => "Previous step", :id => 1})
-    assert_response :redirect
-    assert_redirected_to "http://test.host/companies/new?id=1"
-  end
-
-  test "should redirect to show if commit 'Finish form'" do
-    put(:update, {:company => {:code => "23"}, :commit => "Finish form", :id => 1})
-    assert_response :redirect
-    assert_redirected_to "http://test.host/companies/1"
-  end
-
-  protected
-  def mock_company(stubs={})
-    @mock_company ||= mock(stubs)
-  end
-end
-
-class CompaniesInvalidParamsControllerTest < ActionController::TestCase
-  tests CompaniesController
-
-  setup do
-    @controller.expects(:render).at_least_once
-  end
-
-  test "should create action render to new action if object.save returns false" do
-    Company.expects(:new).with({'name' => 'Hina'}).returns(mock_company)
-    mock_company.expects(:save).returns(false)
-    mock_company.expects(:previous_step!)
-    post(:create, {:company => {:name => "Hina"}, :commit => "Next step"})
-    assert_response :success
-  end
-
-  test "should update action redirect to new action if object.save returns false" do
-    Company.expects(:find).with('1').returns(mock_company)
-    mock_company.expects(:attributes=).with({"name" => "Hina"}).returns(true)
-    mock_company.expects(:save).returns(false)
-    mock_company.expects(:previous_step!)
-    post(:update, {:company => {:name => "Hina"}, :id => 1, :commit => "Next step"})
-    assert_response :success
-  end
-
-  protected
-  def mock_company(stubs={})
-    @mock_company ||= mock(stubs)
-  end
-end

data/test/controllers/controller_update_test.rb

@@ -0,0 +1,45 @@
+require "helper"
+
+class CompaniesUpdateControllerTest < ActionController::TestCase
+  tests CompaniesController
+
+  setup do
+    Company.expects(:find).with('1').returns(mock_company)
+    mock_company.expects(:attributes=).with({'code' => '23'}).returns(true)
+    mock_company.expects(:save).returns(true)
+    mock_company.stubs(:id).returns(1)
+  end
+
+  test "should redirect to next step if commit 'Next step'" do
+    mock_company.stubs(:stepper_current_step).returns("step2")
+    put(:update, {:company => {:code => "23"}, :commit => "Next step", :id => 1})
+    assert_response :redirect
+    assert_redirected_to "http://test.host/companies/1/next_step"
+  end
+
+  test "should redirect to index if commit 'Finish later'" do
+    mock_company.stubs(:previous_step!)
+    put(:update, {:company => {:code => "23"}, :commit => "Finish later", :id => 1})
+    assert_response :redirect
+    assert_redirected_to "http://test.host/companies"
+  end
+
+  test "should redirect to previous step if commit 'Previous step'" do
+    mock_company.expects(:previous_step!).returns(mock_company).at_least(2)
+    mock_company.stubs(:current_step).returns("step2")
+    put(:update, {:company => {:code => "23"}, :commit => "Previous step", :id => 1})
+    assert_response :redirect
+    assert_redirected_to "http://test.host/companies/1/next_step"
+  end
+
+  test "should redirect to show if commit 'Finish form'" do
+    put(:update, {:company => {:code => "23"}, :commit => "Finish form", :id => 1})
+    assert_response :redirect
+    assert_redirected_to "http://test.host/companies/1"
+  end
+
+  protected
+  def mock_company(stubs={})
+    @mock_company ||= mock(stubs)
+  end
+end

data/test/controllers/redirect_test.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+class RedirectControllerTest < ActionController::TestCase
+  tests OrdersController
+
+  setup do
+    Order.expects(:find).with('1').returns(mock_order)
+    mock_order.expects(:attributes=).with({'code' => '23'}).returns(true)
+    mock_order.expects(:save).returns(true)
+    mock_order.stubs(:id).returns(1)
+  end
+
+  test "should redirect to :action => :index if commit 'Save'" do
+    mock_order.stubs(:stepper_current_step).returns("step2")
+    mock_order.stubs(:previous_step!)
+    put(:update, {:order => {:code => "23"}, :commit => "Finish later", :id => 1})
+    assert_response :redirect
+    assert_redirected_to "http://test.host/orders"
+  end
+
+  test "should redirect to show if commit 'Finish' and option is Proc" do
+    mock_order.stubs(:stepper_current_step).returns("step3")
+    put(:update, {:order => {:code => "23"}, :commit => "Finish form", :id => 1})
+    assert_response :redirect
+    assert_redirected_to "http://test.host/orders/1"
+  end
+
+  protected
+    def mock_order(stubs={})
+      @mock_order ||= mock(stubs)
+    end
+end
+

data/test/helpers/helper_test.rb

@@ -14,7 +14,7 @@ class StepperButtonsTest < ActionController::IntegrationTest
 
   test "second step should have 'finish later', 'previous step' and 'next step' buttons" do
     company = Company.create!(:name => "My company", :my_step => "step1")
-    get new_company_path(:id => company.id)
+    get next_step_company_path(:id => company.id)
 
     assert_select "li.next_step" do
       assert_select "input[value='Next step']"
@@ -31,7 +31,7 @@ class StepperButtonsTest < ActionController::IntegrationTest
 
   test "last step should have 'finish later', 'previous step' and 'finish' buttons" do
     company = Company.create!(:name => "My company", :code => "04108", :my_step => "step2")
-    get new_company_path(:id => company.id)
+    get next_step_company_path(:id => company.id)
 
     assert_select "li.finish" do
       assert_select "input[value='Finish form']"

data/test/models/assigns_test.rb

@@ -2,14 +2,15 @@ require 'helper'
 class AssignsModelTest < ActiveSupport::TestCase
 
   test "should assign default column" do
-    assert_equal User._stepper_current_step_column, :current_step
+    assert_equal User.stepper_current_step_column, :current_step
   end
 
   test "should assign column from options" do
-    assert_equal Company._stepper_current_step_column, :my_step
+    assert_equal Company.stepper_current_step_column, :my_step
   end
 
   test "should assign default steps" do
-    assert_equal Company._stepper_steps, ["step1", "step2", "step3"]
+    company = Company.new
+    assert_equal company.stepper_steps, ["step1", "step2", "step3"]
   end
 end

data/test/rails_app/app/controllers/orders_controller.rb

@@ -0,0 +1,14 @@
+class OrdersController < ApplicationController
+  has_steps :redirect_to => {
+      :after_save =>   {:action => :index},
+      :after_finish => proc { |controller, resource| controller.order_url(resource.id) }
+  }
+
+  def show
+
+  end
+
+  def index
+
+  end
+end

data/test/rails_app/app/models/big_company.rb

@@ -1,4 +1,4 @@
 class BigCompany < Company
-  has_steps :current_step_column => :my_step, :steps => ["step4", "step5", "step6"], :inherit => true
+  has_steps :current_step_column => :my_step, :steps => ["step4", "step5", "step6"]
 
 end

data/test/rails_app/app/models/order.rb

@@ -0,0 +1,3 @@
+class Order < ActiveRecord::Base
+  has_steps :steps => ["step1", "step2", "step3"]
+end

data/test/rails_app/config/routes.rb

@@ -1,3 +1,9 @@
 RailsApp::Application.routes.draw do
-  resources :companies
+  resources :companies do
+    get :next_step , :on => :member
+  end
+
+  resources :orders do
+    get :next_step , :on => :member
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stepper
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-10-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70269103329660 !ruby/object:Gem::Requirement
+  requirement: &70157641092880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70269103329660
+  version_requirements: *70157641092880
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70269103329180 !ruby/object:Gem::Requirement
+  requirement: &70157641090560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269103329180
+  version_requirements: *70157641090560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70269103328680 !ruby/object:Gem::Requirement
+  requirement: &70157641082780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269103328680
+  version_requirements: *70157641082780
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70269103328200 !ruby/object:Gem::Requirement
+  requirement: &70157641081340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269103328200
+  version_requirements: *70157641081340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70269103327720 !ruby/object:Gem::Requirement
+  requirement: &70157641078200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70269103327720
+  version_requirements: *70157641078200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70269103327240 !ruby/object:Gem::Requirement
+  requirement: &70157641076460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70269103327240
+  version_requirements: *70157641076460
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70269103326760 !ruby/object:Gem::Requirement
+  requirement: &70157641064820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269103326760
+  version_requirements: *70157641064820
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70269103326280 !ruby/object:Gem::Requirement
+  requirement: &70157641062940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269103326280
+  version_requirements: *70157641062940
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70269103325800 !ruby/object:Gem::Requirement
+  requirement: &70157641061660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269103325800
+  version_requirements: *70157641061660
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70269103325320 !ruby/object:Gem::Requirement
+  requirement: &70157641059620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269103325320
+  version_requirements: *70157641059620
 description: Stepper is multistep form (wizard) solution for Rails 3. Stepper allows
   you to split up your large form into series of pages that users can navigate through
   to complete the form and save it state.
@@ -150,24 +150,29 @@ files:
 - lib/stepper/railtie.rb
 - stepper.gemspec
 - test/controllers/controller_additions_test.rb
+- test/controllers/controller_create_test.rb
+- test/controllers/controller_invalid_params_test.rb
 - test/controllers/controller_resource_test.rb
 - test/controllers/controller_test.rb
+- test/controllers/controller_update_test.rb
+- test/controllers/redirect_test.rb
 - test/helper.rb
 - test/helpers/helper_test.rb
 - test/integration/steps_test.rb
 - test/models/assigns_test.rb
 - test/models/instance_test.rb
 - test/models/models_test.rb
-- test/models/sti_test.rb
 - test/models/validation_test.rb
 - test/rails_app/Rakefile
 - test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/companies_controller.rb
+- test/rails_app/app/controllers/orders_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
 - test/rails_app/app/mailers/.gitkeep
 - test/rails_app/app/models/.gitkeep
 - test/rails_app/app/models/big_company.rb
 - test/rails_app/app/models/company.rb
+- test/rails_app/app/models/order.rb
 - test/rails_app/app/models/users.rb
 - test/rails_app/app/views/companies/_step1_step.html.erb
 - test/rails_app/app/views/companies/_step2_step.html.erb
@@ -218,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2396480350748237509
+      hash: 1432706558096763112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/test/models/sti_test.rb

@@ -1,11 +0,0 @@
-require 'helper'
-class StiModelTest < ActiveSupport::TestCase
-  setup do
-    @big_company = BigCompany.new
-  end
-
-  test "should get steps from parent class" do
-    assert_equal  @big_company.stepper_steps, ["step1", "step2", "step3", "step4", "step5", "step6"]
-  end
-
-end