padrino-helpers 0.11.2 → 0.11.3

data/lib/padrino-helpers.rb

@@ -1,5 +1,4 @@
 require 'padrino-core/support_lite' unless defined?(SupportLite)
-require 'cgi'
 require 'i18n'
 require 'enumerator'
 require 'active_support/time_with_zone'               # next extension depends on this

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -182,10 +182,10 @@ module Padrino
       # @return [String] Meta html tag with specified +options+.
       #
       # @example
-      #   # Generates: <meta name="keywords" content="weblog,news">
+      #   # Generates: <meta name="keywords" content="weblog,news" />
       #   meta_tag "weblog,news", :name => "keywords"
       #
-      #   # Generates: <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+      #   # Generates: <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       #   meta_tag "text/html; charset=UTF-8", 'http-equiv' => "Content-Type"
       #
       # @api public

data/lib/padrino-helpers/breadcrumb_helpers.rb

@@ -2,8 +2,7 @@ module Padrino
   module Helpers
     class Breadcrumb
 
-      attr_accessor :home
-      attr_accessor :items
+      attr_accessor :home, :items
 
       DEFAULT_URL = "/"
       DEFAULT_CAPTION ="Home Page"
@@ -18,8 +17,7 @@ module Padrino
       #
       # @api public
       def initialize
-        self.home = { :url => DEFAULT_URL, :caption => DEFAULT_CAPTION, :name => :home }
-        reset
+        reset!
       end
 
       ##
@@ -31,13 +29,21 @@ module Padrino
       # @param [String] caption
       #   The  text caption.
       #
+      # @param [Hash] options
+      #   The HTML options to include in li.
+      #
       # @example
-      #   breadcrumbs.set_home "/HomeFoo", "Foo Home"
+      #   breadcrumbs.set_home "/HomeFoo", "Foo Home", :id => "home-breadcrumb"
       #
       #
       # @api public
-      def set_home(url, caption)
-        self.home = { :url => url, :caption => caption.to_s.humanize.html_safe, :name => :home }
+      def set_home(url, caption, options = {})
+        self.home = {
+          :url     => url.to_s,
+          :caption => caption.to_s.humanize.html_safe,
+          :name    => :home,
+          :options => options
+        }
         reset
       end
 
@@ -49,7 +55,7 @@ module Padrino
       #
       # @api public
       def reset
-        self.items=[]
+        self.items = []
         self.items << home
       end
 
@@ -61,7 +67,12 @@ module Padrino
       #
       # @api public
       def reset!
-        self.home = { :url => DEFAULT_URL, :caption => DEFAULT_CAPTION, :name => :home }
+        self.home = {
+          :name    => :home,
+          :url     => DEFAULT_URL,
+          :caption => DEFAULT_CAPTION,
+          :options => {}
+        }
         reset
       end
 
@@ -69,23 +80,31 @@ module Padrino
       # Add a new  breadcrumbs
       #
       # @param [String] name
-      #   The name of resource
+      #   The name of resource.
       # @param [Symbol] name
-      #   The name of resource
+      #   The name of resource.
       #
       # @param [String] url
       #   The url href.
       #
       # @param [String] caption
-      #   The text caption
+      #   The text caption.
+      #
+      # @param [Hash] options
+      #   The HTML options to include in li.
       #
       # @example
-      #   breadcrumbs.add "foo", "/foo", "Foo Link"
-      #   breadcrumbs.add :foo, "/foo", "Foo Link"
+      #   breadcrumbs.add "foo", "/foo", "Foo Link", :id => "foo-id"
+      #   breadcrumbs.add :foo, "/foo", "Foo Link", :class => "foo-class"
       #
       # @api public
-      def add(name, url, caption)
-        items << { :name => name, :url => url.to_s, :caption => caption.to_s.humanize.html_safe }
+      def add(name, url, caption, options = {})
+        items << {
+          :name    => name.to_sym,
+          :url     => url.to_s,
+          :caption => caption.to_s.humanize.html_safe,
+          :options => options
+        }
       end
 
       alias :<< :add
@@ -124,26 +143,37 @@ module Padrino
       # @param [String] active
       #  Css class style set to active breadcrumb
       #
+      # @param [Hash] options
+      #   The HTML options to include in ul.
+      #
       # @return [String] Unordered list with breadcrumbs
       #
       # @example
       #  = breadcrumbs @breacrumbs
       #  # Generates:
       #  # <ul>
-      #  #   <li><a herf="/foo" >Foo Link</a></li>
-      #  #   <li class="active" ><a herf="/bar">Bar Link</a></li>
+      #  #   <li><a href="/foo">Foo Link</a></li>
+      #  #   <li class="active"><a href="/bar">Bar Link</a></li>
       #  # </ul>
       #
       #
       # @api public
-      def breadcrumbs(breadcrumbs, bootstrap=false, active="active")
-        content=""
+      def breadcrumbs(breadcrumbs, bootstrap = false, active = "active", options = {})
+        content = ""
         breadcrumbs.items[0..-2].each do |item|
           content << render_item(item, bootstrap)
         end
-        last = link_to(breadcrumbs.items.last[:caption], breadcrumbs.items.last[:url])
-        content << safe_content_tag(:li, last, :class => active)
-        safe_content_tag(:ul, content, :class => "breadcrumb" )
+        last = breadcrumbs.items.last
+        last_options = last[:options]
+        last = link_to(last[:caption], last[:url])
+
+        classes = [options[:class], last_options[:class]].map { |class_name| class_name.to_s.split(/\s/) }
+        classes[0] << "breadcrumb"
+        classes[1] << active if active
+        options[:class], last_options[:class] = classes.map { |class_name| class_name * " " }
+
+        content << safe_content_tag(:li, last, last_options)
+        safe_content_tag(:ul, content, options)
       end
 
       private
@@ -163,7 +193,7 @@ module Padrino
         content = ""
         content << link_to(item[:caption], item[:url])
         content << safe_content_tag(:span, "/", :class => "divider") if bootstrap
-        safe_content_tag(:li, content )
+        safe_content_tag(:li, content, item[:options])
       end
 
     end # Breadcrumb

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

@@ -2,7 +2,7 @@ module Padrino
   module Helpers
     module FormBuilder # @private
       class AbstractFormBuilder # @private
-        attr_accessor :template, :object
+        attr_accessor :template, :object, :multipart
 
         def initialize(template, object, options={})
           @template = template
@@ -139,13 +139,16 @@ module Padrino
 
         # f.file_field :photo, :class => 'avatar'
         def file_field(field, options={})
