padrino-helpers 0.10.5 → 0.10.6.a

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -153,7 +153,7 @@ module Padrino
       # @api public
       def feed_tag(mime, url, options={})
         full_mime = (mime == :atom) ? 'application/atom+xml' : 'application/rss+xml'
-        content_tag(:link, options.reverse_merge(:rel => 'alternate', :type => full_mime, :title => mime, :href => url))
+        tag(:link, options.reverse_merge(:rel => 'alternate', :type => full_mime, :title => mime, :href => url))
       end
 
       ##
@@ -291,9 +291,9 @@ module Padrino
       # @api public
       def javascript_include_tag(*sources)
         options = sources.extract_options!.symbolize_keys
-        options.reverse_merge!(:type => 'text/javascript', :content => "")
+        options.reverse_merge!(:type => 'text/javascript')
         sources.flatten.map { |source|
-          tag(:script, options.reverse_merge(:src => asset_path(:js, source)))
+          content_tag(:script, nil, options.reverse_merge(:src => asset_path(:js, source)))
         }.join("\n")
       end
 

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

@@ -42,6 +42,37 @@ module Padrino
           @template.text_field_tag field_name(field), options
         end
 
+       def number_field(field, options={})
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.merge!(:class => field_error(field, options))
+          @template.number_field_tag field_name(field), options
+        end
+
+        def telephone_field(field, options={})
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.merge!(:class => field_error(field, options))
+          @template.telephone_field_tag field_name(field), options
+        end
+        alias_method :phone_field, :telephone_field
+
+        def email_field(field, options={})
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.merge!(:class => field_error(field, options))
+          @template.email_field_tag field_name(field), options
+        end
+
+        def search_field(field, options={})
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.merge!(:class => field_error(field, options))
+          @template.search_field_tag field_name(field), options
+        end
+
+        def url_field(field, options={})
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.merge!(:class => field_error(field, options))
+          @template.url_field_tag field_name(field), options
+        end
+
         # f.text_area :summary, :value => "(enter summary)", :id => 'summary'
         def text_area(field, options={})
           options.reverse_merge!(:value => field_value(field), :id => field_id(field))

data/lib/padrino-helpers/form_helpers.rb

@@ -140,9 +140,9 @@ module Padrino
       #   @param [Hash]           options  Error message display options.
       #   @option options [String] :header_tag ("h2")
       #     Used for the header of the error div
-      #   @option options [String] :id ("errorExplanation")
+      #   @option options [String] :id ("field-errors")
       #     The id of the error div.
-      #   @option options [String] :class ("errorExplanation")
+      #   @option options [String] :class ("field-errors")
       #     The class of the error div.
       #   @option options [Array<Object>]  :object
       #     The object (or array of objects) for which to display errors,
@@ -222,7 +222,7 @@ module Padrino
       #   The field on the +object+ to display the error for.
       # @param [Hash] options
       #   The options to control the error display.
-      # @option options [String] :tag ("div")
+      # @option options [String] :tag ("span")
       #   The tag that encloses the error.
       # @option options [String] :prepend ("")
       #   The text to prepend before the field error.
@@ -289,29 +289,216 @@ module Padrino
       end
 
       ##
-      # Constructs a text field input from the given options
+      # Creates a text field input with the given name and options
       #
-      # @macro [new] input_field_doc
-      #   @param [String] name
-      #     The name of the input field.
+      # @macro [new] text_field
+      #   @param [Symbol] name
+      #     The name of the input to create.
       #   @param [Hash] options
