padrino-helpers 0.9.20 → 0.9.21

data/README.rdoc

@@ -152,6 +152,8 @@ A form_for using these basic fields might look like:
     %p
       = f.submit "Create", :class => 'button'
 
+Forms can also accept nested attributes using `fields_for` within the form builder in recent releases. Check out the guide for {Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers] to learn more about nested forms.
+
 There is also an additional StandardFormBuilder which builds on the abstract fields that can be used within a form_for.
 
 A form_for using these standard fields might be:

data/lib/padrino-helpers.rb

@@ -1,6 +1,7 @@
 require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'cgi'
 require 'i18n'
+require 'enumerator'
 
 FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__)
 

data/lib/padrino-helpers/form_builder/abstract_form_builder.rb

@@ -4,9 +4,10 @@ module Padrino
       class AbstractFormBuilder #:nodoc:
         attr_accessor :template, :object
 
-        def initialize(template, object)
+        def initialize(template, object, options={})
           @template = template
           @object   = build_object(object)
+          @options  = options
           raise "FormBuilder template must be initialized!" unless template
           raise "FormBuilder object must be not be nil value. If there's no object, use a symbol instead! (i.e :user)" unless object
         end
@@ -19,7 +20,7 @@ module Padrino
 
         # f.error_message_on(field)
         def error_message_on(field, options={})
-          @template.error_message_on(object_name, field, options)
+          @template.error_message_on(object, field, options)
         end
 
         # f.label :username, :caption => "Nickname"
@@ -91,57 +92,105 @@ module Padrino
           @template.submit_tag caption, options
         end
 
-        # f.simage_submitubmit "buttons/submit.png", :class => 'large'
+        # f.image_submit "buttons/submit.png", :class => 'large'
         def image_submit(source, options={})
           @template.image_submit_tag source, options
         end
 
+        # Supports nested fields for a child model within a form
+        # f.fields_for :addresses
+        # f.fields_for :addresses, address
+        # f.fields_for :addresses, @addresses
+        def fields_for(child_association, instance_or_collection=nil, &block)
+          default_collection = self.object.send(child_association)
+          include_index = default_collection.respond_to?(:each)
+          nested_options = { :parent => self, :association => child_association }
+          nested_objects = instance_or_collection ? Array(instance_or_collection) : Array(default_collection)
+          result = nested_objects.each_with_index.map do |child_instance, index|
+            nested_options[:index] = include_index ? index : nil
+            @template.fields_for(child_instance,  { :nested => nested_options }, &block)
+          end.join("\n")
+        end
+
         protected
           # Returns the known field types for a formbuilder
           def self.field_types
             [:hidden_field, :text_field, :text_area, :password_field, :file_field, :radio_button, :check_box, :select]
           end
 
-          # Returns the object's models name
-          #   => user_assignment
-          def object_name
-            object.is_a?(Symbol) ? object : object.class.to_s.underscore.gsub('/', '-')
-          end
-
           # Returns true if the value matches the value in the field
           # field_has_value?(:gender, 'male')
           def values_matches_field?(field, value)
             value.present? && (field_value(field).to_s == value.to_s || field_value(field).to_s == 'true')
           end
 
-          # Returns the value for the object's field
-          # field_value(:username) => "Joey"
-          def field_value(field)
-            @object && @object.respond_to?(field) ? @object.send(field) : ""
-          end
-
           # Add a :invalid css class to the field if it contain an error
           def field_error(field, options)
             error = @object.errors[field] rescue nil
             error.blank? ? options[:class] : [options[:class], :invalid].flatten.compact.join(" ")
           end
 
-          # Returns the name for the given field
-          # field_name(:username) => "user[username]"
-          def field_name(field)
-            "#{object_name}[#{field}]"
-          end
-
           # Returns the human name of the field. Look that use builtin I18n.
           def field_human_name(field)
-            I18n.translate("#{object_name}.attributes.#{field}", :count => 1, :default => field.to_s.humanize, :scope => :models)
+            I18n.translate("#{object_model_name}.attributes.#{field}", :count => 1, :default => field.to_s.humanize, :scope => :models)
+          end
+
+          # Returns the name for the given field
+          # field_name(:username) => "user[username]"
+          # field_name(:number) => "user[telephone_attributes][number]"
+          # field_name(:street) => "user[addresses_attributes][0][street]"
+          def field_name(field=nil)
+            result = []
+            if root_form?
+              result << object_model_name
+            elsif nested_form?
+              parent_form = @options[:nested][:parent]
+              attributes_name = "#{@options[:nested][:association]}_attributes"
+              nested_index = @options[:nested][:index]
+              fragment = [parent_form.field_name, "[#{attributes_name}", "]"]
+              fragment.insert(2, "][#{nested_index}") if nested_index
+              result << fragment
+            end
+            result << "[#{field}]" unless field.blank?
+            result.flatten.join
           end
 
           # Returns the id for the given field
           # field_id(:username) => "user_username"
           # field_id(:gender, :male) => "user_gender_male"
-          def field_id(field, value=nil)
-            value.blank? ? "#{object_name}_#{field}" : "#{object_name}_#{field}_#{value}"
+          # field_name(:number) => "user_telephone_attributes_number"
+          # field_name(:street) => "user_addresses_attributes_0_street"
+          def field_id(field=nil, value=nil)
+            result = []
+            if root_form?
+              result << object_model_name
+            elsif nested_form?
+              parent_form = @options[:nested][:parent]
+              attributes_name = "#{@options[:nested][:association]}_attributes"
+              nested_index = @options[:nested][:index]
+              fragment = [parent_form.field_id, "_#{attributes_name}"]
+              fragment.push("_#{nested_index}") if nested_index
+              result << fragment
+            end
+            result << "_#{field}" unless field.blank?
+            result << "_#{value}" unless value.blank?
+            result.flatten.join
+          end
+
+          # Returns the child object if it exists
+          def nested_object_id
+            nested_form? && object.respond_to?(:new_record?) && !object.new_record? && object.id
+          end
+
+          # Returns true if this form object is nested in a parent form
+          def nested_form?
+            @options[:nested] && @options[:nested][:parent] && @options[:nested][:parent].respond_to?(:object)
+          end
+
+          # Returns the value for the object's field
+          # field_value(:username) => "Joey"
+          def field_value(field)
+            @object && @object.respond_to?(field) ? @object.send(field) : ""
           end
 
           # explicit_object is either a symbol or a record
@@ -150,10 +199,21 @@ module Padrino
             object_or_symbol.is_a?(Symbol) ? @template.instance_variable_get("@#{object_or_symbol}") || object_class(object_or_symbol).new : object_or_symbol
           end
 
+           # Returns the object's models name
+          #   => user_assignment
+          def object_model_name(explicit_object=object)
+            explicit_object.is_a?(Symbol) ? explicit_object : explicit_object.class.to_s.underscore.gsub('/', '-')
+          end
+
           # Returns the class type for the given object
           def object_class(explicit_object)
             explicit_object.is_a?(Symbol) ? explicit_object.to_s.camelize.constantize : explicit_object.class
           end
+
+          # Returns true if this form is the top-level (not nested)
+          def root_form?
+            !nested_form?
+          end
       end # AbstractFormBuilder
     end # FormBuilder
   end # Helpers

data/lib/padrino-helpers/form_helpers.rb

@@ -10,8 +10,7 @@ module Padrino
       #   form_for @user, '/register', :id => 'register' do |f| ... end
       #
       def form_for(object, url, settings={}, &block)
-        builder_class = configured_form_builder_class(settings[:builder])
-        form_html = capture_html(builder_class.new(self, object), &block)
+        form_html = capture_html(builder_instance(object, settings), &block)
         form_tag(url, settings) { form_html }
       end
 
@@ -25,8 +24,9 @@ module Padrino
       #   fields_for :assignment do |assigment| ... end
       #
       def fields_for(object, settings={}, &block)
-        builder_class = configured_form_builder_class(settings[:builder])
-        fields_html = capture_html(builder_class.new(self, object), &block)
+        instance = builder_instance(object, settings)
+        fields_html = capture_html(instance, &block)
+        fields_html << instance.hidden_field(:id) if instance.send(:nested_object_id)
         concat_content fields_html
       end
 
@@ -46,7 +46,7 @@ module Padrino
         options["data-method"] = data_method if data_method
         options["accept-charset"] ||= "UTF-8"
         inner_form_html  = hidden_form_method_field(desired_method)
-        inner_form_html += hidden_field_tag(:"_utf8", :value => "&#9731;") + capture_html(&block)
+        inner_form_html += capture_html(&block)
         concat_content content_tag('form', inner_form_html, options)
       end
 
@@ -163,6 +163,7 @@ module Padrino
       #
       #   # => <span class="error">can't be blank</div>
       #   error_message_on :post, :title
+      #   error_message_on @post, :title
       #
       #   # => <div class="custom" style="border:1px solid red">can't be blank</div>
       #   error_message_on :post, :title, :tag => :id, :class => :custom, :style => "border:1px solid red"
@@ -171,7 +172,7 @@ module Padrino
       #   error_message_on :post, :title, :prepend => "This title", :append => "(or it won't work)"
       #
       def error_message_on(object, field, options={})
-        object = instance_variable_get("@#{object}")
+        object = object.is_a?(Symbol) ? instance_variable_get("@#{object}") : object
         error  = object.errors[field] rescue nil
         if error
           options.reverse_merge!(:tag => :span, :class => :error)
@@ -377,17 +378,22 @@ module Padrino
           configured_builder
         end
 
-
+        ##
+        # Returns an initialized builder instance for the given object and settings
         #
+        #   builder_instance(@account, :nested => { ... }) => <FormBuilder>
+        #
+        def builder_instance(object, settings={})
+           builder_class = configured_form_builder_class(settings.delete(:builder))
+           builder_class.new(self, object, settings)
+        end
+
+        ##
         # Returns whether the option should be selected or not
         #
-        def option_is_selected?(value, caption, selected_value)
-          if selected_value.is_a? Array
-            selected_value.any? do |selected|
-              selected.to_s =~ /^(#{value}|#{caption})$/
-            end
-          else
-            selected_value.to_s =~ /^(#{value}|#{caption})$/
+        def option_is_selected?(value, caption, selected_values)
+          Array(selected_values).any? do |selected|
+            [value.to_s, caption.to_s].include?(selected.to_s)
           end
         end
     end # FormHelpers

data/lib/padrino-helpers/locale/zh_tw.yml

@@ -0,0 +1,103 @@
+zh_tw:
+  number:
+    # Used in number_with_delimiter()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+      separator: "."
+      # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      delimiter: ","
+      # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
+      precision: 3
+
+    # Used in number_to_currency()
+    currency:
+      format:
+        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
+        format: "%u %n"
+        unit: "NT$"
+        # These three are to override number.format and are optional
+        separator: "."
+        delimiter: ","
+        precision: 2
+
+    # Used in number_to_percentage()
+    percentage:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+
+    # Used in number_to_precision()
+    precision:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+
+    # Used in number_to_human_size()
+    human:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        precision: 1
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
+  datetime:
+    distance_in_words:
+      half_a_minute: "半分鐘"
+      less_than_x_seconds:
+        one:   "不到一秒"
+        other: "不到 %{count} 秒"
+      x_seconds:
+        one:   "一秒"
+        other: "%{count} 秒"
+      less_than_x_minutes:
+        one:   "不到一分鐘"
+        other: "不到 %{count} 分鐘"
+      x_minutes:
+        one:   "一分鐘"
+        other: "%{count} 分鐘"
+      about_x_hours:
+        one:   "大約一小時"
+        other: "大約 %{count} 小時"
+      x_days:
+        one:   "一天"
+        other: "%{count} 天"
+      about_x_months:
+        one:   "大約一個月"
+        other: "大約 %{count} 個月"
+      x_months:
+        one:   "一個月"
+        other: "%{count} 個月"
+      about_x_years:
+        one:   "大約一年"
+        other: "大約 %{count} 年"
+      over_x_years:
+        one:   "一年多"
+        other: "%{count} 年多"
+      almost_x_years:
+        one:   "接近一年"
+        other: "接近 %{count} 年"
+  models:
+    errors:
+      template:
+        header:
+          one:    "有 1 個錯誤發生使得「%{model}」無法被儲存。"
+          other:  "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
+        body: "以下欄位發生問題："

data/lib/padrino-helpers/output_helpers.rb

@@ -2,21 +2,20 @@ module Padrino
   module Helpers
     module OutputHelpers
       ##
-      # Captures the html from a block of template code for erb or haml
+      # Captures the html from a block of template code for any available handler
       #
       # ==== Examples
       #
       #   capture_html(&block) => "...html..."
       #
       def capture_html(*args, &block)
-        if self.respond_to?(:is_haml?) && is_haml?
-          block_is_haml?(block) ? capture_haml(*args, &block) : block.call
-        elsif has_erb_buffer?
-          result_text = capture_erb(*args, &block)
-          result_text.present? ? result_text : (block_given? && block.call(*args))
-        else # theres no template to capture, invoke the block directly
-          block.call(*args)
+        handler = self.find_proper_handler
+        if handler && handler.is_type? && handler.block_is_type?(block)
+          captured_html = handler.capture_from_template(*args, &block)
         end
+        # invoking the block directly if there was no template
+        captured_html = block_given? && block.call(*args) if captured_html.blank?
+        captured_html
       end
 
       ##
@@ -24,28 +23,28 @@ module Padrino
       #
       # ==== Examples
       #
-      #   concat_content("This will be output to the template buffer in erb or haml")
+      #   concat_content("This will be output to the template buffer")
       #
       def concat_content(text="")
-        if self.respond_to?(:is_haml?) && is_haml?
-          haml_concat(text)
-        elsif has_erb_buffer?
-          erb_concat(text)
+        handler = self.find_proper_handler
+        if handler && handler.is_type?
+          handler.concat_to_template(text)
         else # theres no template to concat, return the text directly
           text
         end
       end
 
       ##
-      # Returns true if the block is from an ERB or HAML template; false otherwise.
-      # Used to determine if html should be returned or concatted to view
+      # Returns true if the block is from a supported template type; false otherwise.
+      # Used to determine if html should be returned or concatenated to the view
       #
       # ==== Examples
       #
       #   block_is_template?(block)
       #
       def block_is_template?(block)
-        block && (block_is_erb?(block) || (self.respond_to?(:block_is_haml?) && block_is_haml?(block)))
+        handler = self.find_proper_handler
+        block && handler && handler.block_is_type?(block)
       end
 
       ##
@@ -81,7 +80,7 @@ module Padrino
         }.join
       end
 
-      private
+      protected
         ##
         # Retrieves content_blocks stored by content_for or within yield_content
         #
@@ -94,61 +93,15 @@ module Padrino
         end
 
         ##
-        # Used to capture the html from a block of erb code
+        # Retrieves the template handler for the given output context.
+        # Can handle any output related to capturing or concating in a given template.
         #
         # ==== Examples
         #
-        #   capture_erb(&block) => '...html...'
+        #   find_proper_handler => <OutputHelpers::HamlHandler>
         #
-        def capture_erb(*args, &block)
-          erb_with_output_buffer { block_given? && block.call(*args) }
-        end
-
-        ##
-        # Concats directly to an erb template
-        #
-        # ==== Examples
-        #
-        #   erb_concat("Direct to buffer")
-        #
-        def erb_concat(text)
-          @_out_buf << text if has_erb_buffer?
-        end
-
-        ##
-        # Returns true if an erb buffer is detected
-        #
-        # ==== Examples
-        #
-        #   has_erb_buffer? => true
-        #
-        def has_erb_buffer?
-          !@_out_buf.nil?
-        end
-
-        if RUBY_VERSION < '1.9.0'
-          # Check whether we're called from an erb template.
-          # We'd return a string in any other case, but erb <%= ... %>
-          # can't take an <% end %> later on, so we have to use <% ... %>
-          # and implicitly concat.
-          def block_is_erb?(block)
-            has_erb_buffer? || (block && eval('defined? __in_erb_template', block))
-          end
-        else
-          def block_is_erb?(block)
-            has_erb_buffer? || (block && eval('defined? __in_erb_template', block.binding))
-          end
-        end
-
-        ##
-        # Used to direct the buffer for the erb capture
-        #
-        def erb_with_output_buffer(buf = '')
-          @_out_buf, old_buffer = buf, @_out_buf
-          yield
-          @_out_buf
-        ensure
-          @_out_buf = old_buffer
+        def find_proper_handler
+          OutputHelpers.handlers.map { |h| h.new(self) }.find { |h| h.is_type? }
         end
     end # OutputHelpers
   end # Helpers

data/lib/padrino-helpers/output_helpers/abstract_handler.rb

@@ -0,0 +1,96 @@
+module Padrino
+  module Helpers
+
+    module OutputHelpers
+      @template_handlers = []
+
+      ##
+      # Returns the list of all available template handlers
+      #
+      # ==== Examples
+      #
+      #   OutputHelpers.handlers => [<OutputHelpers::HamlHandler>, <OutputHelpers::ErbHandler>]
+      #
+      def self.handlers
+        @template_handlers
+      end
+
+      ##
+      # Registers a new handler as available to the output helpers
+      #
+      # ==== Examples
+      #
+      #   OutputHelpers.register(OutputHelpers::HamlHandler)
+      #
+      def self.register(handler)
+        handlers << handler
+      end
+
+      class AbstractHandler
+        attr_reader :template
+
+        def initialize(template)
+          @template = template
+        end
+
+        ##
+        # Returns extension of the template
+        #
+        # ==== Examples
+        #
+        #  @handler.template_extension => "erubis"
+        #
+        def template_extension
+          caller.find { |c| c =~ /\/views\// }[/\.([\w]*?)\:/, 1] rescue nil
+          # "/some/path/app/views/posts/foo.html.erubis:3:in `evaluate_source'"
+          # => "erubis"
+        end
+
+        ##
+        # Returns true if the current template type is same as this handlers; false otherwise.
+        #
+        # ==== Examples
+        #
+        #  @handler.is_type? => true
+        #
+        def is_type?
+          # Implemented in subclass
+        end
+
+        ##
+        # Returns true if the block given is of the handler's template type; false otherwise.
+        #
+        # ==== Examples
+        #
+        #  @handler.block_is_type?(block) => true
+        #
+        def block_is_type?(block)
+          # Implemented in subclass
+        end
+
+        ##
+        # Captures the html from a block of template code for this handler
+        #
+        # ==== Examples
+        #
+        #  @handler.capture_from_template(&block) => "...html..."
+        #
+        def capture_from_template(*args, &block)
+          # Implemented in subclass
+        end
+
+        ##
+        # Outputs the given text to the templates buffer directly
+        #
+        # ==== Examples
+        #
+        #   @handler.concat_to_template("This will be output to the template buffer")
+        #
+        def concat_to_template(text="")
+          # Implemented in subclass
+        end
+      end # AbstractHandler
+    end # OutputHelpers
+
+  end
+end

data/lib/padrino-helpers/output_helpers/erb_handler.rb

@@ -0,0 +1,80 @@
+module Padrino
+  module Helpers
+
+    module OutputHelpers
+      class ErbHandler < AbstractHandler
+        attr_reader :output_buffer
+
+        def initialize(template)
+          super
+          @output_buffer = template.instance_variable_get(:@_out_buf)
+        end
+
+        ##
+        # Returns true if the current template type is same as this handlers; false otherwise.
+        #
+        # ==== Examples
+        #
+        #  @handler.is_type? => true
+        #
+        def is_type?
+          self.output_buffer.present?
+        end
+
+        # Captures the html from a block of template code for this handler
+        #
+        # ==== Examples
+        #
+        #  @handler.capture_from_template(&block) => "...html..."
+        #
+        def capture_from_template(*args, &block)
+          erb_with_output_buffer { block_given? && block.call(*args) }
+        end
+
+        ##
+        # Outputs the given text to the templates buffer directly
+        #
+        # ==== Examples
+        #
+        #   @handler.concat_to_template("This will be output to the template buffer")
+        #
+        def concat_to_template(text="")
+          self.output_buffer << text if self.is_type? && text
+          nil
+        end
+
+        if RUBY_VERSION < '1.9.0'
+          # Check whether we're called from an erb template.
+          # We'd return a string in any other case, but erb <%= ... %>
+          # can't take an <% end %> later on, so we have to use <% ... %>
+          # and implicitly concat.
+          def block_is_type?(block)
+            self.is_type? || (block && eval('defined? __in_erb_template', block))
+          end
+        else
+          def block_is_type?(block)
+            self.is_type? || (block && eval('defined? __in_erb_template', block.binding))
+          end
+        end
+
+        protected
+
+        ##
+        # Used to direct the buffer for the erb capture
+        #
+        def erb_with_output_buffer(buf = '')
+          self.output_buffer, old_buffer = buf, self.output_buffer
+          yield
+          buf
+        ensure
+          self.output_buffer = old_buffer
+        end
+
+        def output_buffer=(val)
+          template.instance_variable_set(:@_out_buf, val)
+        end
+      end # ErbHandler
+      OutputHelpers.register(ErbHandler)
+    end # OutputHelpers
+  end
+end

data/lib/padrino-helpers/output_helpers/haml_handler.rb

@@ -0,0 +1,54 @@
+module Padrino
+  module Helpers
+
+    module OutputHelpers
+      class HamlHandler < AbstractHandler
+        ##
+        # Returns true if the current template type is same as this handlers; false otherwise.
+        #
+        # ==== Examples
+        #
+        #  @handler.is_type? => true
+        #
+        def is_type?
+          template.respond_to?(:is_haml?) && template.is_haml?
+        end
+
+        ##
+        # Returns true if the block given is of the handler's template type; false otherwise.
+        #
+        # ==== Examples
+        #
+        #  @handler.block_is_type?(block) => true
+        #
+        def block_is_type?(block)
+          template.block_is_haml?(block)
+        end
+
+        # Captures the html from a block of template code for this handler
+        #
+        # ==== Examples
+        #
+        #  @handler.capture_from_template(&block) => "...html..."
+        #
+        def capture_from_template(*args, &block)
+          template.capture_haml(*args, &block)
+        end
+
+        ##
+        # Outputs the given text to the templates buffer directly
+        #
+        # ==== Examples
+        #
+        #   @handler.concat_to_template("This will be output to the template buffer")
+        #
+        def concat_to_template(text="")
+          template.haml_concat(text)
+          nil
+        end
+      end # HamlHandler
+
+      OutputHelpers.register(HamlHandler)
+    end # OutputHelpers
+  end
+end

data/test/fixtures/markup_app/app.rb

@@ -46,6 +46,19 @@ class MarkupUser
   def gender; 'male'; end
   def remember_me; '1'; end
   def permission; Permission.new; end
+  def telephone; Telephone.new; end
+  def addresses; [Address.new('Greenfield', true), Address.new('Willowrun', false)]; end
+end
+
+class Telephone
+  def number; "62634576545"; end
+end
+
+class Address
+  attr_accessor :name
+  def initialize(name, existing); @name, @existing = name, existing; end
+  def new_record?; !@existing; end
+  def id; @existing ? 25 : nil; end
 end
 
 class Permission

data/test/fixtures/markup_app/views/fields_for.erb

@@ -5,4 +5,16 @@
     <%= permission.check_box :can_edit %>
     <%= permission.check_box :can_delete %>
   <% end %>
+  <% f.fields_for :telephone do |child_form| %>
+    <%= child_form.label :number %>
+    <%= child_form.text_field :number %> 
+  <% end %>
+  <% f.fields_for :addresses do |child_form| %>
+    <%= child_form.label :name %>
+    <%= child_form.text_field :name %>
+    <% unless child_form.object.new_record? %>
+      <%= child_form.check_box '_destroy' %>
+      <%= child_form.label '_destroy', :caption => 'Remove' %>
+    <% end %>
+  <% end %>
 <% end %>

data/test/fixtures/markup_app/views/fields_for.haml

@@ -3,4 +3,13 @@
   = f.text_field :gender
   - fields_for @user.permission do |permission|
     = permission.check_box :can_edit
-    = permission.check_box :can_delete
+    = permission.check_box :can_delete
+  - f.fields_for :telephone do |child_form|
+    = child_form.label :number
+    = child_form.text_field :number 
+  - f.fields_for :addresses do |child_form| 
+    = child_form.label :name 
+    = child_form.text_field :name 
+    - unless child_form.object.new_record? 
+      = child_form.check_box '_destroy' 
+      = child_form.label '_destroy', :caption => 'Remove' 

data/test/helper.rb

@@ -70,6 +70,14 @@ class Test::Unit::TestCase
     assert File.exist?(file), "File '#{file}' does not exist!"
     assert_match pattern, File.read(file)
   end
+
+  # mock_model("Business", :new_record? => true) => <Business>
+  def mock_model(klazz, options={})
+    options.reverse_merge!(:class => klazz, :new_record? => false, :id => 20, :errors => {})
+    record = stub(options)
+    record.stubs(:to_ary => [record])
+    record
+  end
 end
 
 module Webrat

data/test/test_form_builder.rb

@@ -9,10 +9,12 @@ class TestFormBuilder < Test::Unit::TestCase
   end
 
   def setup
-    role_types = [stub(:name => 'Admin', :id => 1), stub(:name => 'Moderate', :id => 2),  stub(:name => 'Limited', :id => 3)]
-    @user = stub(:errors => {:a => "must be present", :b => "must be valid", :email => "Must be valid", :first_name => []}, :class => 'User', :first_name => "Joe", :email => '', :session_id => 54)
+    role_types = [mock_model('Role', :name => "Admin", :id => 1),
+      mock_model('Role', :name => 'Moderate', :id => 2),  mock_model('Role', :name => 'Limited', :id => 3)]
+    @user = mock_model("User", :first_name => "Joe", :email => '', :session_id => 54)
+    @user.stubs(:errors => {:a => "must be present", :b => "must be valid", :email => "Must be valid", :first_name => []})
     @user.stubs(:role_types => role_types, :role => "1")
-    @user_none = stub(:errors => {}, :class => 'User')
+    @user_none = mock_model("User")
   end
 
   def standard_builder(object=@user)
@@ -184,6 +186,24 @@ class TestFormBuilder < Test::Unit::TestCase
     end
   end
 
+  context 'for #error_message_on method' do
+    should "display correct form html with no record" do
+      actual_html = standard_builder(@user_none).error_message_on(:name)
+      assert actual_html.blank?
+    end
+
+    should "display error for specified invalid object" do
+      actual_html = standard_builder(@user).error_message_on(:a, :prepend => "foo", :append => "bar")
+      assert_has_tag('span.error', :content => "foo must be present bar") { actual_html }
+    end
+
+    should "display error for specified invalid object not matching class name" do
+      @bob = mock_model("User", :first_name => "Frank", :errors => { :foo => "must be bob" })
+      actual_html = standard_builder(@bob).error_message_on(:foo, :prepend => "foo", :append => "bar")
+      assert_has_tag('span.error', :content => "foo must be bob bar") { actual_html }
+    end
+  end
+
   context 'for #label method' do
     should "display correct label html" do
       actual_html = standard_builder.label(:first_name, :class => 'large', :caption => "F. Name: ")
@@ -520,6 +540,126 @@ class TestFormBuilder < Test::Unit::TestCase
     end
   end
 
+  context 'for #fields_for method' do
+    setup do
+      @telephone = mock_model("Telephone", :number => "4568769876")
+      @user.stubs(:telephone).returns(@telephone)
+      @businesses = [ mock_model("Business", :name => "Silver", :new_record? => false, :id => 20) ]
+      @businesses <<  mock_model("Business", :name => "Gold", :new_record? => true)
+      @addresses = [ mock_model("Address", :name => "Foo", :new_record? => false, :id => 20, :businesses => @businesses) ]
+      @addresses <<  mock_model("Address", :name => "Bar", :new_record? => true, :businesses => @businesses)
+      @user.stubs(:addresses).returns(@addresses)
+    end
+
+    should "display nested children fields one-to-one within form" do
+      actual_html = standard_builder.fields_for :telephone do |child_form|
+        child_form.label(:number) +
+        child_form.text_field(:number) +
+        child_form.check_box('_destroy')
+      end
+      assert_has_tag('label', :for => 'user_telephone_attributes_number') { actual_html }
+      assert_has_tag('input', :type => 'text', :id => 'user_telephone_attributes_number', :name => 'user[telephone_attributes][number]', :value => "4568769876") { actual_html }
+      assert_has_tag('input', :type => 'hidden', :name => 'user[telephone_attributes][_destroy]', :value => '0') { actual_html }
+      assert_has_tag('input', :type => 'checkbox', :id => 'user_telephone_attributes__destroy', :name => 'user[telephone_attributes][_destroy]', :value => '1') { actual_html }
+    end
+
+    should "display nested children fields one-to-many within form" do
+      actual_html = standard_builder.fields_for(:addresses) do |child_form|
+        html = child_form.label(:name)
+        html << child_form.check_box('_destroy') unless child_form.object.new_record?
+        html << child_form.text_field(:name)
+      end
+      # Address 1 (Saved)
+      assert_has_tag('input', :type => 'hidden', :id => 'user_addresses_attributes_0_id', :name => "user[addresses_attributes][0][id]", :value => '20') { actual_html }
+      assert_has_tag('label', :for => 'user_addresses_attributes_0_name', :content => 'Name') { actual_html }
+      assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_0_name', :name => 'user[addresses_attributes][0][name]') { actual_html }
+      assert_has_tag('input', :type => 'checkbox', :id => 'user_addresses_attributes_0__destroy', :name => 'user[addresses_attributes][0][_destroy]') { actual_html }
+      # Address 2 (New)
+      assert_has_no_tag('input', :type => 'hidden', :id => 'user_addresses_attributes_1_id') { actual_html }
+      assert_has_tag('label', :for => 'user_addresses_attributes_1_name', :content => 'Name') { actual_html }
+      assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_1_name', :name => 'user[addresses_attributes][1][name]') { actual_html }
+      assert_has_no_tag('input', :type => 'checkbox', :id => 'user_addresses_attributes_1__destroy') { actual_html }
+    end
+
+    should "display fields for explicit instance object" do
+      address = mock_model("Address", :name => "Page", :new_record? => false, :id => 40)
+      actual_html = standard_builder.fields_for(:addresses, address) do |child_form|
+        html = child_form.label(:name)
+        html << child_form.text_field(:name)
+        html << child_form.check_box('_destroy')
+      end
+      assert_has_tag('input', :type => 'hidden', :id => 'user_addresses_attributes_0_id', :name => "user[addresses_attributes][0][id]", :value => '40') { actual_html }
+      assert_has_tag('label', :for => 'user_addresses_attributes_0_name', :content => 'Name') { actual_html }
+      assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_0_name', :name => 'user[addresses_attributes][0][name]', :value => "Page") { actual_html }
+      assert_has_tag('input', :type => 'checkbox', :id => 'user_addresses_attributes_0__destroy', :name => 'user[addresses_attributes][0][_destroy]', :value => '1') { actual_html }
+    end
+
+    should "display fields for collection object" do
+      addresses = @addresses + [mock_model("Address", :name => "Walter", :new_record? => false, :id => 50)]
+      actual_html = standard_builder.fields_for(:addresses, addresses) do |child_form|
+        child_form.label(:name) +
+        child_form.text_field(:name) +
+        child_form.check_box('_destroy')
+      end
+      # Address 1
+      assert_has_tag('input', :type => 'hidden', :id => 'user_addresses_attributes_0_id', :name => "user[addresses_attributes][0][id]", :value => '20') { actual_html }
+      assert_has_tag('label', :for => 'user_addresses_attributes_0_name', :content => 'Name') { actual_html }
+      assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_0_name', :name => 'user[addresses_attributes][0][name]', :value => "Foo") { actual_html }
+      assert_has_tag('input', :type => 'checkbox', :id => 'user_addresses_attributes_0__destroy', :name => 'user[addresses_attributes][0][_destroy]') { actual_html }
+      # Address 3
+      assert_has_tag('input', :type => 'hidden', :id => 'user_addresses_attributes_2_id', :value => '50') { actual_html }
+      assert_has_tag('label', :for => 'user_addresses_attributes_2_name', :content => 'Name') { actual_html }
+      assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_2_name', :name => 'user[addresses_attributes][2][name]', :value => "Walter") { actual_html }
+      assert_has_tag('input', :type => 'checkbox', :id => 'user_addresses_attributes_2__destroy') { actual_html }
+    end
+
+    should "display fields for arbitrarily deep nested forms" do
+      actual_html = standard_builder.fields_for :addresses do |child_form|
+        child_form.fields_for(:businesses) do |second_child_form|
+          second_child_form.label(:name) +
+          second_child_form.text_field(:name) +
+          second_child_form.check_box('_destroy')
+        end
+      end
+      assert_has_tag('label', :for => 'user_addresses_attributes_1_businesses_attributes_0_name', :content => 'Name') { actual_html }
+      assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_1_businesses_attributes_0_name', :name => 'user[addresses_attributes][1][businesses_attributes][0][name]') { actual_html }
+    end
+
+    should "display nested children fields in erb" do
+      visit '/erb/fields_for'
+      # Telephone
+      assert_have_selector('label', :for => 'markup_user_telephone_attributes_number')
+      assert_have_selector('input', :type => 'text', :id => 'markup_user_telephone_attributes_number', :name => 'markup_user[telephone_attributes][number]', :value => "62634576545")
+      # Address 1 (Saved)
+      assert_have_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_0_id', :name => "markup_user[addresses_attributes][0][id]", :value => '25')
+      assert_have_selector('label', :for => 'markup_user_addresses_attributes_0_name', :content => 'Name')
+      assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_0_name', :name => 'markup_user[addresses_attributes][0][name]')
+      assert_have_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_0__destroy', :name => 'markup_user[addresses_attributes][0][_destroy]')
+      # Address 2 (New)
+      assert_have_no_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_1_id')
+      assert_have_selector('label', :for => 'markup_user_addresses_attributes_1_name', :content => 'Name')
+      assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_1_name', :name => 'markup_user[addresses_attributes][1][name]')
+      assert_have_no_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_1__destroy')
+    end
+
+    should "display nested children fields in haml" do
+      visit '/haml/fields_for'
+      # Telephone
+      assert_have_selector('label', :for => 'markup_user_telephone_attributes_number')
+      assert_have_selector('input', :type => 'text', :id => 'markup_user_telephone_attributes_number', :name => 'markup_user[telephone_attributes][number]', :value => "62634576545")
+      # Address 1 (Saved)
+      assert_have_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_0_id', :name => "markup_user[addresses_attributes][0][id]", :value => '25')
+      assert_have_selector('label', :for => 'markup_user_addresses_attributes_0_name', :content => 'Name')
+      assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_0_name', :name => 'markup_user[addresses_attributes][0][name]')
+      assert_have_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_0__destroy', :name => 'markup_user[addresses_attributes][0][_destroy]')
+      # Address 2 (New)
+      assert_have_no_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_1_id')
+      assert_have_selector('label', :for => 'markup_user_addresses_attributes_1_name', :content => 'Name')
+      assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_1_name', :name => 'markup_user[addresses_attributes][1][name]')
+      assert_have_no_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_1__destroy')
+    end
+  end
+
   # ===========================
   # StandardFormBuilder
   # ===========================
@@ -685,4 +825,4 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
   end
-end
+end

data/test/test_form_helpers.rb

@@ -42,13 +42,11 @@ class TestFormHelpers < Test::Unit::TestCase
       actual_html = form_tag('/remove', :"accept-charset" => "UTF-8", :class => 'delete-form', :method => "delete") { "Demo" }
       assert_has_tag(:form, :class => "delete-form", :"accept-charset" => "UTF-8", :method => 'post') { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'delete') { actual_html }
-      assert_has_tag('form input', :type => 'hidden', :name => "_utf8") { actual_html }
     end
 
     should "display correct form with charset" do
       actual_html = form_tag('/charset', :"accept-charset" => "UTF-8", :class => 'charset-form') { "Demo" }
       assert_has_tag(:form, :class => "charset-form", :"accept-charset" => "UTF-8", :method => 'post') { actual_html }
-      assert_has_tag('form input', :type => 'hidden', :name => "_utf8") { actual_html }
     end
 
     should "display correct form with multipart encoding" do
@@ -95,7 +93,7 @@ class TestFormHelpers < Test::Unit::TestCase
 
   context 'for #error_messages_for method' do
     should "display correct error messages list in ruby" do
-      user = stub(:class => "User", :errors => { :a => "1", :b => "2" }, :blank? => false)
+      user = mock_model("User", :errors => { :a => "1", :b => "2" }, :blank? => false)
       actual_html = error_messages_for(user)
       assert_has_tag('div.field-errors') { actual_html }
       assert_has_tag('div.field-errors h2', :content => "2 errors prohibited this User from being saved") { actual_html }
@@ -133,6 +131,26 @@ class TestFormHelpers < Test::Unit::TestCase
     end
   end
 
+  context 'for #error_message_on method' do
+    should "display correct error message on specified model name in ruby" do
+      @user = mock_model("User", :errors => { :a => "1", :b => "2" }, :blank? => false)
+      actual_html = error_message_on(:user, :a, :prepend => "foo", :append => "bar")
+      assert_has_tag('span.error', :content => "foo 1 bar") { actual_html }
+    end
+
+    should "display correct error message on specified object in ruby" do
+      @bob = mock_model("User", :errors => { :a => "1", :b => "2" }, :blank? => false)
+      actual_html = error_message_on(@bob, :a, :prepend => "foo", :append => "bar")
+      assert_has_tag('span.error', :content => "foo 1 bar") { actual_html }
+    end
+
+    should "display no message when error isn't present" do
+      @user = mock_model("User", :errors => { :a => "1", :b => "2" }, :blank? => false)
+      actual_html = error_message_on(:user, :fake, :prepend => "foo", :append => "bar")
+      assert actual_html.blank?
+    end
+  end
+
   context 'for #label_tag method' do
     should "display label tag in ruby" do
       actual_html = label_tag(:username, :class => 'long-label', :caption => "Nickname")
@@ -349,7 +367,7 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_has_tag(:select, :multiple => 'multiple', :name => 'favorite_color[]') { actual_html }
     end
 
-    should "display options with values and selected" do
+    should "display options with values and single selected" do
       options = [['Green', 'green1'], ['Blue', 'blue1'], ['Black', "black1"]]
       actual_html = select_tag(:favorite_color, :options => options, :selected => 'green1')
       assert_has_tag(:select, :name => 'favorite_color') { actual_html }
@@ -359,6 +377,16 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_has_tag('select option', :content => 'Black', :value => 'black1') { actual_html }
     end
 
+    should "display option with values and multiple selected" do
+      options = [['Green', 'green1'], ['Blue', 'blue1'], ['Black', "black1"]]
+      actual_html = select_tag(:favorite_color, :options => options, :selected => ['green1', 'Black'])
+      assert_has_tag(:select, :name => 'favorite_color') { actual_html }
+      assert_has_tag('select option', :selected => 'selected', :count => 2) { actual_html }
+      assert_has_tag('select option', :content => 'Green', :value => 'green1', :selected => 'selected') { actual_html }
+      assert_has_tag('select option', :content => 'Blue', :value => 'blue1') { actual_html }
+      assert_has_tag('select option', :content => 'Black', :value => 'black1', :selected => 'selected') { actual_html }
+    end
+
     should "display options selected only for exact match" do
       options = [['One', '1'], ['1', '10'], ['Two', "-1"]]
       actual_html = select_tag(:range, :options => options, :selected => '-1')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 20
-  version: 0.9.20
+  - 21
+  version: 0.9.21
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -08:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 9
-        - 20
-        version: 0.9.20
+        - 21
+        version: 0.9.21
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -88,7 +88,11 @@ files:
 - lib/padrino-helpers/locale/ru.yml
 - lib/padrino-helpers/locale/tr.yml
 - lib/padrino-helpers/locale/uk.yml
+- lib/padrino-helpers/locale/zh_tw.yml
 - lib/padrino-helpers/number_helpers.rb
+- lib/padrino-helpers/output_helpers/abstract_handler.rb
+- lib/padrino-helpers/output_helpers/erb_handler.rb
+- lib/padrino-helpers/output_helpers/haml_handler.rb
 - lib/padrino-helpers/output_helpers.rb
 - lib/padrino-helpers/render_helpers.rb
 - lib/padrino-helpers/tag_helpers.rb
@@ -161,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: padrino-helpers
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Helpers for padrino