+          self.multipart = true
           options.reverse_merge!(:id => field_id(field))
           options.merge!(:class => field_error(field, options))
           @template.file_field_tag field_name(field), options
         end
 
         # f.submit "Update", :class => 'large'
-        def submit(caption="Submit", options={})
+        def submit(*args)
+          options = args[-1].is_a?(Hash) ? args.pop : {}
+          caption = args.length >= 1 ? args.shift : "Submit"
           @template.submit_tag caption, options
         end
 
@@ -213,7 +216,9 @@ module Padrino
           # field_name(:number) => "user_telephone_attributes_number"
           # field_name(:street) => "user_addresses_attributes_0_street"
           def field_id(field=nil, value=nil)
-            result = field_result
+            result = []
+            result << "#{@options[:namespace]}_" if @options[:namespace] && root_form?
+            result << field_result
             result << field_id_fragment if nested_form?
             result << "_#{field}" unless field.blank?
             result << "_#{value}" unless value.blank?

data/lib/padrino-helpers/form_helpers.rb

@@ -14,7 +14,9 @@ module Padrino
       # @param [String] url
       #   The url this form will submit to.
       # @param [Hash] settings
-      #   The settings associated with this form. Accepts html options.
+      #   The settings associated with this form.
+      #   Accepts a :namespace option that will be prepended to the id attributes of the form's elements.
+      #   Also accepts html options.
       # @option settings [String] :builder ("StandardFormBuilder")
       #   The FormBuilder class to use such as StandardFormBuilder.
       # @param [Proc] block
@@ -32,6 +34,8 @@ module Padrino
       def form_for(object, url, settings={}, &block)
         instance = builder_instance(object, settings)
         html = capture_html(instance, &block)
+        settings[:multipart] = instance.multipart unless settings.include?(:multipart)
+        settings.delete(:namespace)
         form_tag(url, settings) { html }
       end
 
@@ -79,13 +83,19 @@ module Padrino
       def form_tag(url, options={}, &block)
         desired_method = options[:method].to_s
         options.delete(:method) unless desired_method =~ /get|post/i
-        options.reverse_merge!(:method => 'post', :action => url)
+        options.reverse_merge!(:method => 'post',
+                               :action => url,
+                               :protect_from_csrf => is_protected_from_csrf? )
         options[:enctype] = 'multipart/form-data' if options.delete(:multipart)
         options['accept-charset'] ||= 'UTF-8'
         inner_form_html = hidden_form_method_field(desired_method)
-        inner_form_html << csrf_token_field
+        if options[:protect_from_csrf] == true && !(desired_method =~ /get/i)
+          inner_form_html << csrf_token_field
+        end
         inner_form_html << mark_safe(capture_html(&block))
-        concat_content content_tag(:form, inner_form_html, options)
+        not_concat = options.delete(:not_concat)
+        form_html  = content_tag(:form, inner_form_html, options)
+        not_concat ? form_html : concat_content(form_html)
       end
 
       ##
@@ -251,7 +261,7 @@ module Padrino
         error = if defined?(Ohm::Model) && object.is_a?(Ohm::Model)
           I18n.t("ohm.errors.messages.#{error[0]}", :default => error[0].to_s)
         else
-          # Array(error).first is necessary because some ORMs 
+          # Array(error).first is necessary because some ORMs
           # give us an array others directly a value
           Array(error)[0]
         end
@@ -347,13 +357,13 @@ module Padrino
       #
       # @example
       #   text_field_tag :first_name, :maxlength => 40, :required => true
-      #   # => <input name="first_name" maxlength="40" required type="text">
+      #   # => <input name="first_name" maxlength="40" required type="text" />
       #
       #   text_field_tag :last_name, :class => 'string', :size => 40
-      #   # => <input name="last_name" class="string" size="40" type="text">
+      #   # => <input name="last_name" class="string" size="40" type="text" />
       #
       #   text_field_tag :username, :placeholder => 'Your Username'
-      #   # => <input name="username" placeholder="Your Username" type="text">
+      #   # => <input name="username" placeholder="Your Username" type="text" />
       #
       # @api public
       def text_field_tag(name, options={})
@@ -409,16 +419,16 @@ module Padrino
       #
       # @example
       #   number_field_tag :quanity, :class => 'numeric'
-      #   # => <input name="quanity" class="numeric" type="number">
+      #   # => <input name="quanity" class="numeric" type="number" />
       #
       #   number_field_tag :zip_code, :pattern => /[0-9]{5}/
-      #   # => <input name="zip_code" pattern="[0-9]{5}" type="number">
+      #   # => <input name="zip_code" pattern="[0-9]{5}" type="number" />
       #
       #   number_field_tag :credit_card, :autocomplete => :off
-      #   # => <input name="credit_card" autocomplete="off" type="number">
+      #   # => <input name="credit_card" autocomplete="off" type="number" />
       #
       #   number_field_tag :age, :min => 18, :max => 120, :step => 1
-      #   # => <input name="age" min="18" max="120" step="1" type="number">
+      #   # => <input name="age" min="18" max="120" step="1" type="number" />
       #
       # @api public
       def number_field_tag(name, options={})
@@ -432,15 +442,15 @@ module Padrino
       #
       # @example
       #   telephone_field_tag :phone_number, :class => 'string'
-      #   # => <input name="phone_number" class="string" type="tel">
+      #   # => <input name="phone_number" class="string" type="tel" />
       #
       #  telephone_field_tag :cell_phone, :tabindex => 1
       #  telephone_field_tag :work_phone, :tabindex => 2
       #  telephone_field_tag :home_phone, :tabindex => 3
       #
-      #  # => <input name="cell_phone" tabindex="1" type="tel">
-      #  # => <input name="work_phone" tabindex="2" type="tel">
-      #  # => <input name="home_phone" tabindex="3" type="tel">
+      #  # => <input name="cell_phone" tabindex="1" type="tel" />
+      #  # => <input name="work_phone" tabindex="2" type="tel" />
+      #  # => <input name="home_phone" tabindex="3" type="tel" />
       #
       # @api public
       def telephone_field_tag(name, options={})
@@ -455,10 +465,10 @@ module Padrino
       #
       # @example
       #   email_field_tag :email, :placeholder => 'you@example.com'
-      #   # => <input name="email" placeholder="you@example.com" type="email">
+      #   # => <input name="email" placeholder="you@example.com" type="email" />
       #
       #   email_field_tag :email, :value => 'padrinorb@gmail.com', :readonly => true
-      #   # => <input name="email" value="padrinorb@gmail.com" readonly type="email">
+      #   # => <input name="email" value="padrinorb@gmail.com" readonly type="email" />
       #
       # @api public
       def email_field_tag(name, options={})
@@ -472,16 +482,16 @@ module Padrino
       #
       # @example
       #  search_field_tag :search, :placeholder => 'Search this website...'
-      #  # => <input name="search" placeholder="Search this website..." type="search">
+      #  # => <input name="search" placeholder="Search this website..." type="search" />
       #
       #  search_field_tag :search, :maxlength => 15, :class => ['search', 'string']
-      #  # => <input name="search" maxlength="15" class="search string">
+      #  # => <input name="search" maxlength="15" class="search string" />
       #
       #  search_field_tag :search, :id => 'search'
-      #  # => <input name="search" id="search" type="search">
+      #  # => <input name="search" id="search" type="search" />
       #
       #  search_field_tag :search, :autofocus => true
-      #  # => <input name="search" autofocus type="search">
+      #  # => <input name="search" autofocus type="search" />
       #
       # @api public
       def search_field_tag(name, options={})
@@ -495,10 +505,10 @@ module Padrino
       #
       # @example
       #  url_field_tag :favorite_website, :placeholder => 'http://padrinorb.com'
-      #  <input name="favorite_website" placeholder="http://padrinorb.com." type="url">
+      #  <input name="favorite_website" placeholder="http://padrinorb.com." type="url" />
       #
       #  url_field_tag :home_page, :class => 'string url'
-      #  <input name="home_page" class="string url", type="url">
+      #  <input name="home_page" class="string url", type="url" />
       #
       # @api public
       def url_field_tag(name, options={})
@@ -668,7 +678,7 @@ module Padrino
       ##
       # Constructs a submit button from the given options
       #
-      # @param [String] caption
+      # @param [String] caption (defaults to: +Submit+)
       #   The caption for the submit button.
       # @param [Hash] options
       #   The html options for the input field.
@@ -677,9 +687,12 @@ module Padrino
       #
       # @example
       #   submit_tag "Create", :class => 'success'
+      #   submit_tag :class => 'btn'
       #
       # @api public
-      def submit_tag(caption="Submit", options={})
+      def submit_tag(*args)
+        options = args[-1].is_a?(Hash) ? args.pop : {}
+        caption = args.length >= 1 ? args.shift : "Submit"
         options.reverse_merge!(:value => caption)
         input_tag(:submit, options)
       end
@@ -758,12 +771,40 @@ module Padrino
         if block_given?
           form_tag(url, options, &block)
         else
-          form_tag(url, options) do
+          form_tag(url, options.merge!(:not_concat => true)) do
             submit_tag(name)
           end
         end
       end
 
+      ##
+      # Constructs a range tag from the given options
+      #
+      # @example
+      #   range_field_tag('ranger_with_min_max', :min => 1, :max => 50)
+      #   range_field_tag('ranger_with_range', :range => 1..5)
+      #
+      # @param [String] name
+      #   The name of the range field.
+      # @param [Hash] options
+      #   The html options for the range field.
+      # @option options [Integer] :min
+      #  The min range of the range field
+      # @option options [Integer] :max
+      #  The max range of the range field
+      # @option options [range] :range
+      #  The range, in lieu of :min and :max.  See examples for details
+      # @return [String] The html range field
+      #
+      # @api public
+      def range_field_tag(name, options = {})
+        options.reverse_merge!(:name => name)
+        if range = options.delete(:range)
+          options[:min], options[:max] = range.min, range.max
+        end
+        input_tag(:range, options)
+      end
+
       protected
 
         ##
@@ -779,9 +820,10 @@ module Padrino
         #
         def options_for_select(option_items, selected_value=nil)
           return [] if option_items.blank?
-          option_items.map do |caption, value|
+          option_items.map do |caption, value, disabled|
             value ||= caption
-            content_tag(:option, caption, :value => value, :selected => option_is_selected?(value, caption, selected_value))
+            disabled ||= false
+            content_tag(:option, caption, :value => value, :selected => option_is_selected?(value, caption, selected_value), :disabled => disabled)
           end
         end
 
@@ -791,15 +833,23 @@ module Padrino
         def grouped_options_for_select(collection, selected=nil, prompt=false)
           if collection.is_a?(Hash)
             collection.map do |key, value|
-              content_tag :optgroup, :label => key do
-                options_for_select(value, selected)
-              end
+              # Hash format:
+              # {:first => [1,2,3], :second => [4,5,6]}
+              # or:
+              # {:first => [[1,2,3], {:disabled => true}], :second => [4,5,6]}
+              attributes_hash = value.last.is_a?(Hash) ? value.pop : nil
+              disabled ||=  attributes_hash && attributes_hash.include?(:disabled) ? attributes_hash[:disabled] : false
+              content_tag :optgroup, options_for_select(value, selected), :label => key, :disabled => disabled
             end
           elsif collection.is_a?(Array)
+            # Array format:
+            # ["Option Label", [:option1, :option2, ...]]
+            # or:
+            # ["Option Label", [:option1, :option2, ...], true]
+            # the last item tells if it is disabled or not. This is keeps it backwards compatible.
             collection.map do |optgroup|
-              content_tag :optgroup, :label => optgroup.first do
-                options_for_select(optgroup.last, selected)
-              end
+              disabled ||= optgroup.count > 2 ? optgroup.pop : false
+              content_tag :optgroup, options_for_select(optgroup.last, selected), :label => optgroup.first, :disabled => disabled
             end
           end
         end
@@ -857,6 +907,16 @@ module Padrino
             [value.to_s, caption.to_s].include?(selected.to_s)
           end
         end
+
+        ##
+        # Returns whether the application is being protected from csrf
+        #
+        def is_protected_from_csrf?
+          return true unless defined? app
+          return true unless app.respond_to?(:protect_from_csrf)
+          return true if app.protect_from_csrf == nil
+          app.protect_from_csrf
+        end
     end # FormHelpers
   end # Helpers
 end # Padrino

data/lib/padrino-helpers/output_helpers.rb

@@ -42,7 +42,7 @@ module Padrino
       # @example
       #   ActiveSupport::SafeBuffer.new + capture_html { "<foo>" }
       #   # => "&lt;foo&gt;"
-      #   ActiveSupport::SafeBuffer.safe_concat + capture_html { "<foo>" }
+      #   ActiveSupport::SafeBuffer.new.safe_concat(capture_html { "<foo>" })
       #   # => "<foo>"
       #
       # @api semipublic

data/lib/padrino-helpers/tag_helpers.rb