-      #     The html options for the input field.
-      #
-      #   @return [String] The html input field based on the +options+ specified
+      #     The HTML options to include in this field.
+      #
+      #   @option options [String] :id
+      #     Specifies a unique identifier for the field.
+      #   @option options [String] :class
+      #     Specifies the stylesheet class of the field.
+      #   @option options [String] :name
+      #     Specifies the name of the field.
+      #   @option options [String] :accesskey
+      #     Specifies a shortcut key to access the field.
+      #   @option options [Integer] :tabindex
+      #     Specifies the tab order of the field.
+      #   @option options [Integer] :maxlength
+      #     Specifies the maximum length, in characters, of the field.
+      #   @option options [Integer] :size
+      #     Specifies the width, in characters, of the field.
+      #   @option options [String] :placeholder
+      #     Specifies a short hint that describes the expected value of the field.
+      #   @option options [Boolean] :hidden
+      #     Specifies whether or not the field is hidden from view.
+      #   @option options [Boolean] :spellcheck
+      #     Specifies whether or not the field should have it's spelling and grammar checked for errors.
+      #   @option options [Boolean] :draggable
+      #     Specifies whether or not the field is draggable. (true, false, :auto)
+      #   @option options [String] :pattern
+      #     Specifies the regular expression pattern that the field's value is checked against.
+      #   @option options [Symbol] :autocomplete
+      #     Specifies whether or not the field should have autocomplete enabled. (:on, :off)
+      #   @option options [Boolean] :autofocus
+      #     Specifies whether or not the field should automatically get focus when the page loads.
+      #   @option options [Boolean] :required
+      #     Specifies whether or not the field is required to be completeled before the form is submitted.
+      #   @option options [Boolean] :readonly
+      #     Specifies whether or not the field is read only.
+      #   @option options [Boolean] :disabled
+      #     Specifies whether or not the field is disabled.
+      #
+      #   @return [String]
+      #     Generated HTML with specified +options+
       #
       # @example
-      #   text_field_tag :username, :class => 'long'
+      #   text_field_tag :first_name, :maxlength => 40, :required => true
+      #   # => <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">
+      #
+      #   text_field_tag :username, :placeholder => 'Your Username'
+      #   # => <input name="username" placeholder="Your Username" type="text">
       #
       # @api public
       def text_field_tag(name, options={})
-        options.reverse_merge!(:name => name)
-        input_tag(:text, options)
+        input_tag(:text, options.reverse_merge!(:name => name))
+      end
+
+      ##
+      # Creates a number field input with the given name and options
+      #
+      # @macro [new] number_field
+      #   @param [Symbol] name
+      #     The name of the input to create.
+      #   @param [Hash] options
+      #     The HTML options to include in this field.
+      #
+      #   @option options [String] :id
+      #     Specifies a unique identifier for the field.
+      #   @option options [String] :class
+      #     Specifies the stylesheet class of the field.
+      #   @option options [String] :name
+      #     Specifies the name of the field.
+      #   @option options [String] :accesskey
+      #     Specifies a shortcut key to access the field.
+      #   @option options [Integer] :tabindex
+      #     Specifies the tab order of the field.
+      #   @option options [Integer] :min
+      #     Specifies the minimum value of the field.
+      #   @option options [Integer] :max
+      #     Specifies the maximum value of the field.
+      #   @option options [Integer] :step
+      #     Specifies the legal number intervals of the field.
+      #   @option options [Boolean] :hidden
+      #     Specifies whether or not the field is hidden from view.
+      #   @option options [Boolean] :spellcheck
+      #     Specifies whether or not the field should have it's spelling and grammar checked for errors.
+      #   @option options [Boolean] :draggable
+      #     Specifies whether or not the field is draggable. (true, false, :auto)
+      #   @option options [String] :pattern
+      #     Specifies the regular expression pattern that the field's value is checked against.
+      #   @option options [Symbol] :autocomplete
+      #     Specifies whether or not the field should have autocomplete enabled. (:on, :off)
+      #   @option options [Boolean] :autofocus
+      #     Specifies whether or not the field should automatically get focus when the page loads.
+      #   @option options [Boolean] :required
+      #     Specifies whether or not the field is required to be completeled before the form is submitted.
+      #   @option options [Boolean] :readonly
+      #     Specifies whether or not the field is read only.
+      #   @option options [Boolean] :disabled
+      #     Specifies whether or not the field is disabled.
+      #
+      #   @return [String]
+      #     Generated HTML with specified +options+
+      #
+      # @example
+      #   number_field_tag :quanity, :class => 'numeric'
+      #   # => <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">
+      #
+      #   number_field_tag :credit_card, :autocomplete => :off
+      #   # => <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">
+      #
+      # @api public
+      def number_field_tag(name, options={})        
+        input_tag(:number, options.reverse_merge(:name => name))
+      end
+      
+      ##
+      # Creates a telephone field input with the given name and options
+      #
+      # @macro text_field
+      #
+      # @example
+      #   telephone_field_tag :phone_number, :class => 'string'
+      #   # => <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">
+      #
+      # @api public
+      def telephone_field_tag(name, options={})
+        input_tag(:tel, options.reverse_merge(:name => name))
+      end
+      alias_method :phone_field_tag, :telephone_field_tag
+
+      ##
+      # Creates an email field input with the given name and options
+      #
+      # @macro text_field
+      #
+      # @example
+      #   email_field_tag :email, :placeholder => 'you@example.com'
+      #   # => <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">
+      #
+      # @api public
+      def email_field_tag(name, options={})
+        input_tag(:email, options.reverse_merge(:name => name))
+      end
+      
+      ##
+      # Creates a search field input with the given name and options
+      #
+      # @macro text_field
+      #
+      # @example
+      #  search_field_tag :search, :placeholder => 'Search this website...'
+      #  # => <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">
+      #
+      #  search_field_tag :search, :id => 'search'
+      #  # => <input name="search" id="search" type="search">
+      #
+      #  search_field_tag :search, :autofocus => true
+      #  # => <input name="search" autofocus type="search">
+      #
+      # @api public
+      def search_field_tag(name, options={})
+        input_tag(:search, options.reverse_merge(:name => name))
+      end
+
+      ##
+      # Creates a url field input with the given name and options
+      #
+      # @macro text_field
+      #
+      # @example
+      #  url_field_tag :favorite_website, :placeholder => 'http://padrinorb.com'
+      #  <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">
+      #
+      # @api public
+      def url_field_tag(name, options={})
+        input_tag(:url, options.reverse_merge(:name => name))
       end
 
       ##
       # Constructs a hidden field input from the given options
       #
