gendalf 0.7 → 0.8

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.8. Added step model instantination (in terms of attributes values) from WizardModel class instance possible
+
 v0.7. Added @wizard_model assignment on every step
 
 v0.6. Extracted current step loading routine to be used outside of the original gem workflow

data/Rakefile

@@ -5,7 +5,7 @@ Echoe.new('gendalf') do |p|
   p.email = 'sky.31338@gmail.com'
   p.summary = 'Trivial gem to support wizard application style creation.'
   p.url = 'http://github.com/skywriter/gendalf'
-  p.runtime_dependencies = ['activemodel', 'actionpack']
+  p.runtime_dependencies = ['activemodel >=3.0.4', 'actionpack >=3.0.4']
   p.development_dependencies = ['echoe']
   p.retain_gemspec = true
 end

data/gendalf.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gendalf}
-  s.version = "0.7"
+  s.version = "0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Kasatenko"]
-  s.date = %q{2011-03-02}
+  s.date = %q{2011-03-09}
   s.description = %q{Trivial gem to support wizard application style creation.}
   s.email = %q{sky.31338@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "README.markdown", "lib/controllers/wizard_controller.rb", "lib/extensions/routes.rb", "lib/gendalf.rb", "lib/models/wizard_model.rb"]
@@ -22,17 +22,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activemodel>, [">= 0"])
-      s.add_runtime_dependency(%q<actionpack>, [">= 0"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.4"])
+      s.add_runtime_dependency(%q<actionpack>, [">= 3.0.4"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<activemodel>, [">= 0"])
-      s.add_dependency(%q<actionpack>, [">= 0"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.4"])
+      s.add_dependency(%q<actionpack>, [">= 3.0.4"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activemodel>, [">= 0"])
-    s.add_dependency(%q<actionpack>, [">= 0"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.4"])
+    s.add_dependency(%q<actionpack>, [">= 3.0.4"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/lib/controllers/wizard_controller.rb

@@ -44,7 +44,7 @@ module Gendalf
   
     def load_current_step
       @wizard_model = wizard_model
-      @step = model.new(params[param_name])
+      @step = model.new(params[param_name] || wizard_model)
     end
 
     def wizard_model

data/lib/models/wizard_model.rb

@@ -63,19 +63,37 @@ module Gendalf
       
         step_model_class.class_eval do
           def initialize(attributes = {})
-            return unless attributes.kind_of? Hash
             if self.respond_to?(:custom_load_attributes)
               custom_load_attributes attributes
-            else
-              load_attributes attributes
+              return
             end
+            
+            puts "#{attributes.inspect}"
+            
+            if attributes.kind_of? WizardModel
+              load_attributes_from_wizard_model attributes
+              return
+            end
+            
+            if attributes.kind_of? Hash
+              load_attributes_from_hash attributes
+              return
+            end
+            
+            raise "Step model class requires initial values to be either Hash or WizardModel instance"
           end
           
-          def load_attributes(attributes)
+          def load_attributes_from_hash(attributes)
             attributes.each do |name, value|  
               send("#{name}=", value)  
             end
           end
+          
+          def load_attributes_from_wizard_model(model)
+            self.class.step_attributes.each do |attribute|
+              send("#{attribute}=", model.send(attribute))
+            end
+          end
         
           def persisted?
             false

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gendalf
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 7
-  version: "0.7"
+  - 8
+  version: "0.8"
 platform: ruby
 authors: 
 - Ivan Kasatenko
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 +03:00
+date: 2011-03-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 4
+        version: 3.0.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -39,10 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 4
+        version: 3.0.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency