merb_helpers 0.9.6 → 0.9.7

data/Rakefile

@@ -18,7 +18,7 @@ GEM_EMAIL  = "ykatz@engineyard.com"
 
 GEM_NAME    = "merb_helpers"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.6") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.7") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -36,7 +36,7 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.6')
+  s.add_dependency('merb-core', '>= 0.9.7')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
 end

data/lib/merb_helpers/form/builder.rb

@@ -14,19 +14,117 @@ module Merb::Helpers::Form::Builder
       @origin.concat(@origin.capture(&blk), blk.binding)
     end
 
+    def form(attrs = {}, &blk)
+      captured = @origin.capture(&blk)
+      fake_method_tag = process_form_attrs(attrs)
+      tag(:form, fake_method_tag + captured, attrs)
+    end
+
     def fieldset(attrs, &blk)
       legend = (l_attr = attrs.delete(:legend)) ? tag(:legend, l_attr) : ""
       tag(:fieldset, legend + @origin.capture(&blk), attrs)
       # @origin.concat(contents, blk.binding)
     end
 
-    def form(attrs = {}, &blk)
-      captured = @origin.capture(&blk)
-      fake_method_tag = process_form_attrs(attrs)
+    %w(text password hidden file).each do |kind|
+      self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def bound_#{kind}_field(method, attrs = {})
+          name = control_name(method)
+          update_bound_controls(method, attrs, "#{kind}")
+          unbound_#{kind}_field({:name => name, :value => @obj.send(method)}.merge(attrs))
+        end
 
-      tag(:form, fake_method_tag + captured, attrs)
+        def unbound_#{kind}_field(attrs)
+          update_unbound_controls(attrs, "#{kind}")
+          self_closing_tag(:input, {:type => "#{kind}"}.merge(attrs))
+        end
+      RUBY
+    end
+
+    def bound_check_box(method, attrs = {})
+      name = control_name(method)
+      update_bound_controls(method, attrs, "checkbox")
+      unbound_check_box({:name => name}.merge(attrs))
+    end
+
+    def unbound_check_box(attrs)
+      update_unbound_controls(attrs, "checkbox")
+      if attrs.delete(:boolean)
+        on, off = attrs.delete(:on), attrs.delete(:off)
+        unbound_hidden_field(:name => attrs[:name], :value => off) <<
+          self_closing_tag(:input, {:type => "checkbox", :value => on}.merge(attrs))
+      else
+        self_closing_tag(:input, {:type => "checkbox"}.merge(attrs))
+      end
     end
 
+    def bound_radio_button(method, attrs = {})
+      name = control_name(method)
+      update_bound_controls(method, attrs, "radio")
+      unbound_radio_button({:name => name, :value => @obj.send(method)}.merge(attrs))
+    end
+
+    def unbound_radio_button(attrs)
+      update_unbound_controls(attrs, "radio")
+      self_closing_tag(:input, {:type => "radio"}.merge(attrs))
+    end
+
+    def bound_radio_group(method, arr)
+      val = @obj.send(method)
+      arr.map do |attrs|
+        attrs = {:value => attrs} unless attrs.is_a?(Hash)
+        attrs[:checked] ||= (val == attrs[:value])
+        radio_group_item(method, attrs)
+      end.join
+    end
+
+    def unbound_radio_group(arr, attrs = {})
+      arr.map do |ind_attrs|
+        ind_attrs = {:value => ind_attrs} unless ind_attrs.is_a?(Hash)
+        joined = attrs.merge(ind_attrs)
+        joined.merge!(:label => joined[:label] || joined[:value])
+        unbound_radio_button(joined)
+      end.join
+    end
+
+    def bound_select(method, attrs = {})
+      name = control_name(method)
+      update_bound_controls(method, attrs, "select")
+      unbound_select({:name => name}.merge(attrs))
+    end
+
+    def unbound_select(attrs = {})
+      update_unbound_controls(attrs, "select")
+      attrs[:name] << "[]" if attrs[:multiple] && !(attrs[:name] =~ /\[\]$/)
+      tag(:select, options_for(attrs), attrs)
+    end
+
+    def bound_text_area(method, attrs = {})
+      name = "#{@name}[#{method}]"
+      update_bound_controls(method, attrs, "text_area")
+      unbound_text_area(@obj.send(method), {:name => name}.merge(attrs))
+    end
+
+    def unbound_text_area(contents, attrs)
+      update_unbound_controls(attrs, "text_area")
+      tag(:textarea, contents, attrs)
+    end
+
+    def button(contents, attrs)
+      update_unbound_controls(attrs, "button")
+      tag(:button, contents, attrs)
+    end
+
+    def submit(value, attrs)
+      attrs[:type]  ||= "submit"
+      attrs[:name]  ||= "submit"
+      attrs[:value] ||= value
+      update_unbound_controls(attrs, "submit")
+      self_closing_tag(:input, attrs)
+    end
+
+    private
+
     def process_form_attrs(attrs)
       method = attrs[:method]
 
@@ -46,10 +144,6 @@ module Merb::Helpers::Form::Builder
       self_closing_tag(:input, :type => "hidden", :name => "_method", :value => method)
     end
 
-    def add_css_class(attrs, new_class)
-      attrs[:class] = attrs[:class] ? "#{attrs[:class]} #{new_class}" : new_class
-    end
-
     def update_bound_controls(method, attrs, type)
       case type
       when "checkbox"
@@ -59,12 +153,6 @@ module Merb::Helpers::Form::Builder
       end
     end
 
-    def update_bound_select(method, attrs)
-      attrs[:value_method] ||= method
-      attrs[:text_method] ||= attrs[:value_method] || :to_s
-      attrs[:selected] ||= @obj.send(attrs[:value_method])
-    end
-
     def update_bound_check_box(method, attrs)
       raise ArgumentError, ":value can't be used with a bound_check_box" if attrs.has_key?(:value)
 
@@ -74,6 +162,12 @@ module Merb::Helpers::Form::Builder
       attrs[:checked] = attrs.key?(:on) ? val == attrs[:on] : considered_true?(val)
     end
 
+    def update_bound_select(method, attrs)
+      attrs[:value_method] ||= method
+      attrs[:text_method] ||= attrs[:value_method] || :to_s
+      attrs[:selected] ||= @obj.send(attrs[:value_method])
+    end
+
     def update_unbound_controls(attrs, type)
       case type
       when "checkbox"
@@ -104,109 +198,6 @@ module Merb::Helpers::Form::Builder
       attrs[:checked] = "checked" if attrs.delete(:checked)
     end
 
-    def bound_check_box(method, attrs = {})
-      name = control_name(method)
-      update_bound_controls(method, attrs, "checkbox")
-      unbound_check_box({:name => name}.merge(attrs))
-    end
-
-    def unbound_check_box(attrs)
-      update_unbound_controls(attrs, "checkbox")
-      if attrs.delete(:boolean)
-        on, off = attrs.delete(:on), attrs.delete(:off)
-        unbound_hidden_field(:name => attrs[:name], :value => off) <<
-          self_closing_tag(:input, {:type => "checkbox", :value => on}.merge(attrs))
-      else
-        self_closing_tag(:input, {:type => "checkbox"}.merge(attrs))
-      end
-    end
-
-    %w(text password hidden file).each do |kind|
-      self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def unbound_#{kind}_field(attrs)
-          update_unbound_controls(attrs, "#{kind}")
-          self_closing_tag(:input, {:type => "#{kind}"}.merge(attrs))
-        end
-
-        def bound_#{kind}_field(method, attrs = {})
-          name = control_name(method)
-          update_bound_controls(method, attrs, "#{kind}")
-          unbound_#{kind}_field({:name => name, :value => @obj.send(method)}.merge(attrs))
-        end
-      RUBY
-    end
-
-    def bound_radio_button(method, attrs = {})
-      name = control_name(method)
-      update_bound_controls(method, attrs, "radio")
-      unbound_radio_button({:name => name, :value => @obj.send(method)}.merge(attrs))
-    end
-
-    def unbound_radio_button(attrs)
-      update_unbound_controls(attrs, "radio")
-      self_closing_tag(:input, {:type => "radio"}.merge(attrs))
-    end
-
-    def button(contents, attrs)
-      update_unbound_controls(attrs, "button")
-      tag(:button, contents, attrs)
-    end
-
-    def submit(value, attrs)
-      attrs[:type]  ||= "submit"
-      attrs[:name]  ||= "submit"
-      attrs[:value] ||= value
-      update_unbound_controls(attrs, "submit")
-      self_closing_tag(:input, attrs)
-    end
-
-    def bound_select(method, attrs = {})
-      name = control_name(method)
-      update_bound_controls(method, attrs, "select")
-      unbound_select({:name => name}.merge(attrs))
-    end
-
-    def unbound_select(attrs = {})
-      update_unbound_controls(attrs, "select")
-      attrs[:name] << "[]" if attrs[:multiple] && !(attrs[:name] =~ /\[\]$/)
-      tag(:select, options_for(attrs), attrs)
-    end
-
-    def bound_radio_group(method, arr)
-      val = @obj.send(method)
-      arr.map do |attrs|
-        attrs = {:value => attrs} unless attrs.is_a?(Hash)
-        attrs[:checked] ||= (val == attrs[:value])
-        radio_group_item(method, attrs)
-      end.join
-    end
-
-    def unbound_radio_group(arr, attrs = {})
-      arr.map do |ind_attrs|
-        ind_attrs = {:value => ind_attrs} unless ind_attrs.is_a?(Hash)
-        joined = attrs.merge(ind_attrs)
-        joined.merge!(:label => joined[:label] || joined[:value])
-        unbound_radio_button(joined)
-      end.join
-    end
-
-    def unbound_text_area(contents, attrs)
-      update_unbound_controls(attrs, "text_area")
-      tag(:textarea, contents, attrs)
-    end
-
-    def bound_text_area(method, attrs = {})
-      name = "#{@name}[#{method}]"
-      update_bound_controls(method, attrs, "text_area")
-      unbound_text_area(@obj.send(method), {:name => name}.merge(attrs))
-    end
-
-    private
-
-    def control_name(method)
-      "#{@name}[#{method}]"
-    end
-
     # Accepts a collection (hash, array, enumerable, your type) and returns a string of option tags. 
     # Given a collection where the elements respond to first and last (such as a two-element array), 
     # the "lasts" serve as option values and the "firsts" as option text. Hashes are turned into
@@ -258,7 +249,11 @@ module Merb::Helpers::Form::Builder
         value = item.is_a?(String) ? item : item.send(value_meth)
 
         option_attrs = {:value => value}
-        option_attrs.merge!(:selected => "selected") if value == sel
+        if sel.is_a?(Array)
+          option_attrs.merge!(:selected => "selected") if value.in? sel
+        else
+          option_attrs.merge!(:selected => "selected") if value == sel
+        end
         tag(:option, text, option_attrs)
       end).join
     end
@@ -271,22 +266,17 @@ module Merb::Helpers::Form::Builder
     def considered_true?(value)
       value && value != "0" && value != 0
     end
-  end
 
-  class Form < Base
-    def update_bound_controls(method, attrs, type)
-      attrs.merge!(:id => "#{@name}_#{method}") unless attrs[:id]
-      super
+    def control_name(method)
+      "#{@name}[#{method}]"
     end
 
-    def update_unbound_controls(attrs, type)
-      case type
-      when "text", "radio", "password", "hidden", "checkbox", "file"
-        add_css_class(attrs, type)
-      end
-      super
+    def add_css_class(attrs, new_class)
+      attrs[:class] = attrs[:class] ? "#{attrs[:class]} #{new_class}" : new_class
     end
+  end
 
+  class Form < Base
     def label(contents, attrs = {})
       if contents.is_a?(Hash)
         attrs    = contents
@@ -308,11 +298,22 @@ module Merb::Helpers::Form::Builder
       RUBY
     end
 
-    def button(contents, attrs = {})
-      label(attrs) + super
+    def unbound_check_box(attrs = {})
+      label_text = label(attrs)
+      super + label_text
     end
 
-    def submit(value, attrs = {})
+    def unbound_hidden_field(attrs = {})
+      attrs.delete(:label)
+      super
+    end
+
+    def unbound_radio_button(attrs = {})
+      label_text = label(attrs)
+      super + label_text
+    end
+
+    def unbound_select(attrs = {})
       label(attrs) + super
     end
 
@@ -320,18 +321,27 @@ module Merb::Helpers::Form::Builder
       label(attrs) + super
     end
 
-    def unbound_select(attrs = {})
+    def button(contents, attrs = {})
       label(attrs) + super
     end
 
-    def unbound_check_box(attrs = {})
-      label_text = label(attrs)
-      super + label_text
+    def submit(value, attrs = {})
+      label(attrs) + super
     end
 
