padrino-helpers 0.10.6.e → 0.10.6

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -17,13 +17,18 @@ module Padrino
       # @example
       #   flash_tag(:notice, :id => 'flash-notice')
       #   # Generates: <div class="notice">flash-notice</div>
+      #   flash_tag(:error, :success)
+      #   # Generates: <div class="error">flash-error</div>
+      #   # <div class="success">flash-success</div>
       #
       # @api public
-      def flash_tag(kind, options={})
-        flash_text = flash[kind]
-        return '' if flash_text.blank?
-        options.reverse_merge!(:class => kind)
-        content_tag(:div, flash_text, options)
+      def flash_tag(*args)
+        options = args.extract_options!
+        args.map do |kind|
+          flash_text = flash[kind]
+          next if flash_text.blank?
+          content_tag(:div, flash_text, options.reverse_merge(:class => kind))
+        end.compact * "\n"
       end
 
       ##
@@ -65,18 +70,17 @@ module Padrino
       # @api public
       def link_to(*args, &block)
         options = args.extract_options!
-        options = parse_js_attributes(options) # parses remote, method and confirm options
         anchor  = "##{CGI.escape options.delete(:anchor).to_s}" if options[:anchor]
 
         if block_given?
-          url = args[0] ? args[0] + anchor.to_s : anchor || 'javascript:void(0);'
+          url = args[0] ? args[0] + anchor.to_s : anchor || '#'
           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 || 'javascript:void(0);')
+          name, url = args[0], (args[1] ? args[1] + anchor.to_s : anchor || '#')
           return name unless parse_conditions(url, options)
           options.reverse_merge!(:href => url)
           content_tag(:a, name, options)
@@ -119,8 +123,8 @@ module Padrino
         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)
+        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)
@@ -349,86 +353,65 @@ module Padrino
       end
 
       private
+      ##
+      # Returns the uri root of the application with optional paths appended.
+      #
+      # @example
+      #   uri_root_path("/some/path") => "/root/some/path"
+      #   uri_root_path("javascripts", "test.js") => "/uri/root/javascripts/test.js"
+      #
+      def uri_root_path(*paths)
+        root_uri = self.class.uri_root if self.class.respond_to?(:uri_root)
+        File.join(ENV['RACK_BASE_URI'].to_s, root_uri || '/', *paths)
+      end
 
-        ##
-        # Returns the uri root of the application with optional paths appended.
-        #
-        # @example
-        #   uri_root_path("/some/path") => "/root/some/path"
-        #   uri_root_path("javascripts", "test.js") => "/uri/root/javascripts/test.js"
-        #
-        def uri_root_path(*paths)
-          root_uri = self.class.uri_root if self.class.respond_to?(:uri_root)
-          File.join(ENV['RACK_BASE_URI'].to_s, root_uri || '/', *paths)
-        end
-
-        ##
-        # Returns the timestamp mtime for an asset
-        #
-        # @example
-        #   asset_timestamp("some/path/to/file.png") => "?154543678"
-        #   asset_timestamp("/some/absolute/path.png", true) => nil
-        #
-        def asset_timestamp(file_path, absolute=false)
-          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)
-          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
-        end
-
-        ###
-        # Returns the asset folder given a kind.
-        #
-        # @example
-        #   asset_folder_name(:css) => 'stylesheets'
-        #   asset_folder_name(:js)  => 'javascripts'
-        #   asset_folder_name(:images) => 'images'
-        #
-        def asset_folder_name(kind)
-          case kind
-          when :css then 'stylesheets'
-          when :js  then 'javascripts'
-          else kind.to_s
-          end
-        end
+      ##
+      # Returns the timestamp mtime for an asset
+      #
+      # @example
+      #   asset_timestamp("some/path/to/file.png") => "?154543678"
+      #   asset_timestamp("/some/absolute/path.png", true) => nil
+      #
+      def asset_timestamp(file_path, absolute=false)
+        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)
+        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
+      end
 
-        ##
-        # Parses link_to options for given correct conditions
-        #
-        # @example
-        #   parse_conditions("/some/url", :if => false) => true
-        #
-        def parse_conditions(url, options)
-          if options.has_key?(:if)
-            condition = options.delete(:if)
-            condition == :current ? url == request.path_info : condition
-          elsif condition = options.delete(:unless)
-            condition == :current ? url != request.path_info : !condition
-          else
-            true
-          end
+      ###
+      # Returns the asset folder given a kind.
+      #
+      # @example
+      #   asset_folder_name(:css) => 'stylesheets'
+      #   asset_folder_name(:js)  => 'javascripts'
+      #   asset_folder_name(:images) => 'images'
+      #
+      def asset_folder_name(kind)
+        case kind
+        when :css then 'stylesheets'
+        when :js  then 'javascripts'
+        else kind.to_s
         end
+      end
 
-        ##
-        # Parses link_to options for given js declarations (remote, method, confirm)
-        # Not destructive on options; returns updated options
-        #
-        # parse_js_attributes(:remote => true, :confirm => "test", :method => :delete)
-        # => { "data-remote" => true, "data-method" => "delete", "data-confirm" => "test" }
-        #
-        def parse_js_attributes(options)
-          options = options.dup
-          options["data-remote"] = "true" if options.delete(:remote)
-          if link_confirm = options.delete(:confirm)
-            options["data-confirm"] = link_confirm
-          end
-          if link_method = options.delete(:method)
-            options["data-method"] = link_method
-            options["rel"] = "nofollow"
-          end
-          options
+      ##
+      # Parses link_to options for given correct conditions
+      #
+      # @example
+      #   parse_conditions("/some/url", :if => false) => true
+      #
+      def parse_conditions(url, options)
+        if options.has_key?(:if)
+          condition = options.delete(:if)
+          condition == :current ? url == request.path_info : condition
+        elsif condition = options.delete(:unless)
+          condition == :current ? url != request.path_info : !condition
+        else
+          true
         end
+      end
     end # AssetTagHelpers
   end # Helpers
 end # Padrino

data/lib/padrino-helpers/form_helpers.rb

@@ -74,13 +74,11 @@ module Padrino
       #
       # @api public
       def form_tag(url, options={}, &block)
-        desired_method = options[:method]
-        data_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)
-        options["data-method"] = data_method if data_method
-        options["accept-charset"] ||= "UTF-8"
+        desired_method = options[:method].to_s
+        options.delete(:method) unless desired_method =~ /get|post/i
+        options.reverse_merge!(:method => 'post', :action => url)
+        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 += capture_html(&block)
         concat_content content_tag(:form, inner_form_html, options)

data/lib/padrino-helpers/tag_helpers.rb

@@ -2,11 +2,11 @@ module Padrino
   module Helpers
     ##
     # Helpers related to producing html tags within templates.
-    ##
+    #
     module TagHelpers
       ##
       # Tag values escaped to html entities
-      ##
+      #
       ESCAPE_VALUES = {
         "<" => "&lt;",
         ">" => "&gt;",
@@ -28,6 +28,20 @@ module Padrino
         :selected
       ]
 
+      ##
+      # Custom data attributes,
+      # feel free to update with yours:
+      #
+      #   Padrino::Helpers::TagHelpers::DATA_ATTRIBUTES.push(:dialog)
+      #   text_field :foo, :dialog => true
+      #   # Generates: <input type="text" data-dialog="true" name="foo" />
+      #
+      DATA_ATTRIBUTES = [
+        :method,
+        :remote,
+        :confirm
+      ]
+
       ##
       # Creates an HTML tag with given name, content, and options
       #
@@ -92,7 +106,9 @@ module Padrino
 
         content = content.join("\n") if content.respond_to?(:join)
 
-        output = "<#{name}#{tag_options(options) if options}>#{content}</#{name}>"
+        options    = parse_data_options(name, options)
+        attributes = tag_attributes(options)
+        output = "<#{name}#{attributes}>#{content}</#{name}>"
         block_is_template?(block) ? concat_content(output) : output
       end
 
@@ -182,35 +198,63 @@ module Padrino
       #
       # @api public
       def tag(name, options = nil, open = false)
-        "<#{name}#{tag_options(options) if options}#{open ? '>' : ' />'}"
+        options    = parse_data_options(name, options)
+        attributes = tag_attributes(options)
+        "<#{name}#{attributes}#{open ? '>' : ' />'}"
       end
 
       private