@@ -8,6 +8,7 @@ module Padrino
       # Tag values escaped to html entities
       #
       ESCAPE_VALUES = {
+        "&" => "&",
         "<" => "&lt;",
         ">" => "&gt;",
         '"' => "&quot;"
@@ -31,7 +32,13 @@ module Padrino
         :muted,
         :readonly,
         :required,
-        :selected
+        :selected,
+        :declare,
+        :defer,
+        :ismap,
+        :itemscope,
+        :noresize,
+        :novalidate
       ]
 
       ##

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

@@ -0,0 +1,8 @@
+<% button_to 'Foo button', '/foo', :class => 'foo-form' do %>
+  <% field_set_tag do %>
+    <%= hidden_field_tag :session_id, :value => "__secret__" %>
+    <%= label_tag :username %>
+  <% end %>
+<% end %>
+<%= content_tag(:p, 'button_to test', :id => 'test-point') %>
+<%= button_to 'Bar button', '/bar' %>

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

@@ -0,0 +1,5 @@
+- button_to 'Foo button', '/foo', :class => 'foo-form' do
+  - field_set_tag do
+    = label_tag :username
+= content_tag(:p, 'button_to test', :id => 'test-point')
+= button_to 'Bar button', '/bar'

data/test/fixtures/markup_app/views/button_to.slim

@@ -0,0 +1,6 @@
+= button_to 'Foo button', '/foo', :class => 'foo-form' do
+  = field_set_tag do
+    = hidden_field_tag :session_id, :value => "__secret__"
+    = label_tag :username
+= content_tag(:p, 'button_to test', :id => 'test-point')
+= button_to 'Bar button', '/bar'

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

@@ -19,6 +19,8 @@
     <%= label_tag :gender %>
     <%= label_tag :color %>
     <%= select_tag :color, :options => ['green', 'orange', 'purple'] %>
+    <%= select_tag :type, :grouped_options => { 'foo' => ['foo', 'bar'], 'bar' => ['foo', 'bar'] } %>
+    <%= select_tag :character, :grouped_options => [['Friends',['Yoda',['Obiwan',1]]],['Enemies',['Palpatine',['Darth Vader',3]]]] %>
     <%= radio_button_tag :gender, :value => 'male' %>
     <%= radio_button_tag :gender, :value => 'female' %>
     <%= submit_tag %>
@@ -77,6 +79,10 @@
     <p>
       <%= check_box_tag :remember_me, :value => '1', :checked => true %>
     <p>
+    <p>
+      <%= range_field_tag('ranger_with_min_max', :min => 1, :max => 50) %>
+      <%= range_field_tag('ranger_with_range', :range => 1..5) %>
+    </p>
   <% end %>
   <% field_set_tag(:class => 'buttons') do %>
     <%= submit_tag "Login" %>
@@ -84,3 +90,6 @@
     <%= image_submit_tag "buttons/submit.png" %>
   <% end %>
 <% end %>
+
+<% form_tag '/dontprotect', :class => 'no-protection', :protect_from_csrf => false do %>
+<% end %>

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

@@ -18,6 +18,8 @@
     = search_field_tag :search
     = label_tag  :color
     = select_tag :color, :options => ['green', 'orange', 'purple']
+    = select_tag :type, :grouped_options => { 'foo' => ['foo', 'bar'], 'bar' => ['foo', 'bar'] }
+    = select_tag :character, :grouped_options => [['Friends',['Yoda',['Obiwan',1]]],['Enemies',['Palpatine',['Darth Vader',3]]]]
     = label_tag  :gender
     = radio_button_tag :gender, :value => 'male'
     = radio_button_tag :gender, :value => 'female'
@@ -64,7 +66,13 @@
       = select_tag :fav_color, :options => [ ['green', '1'], ['orange', '2'], ['purple', '3'] ], :selected => '2'
     %p
       = check_box_tag :remember_me, :value => "1", :checked => true
+    %p
+      = range_field_tag('ranger_with_min_max', :min => 1, :max => 50)
+      = range_field_tag('ranger_with_range', :range => 1..5)
   - field_set_tag(:class => 'buttons') do
     = submit_tag "Login"
     = button_tag "Cancel"
     = image_submit_tag "buttons/submit.png"
+
+- form_tag '/dontprotect', :class => 'no-protection', :protect_from_csrf => false do
+  = submit_tag "Login"

data/test/fixtures/markup_app/views/form_tag.slim

@@ -18,6 +18,8 @@
     = search_field_tag :search
     = label_tag  :color
     = select_tag :color, :options => ['green', 'orange', 'purple']
+    = select_tag :type, :grouped_options => { 'foo' => ['foo', 'bar'], 'bar' => ['foo', 'bar'] }
+    = select_tag :character, :grouped_options => [['Friends',['Yoda',['Obiwan',1]]],['Enemies',['Palpatine',['Darth Vader',3]]]]
     = label_tag  :gender
     = radio_button_tag :gender, :value => 'male'
     = radio_button_tag :gender, :value => 'female'
@@ -64,7 +66,14 @@
       = select_tag :fav_color, :options => [ ['green', '1'], ['orange', '2'], ['purple', '3'] ], :selected => '2'
     p
       = check_box_tag :remember_me, :value => "1", :checked => true
+    p
+      = range_field_tag('ranger_with_min_max', :min => 1, :max => 50)
+      = range_field_tag('ranger_with_range', :range => 1..5)
+
   = field_set_tag(:class => 'buttons') do
     = submit_tag "Login"
     = button_tag "Cancel"
     = image_submit_tag "buttons/submit.png"
+    
+= form_tag '/dontprotect', :class => 'no-protection', :protect_from_csrf => false do
+  = submit_tag "Login"

data/test/test_asset_tag_helpers.rb

@@ -71,9 +71,9 @@ describe "AssetTagHelpers" do
     end
 
     should "escape the link text" do
-      actual_link = link_to('/register', :class => 'first', :id => 'binky') { "<>" }
+      actual_link = link_to('/register', :class => 'first', :id => 'binky') { "<&>" }
       assert_has_tag('a#binky.first', :href => '/register') { actual_link }
-      assert_match "&lt;&gt;", actual_link
+      assert_match "&lt;&amp;&gt;", actual_link
     end
 
     should "not escape image_tag" do
@@ -119,6 +119,12 @@ describe "AssetTagHelpers" do
       assert_match %r{subject\=demo\%20test}, actual_html
     end
 
+    should "escape & with encoded string and &amp; in HTML" do
+      actual_html = mail_to('test@demo.com', "My&Email", :subject => "this&that")
+      assert_match 'this%26that', actual_html
+      assert_match 'My&amp;Email', actual_html
+    end
+
     should "display mail link element in haml" do
       visit '/haml/mail_to'
       assert_have_selector 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'

data/test/test_breadcrumb_helpers.rb