-      # @macro input_field_doc
+      # @macro text_field
       #
       # @example
       #   hidden_field_tag :session_key, :value => "__secret__"
@@ -325,7 +512,7 @@ module Padrino
       ##
       # Constructs a text area input from the given options
       #
-      # @macro input_field_doc
+      # @macro text_field
       #
       # @example
       #   text_area_tag :username, :class => 'long', :value => "Demo?"
@@ -339,7 +526,7 @@ module Padrino
       ##
       # Constructs a password field input from the given options
       #
-      # @macro input_field_doc
+      # @macro text_field
       #
       # @example
       #   password_field_tag :password, :class => 'long'
@@ -353,7 +540,7 @@ module Padrino
       ##
       # Constructs a check_box from the given options
       #
-      # @macro input_field_doc
+      # @macro text_field
       #
       # @example
       #   check_box_tag :remember_me, :value => 'Yes'
@@ -367,7 +554,7 @@ module Padrino
       ##
       # Constructs a radio_button from the given options
       #
-      # @macro input_field_doc
+      # @macro text_field
       #
       # @example
       #   radio_button_tag :remember_me, :value => 'true'
@@ -381,7 +568,7 @@ module Padrino
       ##
       # Constructs a file field input from the given options
       #
-      # @macro input_field_doc
+      # @macro text_field
       #
       # @example
       #   file_field_tag :photo, :class => 'long'

data/lib/padrino-helpers/format_helpers.rb

@@ -81,11 +81,11 @@ module Padrino
       # @api public
       def simple_format(text, options={})
         t = options.delete(:tag) || :p
-        start_tag = tag(t, options.merge(:open => true))
+        start_tag = tag(t, options)
         text = text.to_s.dup
         text.gsub!(/\r\n?/, "\n")                    # \r\n and \r -> \n
         text.gsub!(/\n\n+/, "</#{t}>\n\n#{start_tag}")  # 2+ newline  -> paragraph
-        text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />') # 1 newline   -> br
+        text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br>') # 1 newline   -> br
         text.insert 0, start_tag
         text << "</#{t}>"
       end

data/lib/padrino-helpers/tag_helpers.rb

@@ -2,99 +2,212 @@ module Padrino
   module Helpers
     ##
     # Helpers related to producing html tags within templates.
-    #
+    ##
     module TagHelpers
       ##
       # Tag values escaped to html entities
-      #
+      ##
       ESCAPE_VALUES = {
         "<" => "&lt;",
         ">" => "&gt;",
         '"' => "&quot;"
       }
 
+      BOOLEAN_ATTRIBUTES = [
+        :autoplay,
+        :autofocus,
+        :formnovalidate,
+        :checked,
+        :disabled,
+        :hidden,
+        :loop,
+        :multiple,
+        :muted,
+        :readonly,
+        :required,
+        :selected
+      ]
+
       ##
-      # Creates an html tag with given name, content and options
+      # Creates an HTML tag with given name, content, and options
       #
