padrino-helpers 0.12.9 → 0.13.0.beta1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWZmYWM3OThmOGFlNjFhMTZhMzUxNWFjYjBkNGQyZjYxOTI2NTM3Yg==
-  data.tar.gz: !binary |-
-    OWUzZmRkZGE3NTlkZTY4OWY5OGEyN2I3YzQ2YWE5NDAwZTUwOTQxNw==
+SHA1:
+  metadata.gz: 90f809ec2266b9152c925d2f58349e4c21aad7ba
+  data.tar.gz: bd46c487a141f9dd7ec10e47c750a12563de6b42
 SHA512:
-  metadata.gz: !binary |-
-    YzBkY2FiOGQzNmEwNTA2N2NjMWQzZDIwY2Y4ZjU1OWJhOWI3NGFjZTVhZDhi
-    OTQxYjIyMGQ2MDZhYzdlZmY3MDQxZDBiYmE5NWI0MjUzZjgzNDUwZjg4NzIw
-    OTI4M2ZmYWYzMDhhMjlhY2Y4OWMyMDQ0Y2VmMTczYjQ1NDQ0ZDM=
-  data.tar.gz: !binary |-
-    YmYyOWE2NzFlZmNjYjJmMmJiZjM5NzFiMDg5ZTQ2NDljYzUzZDY2MjlhMGE0
-    NDNlMmZkZjVlZWQwN2ZmNzg5NzQ4YjgwZjdkZTlhMDVkZDE0ZTU2NjQ0YzAz
-    ZTVkZjA0MWI3NjMyZTE4NGE0NTBkYjM3ZGE4YTFkODUyZDVhYmQ=
+  metadata.gz: b6d5d486ffa13c48f4f228911a21eb05ee37137f8e089ab0ea11db55f3ce5fadf0780596a670380e6dbc0d9d52eb1b7e77cf163bd0c40627495c937c5e955e5a
+  data.tar.gz: d8545dcaf232f2c57905fd64370fba723bd60c8015cb4c5341df244d8aa21df9b070d65d64ffca40a7dcccc9b825495bb3be33c8869778738680dd9eb7c42131

data/lib/padrino-helpers.rb

@@ -6,6 +6,7 @@ require 'active_support/core_ext/string/conversions'  # to_date
 require 'active_support/option_merger'                # with_options
 require 'active_support/core_ext/object/with_options' # with_options
 require 'active_support/inflector'                    # humanize
+require 'active_support/core_ext/hash/except'         # Hash#except
 require 'padrino/rendering'
 
 FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__)
@@ -41,9 +42,8 @@ module Padrino
       #   end
       #
       def registered(app)
-        require 'padrino/rendering'
         app.register Padrino::Rendering
-        app.set :default_builder, 'StandardFormBuilder' unless app.respond_to?(:default_builder)
+        app.set :default_builder, 'StandardFormBuilder'
         included(app)
       end
 

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -24,7 +24,7 @@ module Padrino
       #
       # @example
       #   flash_tag(:notice, :id => 'flash-notice')
-      #   # Generates: <div class="notice">flash-notice</div>
+      #   # Generates: <div class="notice" id="flash-notice">flash-notice</div>
       #   flash_tag(:error, :success)
       #   # Generates: <div class="error">flash-error</div>
       #   # <div class="success">flash-success</div>
@@ -67,22 +67,25 @@ module Padrino
       #
       # @example
       #   link_to('click me', '/dashboard', :class => 'linky')
+      #   # Generates <a class="linky" href="/dashboard">click me</a>
+      #
       #   link_to('click me', '/dashboard', :remote => true)
+      #   # Generates <a href="/dashboard" data-remote="true">click me</a>
+      #
       #   link_to('click me', '/dashboard', :method => :delete)
-      #   link_to('/dashboard', :class => 'blocky') do; end
+      #   # Generates <a href="/dashboard" data-method="delete" rel="nofollow">click me</a>
+      #
+      #   link_to('click me', :class => 'blocky') do; end
+      #   # Generates <a class="blocky" href="#">click me</a>
       #
       # Note that you can pass :+if+ or :+unless+ conditions, but if you provide :current as
       # 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 = { :href => href ? escape_link(href) : '#' }.update(options)
+        options.reverse_merge!(:href => href || '#')
         return name unless parse_conditions(href, options)
         block_given? ? content_tag(:a, options, &block) : content_tag(:a, name, options)
       end
@@ -133,10 +136,11 @@ module Padrino
       # @return [String] Mail link html tag with specified +options+.
       #
       # @example
-      #   # Generates: <a href="mailto:me@demo.com">me@demo.com</a>
       #   mail_to "me@demo.com"
-      #   # Generates: <a href="mailto:me@demo.com">My Email</a>
+      #   # Generates: <a href="mailto:me@demo.com">me@demo.com</a>
+      #
       #   mail_to "me@demo.com", "My Email"
+      #   # Generates: <a href="mailto:me@demo.com">My Email</a>
       #
       def mail_to(email, caption=nil, mail_options={})
         html_options = mail_options.slice!(:cc, :bcc, :subject, :body)
