padrino-helpers 0.12.8.1 → 0.12.9

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 008eb5f6eb8cd941fc5498e1ed53985dd84d3de4
-  data.tar.gz: 65daa6ac52444c12c328e95bad7b56ba0133aa32
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWZmYWM3OThmOGFlNjFhMTZhMzUxNWFjYjBkNGQyZjYxOTI2NTM3Yg==
+  data.tar.gz: !binary |-
+    OWUzZmRkZGE3NTlkZTY4OWY5OGEyN2I3YzQ2YWE5NDAwZTUwOTQxNw==
 SHA512:
-  metadata.gz: 466682d38365cd8e3c5cbb048fade5cde1c09f1de749c2e922f40ed47786e442433cdea68ee5e09c7d4411152f70d3a330ae32b2e7ca20415e5ccd6c86b184d6
-  data.tar.gz: 3e23b26193925ffd0002f60091b5b041302a675ea9946ca997ecbb9ac1f0579843e80ffaa645fd2ca217ca5693be1419e2948563acc910602c934804eae24355
+  metadata.gz: !binary |-
+    YzBkY2FiOGQzNmEwNTA2N2NjMWQzZDIwY2Y4ZjU1OWJhOWI3NGFjZTVhZDhi
+    OTQxYjIyMGQ2MDZhYzdlZmY3MDQxZDBiYmE5NWI0MjUzZjgzNDUwZjg4NzIw
+    OTI4M2ZmYWYzMDhhMjlhY2Y4OWMyMDQ0Y2VmMTczYjQ1NDQ0ZDM=
+  data.tar.gz: !binary |-
+    YmYyOWE2NzFlZmNjYjJmMmJiZjM5NzFiMDg5ZTQ2NDljYzUzZDY2MjlhMGE0
+    NDNlMmZkZjVlZWQwN2ZmNzg5NzQ4YjgwZjdkZTlhMDVkZDE0ZTU2NjQ0YzAz
+    ZTVkZjA0MWI3NjMyZTE4NGE0NTBkYjM3ZGE4YTFkODUyZDVhYmQ=

data/Rakefile

@@ -1,5 +1 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-
-require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/lib/padrino-helpers.rb

@@ -41,8 +41,9 @@ module Padrino
       #   end
       #
       def registered(app)
+        require 'padrino/rendering'
         app.register Padrino::Rendering
-        app.set :default_builder, 'StandardFormBuilder'
+        app.set :default_builder, 'StandardFormBuilder' unless app.respond_to?(:default_builder)
         included(app)
       end
 

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -75,14 +75,14 @@ module Padrino
       # condition padrino return true/false if the request.path_info match the given url.
       #
       def link_to(*args, &block)
-        options  = args.extract_options!
+        options = args.extract_options!
         name = block_given? ? '' : args.shift
         href = args.first
         if fragment = options[:fragment] || options[:anchor]
           warn 'Options :anchor and :fragment are deprecated for #link_to. Please use :fragment for #url'
           href << '#' << fragment.to_s
         end
-        options.reverse_merge!(:href => href || '#')
+        options = { :href => href ? escape_link(href) : '#' }.update(options)
         return name unless parse_conditions(href, options)
         block_given? ? content_tag(:a, options, &block) : content_tag(:a, name, options)
       end
@@ -204,11 +204,23 @@ module Padrino
       #
       def image_tag(url, options={})
         options.reverse_merge!(:src => image_path(url))
+        options[:alt] ||= image_alt(url) unless url =~ /\A(?:cid|data):/ || url.blank?
         tag(:img, options)
       end
 
       ##
-      # Returns an html script tag for each of the sources provided.
+      # Returns a string suitable for an alt attribute of img element.
+      #
+      # @param [String] src
+      #   The source path for the image tag.
+      # @return [String] The alt attribute value.
+      #
+      def image_alt(src)
+        File.basename(src, '.*').sub(/-[[:xdigit:]]{32,64}\z/, '').tr('-_', ' ').capitalize
+      end
+
+      ##
+      # Returns a html link tag for each of the sources provided.
       # You can pass in the filename without extension or a symbol and we search it in your +appname.public_folder+
       # like app/public/stylesheets for inclusion. You can provide also a full path.
       #
@@ -298,7 +310,7 @@ module Padrino
       #
       def asset_path(kind, source = nil)
         kind, source = source, kind if source.nil?