-    def unbound_radio_button(attrs = {})
-      label_text = label(attrs)
-      super + label_text
+    private
+
+    def update_bound_controls(method, attrs, type)
+      attrs.merge!(:id => "#{@name}_#{method}") unless attrs[:id]
+      super
+    end
+
+    def update_unbound_controls(attrs, type)
+      case type
+      when "text", "radio", "password", "hidden", "checkbox", "file"
+        add_css_class(attrs, type)
+      end
+      super
     end
 
     def radio_group_item(method, attrs)
@@ -342,21 +352,9 @@ module Merb::Helpers::Form::Builder
       attrs.merge!(:label => attrs[:label] || attrs[:value])
       super
     end
-
-    def unbound_hidden_field(attrs = {})
-      attrs.delete(:label)
-      super
-    end
   end
 
   module Errorifier
-    def update_bound_controls(method, attrs, type)
-      if @obj.errors.on(method.to_sym)
-        add_css_class(attrs, "error")
-      end
-      super
-    end
-
     def error_messages_for(obj, error_class, build_li, header, before)
       obj ||= @obj
       return "" unless obj.respond_to?(:errors)
@@ -371,6 +369,15 @@ module Merb::Helpers::Form::Builder
       errors.each {|err| markup << (build_li % (sequel ? err : err.join(" ")))}
       markup << %Q{</ul></div>}
     end
+
+    private
+
+    def update_bound_controls(method, attrs, type)
+      if @obj.errors.on(method.to_sym)
+        add_css_class(attrs, "error")
+      end
+      super
+    end
   end
 
   class FormWithErrors < Form
@@ -378,6 +385,8 @@ module Merb::Helpers::Form::Builder
   end
 
   module Resourceful
+    private
+
     def process_form_attrs(attrs)
       attrs[:action] ||= @origin.url(@name, @obj) if @origin
       super

data/lib/merb_helpers/form/helpers.rb

@@ -3,8 +3,9 @@
 module Merb::Helpers::Form
 
   def _singleton_form_context
+    self._default_builder = Merb::Helpers::Form::Builder::ResourcefulFormWithErrors unless self._default_builder
     @_singleton_form_context ||=
-      self._form_class.new(nil, nil, self)
+      self._default_builder.new(nil, nil, self)
   end
 
   def form_contexts
@@ -22,7 +23,7 @@ module Merb::Helpers::Form
       ivar, name = name, name.class.to_s.snake_case
     end
     builder ||= current_form_context.class if current_form_context
-    (builder || self._form_class).new(ivar, name, self)
+    (builder || self._default_builder).new(ivar, name, self)
   end
 
   def with_form_context(name, builder)
@@ -149,22 +150,31 @@ module Merb::Helpers::Form
     end
   end
 
-  # Provides a generic HTML label.
+  # Provides a generic HTML checkbox input tag.
+  # There are two ways this tag can be generated, based on the
+  # option :boolean. If not set to true, a "magic" input is generated.
+  # Otherwise, an input is created that can be easily used for passing
+  # an array of values to the application.
   #
   # ==== Parameters
-  # attrs<Hash>:: HTML attributes
+  # method<Symbol>:: Resource attribute
+  # attrs<Hash>:: HTML attributes and options
   #
   # ==== Returns
   # String:: HTML
   #
   # ==== Example
-  #   <%= label "Full Name", :for => "name" %> 
-  #   => <label for="name">Full Name</label>
-  def label(*args)
-    current_form_context.label(*args)
-  end
+  #   <%= check_box :name => "is_activated", :value => "1" %>
+  #   <%= check_box :name => "choices[]", :boolean => false, :value => "dog" %>
+  #   <%= check_box :name => "choices[]", :boolean => false, :value => "cat" %>
+  #   <%= check_box :name => "choices[]", :boolean => false, :value => "weasle" %>
+  #
+  # Used with a model:
+  #
+  #   <%= check_box :is_activated, :label => "Activated?" %>
+  def check_box; end
 
-  # Provides a HTML text input tag
+  # Provides a HTML file input
   #
   # ==== Parameters
   # name<Symbol>:: Model or Resource
@@ -174,17 +184,14 @@ module Merb::Helpers::Form
   # String:: HTML
   #
   # ==== Example
-  #   <%= text_field :name => :fav_color, :label => "Your Favorite Color" %>
-  #   # => <label for="fav_color">Your Favorite Color</label><input type="text" id="fav_color" name="fav_color" />
+  #   <%= file_field :name => "file", :label => "File" %>
   #
   # Used with a model:
   #