-      # @overload content_tag(name, content, options)
-      #   @param [Symbol]  name     The html type of tag.
-      #   @param [String]  content  The contents in the tag.
-      #   @param [Hash]    options  The html options to include in this tag.
-      # @overload content_tag(name, options, &block)
-      #   @param [Symbol]  name     The html type of tag.
-      #   @param [Hash]    options  The html options to include in this tag.
-      #   @param [Proc]    block    The block returning html content
+      # @overload content_tag(name, content, options = nil)
+      #   @param [Symbol] name
+      #     The name of the HTML tag to create.
+      #   @param [String] content
+      #     The content inside of the the tag.
+      #   @param [Hash] options
+      #     The HTML options to include in this tag.
       #
-      # @return [String] The html generated for the tag.
+      # @overload content_tag(name, options = nil, &block)
+      #   @param [Symbol] name
+      #     The name of the HTML tag to create.
+      #   @param [Hash] options
+      #     The HTML options to include in this tag.
+      #   @param [Proc] block
+      #     The block returning HTML content.
+      #
+      # @macro [new] global_html_attributes
+      #   @option options [String] :id
+      #     Specifies a unique identifier for the element.
+      #   @option options [String] :class
+      #     Specifies the stylesheet class of the element.
+      #   @option options [String] :title
+      #     Specifies the title for the element.
+      #   @option options [String] :accesskey
+      #     Specifies a shortcut key to access the element.
+      #   @option options [Symbol] :dropzone
+      #     Specifies what happens when dragged items are dropped on the element. (:copy, :link, :move)
+      #   @option options [Boolean] :hidden
+      #     Specifies whether or not the element is hidden from view.
+      #   @option options [Boolean] :draggable
+      #     Specifies whether or not the element is draggable. (true, false, :auto)
+      #   @option options [Boolean] :contenteditable
+      #     Specifies whether or not the element is editable.
+      #
+      # @return [String]
+      #   Generated HTML with specified +options+
       #
       # @example
-      #   content_tag(:p, "hello", :class => 'light')
-      #   content_tag(:p, :class => 'dark') { ... }
+      #   content_tag(:p, 'Hello World', :class => 'light')
+      #
+      #   # => <p class="light">
+      #   # =>   Hello World
+      #   # => </p>
+      #
+      #   content_tag(:p, :class => 'dark') do
+      #     link_to 'Padrino', 'http://www.padrinorb.com'
+      #   end
+      #
+      #   # => <p class="dark">
+      #   # =>   <a href="http://www.padrinorb.com">Padrino</a>
+      #   # => </p>
       #
       # @api public
-      def content_tag(*args, &block)
-        name = args.first
-        options = args.extract_options!
-        tag_html = block_given? ? capture_html(&block) : args[1]
-        tag_result = tag(name, options.merge(:content => tag_html))
-        block_is_template?(block) ? concat_content(tag_result) : tag_result
+      def content_tag(name, content = nil, options = nil, &block)
+        if block_given?
+          options = content if content.is_a?(Hash)
+          content = capture_html(&block)
+        end
+
+        content = content.join("\n") if content.respond_to?(:join)
+
+        output = "<#{name}#{tag_options(options) if options}>#{content}</#{name}>"
+        block_is_template?(block) ? concat_content(output) : output
       end
 
       ##
-      # Creates an html input field with given type and options
+      # Creates an HTML input field with the given type and options
       #
       # @param [Symbol] type
-      #   The html type of tag to create.
+      #   The type of input to create.
       # @param [Hash] options
-      #   The html options to include in this tag.
+      #   The HTML options to include in this input.
       #
-      # @return [String] The html for the input tag.
+      # @option options [String] :id
+      #   Specifies a unique identifier for the input.
+      # @option options [String] :class
+      #   Specifies the stylesheet class of the input.
+      # @option options [String] :name
+      #   Specifies the name of the input.
+      # @option options [String] :accesskey
+      #   Specifies a shortcut key to access the input.
+      # @option options [Integer] :tabindex
+      #   Specifies the tab order of the input.
+      # @option options [Boolean] :hidden
+      #   Specifies whether or not the input is hidden from view.
+      # @option options [Boolean] :spellcheck
+      #   Specifies whether or not the input should have it's spelling and grammar checked for errors.
+      # @option options [Boolean] :draggable
+      #   Specifies whether or not the input is draggable. (true, false, :auto)
+      # @option options [String] :pattern
+      #   Specifies the regular expression pattern that the input's value is checked against.
+      # @option options [Symbol] :autocomplete
+      #   Specifies whether or not the input should have autocomplete enabled. (:on, :off)
+      # @option options [Boolean] :autofocus
+      #   Specifies whether or not the input should automatically get focus when the page loads.
+      # @option options [Boolean] :required
+      #   Specifies whether or not the input is required to be completeled before the form is submitted.
+      # @option options [Boolean] :readonly
+      #   Specifies whether or not the input is read only.
+      # @option options [Boolean] :disabled
+      #   Specifies whether or not the input is disabled.
+      #
+      # @return [String]
+      #   Generated HTML with specified +options+
       #
       # @example