-        source = asset_normalize_extension(kind, URI.escape(source.to_s))
+        source = asset_normalize_extension(kind, escape_link(source.to_s))
         return source if source =~ ABSOLUTE_URL_PATTERN || source =~ /^\//
         source = File.join(asset_folder_name(kind), source)
         timestamp = asset_timestamp(source)

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

@@ -125,6 +125,34 @@ module Padrino
           @template.image_submit_tag source, options
         end
 
+        def datetime_field(field, options={})
+          @template.datetime_field_tag field_name(field), default_options(field, options)
+        end
+
+        def datetime_local_field(field, options={})
+          @template.datetime_local_field_tag field_name(field), default_options(field, options)
+        end
+
+        def date_field(field, options={})
+          @template.date_field_tag field_name(field), default_options(field, options)
+        end
+
+        def month_field(field, options={})
+          @template.month_field_tag field_name(field), default_options(field, options)
+        end
+
+        def week_field(field, options={})
+          @template.week_field_tag field_name(field), default_options(field, options)
+        end
+
+        def time_field(field, options={})
+          @template.time_field_tag field_name(field), default_options(field, options)
+        end
+
+        def color_field(field, options={})
+          @template.color_field_tag field_name(field), default_options(field, options)
+        end
+
         ##
         # Supports nested fields for a child model within a form.
         # f.fields_for :addresses
@@ -151,7 +179,10 @@ module Padrino
 
         # 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]
+          [:hidden_field, :text_field, :text_area, :password_field, :file_field, :radio_button, :check_box, :select,
+            :number_field, :telephone_field, :email_field, :search_field, :url_field,
+            :datetime_field, :datetime_local_field, :date_field, :month_field, :week_field, :time_field, :color_field,
+          ]
         end
 
         ##
@@ -161,6 +192,13 @@ module Padrino
           I18n.translate("#{object_model_name}.attributes.#{field}", :count => 1, :default => field.to_s.humanize, :scope => :models)
         end
 