-  #   <%= form_for @person do %>
-  #     <%= text_field :first_name, :label => "First Name" %>
-  #   <% end =%>
-  def text_field; end
+  #   <%= file_field :file, :label => "Choose a file" %>
+  def file_field; end
 
-  # Provides a HTML password input.
+  # Provides a HTML hidden input field
   #
   # ==== Parameters
   # name<Symbol>:: Model or Resource
@@ -194,33 +201,30 @@ module Merb::Helpers::Form
   # String:: HTML
   #
   # ==== Example
-  #   <%= password_field :name => :password, :label => "Password" %>
-  #   # => <label for="password">Password</label><input type="password" id="password" name="password" />
+  #   <%= hidden_field :name => "secret", :value => "some secret value" %>
   #
   # Used with a model:
   #
-  #   <%= password_field :password, :label => 'New Password' %>
-  def password_field; end
+  #   <%= hidden_field :identifier %>
+  #   # => <input type="hidden" id="person_identifier" name="person[identifier]" value="#{@person.identifier}" />
+  def hidden_field; end
 
-  # Provides a HTML hidden input field
+  # Provides a generic HTML label.
   #
   # ==== Parameters
-  # name<Symbol>:: Model or Resource
   # attrs<Hash>:: HTML attributes
   #
   # ==== Returns
   # String:: HTML
   #
   # ==== Example
-  #   <%= hidden_field :name => "secret", :value => "some secret value" %>
-  #
-  # Used with a model:
-  #
-  #   <%= hidden_field :identifier %>
-  #   # => <input type="hidden" id="person_identifier" name="person[identifier]" value="#{@person.identifier}" />
-  def hidden_field; end
+  #   <%= label "Full Name", :for => "name" %> 
+  #   => <label for="name">Full Name</label>
+  def label(*args)
+    current_form_context.label(*args)
+  end
 
-  # Provides a HTML file input
+  # Provides a HTML password input.
   #
   # ==== Parameters
   # name<Symbol>:: Model or Resource
@@ -230,29 +234,52 @@ module Merb::Helpers::Form
   # String:: HTML
   #
   # ==== Example
-  #   <%= file_field :name => "file", :label => "File" %>
+  #   <%= password_field :name => :password, :label => "Password" %>
+  #   # => <label for="password">Password</label><input type="password" id="password" name="password" />
   #
   # Used with a model:
   #
-  #   <%= file_field :file, :label => "Choose a file" %>
-  def file_field; end
+  #   <%= password_field :password, :label => 'New Password' %>
+  def password_field; end
 
-  # Provides a HTML textarea tag
+  # Provides a HTML radio input tag
   #
   # ==== Parameters
-  # contents<String>:: Contents of the text area
-  # attrs<Hash>:: HTML attributes
+  # method<Symbol>:: Resource attribute
+  # attrs<Hash>:: HTML attributes and options
   #
   # ==== Returns
   # String:: HTML
   #
   # ==== Example
-  #   <%= text_area "my comments", :name => "comments" %>
+  #   <%= radio_button :name => "radio_options", :value => "1", :label => "One" %>
+  #   <%= radio_button :name => "radio_options", :value => "2", :label => "Two" %>
+  #   <%= radio_button :name => "radio_options", :value => "3", :label => "Three", :checked => true %>
   #
   # Used with a model:
   #
-  #   <%= text_area :comments %>
-  def text_area; end
+  #   <%= form_for @person do %>
+  #     <%= radio_button :first_name %>
+  #   <% end =%>
+  def radio_button; end
+
+  # Provides a radio group based on a resource attribute.
+  # This is generally used within a resource block such as +form_for+.
+  #
+  # ==== Parameters
+  # method<Symbol>:: Resource attribute
+  # arr<Array>:: Choices
+  #
+  # ==== Returns
+  # String:: HTML
+  #
+  # ==== Examples
+  #   <%# the labels are the options %>
+  #   <%= radio_group :my_choice, [5,6,7] %>
+  #
+  #   <%# custom labels %>
+  #   <%= radio_group :my_choice, [{:value => 5, :label => "five"}] %>
+  def radio_group; end
 
   # Provides a HTML select
   #
@@ -275,68 +302,42 @@ module Merb::Helpers::Form
   #   <%= select :name, :collection => %w(one two three) %>
   def select; end
 