-        ##
-        # 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
+      ##
+      # Returns a compiled list of HTML attributes
+      ##
+      def tag_attributes(options)
+        return '' if options.nil?
+        attributes = options.map do |k, v|
+          next if v.nil? || v == false
+          if v.is_a?(Hash)
+            nested_values(k, v)
+          elsif BOOLEAN_ATTRIBUTES.include?(k)
+            k.to_s
+          else
+            %(#{k}="#{escape_value(v)}")
           end
-          " #{attributes.join(' ')}"
-        end
+        end.compact
+        attributes.empty? ? '' : " #{attributes * ' '}"
+      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] }
+      ##
+      # 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
+
+      ##
+      # Iterate through nested values
+      #
+      def nested_values(attribute, hash)
+        hash.map do |k, v|
+          if v.is_a?(Hash)
+            nested_values("#{attribute}-#{k.to_s.dasherize}", v)
+          else
+            %(#{attribute}-#{k.to_s.dasherize}="#{escape_value(v)}")
+          end
+        end * ' '
+      end
+
+      ##
+      # Parses custom data attributes
+      #
+      def parse_data_options(tag, options)
+        return if options.nil?
+        parsed_options = options.dup
+        options.each do |k, v|
+          next if !DATA_ATTRIBUTES.include?(k) || (tag.to_s == 'form' && k == :method)
+          parsed_options["data-#{k}"] = parsed_options.delete(k)
+          parsed_options[:rel] = 'nofollow' if k == :method
         end
+        parsed_options
+      end
     end # TagHelpers
   end # Helpers
 end # Padrino

data/test/test_asset_tag_helpers.rb

@@ -9,7 +9,7 @@ describe "AssetTagHelpers" do
   end
 
   def flash
-    { :notice => "Demo notice" }
+    @_flash ||= { :notice => "Demo notice" }
   end
 
   context 'for #flash_tag method' do
@@ -20,6 +20,14 @@ describe "AssetTagHelpers" do
       actual_html = flash_tag(:notice, :class => 'notice', :id => 'notice-area')
       assert_has_tag('div.notice#notice-area', :content => "Demo notice") { actual_html }
     end
+    should "display multiple flash tags with given attributes" do
+      flash[:error] = 'wrong'
+      flash[:success] = 'okey'
+      actual_html = flash_tag(:success, :error, :id => 'area')
+      assert_has_tag('div.success#area', :content => flash[:success]) { actual_html }
+      assert_has_tag('div.error#area', :content => flash[:error]) { actual_html }
+      assert_has_no_tag('div.notice') { actual_html }
+    end
   end
 
   context 'for #link_to method' do
@@ -39,7 +47,7 @@ describe "AssetTagHelpers" do
 
     should "display link element with void url and options" do
       actual_link = link_to('Sign up', :class => "test")
-      assert_has_tag('a', :content => "Sign up", :href => 'javascript:void(0);', :class => 'test') { actual_link }
+      assert_has_tag('a', :content => "Sign up", :href => '#', :class => 'test') { actual_link }
     end
 
     should "display link element with remote option" do

data/test/test_form_builder.rb

@@ -63,7 +63,7 @@ describe "FormBuilder" do
 
     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-method" => 'put', "data-remote" => 'true') { actual_html }
+      assert_has_tag('form', :"accept-charset" => "UTF-8", :method => 'post', "data-remote" => 'true') { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
     end
 

data/test/test_form_helpers.rb

@@ -28,7 +28,7 @@ describe "FormHelpers" do
 
     should "display correct form with remote and method is put" do
       actual_html = form_tag('/update', :"accept-charset" => "UTF-8", :method => 'put', :remote => true) { "Demo" }
-      assert_has_tag(:form, "data-remote" => 'true', :"accept-charset" => "UTF-8", :"data-method" => 'put') { actual_html }
+      assert_has_tag(:form, "data-remote" => 'true', :"accept-charset" => "UTF-8") { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
     end
 

data/test/test_number_helpers.rb

@@ -1,3 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
+
 describe "NumberHelpers" do
   include Padrino::Helpers::NumberHelpers
 

data/test/test_tag_helpers.rb

@@ -26,6 +26,11 @@ describe "TagHelpers" do
       assert_has_tag(:a, 'data-remote' => 'true', 'data-method' => 'post') { actual_html }
     end
 
+    should "support nested attributes" do
+      actual_html = tag(:div, :data => {:dojo => {:type => 'dijit.form.TextBox', :props => 'readOnly: true'}})
+      assert_has_tag(:div, 'data-dojo-type' => 'dijit.form.TextBox', 'data-dojo-props' => 'readOnly: true') { actual_html }
+    end
+
     should "support open tags" do
       actual_html = tag(:p, { :class => 'demo' }, true)
       assert_equal "<p class=\"demo\">", actual_html

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  hash: -1410374394
-  prerelease: 7
-  segments: 
-  - 0
-  - 10
-  - 6
-  - e
-  version: 0.10.6.e
+  prerelease: 
+  version: 0.10.6
 platform: ruby
 authors: 
 - Padrino Team
@@ -19,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-23 00:00:00 Z
+date: 2012-03-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
@@ -29,13 +23,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1410374394
-        segments: 
-        - 0
-        - 10
-        - 6
-        - e
-        version: 0.10.6.e
+        version: 0.10.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -46,10 +34,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
         version: "0.6"
   type: :runtime
   version_requirements: *id002
@@ -174,25 +158,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: padrino-helpers
-rubygems_version: 1.8.15
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Helpers for padrino
@@ -255,4 +231,3 @@ test_files:
 - test/test_output_helpers.rb
 - test/test_render_helpers.rb
 - test/test_tag_helpers.rb
-has_rdoc: