padrino-helpers 0.11.4 → 0.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef68c8d06903529b8d8f51c05b1290487a392463
-  data.tar.gz: e7a25b76bffb3892afd7f4a4820e0507670c608a
+  metadata.gz: 4f08fb60a16abffb90ddf4fcef2e7a266bc7f892
+  data.tar.gz: 768407b42f56ce9536202c5e7acc686be5d91357
 SHA512:
-  metadata.gz: 66cda324d865e815ec7bbdd1e93ac7dae958d5ec3db1e7b1f53a409f2aa825c76c58bcab9f632da80c2dce5f48d532a04aa77f9d7c632f72fea4d7955d5b1e19
-  data.tar.gz: c01aaa4bdb41938c530acb00cc1784490a06b462f1ff315c53514f3915a959bc76214c4a5142213e1ebe01abd5407fc498782663ea811368db9c2a9fc0b61671
+  metadata.gz: 0eb4f7c593554199c8700143ec9cf4e8c45ebd3cf6b4c8e7555e04e31d7e6985f54945fded466dd62f4a34b7ad987c01536054ebc34977a7c304a9c562b3b194
+  data.tar.gz: 452ddb85c692e2af46f6f806d85bdfd7c65ce9f71d6f648aba0ce92008340cde2ebe9ac40ecfa67eac64e6479e358e4a8f18f086f933b721c26f423e1cbec5fa

data/README.rdoc

@@ -102,9 +102,9 @@ For more information on using asset helpers, check out the guide for
 Form helpers are the 'standard' form tag helpers you would come to expect when building forms. A simple
 example of constructing a non-object form would be:
 
-  - form_tag '/destroy', :class => 'destroy-form', :method => 'delete' do
+  = form_tag '/destroy', :class => 'destroy-form', :method => 'delete' do
     = flash_tag(:notice)
-    - field_set_tag do
+    = field_set_tag do
       %p
         = label_tag :username, :class => 'first'
         = text_field_tag :username, :value => params[:username]
@@ -116,7 +116,7 @@ example of constructing a non-object form would be:
         = select_tag :strategy, :options => ['delete', 'destroy'], :selected => 'delete'
       %p
         = check_box_tag :confirm_delete
-    - field_set_tag(:class => 'buttons') do
+    = field_set_tag(:class => 'buttons') do
       = submit_tag "Remove"
 
 For more information on using form helpers, check out the guide for
@@ -129,7 +129,7 @@ using a simple, intuitive syntax.
 
 A form_for using these basic fields might look like:
 
-  - form_for @user, '/register', :id => 'register' do |f|
+  = form_for @user, '/register', :id => 'register' do |f|
     = f.error_messages
     %p
       = f.label :username, :caption => "Nickname"
@@ -147,7 +147,7 @@ A form_for using these basic fields might look like:
       = f.label :color, :caption => "Favorite Color?"
       = f.select :color, :options => ['red', 'black']
     %p
-      - fields_for @user.location do |location|
+      = fields_for @user.location do |location|
         = location.text_field :street
         = location.text_field :city
     %p
@@ -159,7 +159,7 @@ There is also an additional StandardFormBuilder which builds on the abstract fie
 
 A form_for using these standard fields might be:
 
-  - form_for @user, '/register', :id => 'register' do |f|
+  = form_for @user, '/register', :id => 'register' do |f|
     = f.error_messages
     = f.text_field_block :name, :caption => "Full name"
     = f.text_field_block :email

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -4,9 +4,12 @@ module Padrino
     # Helpers related to producing assets (images, stylesheets, js, etc) within templates.
     #
     module AssetTagHelpers