-  # Provides a generic HTML checkbox input tag.
-  # There are two ways this tag can be generated, based on the
-  # option :boolean. If not set to true, a "magic" input is generated.
-  # Otherwise, an input is created that can be easily used for passing
-  # an array of values to the application.
+  # Provides a HTML textarea tag
   #
   # ==== Parameters
-  # method<Symbol>:: Resource attribute
-  # attrs<Hash>:: HTML attributes and options
+  # contents<String>:: Contents of the text area
+  # attrs<Hash>:: HTML attributes
   #
   # ==== Returns
   # String:: HTML
   #
   # ==== Example
-  #   <%= check_box :name => "is_activated", :value => "1" %>
-  #   <%= check_box :name => "choices[]", :boolean => false, :value => "dog" %>
-  #   <%= check_box :name => "choices[]", :boolean => false, :value => "cat" %>
-  #   <%= check_box :name => "choices[]", :boolean => false, :value => "weasle" %>
+  #   <%= text_area "my comments", :name => "comments" %>
   #
   # Used with a model:
   #
-  #   <%= check_box :is_activated, :label => "Activated?" %>
-  def check_box; end
+  #   <%= text_area :comments %>
+  def text_area; end
 
-  # Provides a HTML radio input tag
+  # Provides a HTML text input tag
   #
   # ==== Parameters
-  # method<Symbol>:: Resource attribute
-  # attrs<Hash>:: HTML attributes and options
+  # name<Symbol>:: Model or Resource
+  # attrs<Hash>:: HTML attributes
   #
   # ==== Returns
   # String:: HTML
   #
   # ==== Example
-  #   <%= radio_button :name => "radio_options", :value => "1", :label => "One" %>
-  #   <%= radio_button :name => "radio_options", :value => "2", :label => "Two" %>
-  #   <%= radio_button :name => "radio_options", :value => "3", :label => "Three", :checked => true %>
+  #   <%= text_field :name => :fav_color, :label => "Your Favorite Color" %>
+  #   # => <label for="fav_color">Your Favorite Color</label><input type="text" id="fav_color" name="fav_color" />
   #
   # Used with a model:
   #
   #   <%= form_for @person do %>
-  #     <%= radio_button :first_name %>
+  #     <%= text_field :first_name, :label => "First Name" %>
   #   <% end =%>
-  def radio_button; end
-
-  # Provides a radio group based on a resource attribute.
-  # This is generally used within a resource block such as +form_for+.
-  #
-  # ==== Parameters
-  # method<Symbol>:: Resource attribute
-  # arr<Array>:: Choices
-  #
-  # ==== Returns
-  # String:: HTML
-  #
-  # ==== Examples
-  #   <%# the labels are the options %>
-  #   <%= radio_group :my_choice, [5,6,7] %>
-  #
-  #   <%# custom labels %>
-  #   <%= radio_group :my_choice, [{:value => 5, :label => "five"}] %>
-  def radio_group; end
+  def text_field; end
 
   # @todo radio_group helper still needs to be implemented
   %w(text_field password_field hidden_field file_field

data/lib/merb_helpers/form_helpers.rb

@@ -2,13 +2,23 @@ load File.dirname(__FILE__) / "form" / "helpers.rb"
 load File.dirname(__FILE__) / "form" / "builder.rb"
 
 class Merb::Controller
-  class_inheritable_accessor :_form_class
+  class_inheritable_accessor :_default_builder
+  include Merb::Helpers::Form
+end
+
+class Merb::PartController
+  class_inheritable_accessor :_default_builder
   include Merb::Helpers::Form
 end
 
 Merb::BootLoader.after_app_loads do
   class Merb::Controller
-    self._form_class =
-      Object.full_const_get(Merb::Plugins.config[:helpers][:form_class]) rescue Merb::Helpers::Form::Builder::ResourcefulFormWithErrors
+    self._default_builder =
+      Object.full_const_get(Merb::Plugins.config[:helpers][:default_builder]) rescue Merb::Helpers::Form::Builder::ResourcefulFormWithErrors
+  end
+  
+  class Merb::PartController
+    self._default_builder =
+      Object.full_const_get(Merb::Plugins.config[:helpers][:default_builder]) rescue Merb::Helpers::Form::Builder::ResourcefulFormWithErrors
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-08 00:00:00 +03:00
+date: 2008-09-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.6
+        version: 0.9.7
     version: 
 description: Helper support for merb (similar to the Rails form helpers)
 email: ykatz@engineyard.com