+        ##
+        # Returns the object's models name.
+        #
+        def object_model_name(explicit_object=object)
+          explicit_object.is_a?(Symbol) ? explicit_object : explicit_object.class.to_s.underscore.gsub(/\//, '_')
+        end
+
         ##
         # Returns the name for the given field.
         # field_name(:username) => "user[username]"

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

@@ -17,7 +17,7 @@ module Padrino
         (self.field_types - [ :hidden_field, :radio_button ]).each do |field_type|
           class_eval <<-EOF
           def #{field_type}_block(field, options={}, label_options={})
-            label_options.reverse_merge!(:caption => options.delete(:caption)) if options[:caption]
+            label_options = { :caption => options[:caption] }.update(label_options) if options[:caption]
             field_html = label(field, label_options)
             field_html << #{field_type}(field, options)
             @template.content_tag(:p, field_html)

data/lib/padrino-helpers/form_helpers.rb

@@ -92,7 +92,7 @@ module Padrino
       #
       def form_tag(url, options={}, &block)
         options = {
-          :action => url,
+          :action => escape_link(url),
           :protect_from_csrf => is_protected_from_csrf?,
           'accept-charset' => 'UTF-8'
         }.update(options)
@@ -617,6 +617,185 @@ module Padrino
         input_tag(:range, options)
       end
 
+      DATETIME_ATTRIBUTES = [:value, :max, :min].freeze
+      COLOR_CODE_REGEXP   = /\A#([0-9a-fA-F]{3}){1,2}\z/.freeze
+
+      ##
+      # Constructs a datetime tag from the given options.
+      #
+      # @example
+      #   datetime_field_tag('datetime_with_min_max', :min => DateTime.new(1993, 2, 24, 12, 30, 45),
+      #                                               :max => DateTime.new(2000, 4, 1, 12, 0, 0))
+      #   datetime_field_tag('datetime_with_value', :value => DateTime.new(2000, 4, 1, 12, 0, 0))
+      #
+      # @param [String] name
+      #   The name of the datetime field.
+      # @param [Hash] options
+      #   The html options for the datetime field.
+      # @option options [DateTime, String] :min
+      #  The min date time of the datetime field.
+      # @option options [DateTime, String] :max
+      #  The max date time of the datetime field.
+      # @option options [DateTime, String] :value
+      #  The value of the datetime field. See examples for details.
+      # @return [String] The html datetime field
+      #
+      def datetime_field_tag(name, options = {})
+        options = { :name => name }.update(options)
+        options = convert_attributes_into_datetime("%Y-%m-%dT%T.%L%z", options)
+        input_tag(:datetime, options)
+      end
+
+      ##
+      # Constructs a datetime-local tag from the given options.
+      #
+      # @example
+      #   datetime_local_field_tag('datetime_local_with_min_max', :min => DateTime.new(1993, 2, 24, 12, 30, 45),
+      #                                                           :max => DateTime.new(2000, 4, 1, 12, 0, 0))
+      #   datetime_local_field_tag('datetime_local_with_value', :value => DateTime.new(2000, 4, 1, 12, 0, 0))
+      #
+      # @param [String] name
+      #   The name of the datetime local field.
+      # @param [Hash] options
+      #   The html options for the datetime-local field.
+      # @option options [DateTime, String] :min
+      #  The min date time of the datetime-local field.
+      # @option options [DateTime, String] :max
+      #  The max date time of the datetime-local field.
+      # @option options [DateTime, String] :value
+      #  The value of the datetime field. See examples for details.
+      # @return [String] The html datetime-local field
+      #
+      def datetime_local_field_tag(name, options = {})
+        options = { :name => name }.update(options)
+        options = convert_attributes_into_datetime("%Y-%m-%dT%T", options)
+        input_tag(:"datetime-local", options)
+      end
+
+      ##
+      # Constructs a date tag from the given options.
+      #
+      # @example
+      #   date_field_tag('date_with_min_max', :min => DateTime.new(1993, 2, 24),
+      #                                       :max => DateTime.new(2000, 4, 1))
+      #   date_field_tag('date_with_value', :value => DateTime.new(2000, 4, 1))
+      #
+      # @param [String] name
+      #   The name of the date field.
+      # @param [Hash] options
+      #   The html options for the date field.
+      # @option options [DateTime, String] :min
+      #  The min date time of the date field.
+      # @option options [DateTime, String] :max
+      #  The max date time of the date field.
+      # @option options [DateTime, String] :value
+      #  The value of the date field. See examples for details.
+      # @return [String] The html date field
+      #
+      def date_field_tag(name, options = {})
+        options = { :name => name }.update(options)
+        options = convert_attributes_into_datetime("%Y-%m-%d", options)
+        input_tag(:date, options)
+      end
+
+      ##
+      # Constructs a month tag from the given options.
+      #
+      # @example
+      #   month_field_tag('month_with_min_max', :min => DateTime.new(1993, 2, 24),
+      #                                         :max => DateTime.new(2000, 4, 1))
+      #   month_field_tag('month_with_value', :value => DateTime.new(2000, 4, 1))
+      #
+      # @param [String] name
+      #   The name of the month field.
+      # @param [Hash] options
+      #   The html options for the month field.
+      # @option options [DateTime, String] :min
+      #  The min month time of the month field.
+      # @option options [DateTime, String] :max
+      #  The max month time of the month field.
+      # @option options [DateTime, String] :value
+      #  The value of the month field. See examples for details.
+      # @return [String] The html month field
+      #
+      def month_field_tag(name, options = {})
+        options = { :name => name }.update(options)
+        options = convert_attributes_into_datetime("%Y-%m", options)
+        input_tag(:month, options)
+      end
+
+      ##
+      # Constructs a week tag from the given options.
+      #
+      # @example
+      #   week_field_tag('week_with_min_max', :min => DateTime.new(1993, 2, 24),
+      #                                       :max => DateTime.new(2000, 4, 1))
+      #   week_field_tag('week_with_value', :value => DateTime.new(2000, 4, 1))
+      #
+      # @param [String] name
+      #   The name of the week field.
+      # @param [Hash] options
+      #   The html options for the week field.
+      # @option options [DateTime, String] :min
+      #  The min week time of the week field.
+      # @option options [DateTime, String] :max
+      #  The max week time of the week field.
+      # @option options [DateTime, String] :value
+      #  The value of the week field. See examples for details.
+      # @return [String] The html week field
+      #
+      def week_field_tag(name, options = {})
+        options = { :name => name }.update(options)
+        options = convert_attributes_into_datetime("%Y-W%W", options)
+        input_tag(:week, options)
+      end
+
+      ##
+      # Constructs a time tag from the given options.
+      #
+      # @example
+      #   time_field_tag('time_with_min_max', :max => Time.new(1993, 2, 24, 1, 19, 12),
+      #                                       :min => Time.new(2008, 6, 21, 13, 30, 0))
+      #   time_field_tag('time_with_value', :value => Time.new(2008, 6, 21, 13, 30, 0))
+      #
+      # @param [String] name
+      #   The name of the time field.
+      # @param [Hash] options
+      #   The html options for the time field.
+      # @option options [Time, DateTime, String] :min
+      #  The min time of the time field.
+      # @option options [Time, DateTime, String] :max
+      #  The max time of the time field.
+      # @option options [Time, DateTime, String] :value
+      #  The value of the time field. See examples for details.
+      # @return [String] The html time field
+      #
+      def time_field_tag(name, options = {})
+        options = { :name => name }.update(options)
+        options = convert_attributes_into_datetime("%T.%L", options)
+        input_tag(:time, options)
+      end
+
+      ##
+      # Constructs a color tag from the given options.
+      #
+      # @example
+      #   color_field_tag('color', :value => "#ff0000")
+      #   color_field_tag('color', :value => "#f00")
+      #
+      # @param [String] name
+      #   The name of the color field.
+      # @param [Hash] options
+      #   The html options for the color field.
+      # @option options [String] :value
+      #  The value of the color field. See examples for details.
+      #
+      def color_field_tag(name, options = {})
+        options = { :name => name }.update(options)
+        options[:value] = adjust_color(options[:value])
+        input_tag(:color, options)
+      end
+
       private
 
       ##
@@ -631,6 +810,46 @@ module Padrino
         builder_class = "Padrino::Helpers::FormBuilder::#{builder_class}".constantize if builder_class.is_a?(String)
         builder_class.new(self, object, options)
       end
+
+      ##
+      # Converts value into DateTime.
+      #
+      # @example
+      #   datetime_value('1993-02-24T12:30:45') #=> #<DateTime: 1993-02-24T12:30:45+00:00>
+      #
+      def datetime_value(value)
+        if value.kind_of?(String)
+          DateTime.parse(value) rescue nil
+        else
+          value
+        end
+      end
+
+      ##
+      # Converts special attributes into datetime format strings that conforms to RFC 3399.
+      #
+      def convert_attributes_into_datetime(format, options)
+        DATETIME_ATTRIBUTES.each_with_object(options) do |attribute|
+          value = datetime_value(options[attribute])
+          options[attribute] = value.strftime(format) if value.respond_to?(:strftime)
+        end
+      end
+
+      ##
+      # Adjusts color code for the given color.
+      #
+      # @example
+      #   adust_color("#000")    #=> "#000000"
+      #   adust_color("#ff0000") #=> "#ff0000"
+      #   adust_color("#foobar") #=> "#000000"
+      #
+      def adjust_color(color)
+        return "#000000" unless color =~ COLOR_CODE_REGEXP
+        return color if (color_size = color.size) == 7
+        color.slice(1, color_size - 1).each_char.with_object("#") do |chr, obj|
+          obj << chr * 2
+        end
+      end
     end
   end
 end

data/lib/padrino-helpers/form_helpers/options.rb

@@ -45,7 +45,9 @@ module Padrino
         #
         def option_is_selected?(value, caption, selected_values)
           Array(selected_values).any? do |selected|
-            [value.to_s, caption.to_s].include?(selected.to_s)
+            value ?
+              value.to_s == selected.to_s :
+              caption.to_s == selected.to_s
           end
         end
 
@@ -55,9 +57,9 @@ module Padrino
         def options_for_select(option_items, state = {})
           return [] if option_items.blank?
           option_items.map do |caption, value, attributes|
-            html_attributes = { :value => value ||= caption }.merge(attributes||{})
-            html_attributes[:selected] ||= option_is_selected?(value, caption, state[:selected])
-            html_attributes[:disabled] ||= option_is_selected?(value, caption, state[:disabled])
+            html_attributes = { :value => value || caption }.merge(attributes||{})
+            html_attributes[:selected] ||= option_is_selected?(html_attributes[:value], caption, state[:selected])
+            html_attributes[:disabled] ||= option_is_selected?(html_attributes[:value], caption, state[:disabled])
             content_tag(:option, caption, html_attributes)
           end
         end
@@ -90,7 +92,7 @@ module Padrino
             collection.map{ |item| [ item.send(fields.first), item.send(fields.last) ] }
           else
             options.delete(:options) || []
-          end        
+          end
         end
       end
     end

data/lib/padrino-helpers/output_helpers.rb

@@ -80,7 +80,7 @@ module Padrino
       #
       def concat_content(text="")
         if handler = find_proper_handler
-          handler.concat_to_template(text)
+          handler.concat_to_template(text, binding)
         else
           text
         end

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

@@ -46,7 +46,7 @@ module Padrino
         # @example
         #   @handler.concat_to_template("This will be output to the template buffer")
         #
-        def concat_to_template(text="")
+        def concat_to_template(text="", context=nil)
           text
         end