padrino-helpers 0.10.7 → 0.11.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f362f51264ab447da505f5bbaeb295b467cff819
+  data.tar.gz: c0a4370011a89876d15d3668a82e3451e5b9b6cb
+SHA512:
+  metadata.gz: c3b645ff7c6bbdafc844465cb6f78fcdea389ee27ccff8b6dabd2f7eb352ebb1f256f0cea9c67914a6d56ba74609c678a2703b7b7451558c73ef1822877a511f
+  data.tar.gz: fafd39ce16c2639cbde4537a6b6530b2580e1c59ae9c397298dd16d8416bc9a241e7eeff8c4a91f4548609f64339162ec28ad597398a1c6a93839f11c6706652

data/lib/padrino-helpers.rb

@@ -4,7 +4,6 @@ require 'i18n'
 require 'enumerator'
 require 'active_support/time_with_zone'               # next extension depends on this
 require 'active_support/core_ext/string/conversions'  # to_date
-require 'active_support/core_ext/float/rounding'      # round
 require 'active_support/option_merger'                # with_options
 require 'active_support/core_ext/object/with_options' # with_options
 require 'active_support/inflector'                    # humanize
@@ -32,6 +31,7 @@ module Padrino
       #   Padrino::Helpers::FormatHelpers
       #   Padrino::Helpers::RenderHelpers
       #   Padrino::Helpers::NumberHelpers
+      #   Padrino::Helpers::Breadcrumbs
       #
       # @param [Sinatra::Application] app
       #   The specified padrino application
@@ -52,6 +52,7 @@ module Padrino
         app.helpers Padrino::Helpers::RenderHelpers
         app.helpers Padrino::Helpers::NumberHelpers
         app.helpers Padrino::Helpers::TranslationHelpers
+        app.helpers Padrino::Helpers::Breadcrumbs
       end
       alias :included :registered
     end

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -4,6 +4,10 @@ module Padrino
     # Helpers related to producing assets (images,stylesheets,js,etc) within templates.
     #
     module AssetTagHelpers
+      FRAGMENT_HASH = "#".html_safe.freeze
+       # assets that require an appended extension
+      APPEND_ASSET_EXTENSIONS = ["js", "css"]
+
       ##
       # Creates a div to display the flash of given type if it exists
       #
@@ -11,6 +15,7 @@ module Padrino
       #   The type of flash to display in the tag.
       # @param [Hash] options
       #   The html options for this section.
+      #   use :bootstrap => true to support Twitter's bootstrap dismiss alert button
       #
       # @return [String] Flash tag html with specified +options+.
       #
@@ -24,11 +29,13 @@ module Padrino
       # @api public
       def flash_tag(*args)
         options = args.extract_options!
-        args.map do |kind|
+        bootstrap = options.delete(:bootstrap) if options[:bootstrap]
+        args.inject(''.html_safe) do |html,kind|
           flash_text = flash[kind]
           next if flash_text.blank?
-          content_tag(:div, flash_text, options.reverse_merge(:class => kind))
-        end.compact * "\n"
+          flash_text << safe_content_tag(:button, "&times;", {:type => :button, :class => :close, :'data-dismiss' => :alert}) if bootstrap
+          html << safe_content_tag(:div, flash_text, options.reverse_merge(:class => kind))
+        end
       end
 
       ##
@@ -45,6 +52,8 @@ module Padrino
       #
       # @option options [String] :anchor
       #   The anchor for the link (i.e #something)
+      # @option options [String] :fragment
+      #   Synonym for anchor
       # @option options [Boolean] :if
       #   If true, the link will appear, otherwise not;
       # @option options [Boolean] :unless
@@ -70,66 +79,38 @@ module Padrino
       # @api public
       def link_to(*args, &block)
         options = args.extract_options!
-        anchor  = "##{CGI.escape options.delete(:anchor).to_s}" if options[:anchor]
+        fragment  = options.delete(:anchor).to_s if options[:anchor]
+        fragment  = options.delete(:fragment).to_s if options[:fragment]
 
+        url = ActiveSupport::SafeBuffer.new
         if block_given?
-          url = args[0] ? args[0] + anchor.to_s : anchor || '#'
+          if args[0]
+            url.concat(args[0])
+            url.concat(FRAGMENT_HASH).concat(fragment) if fragment
+          else
+            url.concat(FRAGMENT_HASH)
+            url.concat(fragment) if fragment
+          end
           options.reverse_merge!(:href => url)
           link_content = capture_html(&block)
           return '' unless parse_conditions(url, options)
           result_link = content_tag(:a, link_content, options)
           block_is_template?(block) ? concat_content(result_link) : result_link
         else
-          name, url = args[0], (args[1] ? args[1] + anchor.to_s : anchor || '#')
+          if args[1]
+            url.concat(args[1])
+            url.safe_concat(FRAGMENT_HASH).concat(fragment) if fragment
+          else
+            url = FRAGMENT_HASH
+            url.concat(fragment) if fragment
+          end
+          name = args[0]
           return name unless parse_conditions(url, options)
           options.reverse_merge!(:href => url)
           content_tag(:a, name, options)
         end
       end
 
-      ##
-      # Creates a form containing a single button that submits to the url.
-      #
-      # @overload button_to(name, url, options={})
-      #   @param [String]  caption  The text caption.
-      #   @param [String]  url      The url href.
-      #   @param [Hash]    options  The html options.
-      # @overload button_to(name, options={}, &block)
-      #   @param [String]  url      The url href.
-      #   @param [Hash]    options  The html options.
-      #   @param [Proc]    block    The button content.
-      #
-      # @option options [Boolean] :multipart
-      #   If true, this form will support multipart encoding.
-      # @option options [String] :remote
-      #   Instructs ujs handler to handle the submit as ajax.
-      # @option options [Symbol] :method
-      #   Instructs ujs handler to use different http method (i.e :post, :delete).
-      #
-      # @return [String] Form and button html with specified +options+.
-      #
-      # @example
-      #   button_to 'Delete', url(:accounts_destroy, :id => account), :method => :delete, :class => :form
-      #   # Generates:
-      #   # <form class="form" action="/admin/accounts/destroy/2" method="post">
-      #   #   <input type="hidden" value="delete" name="_method" />
-      #   #   <input type="submit" value="Delete" />
-      #   # </form>
-      #
-      # @api public
-      def button_to(*args, &block)
-        name, url = args[0], args[1]
-        options   = args.extract_options!
-        desired_method = options[:method]
-        options.delete(:method) if options[:method].to_s !~ /get|post/i
-        options.reverse_merge!(:method => 'post', :action => url)
-        options[:enctype] = 'multipart/form-data' if options.delete(:multipart)
-        options['data-remote'] = 'true' if options.delete(:remote)
-        inner_form_html  = hidden_form_method_field(desired_method)
-        inner_form_html += block_given? ? capture_html(&block) : submit_tag(name)
-        content_tag('form', inner_form_html, options)
-      end
-
       ##
       # Creates a link tag that browsers and news readers can use to auto-detect an RSS or ATOM feed.
       #
@@ -185,7 +166,7 @@ module Padrino
       # @api public
       def mail_to(email, caption=nil, mail_options={})
         html_options = mail_options.slice!(:cc, :bcc, :subject, :body)
-        mail_query = Rack::Utils.build_query(mail_options).gsub(/\+/, '%20').gsub('%40', '@')
+        mail_query = Rack::Utils.build_query(mail_options).gsub(/\+/, '%20').gsub('%40', '@').gsub('&', '&amp;')
         mail_href = "mailto:#{email}"; mail_href << "?#{mail_query}" if mail_query.present?
         link_to((caption || email), mail_href, html_options)
       end
@@ -275,7 +256,7 @@ module Padrino
         options.reverse_merge!(:media => 'screen', :rel => 'stylesheet', :type => 'text/css')
         sources.flatten.map { |source|
           tag(:link, options.reverse_merge(:href => asset_path(:css, source)))
-        }.join("\n")
+        }.join("\n").html_safe
       end
 
       ##
@@ -298,7 +279,7 @@ module Padrino
         options.reverse_merge!(:type => 'text/javascript')
         sources.flatten.map { |source|
           content_tag(:script, nil, options.reverse_merge(:src => asset_path(:js, source)))
-        }.join("\n")
+        }.join("\n").html_safe
       end
 
       ##
@@ -341,14 +322,11 @@ module Padrino
       #
       # @api semipublic
       def asset_path(kind, source)
-        return source if source =~ /^http/
-        is_absolute  = source =~ %r{^/}
-        asset_folder = asset_folder_name(kind)
-        source = source.to_s.gsub(/\s/, '%20')
-        ignore_extension = (asset_folder.to_s == kind.to_s) # don't append an extension
-        source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
-        result_path = is_absolute ? source : uri_root_path(asset_folder, source)
-        timestamp = asset_timestamp(result_path, is_absolute)
+        source = asset_normalize_extension(kind, URI.escape(source.to_s))
+        return source if source =~ %r{^(/|https?://)} # absolute source
+        source = File.join(asset_folder_name(kind), source)
+        timestamp = asset_timestamp(source)
+        result_path = uri_root_path(source)
         "#{result_path}#{timestamp}"
       end
 
@@ -370,14 +348,15 @@ module Padrino
       #
       # @example
       #   asset_timestamp("some/path/to/file.png") => "?154543678"
-      #   asset_timestamp("/some/absolute/path.png", true) => nil
       #
-      def asset_timestamp(file_path, absolute=false)
+      def asset_timestamp(file_path)
         return nil if file_path =~ /\?/ || (self.class.respond_to?(:asset_stamp) && !self.class.asset_stamp)
-        public_file_path = Padrino.root("public", file_path) if Padrino.respond_to?(:root)
+        public_path = self.class.public_folder if self.class.respond_to?(:public_folder)
+        public_path ||= Padrino.root("public") if Padrino.respond_to?(:root)
+        public_file_path = File.join(public_path, file_path) if public_path
         stamp = File.mtime(public_file_path).to_i if public_file_path && File.exist?(public_file_path)
-        stamp ||= Time.now.to_i unless absolute
-        "?#{stamp}" if stamp
+        stamp ||= Time.now.to_i
+        "?#{stamp}"
       end
 
       ###
@@ -396,6 +375,19 @@ module Padrino
         end
       end
 
+      # Normalizes the extension for a given asset
+      #
+      #  @example
+      #
+      #    asset_normalize_extension(:images, "/foo/bar/baz.png") => "/foo/bar/baz.png"
+      #    asset_normalize_extension(:js, "/foo/bar/baz") => "/foo/bar/baz.js"
+      #
+      def asset_normalize_extension(kind, source)
+        ignore_extension = !APPEND_ASSET_EXTENSIONS.include?(kind.to_s)
+        source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
+        source
+      end
+
       ##
       # Parses link_to options for given correct conditions
       #

data/lib/padrino-helpers/breadcrumb_helpers.rb

@@ -0,0 +1,171 @@
+module Padrino
+  module Helpers
+    class Breadcrumb
+
+      attr_accessor :home
+      attr_accessor :items
+
+      DEFAULT_URL = "/"
+      DEFAULT_CAPTION ="Home Page"
+
+      ##
+      # initialize breadcrumbs with default value
+      #
+      # @example
+      #   before do
+      #     @breadcrumbs = breadcrumbs.new
+      #   end
+      #
+      # @api public
+      def initialize
+        self.home = { :url => DEFAULT_URL, :caption => DEFAULT_CAPTION, :name => :home }
+        reset
+      end
+
+      ##
+      # Set the custom home (Parent) link
+      #
+      # @param [String] url
+      #  The url href
+      #
+      # @param [String] caption
+      #   The  text caption.
+      #
+      # @example
+      #   breadcrumbs.set_home "/HomeFoo", "Foo Home"
+      #
+      #
+      # @api public
+      def set_home(url, caption)
+        self.home = { :url => url, :caption => caption.to_s.humanize, :name => :home }
+        reset
+      end
+
+      ##
+      # Reset breadcrumbs to default or personal  home
+      #
+      # @example
+      #   breadcrumbs.reset
+      #
+      # @api public
+      def reset
+        self.items=[]
+        self.items << home
+      end
+
+      ##
+      # Reset breadcrumbs to default home
+      #
+      # @example
+      #   breadcrumbs.reset!
+      #
+      # @api public
+      def reset!
+        self.home = { :url => DEFAULT_URL, :caption => DEFAULT_CAPTION, :name => :home }
+        reset
+      end
+
+      ##
+      # Add a new  breadcrumbs
+      #
+      # @param [String] name
+      #   The name of resource
+      # @param [Symbol] name
+      #   The name of resource
+      #
+      # @param [String] url
+      #   The url href.
+      #
+      # @param [String] caption
+      #   The text caption
+      #
+      # @example
+      #   breadcrumbs.add "foo", "/foo", "Foo Link"
+      #   breadcrumbs.add :foo, "/foo", "Foo Link"
+      #
+      # @api public
+      def add(name, url, caption)
+        items << { :name => name, :url => url.to_s, :caption => caption.to_s.humanize }
+      end
+
+      alias :<< :add
+
+      ##
+      # Remove a Breadcrumbs
+      #
+      # @param [String] name
+      #  The name of resource to delete from breadcrumbs list
+      #
+      # @param [Symbol] name
+      #  The name of resource to delete from breadcrumbs list
+      #
+      # @example
+      #   breadcrumbs.del "foo"
+      #   breadcrumbs.del :foo
+      #
+      # @api public
+      def del(name)
+        items.delete_if { |item| item[:name] == name.to_sym }
+      end
+
+    end # Breadcrumb
+
+
+    module Breadcrumbs
+
+      # Render breadcrumbs to view
+      #
+      # @param [Breadcrumbs] breadcrumbs
+      #   The breadcrumbs to render into view
+      #
+      # @param [Boolean] bootstrap
+      #  If true, render separation (usefull with Twitter Bootstrap)
+      #
+      # @param [String] active
+      #  Css class style set to active breadcrumb
+      #
+      # @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>
+      #  # </ul>
+      #
+      #
+      # @api public
+      def breadcrumbs(breadcrumbs, bootstrap=false, active="active")
+        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" )
+      end
+
+      private
+      ##
+      # Private method to return list item
+      #
+      # @param [Hash] item
+      #   The breadcrumb item
+      #
+      # @param [Boolean] bootstrap
+      #   If true, render separation (usefull with Twitter Bootstrap)
+      #
+      # @return [String] List item with breacrumb
+      #
+      # @api public
+      def render_item(item, bootstrap)
+        content = ""
+        content << link_to(item[:caption], item[:url])
+        content << safe_content_tag(:span, "/", :class => "divider") if bootstrap
+        safe_content_tag(:li, content )
+      end
+
+    end # Breadcrumb
+  end # Helpers
+end # Padrino

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

@@ -95,12 +95,38 @@ module Padrino
           @template.select_tag field_name(field), options
         end
 
+        # f.check_box_group :color, :options => ['red', 'green', 'blue'], :selected => ['red', 'blue']
+        # f.check_box_group :color, :collection => @colors, :fields => [:name, :id]
+        def check_box_group(field, options={})
+          selected_values = Array(options[:selected] || field_value(field))
+          if options[:collection]
+            fields = options[:fields] || [:name, :id]
+            # don't use map!, it will break some orms
+            selected_values = selected_values.map{ |v| (v.respond_to?(fields[0]) ? v.send(fields[1]) : v).to_s }
+          end
+          labeled_group( field, options ) do |variant|
+            @template.check_box_tag( field_name(field)+'[]', :value => variant[1], :id => variant[2], :checked => selected_values.include?(variant[1]) )
+          end
+        end
+
+        # f.radio_button_group :color, :options => ['red', 'green']
+        # f.radio_button_group :color, :collection => @colors, :fields => [:name, :id], :selected => @colors.first
+        def radio_button_group(field, options={})
+          fields = options[:fields] || [:name, :id]
+          selected_value = options[:selected] || field_value(field)
+          selected_value = selected_value.send(fields[1])  if selected_value.respond_to?(fields[0])
+          labeled_group( field, options ) do |variant|
+            @template.radio_button_tag( field_name(field), :value => variant[1], :id => variant[2], :checked => variant[1] == selected_value.to_s )
+          end
+        end
+
         # f.check_box :remember_me, :value => 'true', :uncheck_value => '0'
         def check_box(field, options={})
+          html = ActiveSupport::SafeBuffer.new
           unchecked_value = options.delete(:uncheck_value) || '0'
           options.reverse_merge!(:id => field_id(field), :value => '1')
           options.reverse_merge!(:checked => true) if values_matches_field?(field, options[:value])
-          html  = @template.hidden_field_tag(options[:name] || field_name(field), :value => unchecked_value, :id => nil)
+          html << @template.hidden_field_tag(options[:name] || field_name(field), :value => unchecked_value, :id => nil)
           html << @template.check_box_tag(field_name(field), options)
         end
 
@@ -140,7 +166,11 @@ module Padrino
           result = nested_objects.each_with_index.map do |child_instance, index|
             nested_options[:index] = include_index ? index : nil
             @template.fields_for(child_instance,  { :nested => nested_options }, &block)
-          end.join("\n")
+          end.join("\n").html_safe
+        end
+
+        def csrf_token_field
+          @template.csrf_token_field
         end
 
         protected
@@ -171,17 +201,8 @@ module Padrino
           # field_name(:number) => "user[telephone_attributes][number]"
           # field_name(:street) => "user[addresses_attributes][0][street]"
           def field_name(field=nil)
-            result = []
-            if root_form?
-              result << object_model_name
-            elsif nested_form?
-              parent_form = @options[:nested][:parent]
-              attributes_name = "#{@options[:nested][:association]}_attributes"
-              nested_index = @options[:nested][:index]
-              fragment = [parent_form.field_name, "[#{attributes_name}", "]"]
-              fragment.insert(2, "][#{nested_index}") if nested_index
-              result << fragment
-            end
+            result = field_result
+            result << field_name_fragment if nested_form?
             result << "[#{field}]" unless field.blank?
             result.flatten.join
           end
@@ -192,17 +213,8 @@ 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 = []
-            if root_form?
-              result << object_model_name
-            elsif nested_form?
-              parent_form = @options[:nested][:parent]
-              attributes_name = "#{@options[:nested][:association]}_attributes"
-              nested_index = @options[:nested][:index]
-              fragment = [parent_form.field_id, "_#{attributes_name}"]
-              fragment.push("_#{nested_index}") if nested_index
-              result << fragment
-            end
+            result = field_result
+            result << field_id_fragment if nested_form?
             result << "_#{field}" unless field.blank?
             result << "_#{value}" unless value.blank?
             result.flatten.join
@@ -245,6 +257,52 @@ module Padrino
           def root_form?
             !nested_form?
           end
+
+          # Builds a group of labels for radios or checkboxes
+          def labeled_group(field, options={})
+            options.reverse_merge!(:id => field_id(field), :selected => field_value(field))
+            options.merge!(:class => field_error(field, options))
+            variants = case
+            when options[:options]
+              options[:options].map{ |caption, value| [caption.to_s, (value||caption).to_s] }
+            when options[:collection]
+              fields = options[:fields] || [:name, :id]
+              options[:collection].map{ |variant| [variant.send(fields.first).to_s, variant.send(fields.last).to_s] }
+            else
+              []
+            end
+            variants.inject('') do |html, variant|
+              variant[2] = "#{field_id(field)}_#{variant[1]}"
+              html << @template.label_tag("#{field_name(field)}[]", :for => variant[2], :caption => "#{yield(variant)} #{variant[0]}")
+            end
+          end
+
+        private
+        def field_result
+          result = []
+          result << object_model_name if root_form?
+          result
+        end
+
+        def field_name_fragment
+          fragment = [result_options[:parent_form].field_name, "[#{result_options[:attributes_name]}", "]"]
+          fragment.insert(2, "][#{result_options[:nested_index]}") if result_options[:nested_index]
+          fragment
+        end
+
+        def field_id_fragment
+          fragment = [result_options[:parent_form].field_id, "_#{result_options[:attributes_name]}"]
+          fragment.push("_#{result_options[:nested_index]}") if result_options[:nested_index]
+          fragment
+        end
+
+        def result_options
+          {
+            :parent_form  => @options[:nested][:parent],
+            :nested_index => @options[:nested][:index],
+            :attributes_name => "#{@options[:nested][:association]}_attributes"
+          }
+        end
       end # AbstractFormBuilder
     end # FormBuilder
   end # Helpers