wizardz 1.3.0 → 1.3.1

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/wizardz/wizard.rb

@@ -66,7 +66,7 @@ module Wizardz
       @valid_states.each do |state|
         results[state] = @pages[state].page_data if @pages[state].respond_to?(:page_data)
       end
-      results[:states] = @valid_states
+      results[:valid_states] = @valid_states
       results[:unprocessed] = @unprocessed.clone
       results[:unprocessed].delete(@state)
       results

data/spec/wizardz/wizard_spec.rb

@@ -1,3 +1,4 @@
+#require 'ruby-debug'
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 class TestClassWiz < Wizardz::Page
@@ -14,6 +15,11 @@ end
 class StateRedefWiz < Wizardz::Wizard
 end
 
+class ValidStates < Wizardz::Wizard
+  STATES = [{:id => :first_state, :class => Wizardz::Page::First},
+           {:id => :test_class_wiz, :class => TestClassWiz}]
+end
+
 describe "Wizard" do
 
   it "has minimum of 0 parameters on creation" do
@@ -81,14 +87,14 @@ describe "Wizard" do
     wiz = StateRedefWiz.new()
     wiz.save_data.should == {:first_state=>{},
                              :unprocessed=>[:second_state],
-                             :states=>[:first_state, :second_state]}
+                             :valid_states=>[:first_state, :second_state]}
   end
 
   it 'returns the data_object to save from default values' do
     wiz = StateRedefWiz.new({:first_state => {:value => 'test'}})
     wiz.save_data.should ==  {:first_state=>{:value=>"test"},
                               :unprocessed=>[:second_state],
-                              :states=>[:first_state, :second_state]}
+                              :valid_states=>[:first_state, :second_state]}
   end
 
   it 'returns the view partial for the wizard' do
@@ -164,6 +170,25 @@ describe "Wizard" do
       wiz.update(1)
     end
   end
+
+  context "data save and load" do
+    before(:each) do
+      @page = Wizardz::Page::First.new({},false)
+      Wizardz::Page::First.should_receive(:new).with({},nil).twice.and_return(@page)
+      @wiz = ValidStates.new
+    end
+
+    it "should correctly reload valid states" do
+      @wiz.valid_states.should == [:first_state, :test_class_wiz]
+      @page.should_receive(:get_valid_states).with([:first_state, :test_class_wiz]).and_return([:first_state])
+      @wiz.update({:first => {:value => 'aaa'}},'next')
+      data = @wiz.save_data
+      load_wiz = ValidStates.new(data)
+      load_wiz.valid_states.should == [:first_state]
+    end
+
+  end
+  
 #  it 'return true for the first_look? value (indicates if page should be validated)' do
 #    wiz = Wizardz::Wizard.new({:unprocessed => [:first_state]})
 #    wiz.first_look?.should be_true

data/wizardz.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wizardz}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wizardz
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - David Henry