@@ -0,0 +1,134 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "BreadcrumbHelpers" do
+  include Padrino::Helpers::Breadcrumbs
+
+  def breadcrumb
+    @breadcrumb ||= Padrino::Helpers::Breadcrumb.new
+  end
+
+  before(:each) { breadcrumb.reset! }
+
+  context "for Breadcrumbs#breadcrumbs method" do
+    should "support breadcrumbs which is Padrino::Helpers::Breadcrumbs instance." do
+      breadcrumb.add "foo", "/foo", "foo link"
+      assert_has_tag(:a, :content => "Foo link", :href => "/foo") { breadcrumbs(breadcrumb) }
+    end
+
+    should "support bootstrap" do
+      breadcrumb.add "foo", "/foo", "foo link"
+      assert_has_tag(:span, :content => "/", :class => "divider") { breadcrumbs(breadcrumb, true) }
+    end
+
+    should "support active" do
+      breadcrumb.add "foo", "/foo", "foo link"
+      assert_has_tag(:li, :class => "custom-active") { breadcrumbs(breadcrumb, nil, "custom-active") }
+    end
+
+    should "support options" do
+      assert_has_tag(:ul, :class => "breadcrumbs-class breadcrumb", :id => "breadcrumbs-id") do
+        breadcrumbs(breadcrumb, nil, nil, :id => "breadcrumbs-id", :class => "breadcrumbs-class")
+      end
+    end
+  end
+
+  context "for #add method" do
+    should "support name of string and symbol type" do
+      breadcrumb.add "foo", "/foo", "Foo Link"
+      breadcrumb.add :bar, "/bar", "Bar Link"
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_tag(:a, :content => "Foo link", :href => "/foo") { actual_html }
+      assert_has_tag(:a, :content => "Bar link", :href => "/bar") { actual_html }
+    end
+
+    should "support url" do
+      breadcrumb.add :foo, "/foo", "Foo Link"
+      assert_has_tag(:a, :href => "/foo") { breadcrumbs(breadcrumb) }
+    end
+
+    should "support caption" do
+      breadcrumb.add :foo, "/foo", "Foo Link"
+      assert_has_tag(:a, :content => "Foo link") { breadcrumbs(breadcrumb) }
+    end
+
+    should "support options" do
+      breadcrumb.add :foo, "/foo", "Foo Link", :id => "foo-id", :class => "foo-class"
+      breadcrumb.add :bar, "/bar", "Bar Link", :id => "bar-id", :class => "bar-class"
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_tag(:li, :class => "foo-class", :id => "foo-id") { actual_html }
+      assert_has_tag(:li, :class => "bar-class active", :id => "bar-id") { actual_html }
+    end
+  end
+
+  context "for #del method" do
+    should "support name of string type" do
+      breadcrumb.add "foo", "/foo", "Foo Link"
+      breadcrumb.add :bar, "/bar", "Bar Link"
+
+      breadcrumb.del "foo"
+      breadcrumb.del "bar"
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_no_tag(:a, :content => "Foo link", :href => "/foo") { actual_html }
+      assert_has_no_tag(:a, :content => "Bar link", :href => "/bar") { actual_html }
+    end
+
+    should "support name of symbol type" do
+      breadcrumb.add "foo", "/foo", "Foo Link"
+      breadcrumb.add :bar, "/bar", "Bar Link"
+
+      breadcrumb.del :foo
+      breadcrumb.del :bar
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_no_tag(:a, :content => "Foo link", :href => "/foo") { actual_html }
+      assert_has_no_tag(:a, :content => "Bar link", :href => "/bar") { actual_html }
+    end
+  end
+
+  context "for #set_home method" do
+    should "modified home item elements." do
+      breadcrumb.set_home("/custom", "Custom Home Page")
+      assert_has_tag(:a, :content => "Custom home page", :href => "/custom") { breadcrumbs(breadcrumb) }
+    end
+
+    should "support options" do
+      breadcrumb.set_home("/custom", "Custom Home Page", :id => "home-id")
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_tag(:li, :id => "home-id") { actual_html }
+      assert_has_tag(:a, :content => "Custom home page", :href => "/custom") { actual_html }
+    end
+  end
+
+  context "for #reset method" do
+    should "be #items which contains only home item." do
+      breadcrumb.set_home("/custom", "Custom Home Page")
+      breadcrumb.add "foo", "/foo", "Foo Link"
+      breadcrumb.add :bar, "/bar", "Bar Link"
+
+      breadcrumb.reset
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_tag(:a, :content => "Custom home page", :href => "/custom") { actual_html }
+      assert_has_no_tag(:a, :content => "Foo link", :href => "/foo") { actual_html }
+      assert_has_no_tag(:a, :content => "Bar link", :href => "/bar") { actual_html }
+    end
+  end
+
+  context "for #reset! method" do
+    should "be #items which contains only default home item." do
+      breadcrumb.add "foo", "/foo", "foo link"
+      breadcrumb.add :bar, "/bar", "Bar Link"
+
+      breadcrumb.reset!
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_tag(:a, :content => "Home Page", :href => "/") { actual_html }
+      assert_has_no_tag(:a, :content => "Foo link", :href => "/foo") { actual_html }
+      assert_has_no_tag(:a, :content => "Bar link", :href => "/bar") { actual_html }
+    end
+  end
+end

data/test/test_form_builder.rb

@@ -61,6 +61,16 @@ describe "FormBuilder" do
       assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/update', :method => 'post', "data-remote" => 'true') { actual_html }
     end
 
+    should "display correct form html with namespace option" do
+      actual_html = form_for(@user, '/update', :namespace => 'foo') do |f|
+        f.text_field(:first_name) << f.fields_for(:role_types) { |role| role.text_field(:name) }
+      end
+
+      assert_has_no_tag(:form, :namespace => 'foo') { actual_html }
+      assert_has_tag(:input, :type => 'text', :name => 'user[first_name]', :id => 'foo_user_first_name') { actual_html }
+      assert_has_tag(:input, :type => 'text', :name => 'user[role_types_attributes][0][name]', :id => 'foo_user_role_types_attributes_0_name') { actual_html }
+    end
+
     should "display correct form html with remote option and method put" do
       actual_html = form_for(@user, '/update', :"accept-charset" => "UTF-8", :remote => true, :method => 'put') { "Demo" }
       assert_has_tag('form', :"accept-charset" => "UTF-8", :method => 'post', "data-remote" => 'true') { actual_html }
@@ -655,6 +665,17 @@ describe "FormBuilder" do
       assert_have_selector '#demo  input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
       assert_have_selector '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
     end
