active_form 0.0.6 → 0.0.7

data/Manifest.txt

@@ -77,6 +77,8 @@ lib/active_form/views/tables.rb
 lib/active_form/widget.rb
 lib/active_form/widgets/base.rb
 lib/loob/uri_validator.rb
+lib/merb/merbtasks.rb
+lib/merb/support.rb
 lib/rails/acts_as_dropdown/MIT-LICENSE
 lib/rails/acts_as_dropdown/acts_as_dropdown.rb
 lib/rails/acts_as_dropdown/dropdown.rb

data/lib/active_form/facets/select_timebased.rb

@@ -37,6 +37,8 @@ class ActiveForm::Element::SelectTimebased < ActiveForm::Element::Section
       when Time then value
       else nil
     end
+    update_values(default_element_values) if @now
+    @now
   end
   
   def render_element(builder = create_builder)

data/lib/active_form/version.rb

@@ -2,7 +2,7 @@ module ActiveForm #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/active_form.rb

@@ -84,3 +84,35 @@ require File.join(File.dirname(__FILE__), 'active_form', 'elements', 'section')
 
 require File.join(File.dirname(__FILE__), 'active_form', 'widget')
 require File.join(File.dirname(__FILE__), 'active_form', 'widgets', 'base')
+
+if defined?(Merb::Plugins)
+  
+  Merb::Plugins.config[:active_form] = { } if Merb::Plugins.config[:active_form].nil?
+  
+  require File.join(File.dirname(__FILE__), 'merb', 'support')
+  Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__), 'merb',  'merbtasks'))
+  
+  Merb.push_path(:form,             Merb.root_path("app/forms"), nil)
+  Merb.push_path(:form_view,        Merb.root_path("app/forms/views"), nil)
+  
+  Merb.push_path(:form_definition,  Merb.root_path("app/forms/definitions"))
+  Merb.push_path(:form_section,     Merb.root_path("app/forms/sections"))
+  Merb.push_path(:form_widget,      Merb.root_path("app/forms/widgets"))
+  Merb.push_path(:form_element,     Merb.root_path("app/forms/elements"))
+  Merb.push_path(:form_validator,   Merb.root_path("app/forms/validators"))
+  
+  class Merb::ActiveFormSetup < Merb::BootLoader
+
+    after BeforeAppRuns
+
+    def self.run
+      ActiveForm::Definition.load_paths << Merb.dir_for(:form_definition)
+      ActiveForm::Definition.load_paths << Merb.dir_for(:form_section)
+      ActiveForm::Widget.load_paths     << Merb.dir_for(:form_widget)
+      ActiveForm::Element.load_paths    << Merb.dir_for(:form_element)
+      ActiveForm::Validator.load_paths  << Merb.dir_for(:form_validator)
+    end
+
+  end
+  
+end

data/lib/merb/merbtasks.rb

@@ -0,0 +1,6 @@
+namespace :active_form do
+  desc "Do something for ActiveForm"
+  task :default do
+    puts "ActiveForm doesn't do anything"
+  end
+end

data/lib/merb/support.rb

@@ -0,0 +1,40 @@
+module ActiveForm
+  module MerbControllerHelper
+   
+    def create_active_form(*args, &block)
+      form = ActiveForm::compose(*args, &block)
+      form.update_from_params(params)
+      instance_variable_set("@#{form.name}", form)
+    end
+  
+    def build_active_form(definition_name, *args, &block)
+      form = ActiveForm::Definition::build(definition_name, *args, &block)
+      form.update_from_params(params)
+      instance_variable_set("@#{form.name}", form)
+    end
+   
+  end
+end
+
+Merb::Controller.send(:include, ActiveForm::MerbControllerHelper)
+
+module ActiveForm
+  module MerbViewHelper
+   
+    def active_form(*args, &block)
+      form = args.first.instance_of?(ActiveForm::Definition) ? args.shift : ActiveForm::Definition.build(*args)   
+      if block_given?    
+        if form.kind_of?(ActiveForm::Definition)
+          concat(form.header, block.binding)
+          yield(form)
+          concat(form.footer, block.binding)
+        end
+      else
+        form.to_html
+      end
+    end
+   
+  end
+end
+
+Merb::GlobalHelpers.send(:include, ActiveForm::MerbViewHelper)

data/test/facets/test_select_datetime_element.rb

@@ -8,9 +8,13 @@ class TestSelectDatetimeElement < Test::Unit::TestCase
   
   def test_format
     form = ActiveForm::compose :form do |f|
-      f.select_datetime_element :start, :format => [:day, :month, :year, :hour, :minute, :second], :range => (2000..2005)
+      f.select_datetime_element :start, :format => [:day, :month, :year, :hour, :minute, :second], :range => (2000..2010) do |e|
+        e.now = Time.local(2007, 8, 14, 13, 52, 5)
+      end
     end
-    assert_equal [:day, :month, :year, :hour, :minute, :second], form[:start].collect(&:name) 
+    expected = {"start"=>{"month"=>8, "minute"=>52, "second"=>5, "hour"=>13, "day"=>14, "year"=>2007}}
+    assert_equal expected, form.export_values
+    assert_equal [:day, :month, :year, :hour, :minute, :second], form[:start].collect(&:name)
   end
   
   def test_european_formatting

metadata

@@ -1,30 +1,12 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: active_form
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
-date: 2008-02-28 00:00:00 +01:00
-summary: ActiveForm provides a DSL for defining complete XHTML forms with validation.
-require_paths: 
-- lib
-email: 
-- info@loobmedia.com
-homepage: http://activeform.rubyforge.org
-rubyforge_project: activeform
-description: ActiveForm provides a DSL for defining complete XHTML forms with validation.
+  version: 0.0.7
+platform: ruby
+authors: 
+- Fabien Franzen
 autorequire: 
-default_executable: 
 bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
 cert_chain: 
 - |
   -----BEGIN CERTIFICATE-----
@@ -48,9 +30,22 @@ cert_chain:
   9Kl7sLBL
   -----END CERTIFICATE-----
 
-post_install_message: 
-authors: 
-- Fabien Franzen
+date: 2008-05-05 00:00:00 +02:00
+default_executable: 
+dependencies: []
+
+description: ActiveForm provides a DSL for defining complete XHTML forms with validation.
+email: 
+- info@loobmedia.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- License.txt
+- Manifest.txt
+- README.txt
 files: 
 - History.txt
 - License.txt
@@ -131,6 +126,8 @@ files:
 - lib/active_form/widget.rb
 - lib/active_form/widgets/base.rb
 - lib/loob/uri_validator.rb
+- lib/merb/merbtasks.rb
+- lib/merb/support.rb
 - lib/rails/acts_as_dropdown/MIT-LICENSE
 - lib/rails/acts_as_dropdown/acts_as_dropdown.rb
 - lib/rails/acts_as_dropdown/dropdown.rb
@@ -234,6 +231,33 @@ files:
 - test/validators/test_validates_within_length_range.rb
 - test/validators/test_validates_within_set.rb
 - test/validators/test_validates_within_time_range.rb
+has_rdoc: true
+homepage: http://activeform.rubyforge.org
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: activeform
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: ActiveForm provides a DSL for defining complete XHTML forms with validation.
 test_files: 
 - test/elements/test_base_element.rb
 - test/elements/test_builder_element.rb
@@ -290,19 +314,3 @@ test_files:
 - test/validators/test_validates_within_length_range.rb
 - test/validators/test_validates_within_set.rb
 - test/validators/test_validates_within_time_range.rb
-rdoc_options: 
-- --main
-- README.txt
-extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
-executables: []
-
-extensions: []
-
-requirements: []
-
-dependencies: []
-