wizardz 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/wizardz/page.rb

@@ -17,7 +17,7 @@ module Wizardz
       id = class_obj::IDENTIFIER rescue nil
       return {} if id.nil? or !states.include?(id)
 
-      obj = class_obj.new(page_data[id] || {})
+      obj = class_obj.new(page_data[id] || {}, page_data[:merge])
       obj.wizard_inst = wizard_inst
       {id => obj}
     end
@@ -38,7 +38,7 @@ module Wizardz
       states
     end
 
-    def initialize(data={})
+    def initialize(data={},merge=true)
       @page_data = data || {}
     end
 

data/wizardz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wizardz}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-06-09}
   s.description = %q{Multi-Step wizard that deals with multiple models and changing step options based on previous step input}
   s.email = %q{dave_henry@lyagushka.co.uk}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wizardz
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - David Henry
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +01:00
+date: 2010-06-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency