wizardz 1.2.0 → 1.3.0

data/.gitignore

@@ -18,5 +18,5 @@ coverage
 rdoc
 pkg
 nbproject
-
+patch
 ## PROJECT::SPECIFIC

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/wizardz/wizard.rb

@@ -13,6 +13,7 @@ module Wizardz
 
     def initialize(fund_data={},state=nil)
       state = self.states.first if state.nil?
+      raise "Invalid State ':merge' is reservered state" if self.states.include?(:merge)
       state = state.to_sym
       raise "Invalid State Assignment: #{state}" unless self.states.include?(state)
       self.load_data(fund_data)

data/spec/wizardz/page_spec.rb

@@ -16,7 +16,21 @@ describe "Page" do
   it "calls new for each subclass" do
     page_data = {:first_state => {:value => 'test'}}
     page = Wizardz::Page::First.new
-    Wizardz::Page::First.should_receive(:new).with({:value => 'test'}).and_return(page)
+    Wizardz::Page::First.should_receive(:new).with({:value => 'test'}, nil).and_return(page)
+    Wizardz::Page.load_pages([:first_state], page_data, mock(Wizardz::Wizard, :classes => [Wizardz::Page::First]))
+  end
+
+  it "sets the merge flag to TRUE is part of passed dataset" do
+    page_data = {:first_state => {:value => 'test'}, :merge => true}
+    page = Wizardz::Page::First.new
+    Wizardz::Page::First.should_receive(:new).with({:value => 'test'}, true).and_return(page)
+    Wizardz::Page.load_pages([:first_state], page_data, mock(Wizardz::Wizard, :classes => [Wizardz::Page::First]))
+  end
+
+  it "sets the merge flag to FALSE is part of passed dataset" do
+    page_data = {:first_state => {:value => 'test'}, :merge => false}
+    page = Wizardz::Page::First.new
+    Wizardz::Page::First.should_receive(:new).with({:value => 'test'}, false).and_return(page)
     Wizardz::Page.load_pages([:first_state], page_data, mock(Wizardz::Wizard, :classes => [Wizardz::Page::First]))
   end
 
@@ -46,6 +60,7 @@ describe "Page" do
     page = Wizardz::Page::First.new({:value => 'test'})
     page.page_data.should == {:value => 'test'} 
   end
+
   context 'update' do
     it "does not raise an error if no update method implemented" do
       page = TestClass3.new({})

data/spec/wizardz/wizard_spec.rb

@@ -7,6 +7,10 @@ class TestClassWiz < Wizardz::Page
   end
 end
 
+class ErrorWiz < Wizardz::Wizard
+  STATES=[{:id => :merge, :class => Wizardz::Page::First}]
+end
+
 class StateRedefWiz < Wizardz::Wizard
 end
 
@@ -24,6 +28,10 @@ describe "Wizard" do
     lambda{Wizardz::Wizard.new({}, :invalid_state)}.should  raise_error
   end
 
+  it "raises an error if identifier of :merge is used any Page's" do
+    lambda{ErrorWiz.new()}.should  raise_error
+  end
+
   it 'initialises valid states from params' do
     wiz = Wizardz::Wizard.new({:valid_states => [:first_state, :second_state]})
     wiz.valid_states.should == [:first_state, :second_state]

data/wizardz.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wizardz}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   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: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - David Henry