@@ -156,11 +160,11 @@ module Padrino
       # @return [String] Meta html tag with specified +options+.
       #
       # @example
-      #   # Generates: <meta name="keywords" content="weblog,news" />
       #   meta_tag "weblog,news", :name => "keywords"
+      #   # Generates: <meta name="keywords" content="weblog,news" />
       #
-      #   # Generates: <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       #   meta_tag "text/html; charset=UTF-8", 'http-equiv' => "Content-Type"
+      #   # Generates: <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       #
       def meta_tag(content, options={})
         options.reverse_merge!("content" => content)
@@ -204,21 +208,9 @@ 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 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+
@@ -245,7 +237,7 @@ module Padrino
       end
 
       ##
-      # Returns an html script tag for each of the sources provided.
+      # Returns a html script 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/javascript for inclusion. You can provide also a full path.
       #
@@ -310,7 +302,7 @@ module Padrino
       #
       def asset_path(kind, source = nil)
         kind, source = source, kind if source.nil?
-        source = asset_normalize_extension(kind, escape_link(source.to_s))
+        source = asset_normalize_extension(kind, URI.escape(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

@@ -1,5 +1,3 @@
-require 'padrino-helpers/form_builder/deprecated_builder_methods'
-
 module Padrino
   module Helpers
     module FormBuilder
@@ -8,8 +6,6 @@ module Padrino
         attr_accessor :template, :object, :multipart
         attr_reader :namespace, :is_nested, :parent_form, :nested_index, :attributes_name, :model_name
 
-        include DeprecatedBuilderMethods
-
         def initialize(template, object, options={})
           @template = template
           fail "FormBuilder template must be initialized" unless template
@@ -37,9 +33,7 @@ module Padrino
         def label(field, options={}, &block)
           options[:id] ||= nil
           options[:caption] ||= I18n.t("#{model_name}.attributes.#{field}", :count => 1, :default => field.to_s.humanize, :scope => :models) + ': '
-          defaults = default_options(field, options)
-          defaults.delete(:value)
-          @template.label_tag(field_id(field), defaults, &block)
+          @template.label_tag(field_id(field), default_options(field, options), &block)
         end
 
         def hidden_field(field, options={})
@@ -112,9 +106,7 @@ module Padrino
 
         def file_field(field, options={})
           self.multipart = true
-          defaults = default_options(field, options)
-          defaults.delete(:value)
-          @template.file_field_tag field_name(field), defaults
+          @template.file_field_tag field_name(field), default_options(field, options).except(:value)
         end
 
         def submit(*args)
@@ -125,34 +117,6 @@ 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
@@ -179,24 +143,7 @@ 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,
-            :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
-
-        ##
-        # Returns the human name of the field. Look that use builtin I18n.
-        #
-        def field_human_name(field)
-          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(/\//, '_')
+          [:hidden_field, :text_field, :text_area, :password_field, :file_field, :radio_button, :check_box, :select]
         end
 
         ##

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 = { :caption => options[:caption] }.update(label_options) if options[:caption]
+            label_options.reverse_merge!(:caption => options.delete(:caption)) 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

@@ -45,9 +45,7 @@ module Padrino
         instance = builder_instance(object, options)
         # this can erect instance.multipart flag if the block calls instance.file_field
         html = capture_html(instance, &block)
-        options = { :multipart => instance.multipart }.update(options)
-        options.delete(:as)
-        options.delete(:namespace)
+        options = { :multipart => instance.multipart }.update(options.except(:namespace, :as))
         form_tag(url, options) { html }
       end
 
@@ -92,7 +90,7 @@ module Padrino
       #
       def form_tag(url, options={}, &block)
         options = {
-          :action => escape_link(url),
+          :action => url,
           :protect_from_csrf => is_protected_from_csrf?,
           'accept-charset' => 'UTF-8'
         }.update(options)
@@ -400,7 +398,8 @@ module Padrino
       #
       def text_area_tag(name, options={})
         inner_html = TagHelpers::NEWLINE + options.delete(:value).to_s
-        content_tag(:textarea, inner_html, { :name => name }.update(options))
+        options = { :name => name, :rows => "", :cols => "" }.update(options)
+        content_tag(:textarea, inner_html, options)
       end
 
       ##
@@ -581,13 +580,17 @@ module Padrino
       #   # </form>
       #
       def button_to(*args, &block)
-        warn 'Warning: method button_to with block will change behavior on Padrino 0.13.0 release and will wrap the content of the block with <button></button> tag.' if block_given?
         options   = args.extract_options!.dup
         name, url = *args
         options['data-remote'] = 'true' if options.delete(:remote)
         submit_options = options.delete(:submit_options) || {}
-        block ||= proc { submit_tag(name, submit_options) }
-        form_tag(url || name, options, &block)
+        form_tag(url || name, options) do
+          if block_given?
+            content_tag(:button, capture_html(&block), submit_options)
+          else
+            submit_tag(name, submit_options)
+          end
+        end
       end
 
       ##
@@ -617,185 +620,6 @@ 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
 
       ##
@@ -810,46 +634,6 @@ 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