-      FRAGMENT_HASH = "#".html_safe.freeze
       APPEND_ASSET_EXTENSIONS = ["js", "css"]
       ABSOLUTE_URL_PATTERN = %r{^(https?://)}
+      ASSET_FOLDERS = {
+        :js => 'javascripts',
+        :css => 'stylesheets',
+      }
 
       ##
       # Creates a div to display the flash of given type if it exists.
@@ -79,34 +82,16 @@ module Padrino
         options  = args.extract_options!
         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?
-          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
+        name = block_given? ? '' : args.shift
+        if url = args.first
+          url << '#' << fragment if fragment
         else
-          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)
+          url = '#'
+          url << fragment if fragment
         end
+        options.reverse_merge!(:href => url)
+        return name unless parse_conditions(url, options)
+        block_given? ? content_tag(:a, options, &block) : content_tag(:a, name, options)
       end
 
       ##
@@ -312,9 +297,13 @@ module Padrino
       #   # Generates: /images/example.jpg?1269008689
       #   asset_path :images, 'example.jpg'
       #
-      def asset_path(kind, source)
+      #   # Generates: /uploads/file.ext?1269008689
+      #   asset_path 'uploads/file.ext'
+      #
+      def asset_path(kind, source = nil)
+        kind, source = source, kind if source.nil?
         source = asset_normalize_extension(kind, URI.escape(source.to_s))
-        return source if source =~ ABSOLUTE_URL_PATTERN || source =~ /^\// # absolute source
+        return source if source =~ ABSOLUTE_URL_PATTERN || source =~ /^\//
         source = File.join(asset_folder_name(kind), source)
         timestamp = asset_timestamp(source)
         result_path = uri_root_path(source)
@@ -322,6 +311,7 @@ module Padrino
       end
 
       private
+
       ##
       # Returns the URI root of the application with optional paths appended.
       #
@@ -353,16 +343,19 @@ module Padrino
       ###
       # Returns the asset folder given a kind.
       #
+      # Configureable by setting kind_asset_folder.
+      #
       # @example
       #   asset_folder_name(:css) => 'stylesheets'
       #   asset_folder_name(:js)  => 'javascripts'
       #   asset_folder_name(:images) => 'images'
+      #   asset_folder_name(:abrakadabrah) => 'abrakadabrah'
       #
       def asset_folder_name(kind)
-        case kind
-        when :css then 'stylesheets'
-        when :js  then 'javascripts'
-        else kind.to_s
+        if self.class.respond_to? "#{kind}_asset_folder"
+          self.class.send "#{kind}_asset_folder"
+        else
+          (ASSET_FOLDERS[kind] || kind).to_s
         end
       end
 

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

@@ -32,51 +32,43 @@ module Padrino
         end
 
         def text_field(field, options={})
-          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
-          options.merge!(:class => field_error(field, options))
+          merge_default_options!(field, options)
           @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))
+          merge_default_options!(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))
+          merge_default_options!(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))
+          merge_default_options!(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))
+          merge_default_options!(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))
+          merge_default_options!(field, options)
           @template.url_field_tag field_name(field), options
         end
 
         def text_area(field, options={})
-          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
-          options.merge!(:class => field_error(field, options))
+          merge_default_options!(field, options)
           @template.text_area_tag field_name(field), options
         end
 
         def password_field(field, options={})
-          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
-          options.merge!(:class => field_error(field, options))
+          merge_default_options!(field, options)
           @template.password_field_tag field_name(field), options
         end
 
@@ -246,6 +238,7 @@ module Padrino
         # Returns the object's models name.
         #
         def object_model_name(explicit_object=object)
+          return @options[:as] if root_form? && @options[:as].is_a?(Symbol)
           explicit_object.is_a?(Symbol) ? explicit_object : explicit_object.class.to_s.underscore.gsub(/\//, '_')
         end
 
@@ -280,7 +273,8 @@ module Padrino
           end
           variants.inject(''.html_safe) 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]}")
+            caption = yield(variant) << ' ' << variant[0]
+            html << @template.label_tag("#{field_name(field)}[]", :for => variant[2], :caption => caption)
           end
         end
 
@@ -311,6 +305,11 @@ module Padrino
             :attributes_name => "#{@options[:nested][:association]}_attributes"
           }
         end
+
+        def merge_default_options!(field, options)
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.merge!(:class => field_error(field, options))
+        end
       end
     end
   end