+
+    should "display correct form html with multipart, even if no 'multipart' option is specified" do
+      actual_html = form_for(@user, '/register', :"accept-charset" => "UTF-8") { |f| f.file_field :photo }
+      assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :enctype => "multipart/form-data") { actual_html }
+    end
+
+    should "display correct form html without multipart, if 'multipart' option is specified 'false'" do
+      actual_html = form_for(@user, '/register', :"accept-charset" => "UTF-8", :multipart => false) { |f| f.file_field :photo }
+      assert_has_no_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :enctype => "multipart/form-data") { actual_html }
+    end
+
   end
 
   context 'for #select method' do
@@ -742,6 +763,18 @@ describe "FormBuilder" do
       assert_has_tag('input[type=submit]', :value => "Submit") { actual_html }
     end
 
+
+    should "display correct submit button html with no caption" do
+      actual_html = standard_builder.submit(:class => 'btn')
+      assert_has_tag('input.btn[type=submit]', :value => "Submit") { actual_html }
+    end
+
+    should "display correct submit button html with nil caption" do
+      actual_html = standard_builder.submit(nil, :class => 'btn')
+      assert_has_tag('input.btn[type=submit]') { actual_html }
+      assert actual_html !~ %r{ value \* = }x
+    end
+
     should "display correct submit button html" do
       actual_html = standard_builder.submit("Commit", :class => 'large')
       assert_has_tag('input.large[type=submit]', :value => "Commit") { actual_html }

data/test/test_form_helpers.rb

@@ -9,6 +9,8 @@ describe "FormHelpers" do
   end
 
   context 'for #form_tag method' do
+    after(:each) { app.set :protect_from_csrf, true }
+
     should "display correct forms in ruby" do
       actual_html = form_tag('/register', :"accept-charset" => "UTF-8", :class => 'test', :method => "post") { "Demo" }
       assert_has_tag(:form, :"accept-charset" => "UTF-8", :class => "test") { actual_html }
@@ -54,25 +56,62 @@ describe "FormHelpers" do
       assert_has_tag(:form, :enctype => "multipart/form-data") { actual_html }
     end
 
+    should "have an authenticity_token for method :post, :put or :delete" do
+      %w(post put delete).each do |method|
+        actual_html = form_tag('/modify', :method => method) { "Demo" }
+        assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
+      end
+    end
+
+    should "not have an authenticity_token if method: :get" do
+      actual_html = form_tag('/get', :method => :get) { "Demo" }
+      assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
+    should "have an authenticity_token by default" do
+      actual_html = form_tag('/superadmindelete') { "Demo" }
+      assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
+    should "not have an authenticity_token if passing protect_from_csrf: false" do
+      actual_html = form_tag('/superadmindelete', :protect_from_csrf => false) { "Demo" }
+      assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
+    should "have an authenticity_token if protect_from_csrf is not set on app settings" do
+      app.set :protect_from_csrf, nil
+      actual_html = form_tag('/superadmindelete') { "Demo" }
+      assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
+    should "not have an authenticity_token if protect_from_csrf is false on app settings" do
+      app.set :protect_from_csrf, false
+      actual_html = form_tag('/superadmindelete') { "Demo" }
+      assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
     should "display correct forms in erb" do
       visit '/erb/form_tag'
       assert_have_selector 'form.simple-form', :action => '/simple'
       assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
-      assert_have_selector :input, :name => 'authenticity_token'
+      assert_have_selector 'form.simple-form input', :name => 'authenticity_token'
+      assert_have_no_selector 'form.no-protection input', :name => 'authenticity_token'
     end
 
     should "display correct forms in haml" do
       visit '/haml/form_tag'
       assert_have_selector 'form.simple-form', :action => '/simple'
       assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
-      assert_have_selector :input, :name => 'authenticity_token'
+      assert_have_selector 'form.simple-form input', :name => 'authenticity_token'
+      assert_have_no_selector 'form.no-protection input', :name => 'authenticity_token'
     end
 
     should "display correct forms in slim" do
       visit '/slim/form_tag'
       assert_have_selector 'form.simple-form', :action => '/simple'
       assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
-      assert_have_selector :input, :name => 'authenticity_token'
+      assert_have_selector 'form.simple-form input', :name => 'authenticity_token'
+      assert_have_no_selector 'form.no-protection input', :name => 'authenticity_token'
     end
   end
 
@@ -611,7 +650,7 @@ describe "FormHelpers" do
       assert_has_tag('select option:first-child', :value => "", :content => "") { actual_html }
     end
 
