wizardz 1.1.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/lib/wizardz/page.rb +2 -2
- data/wizardz.gemspec +2 -2
- metadata +4 -4
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.
|
|
1
|
+
1.2.0
|
data/lib/wizardz/page.rb
CHANGED
|
@@ -17,7 +17,7 @@ module Wizardz
|
|
|
17
17
|
id = class_obj::IDENTIFIER rescue nil
|
|
18
18
|
return {} if id.nil? or !states.include?(id)
|
|
19
19
|
|
|
20
|
-
obj = class_obj.new(page_data[id] || {})
|
|
20
|
+
obj = class_obj.new(page_data[id] || {}, page_data[:merge])
|
|
21
21
|
obj.wizard_inst = wizard_inst
|
|
22
22
|
{id => obj}
|
|
23
23
|
end
|
|
@@ -38,7 +38,7 @@ module Wizardz
|
|
|
38
38
|
states
|
|
39
39
|
end
|
|
40
40
|
|
|
41
|
-
def initialize(data={})
|
|
41
|
+
def initialize(data={},merge=true)
|
|
42
42
|
@page_data = data || {}
|
|
43
43
|
end
|
|
44
44
|
|
data/wizardz.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{wizardz}
|
|
8
|
-
s.version = "1.
|
|
8
|
+
s.version = "1.2.0"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["David Henry"]
|
|
12
|
-
s.date = %q{2010-06-
|
|
12
|
+
s.date = %q{2010-06-09}
|
|
13
13
|
s.description = %q{Multi-Step wizard that deals with multiple models and changing step options based on previous step input}
|
|
14
14
|
s.email = %q{dave_henry@lyagushka.co.uk}
|
|
15
15
|
s.extra_rdoc_files = [
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: wizardz
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 31
|
|
5
5
|
prerelease: false
|
|
6
6
|
segments:
|
|
7
7
|
- 1
|
|
8
|
-
-
|
|
8
|
+
- 2
|
|
9
9
|
- 0
|
|
10
|
-
version: 1.
|
|
10
|
+
version: 1.2.0
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- David Henry
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2010-06-
|
|
18
|
+
date: 2010-06-09 00:00:00 +01:00
|
|
19
19
|
default_executable:
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|