padrino-helpers 0.9.24 → 0.9.25

data/lib/padrino-helpers.rb

@@ -31,7 +31,6 @@ module Padrino
     class << self
       def registered(app)
         app.set :default_builder, 'StandardFormBuilder'
-        app.helpers Padrino::Helpers::DomHelpers
         app.helpers Padrino::Helpers::OutputHelpers
         app.helpers Padrino::Helpers::TagHelpers
         app.helpers Padrino::Helpers::AssetTagHelpers

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -167,7 +167,7 @@ module Padrino
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.symbolize_keys
         options.reverse_merge!(:media => 'screen', :rel => 'stylesheet', :type => 'text/css')
-        sources.collect { |source|
+        sources.flatten.map { |source|
           tag(:link, options.reverse_merge(:href => asset_path(:css, source)))
         }.join("\n")
       end
@@ -184,7 +184,7 @@ module Padrino
       def javascript_include_tag(*sources)
         options = sources.extract_options!.symbolize_keys
         options.reverse_merge!(:type => 'text/javascript', :content => "")
-        sources.collect { |source|
+        sources.flatten.map { |source|
           tag(:script, options.reverse_merge(:src => asset_path(:js, source)))
         }.join("\n")
       end

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

@@ -202,7 +202,7 @@ module Padrino
            # Returns the object's models name
           #   => user_assignment
           def object_model_name(explicit_object=object)
-            explicit_object.is_a?(Symbol) ? explicit_object : explicit_object.class.to_s.underscore.gsub('/', '-')
+            explicit_object.is_a?(Symbol) ? explicit_object : explicit_object.class.to_s.underscore.gsub(/\//, '_')
           end
 
           # Returns the class type for the given object

data/lib/padrino-helpers/form_helpers.rb

@@ -47,7 +47,7 @@ module Padrino
         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)
+        concat_content content_tag(:form, inner_form_html, options)
       end
 
       ##
@@ -77,7 +77,7 @@ module Padrino
         legend_text = args[0].is_a?(String) ? args.first : nil
         legend_html = legend_text.blank? ? '' : content_tag(:legend, legend_text)
         field_set_content = legend_html + capture_html(&block)
-        concat_content content_tag('fieldset', field_set_content, options)
+        concat_content content_tag(:fieldset, field_set_content, options)
       end
 
       ##
@@ -105,7 +105,7 @@ module Padrino
       #
       def error_messages_for(*objects)
         options = objects.extract_options!.symbolize_keys
-        objects = objects.collect {|object_name| object_name.is_a?(Symbol) ? instance_variable_get("@#{object_name}") : object_name }.compact
+        objects = objects.map {|object_name| object_name.is_a?(Symbol) ? instance_variable_get("@#{object_name}") : object_name }.compact
         count   = objects.inject(0) {|sum, object| sum + object.errors.size }
 
         unless count.zero?
@@ -125,13 +125,13 @@ module Padrino
             header_message = if options.include?(:header_message)
               options[:header_message]
             else
-              object_name = options[:object_name].to_s.underscore.gsub('_', ' ')
+              object_name = options[:object_name].to_s.underscore.gsub(/\//, ' ')
               object_name = I18n.t(:name, :default => object_name.humanize, :scope => [:models, object_name], :count => 1)
               locale.t :header, :count => count, :model => object_name
             end
             message = options.include?(:message) ? options[:message] : locale.t(:body)
             error_messages = objects.map { |object|
-              object_name = options[:object_name].to_s.underscore.gsub('_', ' ')
+              object_name = options[:object_name].to_s.underscore.gsub(/\//, ' ')
               object.errors.map { |f, msg|
                 field = I18n.t(f, :default => f.to_s.humanize, :scope => [:models, object_name, :attributes])
                 content_tag(:li, "%s %s" % [field, msg])
@@ -237,7 +237,7 @@ module Padrino
       #   text_area_tag :username, :class => 'long', :value => "Demo?"
       #
       def text_area_tag(name, options={})
-        options.reverse_merge!(:name => name)
+        options.reverse_merge!(:name => name, :rows => "", :cols => "")
         content_tag(:textarea, options.delete(:value).to_s, options)
       end
 
@@ -254,7 +254,7 @@ module Padrino
       end
 
       ##
-      # Constructs a check_box from the given options
+      # Constructs a select from the given options
       #
       # ==== Examples
       #
@@ -263,13 +263,27 @@ module Padrino
       #   select_tag(:favorite_color, :options => ['red', 'yellow'], :selected => 'green1')
       #   select_tag(:country, :collection => @countries, :fields => [:name, :code], :include_blank => 'None')
       #
+      #   # Optgroups can be generated using :grouped_options => (Hash or nested Array)
+      #   grouped_options = [['Friends',['Yoda',['Obiwan',1]]],['Enemies',['Palpatine',['Darth Vader',3]]]]
+      #   grouped_options = {'Friends' => ['Yoda',['Obiwan',1]],'Enemies' => ['Palpatine',['Darth Vader',3]]}
+      #   select_tag(:color, :grouped_options => [['warm',['red','yellow']],['cool',['blue', 'purple']]])
+      #
+      #   # Optgroups can be generated using :grouped_options => (Hash or nested Array)
+      #   grouped_options = [['Friends',['Yoda',['Obiwan',1]]],['Enemies',['Palpatine',['Darth Vader',3]]]]
+      #   grouped_options = {'Friends' => ['Yoda',['Obiwan',1]],'Enemies' => ['Palpatine',['Darth Vader',3]]}
+      #   select_tag(:color, :grouped_options => [['warm',['red','yellow']],['cool',['blue', 'purple']]])
+      #
       def select_tag(name, options={})
         options.reverse_merge!(:name => name)
         collection, fields = options.delete(:collection), options.delete(:fields)
         options[:options] = options_from_collection(collection, fields) if collection
-        blank = options.delete(:include_blank)
-        options[:options].unshift(blank.is_a?(String) ? [blank, ''] : '') if blank
-        select_options_html = options_for_select(options.delete(:options), options.delete(:selected))
+        prompt = options.delete(:include_blank)
+        select_options_html = if options[:options]
+          options_for_select(options.delete(:options), options.delete(:selected))
+        elsif options[:grouped_options]
+          grouped_options_for_select(options.delete(:grouped_options), options.delete(:selected), prompt)
+        end
+        select_options_html = select_options_html.unshift(blank_option(prompt)) if select_options_html.is_a?(Array)
         options.merge!(:name => "#{options[:name]}[]") if options[:multiple]
         content_tag(:select, select_options_html, options)
       end
@@ -350,7 +364,7 @@ module Padrino
       # fields is an array containing the fields to display from each item in the collection
       #
       def options_from_collection(collection, fields)
-        collection.collect { |item| [ item.send(fields.first), item.send(fields.last) ] }
+        collection.map { |item| [ item.send(fields.first), item.send(fields.last) ] }
       end
 
       #
@@ -358,12 +372,43 @@ module Padrino
       #
       def options_for_select(option_items, selected_value=nil)
         return '' if option_items.blank?
-        option_items.collect do |caption, value|
+        option_items.map do |caption, value|
           value ||= caption
           content_tag(:option, caption, :value => value, :selected => option_is_selected?(value, caption, selected_value))
         end
       end
 
+      #
+      # Returns the optgroups with options tags for a select based on the given :grouped_options items
+      #
+      def grouped_options_for_select(collection,selected=nil,prompt=false)
+        if collection.is_a?(Hash)
+          collection.map do |key, value|
+            content_tag :optgroup, :label => key do
+              options_for_select(value, selected)
+            end
+          end
+        elsif collection.is_a?(Array)
+          collection.map do |optgroup|
+            content_tag :optgroup, :label => optgroup.first do
+              options_for_select(optgroup.last, selected)
+            end
+          end
+        end
+      end
+
+      #
+      # Returns the blank option serving as a prompt if passed
+      #
+      def blank_option(prompt)
+        return unless prompt
+        case prompt
+          when String then content_tag(:option, prompt,       :value => '')
+          when Array  then content_tag(:option, prompt.first, :value => prompt.last)
+          else             content_tag(:option, '',           :value => '')
+        end
+      end
+
       private
         ##
         # Returns the FormBuilder class to use based on all available setting sources

data/lib/padrino-helpers/format_helpers.rb

@@ -28,21 +28,23 @@ module Padrino
 
       ##
       # Returns text transformed into HTML using simple formatting rules. Two or more consecutive newlines(\n\n) are considered
-      # as a paragraph and wrapped in <p> tags. One newline (\n) is considered as a linebreak and a <br /> tag is appended.
+      # as a paragraph and wrapped in <p> or your own tags. One newline (\n) is considered as a linebreak and a <br /> tag is appended.
       # This method does not remove the newlines from the text.
       #
       # ==== Examples
       #
       #   simple_format("hello\nworld") # => "<p>hello<br/>world</p>"
+      #   simple_format("hello\nworld", :tag => :div, :class => :foo) # => "<div class="foo">hello<br/>world</div>"
       #
-      def simple_format(text, html_options={})
-        start_tag = tag('p', html_options.merge(:open => true))
+      def simple_format(text, options={})
+        t = options.delete(:tag) || :p
+        start_tag = tag(t, options.merge(:open => true))
         text = text.to_s.dup
         text.gsub!(/\r\n?/, "\n")                    # \r\n and \r -> \n
-        text.gsub!(/\n\n+/, "</p>\n\n#{start_tag}")  # 2+ newline  -> paragraph
+        text.gsub!(/\n\n+/, "</#{t}>\n\n#{start_tag}")  # 2+ newline  -> paragraph
         text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />') # 1 newline   -> br
         text.insert 0, start_tag
-        text << "</p>"
+        text << "</#{t}>"
       end
 
       ##
@@ -89,7 +91,7 @@ module Padrino
         end
         options.reverse_merge!(:line_width => 80)
 
-        text.split("\n").collect do |line|
+        text.split("\n").map do |line|
           line.length > options[:line_width] ? line.gsub(/(.{1,#{options[:line_width]}})(\s+|$)/, "\\1\n").strip : line
         end * "\n"
       end

data/lib/padrino-helpers/output_helpers.rb

@@ -1,6 +1,25 @@
 module Padrino
   module Helpers
     module OutputHelpers
+
+      def self.included(base) #:nodoc:
+        base.send(:include, SinatraCurrentEngine) unless base.method_defined?(:current_engine)
+      end
+
+      ##
+      # Module used to detect in vanilla sinatra apps the current engine
+      #
+      module SinatraCurrentEngine
+        attr_reader :current_engine
+
+        def render(engine, *) #:nodoc:
+          @current_engine, engine_was = engine, @current_engine
+          output = super
+          @current_engine = engine_was
+          output
+        end
+      end
+
       ##
       # Captures the html from a block of template code for any available handler
       #
@@ -9,7 +28,8 @@ module Padrino
       #   capture_html(&block) => "...html..."
       #
       def capture_html(*args, &block)
-        handler = self.find_proper_handler
+        handler = find_proper_handler
+        captured_html = ""
         if handler && handler.is_type? && handler.block_is_type?(block)
           captured_html = handler.capture_from_template(*args, &block)
         end
@@ -17,6 +37,7 @@ module Padrino
         captured_html = block_given? && block.call(*args) if captured_html.blank?
         captured_html
       end
+      alias :capture :capture_html
 
       ##
       # Outputs the given text to the templates buffer directly
@@ -26,13 +47,14 @@ module Padrino
       #   concat_content("This will be output to the template buffer")
       #
       def concat_content(text="")
-        handler = self.find_proper_handler
+        handler = find_proper_handler
         if handler && handler.is_type?
           handler.concat_to_template(text)
         else # theres no template to concat, return the text directly
           text
         end
       end
+      alias :concat :concat_content
 
       ##
       # Returns true if the block is from a supported template type; false otherwise.
@@ -43,7 +65,7 @@ module Padrino
       #   block_is_template?(block)
       #
       def block_is_template?(block)
-        handler = self.find_proper_handler
+        handler = find_proper_handler
         block && handler && handler.block_is_type?(block)
       end
 
@@ -75,9 +97,7 @@ module Padrino
       def yield_content(key, *args)
         blocks = content_blocks[key.to_sym]
         return nil if blocks.empty?
-        blocks.map { |content|
-          capture_html(*args, &content)
-        }.join
+        blocks.map { |content| capture_html(*args, &content) }.join
       end
 
       protected
@@ -89,7 +109,7 @@ module Padrino
         #   content_blocks[:name] => ['...', '...']
         #
         def content_blocks
-          @content_blocks ||= Hash.new {|h,k| h[k] = [] }
+          @content_blocks ||= Hash.new { |h,k| h[k] = [] }
         end
 
         ##
@@ -101,7 +121,7 @@ module Padrino
         #   find_proper_handler => <OutputHelpers::HamlHandler>
         #
         def find_proper_handler
-          OutputHelpers.handlers.map { |h| h.new(self) }.find { |h| h.is_type? }
+          OutputHelpers.handlers.map { |h| h.new(self) }.find { |h| h.engines.include?(current_engine) && h.is_type? }
         end
     end # OutputHelpers
   end # Helpers

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

@@ -1,9 +1,6 @@
 module Padrino
   module Helpers
-
     module OutputHelpers
-      @template_handlers = []
-
       ##
       # Returns the list of all available template handlers
       #
@@ -12,7 +9,7 @@ module Padrino
       #   OutputHelpers.handlers => [<OutputHelpers::HamlHandler>, <OutputHelpers::ErbHandler>]
       #
       def self.handlers
-        @template_handlers
+        @_template_handlers ||= []
       end
 
       ##
@@ -38,12 +35,23 @@ module Padrino
         #
         # ==== Examples
         #
-        #  @handler.template_extension => "erubis"
+        #  @handler.template_extension => "erb"
         #
         def template_extension
           caller.find { |c| c =~ /\/views\// }[/\.([\w]*?)\:/, 1] rescue nil
-          # "/some/path/app/views/posts/foo.html.erubis:3:in `evaluate_source'"
-          # => "erubis"
+          # "/some/path/app/views/posts/foo.html.erb:3:in `evaluate_source'"
+          # => "erb"
+        end
+
+        ##
+        # Returns an array of engines used for the template
+        #
+        # ==== Examples
+        #
+        #   @handler.engines => [:erb, :erubis]
+        #
+        def engines
+          # Implemented in subclass
         end
 
         ##
@@ -91,6 +99,5 @@ module Padrino
         end
       end # AbstractHandler
     end # OutputHelpers
-
-  end
-end
+  end # Helpers
+end # Padrino

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

@@ -1,6 +1,5 @@
 module Padrino
   module Helpers
-
     module OutputHelpers
       class ErbHandler < AbstractHandler
         attr_reader :output_buffer
@@ -18,7 +17,7 @@ module Padrino
         #  @handler.is_type? => true
         #
         def is_type?
-          self.output_buffer.present?
+          !self.output_buffer.nil?
         end
 
         # Captures the html from a block of template code for this handler
@@ -28,7 +27,11 @@ module Padrino
         #  @handler.capture_from_template(&block) => "...html..."
         #
         def capture_from_template(*args, &block)
-          erb_with_output_buffer { block_given? && block.call(*args) }
+          self.output_buffer, _buf_was = "", self.output_buffer
+          block.call(*args)
+          ret = eval("@_out_buf", block.binding)
+          self.output_buffer = _buf_was
+          ret
         end
 
         ##
@@ -39,42 +42,38 @@ module Padrino
         #   @handler.concat_to_template("This will be output to the template buffer")
         #
         def concat_to_template(text="")
-          self.output_buffer << text if self.is_type? && text
+          self.output_buffer << text if is_type? && text
           nil
         end
 
-        if RUBY_VERSION < '1.9.0'
-          # Check whether we're called from an erb template.
-          # We'd return a string in any other case, but erb <%= ... %>
-          # can't take an <% end %> later on, so we have to use <% ... %>
-          # and implicitly concat.
-          def block_is_type?(block)
-            self.is_type? || (block && eval('defined? __in_erb_template', block))
-          end
-        else
-          def block_is_type?(block)
-            self.is_type? || (block && eval('defined? __in_erb_template', block.binding))
-          end
+        ##
+        # Returns true if the block given is of the handler's template type; false otherwise.
+        #
+        # ==== Examples
+        #
+        #  @handler.block_is_type?(block) => true
+        #
+        def block_is_type?(block)
+          is_type? || (block && eval('defined?(__in_erb_template)', block.binding))
         end
 
-        protected
-
         ##
-        # Used to direct the buffer for the erb capture
+        # Returns an array of engines used for the template
+        #
+        # ==== Examples
         #
-        def erb_with_output_buffer(buf = '')
-          self.output_buffer, old_buffer = buf, self.output_buffer
-          yield
-          buf
-        ensure
-          self.output_buffer = old_buffer
+        #   @handler.engines => [:erb, :erubis]
+        #
+        def engines
+          @_engines ||= [:erb, :erubis]
         end
 
-        def output_buffer=(val)
-          template.instance_variable_set(:@_out_buf, val)
-        end
-      end # ErbHandler
-      OutputHelpers.register(ErbHandler)
+        protected
+          def output_buffer=(val)
+            template.instance_variable_set(:@_out_buf, val)
+          end
+        end # ErbHandler
+        OutputHelpers.register(ErbHandler)
     end # OutputHelpers
-  end
-end
+  end # Helpers
+end # Padrino