-    should "return a select tag with grouped options for an nested array" do
+    should "display select tag with grouped options for a nested array" do
       opts = [
         ["Friends",["Yoda",["Obiwan",2]]],
         ["Enemies", ["Palpatine",['Darth Vader',3]]]
@@ -626,7 +665,33 @@ describe "FormHelpers" do
       assert_has_tag(:option,   :value => "3", :content => "Darth Vader") { actual_html }
     end
 
-    should "return a select tag with grouped options for a hash" do
+    should "display select tag with grouped options for a nested array and accept disabled groups" do
+      opts = [
+        ["Friends",["Yoda",["Obiwan",2]]],
+        ["Enemies", ["Palpatine",['Darth Vader',3]], true]
+      ]
+      actual_html = select_tag( 'name', :grouped_options => opts )
+      assert_has_tag(:select,   :name => "name") { actual_html }
+      assert_has_tag(:option,   :disabled => 'disabled', :count => 0) { actual_html }
+      assert_has_tag(:optgroup, :disabled => 'disabled', :count => 1) { actual_html }
+      assert_has_tag(:optgroup, :label => "Enemies", :disabled => 'disabled') { actual_html }
+    end
+
+    should "display select tag with grouped options for a nested array and accept disabled groups and/or with disabled options" do
+      opts = [
+        ["Friends",["Yoda",["Obiwan",2, true]]],
+        ["Enemies", [["Palpatine", "Palpatine", true],['Darth Vader',3]], true]
+      ]
+      actual_html = select_tag( 'name', :grouped_options => opts )
+      assert_has_tag(:select,   :name => "name") { actual_html }
+      assert_has_tag(:option,   :disabled => 'disabled', :count => 2) { actual_html }
+      assert_has_tag(:optgroup, :disabled => 'disabled', :count => 1) { actual_html }
+      assert_has_tag(:option,   :content => "Obiwan", :disabled => 'disabled') { actual_html }
+      assert_has_tag(:optgroup, :label => "Enemies", :disabled => 'disabled') { actual_html }
+      assert_has_tag(:option,   :value => "Palpatine", :content => "Palpatine", :disabled => 'disabled') { actual_html }
+    end
+
+    should "display select tag with grouped options for a hash" do
       opts = {
         "Friends" => ["Yoda",["Obiwan",2]],
         "Enemies" => ["Palpatine",['Darth Vader',3]]
@@ -641,6 +706,33 @@ describe "FormHelpers" do
       assert_has_tag(:option,   :value => "3", :content => "Darth Vader") { actual_html }
     end
 
+    should "display select tag with grouped options for a hash and accept disabled groups" do
+      opts = {
+        "Friends" => ["Yoda",["Obiwan",2]],
+        "Enemies" => ["Palpatine",['Darth Vader',3], {:disabled => true}]
+      }
+      actual_html = select_tag( 'name', :grouped_options => opts )
+      assert_has_tag(:select,   :name => "name") { actual_html }
+      assert_has_tag(:option,   :disabled => 'disabled', :count => 0) { actual_html }
+      assert_has_tag(:optgroup, :disabled => 'disabled', :count => 1) { actual_html }
+      assert_has_tag(:optgroup, :label => "Enemies", :disabled => 'disabled') { actual_html }
+    end
+
+    should "display select tag with grouped options for a hash and accept disabled groups and/or with disabled options" do
+      opts = {
+        "Friends" => ["Yoda",["Obiwan",2,true]],
+        "Enemies" => [["Palpatine","Palpatine",true],["Darth Vader",3], {:disabled => true}]
+      }
+      actual_html = select_tag( 'name', :grouped_options => opts )
+      assert_has_tag(:select,   :name => "name") { actual_html }
+      assert_has_tag(:option,   :disabled => 'disabled', :count => 2) { actual_html }
+      assert_has_tag(:optgroup, :disabled => 'disabled', :count => 1) { actual_html }
+      assert_has_tag(:option,   :content => "Obiwan", :disabled => 'disabled') { actual_html }
+      assert_has_tag(:optgroup, :label => "Enemies", :disabled => 'disabled') { actual_html }
+      assert_has_tag(:option,   :value => "Palpatine", :content => "Palpatine", :disabled => 'disabled') { actual_html }
+    end
+
+
     should "display select tag in ruby with multiple attribute" do
       actual_html = select_tag(:favorite_color, :multiple => true, :options => ['only', 'option'])
       assert_has_tag(:select, :multiple => 'multiple', :name => 'favorite_color[]') { actual_html }
@@ -656,6 +748,16 @@ describe "FormHelpers" do
       assert_has_tag('select option', :content => 'Black', :value => 'black1') { actual_html }
     end
 
+    should "display options with values and accept disabled options" do
+      options = [['Green', 'green1', true], ['Blue', 'blue1'], ['Black', "black1"]]
+      actual_html = select_tag(:favorite_color, :options => options)
+      assert_has_tag(:select, :name => 'favorite_color') { actual_html }
+      assert_has_tag('select option', :disabled => 'disabled', :count => 1) { actual_html }
+      assert_has_tag('select option', :content => 'Green', :value => 'green1', :disabled => 'disabled') { actual_html }
+      assert_has_tag('select option', :content => 'Blue', :value => 'blue1') { actual_html }
+      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'])
@@ -680,10 +782,20 @@ describe "FormHelpers" do
       assert_have_selector('select option', :content => 'green',  :value => 'green')
       assert_have_selector('select option', :content => 'orange', :value => 'orange')
       assert_have_selector('select option', :content => 'purple', :value => 'purple')
-      assert_have_selector 'form.advanced-form select', :name => 'fav_color'
+      assert_have_selector('form.advanced-form select', :name => 'fav_color')
       assert_have_selector('select option', :content => 'green',  :value => '1')
       assert_have_selector('select option', :content => 'orange', :value => '2', :selected => 'selected')
       assert_have_selector('select option', :content => 'purple', :value => '3')
+      assert_have_selector('select optgroup', :label => 'foo')
+      assert_have_selector('select optgroup', :label => 'bar')
+      assert_have_selector('select optgroup option', :content => 'foo', :value => 'foo')
+      assert_have_selector('select optgroup option', :content => 'bar', :value => 'bar')
+      assert_have_selector('select optgroup', :label => 'Friends')
+      assert_have_selector('select optgroup', :label => 'Enemies')
+      assert_have_selector('select optgroup option', :content => 'Yoda', :value => 'Yoda')
+      assert_have_selector('select optgroup option', :content => 'Obiwan', :value => '1')
+      assert_have_selector('select optgroup option', :content => 'Palpatine', :value => 'Palpatine')
+      assert_have_selector('select optgroup option', :content => 'Darth Vader', :value => '3')
     end
 
     should "display select tag in haml" do
@@ -692,10 +804,20 @@ describe "FormHelpers" do
       assert_have_selector('select option', :content => 'green',  :value => 'green')
       assert_have_selector('select option', :content => 'orange', :value => 'orange')
       assert_have_selector('select option', :content => 'purple', :value => 'purple')
-      assert_have_selector 'form.advanced-form select', :name => 'fav_color'
+      assert_have_selector('form.advanced-form select', :name => 'fav_color')
       assert_have_selector('select option', :content => 'green',  :value => '1')
       assert_have_selector('select option', :content => 'orange', :value => '2', :selected => 'selected')
       assert_have_selector('select option', :content => 'purple', :value => '3')
+      assert_have_selector('select optgroup', :label => 'foo')
+      assert_have_selector('select optgroup', :label => 'bar')
+      assert_have_selector('select optgroup option', :content => 'foo', :value => 'foo')
+      assert_have_selector('select optgroup option', :content => 'bar', :value => 'bar')
+      assert_have_selector('select optgroup', :label => 'Friends')
+      assert_have_selector('select optgroup', :label => 'Enemies')
+      assert_have_selector('select optgroup option', :content => 'Yoda', :value => 'Yoda')
+      assert_have_selector('select optgroup option', :content => 'Obiwan', :value => '1')
+      assert_have_selector('select optgroup option', :content => 'Palpatine', :value => 'Palpatine')
+      assert_have_selector('select optgroup option', :content => 'Darth Vader', :value => '3')
     end
 
     should "display select tag in slim" do
@@ -704,10 +826,20 @@ describe "FormHelpers" do
       assert_have_selector('select option', :content => 'green',  :value => 'green')
       assert_have_selector('select option', :content => 'orange', :value => 'orange')
       assert_have_selector('select option', :content => 'purple', :value => 'purple')
-      assert_have_selector 'form.advanced-form select', :name => 'fav_color'
+      assert_have_selector('form.advanced-form select', :name => 'fav_color')
       assert_have_selector('select option', :content => 'green',  :value => '1')
       assert_have_selector('select option', :content => 'orange', :value => '2', :selected => 'selected')
       assert_have_selector('select option', :content => 'purple', :value => '3')
+      assert_have_selector('select optgroup', :label => 'foo')
+      assert_have_selector('select optgroup', :label => 'bar')
+      assert_have_selector('select optgroup option', :content => 'foo', :value => 'foo')
+      assert_have_selector('select optgroup option', :content => 'bar', :value => 'bar')
+      assert_have_selector('select optgroup', :label => 'Friends')
+      assert_have_selector('select optgroup', :label => 'Enemies')
+      assert_have_selector('select optgroup option', :content => 'Yoda', :value => 'Yoda')
+      assert_have_selector('select optgroup option', :content => 'Obiwan', :value => '1')
+      assert_have_selector('select optgroup option', :content => 'Palpatine', :value => 'Palpatine')
+      assert_have_selector('select optgroup option', :content => 'Darth Vader', :value => '3')
     end
   end
 
@@ -734,6 +866,26 @@ describe "FormHelpers" do
       assert_have_selector 'form.simple-form input[type=submit]', :count => 1, :value => "Submit"
       assert_have_selector 'form.advanced-form input[type=submit]', :count => 1, :value => "Login"
     end
+
+    context 'for omitted args' do
+      should "display submit tag with default caption" do
+        actual_html = submit_tag()
+        assert_has_tag(:input, :type => 'submit', :value => 'Submit') { actual_html }
+      end
+    end
+
+    context 'for omitted caption arg' do
+      should "display submit tag with default caption" do
+        actual_html = submit_tag(:class => 'success')
+        assert_has_tag(:input, :type => 'submit', :class => 'success', :value => 'Submit') { actual_html }
+      end
+
+      should "display submit tag without caption value when nil" do
+        actual_html = submit_tag(nil, :class => 'success')
+        assert_has_tag(:input, :type => 'submit', :class => 'success') { actual_html }
+        assert_has_no_tag(:input, :type => 'submit', :class => 'success', :value => 'Submit') { actual_html }
+      end
+    end
   end
 
   context 'for #button_tag method' do
@@ -808,5 +960,59 @@ describe "FormHelpers" do
       end
       assert_has_tag('form button', :type => 'submit', :content => "My button's content", :title => "My button") { actual_html }
     end
+
+    should 'display correct button_to in erb' do
+      visit '/erb/button_to'
+      assert_have_selector('form', :action => '/foo')
+      assert_have_selector('form label', :for => 'username', :content => 'Username: ')
+      assert_have_selector('form', :action => '/bar')
+      assert_have_selector('#test-point ~ form > input[type=submit]', :value => 'Bar button')
+    end
+
+    should 'display correct button_to in haml' do
+      visit '/haml/button_to'
+      assert_have_selector('form', :action => '/foo')
+      assert_have_selector('form label', :for => 'username', :content => 'Username: ')
+      assert_have_selector('form', :action => '/bar')
+      assert_have_selector('#test-point ~ form > input[type=submit]', :value => 'Bar button')
+    end
+
+    should 'display correct button_to in slim' do
+      visit '/slim/button_to'
+      assert_have_selector('form', :action => '/foo')
+      assert_have_selector('form label', :for => 'username', :content => 'Username: ')
+      assert_have_selector('form', :action => '/bar')
+      assert_have_selector('#test-point ~ form > input[type=submit]', :value => 'Bar button')
+    end
+  end
+
+  context 'for #range_field_tag' do
+    should "create an input tag with min and max options" do
+      actual_html = range_field_tag('ranger', :min => 20, :max => 50)
+      assert_has_tag('input', :type => 'range', :name => 'ranger', :min => '20', :max => '50') { actual_html }
+    end
+
+    should "create an input tag with range" do
+      actual_html = range_field_tag('ranger', :range => 1..20)
+      assert_has_tag('input', :min => '1', :max => '20') { actual_html }
+    end
+
+    should "display correct range_field_tag in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_min_max', :min => '1', :max => '50', :count => 1
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_range', :min => '1', :max => '5', :count => 1
+    end
+
+    should "display correct range_field_tag in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_min_max', :min => '1', :max => '50', :count => 1
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_range', :min => '1', :max => '5', :count => 1
+    end
+
+    should "display correct range_field_tag in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_min_max', :min => '1', :max => '50', :count => 1
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_range', :min => '1', :max => '5', :count => 1
+    end
   end
 end

data/test/test_tag_helpers.rb

@@ -37,8 +37,8 @@ describe "TagHelpers" do
     end
 
     should "escape html" do
-      actual_html = tag(:br, :class => 'Example "bar"')
-      assert_equal "<br class=\"Example &quot;bar&quot;\" />", actual_html
+      actual_html = tag(:br, :class => 'Example <foo> & "bar"')
+      assert_equal "<br class=\"Example &lt;foo&gt; &amp; &quot;bar&quot;\" />", actual_html
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,9 @@ files:
 - lib/padrino-helpers/translation_helpers.rb
 - padrino-helpers.gemspec
 - test/fixtures/markup_app/app.rb
+- test/fixtures/markup_app/views/button_to.erb
+- test/fixtures/markup_app/views/button_to.haml
+- test/fixtures/markup_app/views/button_to.slim
 - test/fixtures/markup_app/views/capture_concat.erb
 - test/fixtures/markup_app/views/capture_concat.haml
 - test/fixtures/markup_app/views/capture_concat.slim
@@ -151,6 +154,7 @@ files:
 - test/fixtures/render_app/views/template/some_template.haml
 - test/helper.rb
 - test/test_asset_tag_helpers.rb
+- test/test_breadcrumb_helpers.rb
 - test/test_form_builder.rb
 - test/test_form_helpers.rb
 - test/test_format_helpers.rb
@@ -172,9 +176,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1875793301041170039
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,6 +190,9 @@ specification_version: 3
 summary: Helpers for padrino
 test_files:
 - test/fixtures/markup_app/app.rb
+- test/fixtures/markup_app/views/button_to.erb
+- test/fixtures/markup_app/views/button_to.haml
+- test/fixtures/markup_app/views/button_to.slim
 - test/fixtures/markup_app/views/capture_concat.erb
 - test/fixtures/markup_app/views/capture_concat.haml
 - test/fixtures/markup_app/views/capture_concat.slim
@@ -241,6 +245,7 @@ test_files:
 - test/fixtures/render_app/views/template/some_template.haml
 - test/helper.rb
 - test/test_asset_tag_helpers.rb
+- test/test_breadcrumb_helpers.rb
 - test/test_form_builder.rb
 - test/test_form_helpers.rb
 - test/test_format_helpers.rb