-      #   input_tag :text, :class => "test"
-      #   input_tag :password, :size => "20"
+      #   input_tag :text, :name => 'handle'
+      #   # => <input type="test" name="handle">
+      #
+      #   input_tag :password, :name => 'password', :size => 20
+      #   # => <input type="password" name="password" size="20">
+      #
+      #   input_tag :text, :name => 'username', :required => true, :autofocus => true
+      #   # => <input type="text" name="username" required autofocus>
+      #
+      #   input_tag :number, :name => 'credit_card', :autocomplete => :off
+      #   # => <input type="number" autocomplete="off">
       #
       # @api semipublic
       def input_tag(type, options = {})
-        options.reverse_merge!(:type => type)
-        tag(:input, options)
+        tag(:input, options.reverse_merge!(:type => type))
       end
 
       ##
-      # Creates an html tag with the given name and options
+      # Creates an HTML tag with the given name and options
       #
-      # @param [Symbol] type
-      #   The html type of tag to create.
+      # @param [Symbol] name
+      #  The name of the HTML tag to create.
       # @param [Hash] options
-      #   The html options to include in this tag.
+      #  The HTML options to include in this tag.
+      #
+      # @macro global_html_attributes
       #
-      # @return [String] The html for the input tag.
+      # @return [String]
+      #   Generated HTML with specified +options+
       #
       # @example
-      #   tag(:br, :style => 'clear:both')
-      #   tag(:p, :content => "hello", :class => 'large')
+      #   tag :hr, :class => 'dotted'
+      #   # => <hr class="dotted">
+      #
+      #   tag :input, :name => 'username', :type => :text
+      #   # => <input name="username" type="text">
+      #
+      #   tag :img, :src => 'images/pony.jpg', :alt => 'My Little Pony'
+      #   # => <img src="images/pony.jpg" alt="My Little Pony">
+      #
+      #   tag :img, :src => 'sinatra.jpg, :data => { :nsfw => false, :geo => [34.087, -118.407] }
+      #   # => <img src="sinatra.jpg" data-nsfw="false" data-geo="34.087 -118.407">
       #
       # @api public
-      def tag(name, options={})
-        content, open_tag = options.delete(:content), options.delete(:open)
-        content = content.join("\n") if content.respond_to?(:join)
-        identity_tag_attributes.each { |attr| options[attr] = attr.to_s if options[attr]  }
-        html_attrs = options.map { |a, v| v.nil? || v == false ? nil : "#{a}=\"#{escape_value(v)}\"" }.compact.join(" ")
-        base_tag = (html_attrs.present? ? "<#{name} #{html_attrs}" : "<#{name}")
-        base_tag << (open_tag ? ">" : (content ? ">#{content}</#{name}>" : " />"))
+      def tag(name, options = nil)
+        "<#{name}#{tag_options(options) if options}>"
       end
 
       private
         ##
-        # Returns a list of attributes which can only contain an identity value (i.e selected)
-        #
-        def identity_tag_attributes
-          [:checked, :disabled, :selected, :multiple]
+        # Returns a compiled list of HTML attributes
+        ##
+        def tag_options(options)
+          return if options.blank?
+          attributes = []
+          options.each do |attribute, value|
+            next if value.nil? || value == false
+            if attribute == :data && value.is_a?(Hash)
+              value.each { |k, v| attributes << %[data-#{k.to_s.dasherize}="#{escape_value(v)}"] }
+            elsif BOOLEAN_ATTRIBUTES.include?(attribute)
+              attributes << attribute.to_s
+            else
+              attributes << %[#{attribute}="#{escape_value(value)}"]
+            end
+          end
+          " #{attributes.join(' ')}"
         end
 
         ##
         # Escape tag values to their HTML/XML entities.
-        #
+        ##
         def escape_value(string)
           string.to_s.gsub(Regexp.union(*ESCAPE_VALUES.keys)){|c| ESCAPE_VALUES[c] }
         end