padrino-helpers 0.11.3 → 0.11.4

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

@@ -25,18 +25,19 @@ module Padrino
           template.block_is_haml?(block)
         end
 
-        # Captures the html from a block of template code for this handler
+        ##
+        # Captures the html from a block of template code for this handler.
         #
         # @example
         #   @handler.capture_from_template(&block) => "...html..."
         #
         def capture_from_template(*args, &block)
-          eval("_hamlout ||= @haml_buffer", block.binding) # this is for rbx
+          eval("_hamlout ||= @haml_buffer", block.binding)
           template.capture_haml(*args, &block)
         end
 
         ##
-        # Outputs the given text to the templates buffer directly
+        # Outputs the given text to the templates buffer directly.
         #
         # @example
         #   @handler.concat_to_template("This will be output to the template buffer")
@@ -47,7 +48,7 @@ module Padrino
         end
 
         ##
-        # Returns an array of engines used for the template
+        # Returns an array of engines used for the template.
         #
         # @example
         #   @handler.engines => [:haml]
@@ -55,9 +56,8 @@ module Padrino
         def engines
           @_engines ||= [:haml]
         end
-      end # HamlHandler
-
+      end
       OutputHelpers.register(HamlHandler)
-    end # OutputHelpers
-  end # Helpers
-end # Padrino
+    end
+  end
+end

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

@@ -1,5 +1,3 @@
-# Make slim works with sinatra/padrino
-
 module Padrino
   module Helpers
     module OutputHelpers
@@ -24,7 +22,8 @@ module Padrino
           !self.output_buffer.nil?
         end
 
-        # Captures the html from a block of template code for this handler
+        ##
+        # Captures the html from a block of template code for this handler.
         #
         # @example
         #   @handler.capture_from_template(&block) => "...html..."
@@ -38,7 +37,7 @@ module Padrino
         end
 
         ##
-        # Outputs the given text to the templates buffer directly
+        # Outputs the given text to the templates buffer directly.
         #
         # @example
         #   @handler.concat_to_template("This will be output to the template buffer")
@@ -59,7 +58,7 @@ module Padrino
         end
 
         ##
-        # Returns an array of engines used for the template
+        # Returns an array of engines used for the template.
         #
         # @example
         #   @handler.engines => [:erb, :erubis]
@@ -69,12 +68,11 @@ module Padrino
         end
 
         protected
-          def output_buffer=(val)
-            template.instance_variable_set(:@_out_buf, val)
-          end
-      end # SlimHandler
-
+        def output_buffer=(val)
+          template.instance_variable_set(:@_out_buf, val)
+        end
+      end
       OutputHelpers.register(SlimHandler)
-    end # OutputHelpers
-  end # Helpers
-end # Padrino
+    end
+  end
+end

data/lib/padrino-helpers/render_helpers.rb

@@ -5,7 +5,7 @@ module Padrino
     #
     module RenderHelpers
       ##
-      # Render a partials with collections support
+      # Render a partials with collections support.
       #
       # @param [String] template
       #   Relative path to partial template.
@@ -18,7 +18,7 @@ module Padrino
       # @option options [Hash] :locals ({})
       #   Local variables accessible in the partial.
       # @option options [Symbol] :engine
-      #   Explicit rendering engine to use for this partial
+      #   Explicit rendering engine to use for this partial.
       #
       # @return [String] The html generated from this partial.
       #
@@ -30,7 +30,6 @@ module Padrino
       #
       # @note If using this from Sinatra, pass explicit +:engine+ option
       #
-      # @api public
       def partial(template, options={})
         options.reverse_merge!(:locals => {}, :layout => false)
         path            = template.to_s.split(File::SEPARATOR)
@@ -55,6 +54,6 @@ module Padrino
         end
       end
       alias :render_partial :partial
-    end # RenderHelpers
-  end # Helpers
-end # Padrino
+    end
+  end
+end

data/lib/padrino-helpers/tag_helpers.rb

@@ -5,7 +5,7 @@ module Padrino
     #
     module TagHelpers
       ##
-      # Tag values escaped to html entities
+      # Tag values escaped to html entities.
       #
       ESCAPE_VALUES = {
         "&" => "&",
@@ -62,13 +62,13 @@ module Padrino
       NEWLINE = "\n".html_safe.freeze
 
       ##
-      # Creates an HTML tag with given name, content, and options
+      # Creates an HTML tag with given name, content, and options.
       #
       # @overload content_tag(name, content, options = nil)
       #   @param [Symbol] name
       #     The name of the HTML tag to create.
       #   @param [String] content
-      #     The content inside of the the tag.
+      #     The content inside of the tag.
       #   @param [Hash] options
       #     The HTML options to include in this tag.
       #
@@ -99,7 +99,7 @@ module Padrino
       #     Specifies whether or not the element is editable.
       #
       # @return [String]
-      #   Generated HTML with specified +options+
+      #   Generated HTML with specified +options+.
       #
       # @example
       #   content_tag(:p, 'Hello World', :class => 'light')
@@ -116,7 +116,6 @@ module Padrino
       #   # =>   <a href="http://www.padrinorb.com">Padrino</a>
       #   # => </p>
       #
-      # @api public
       def content_tag(name, content = nil, options = nil, &block)
         if block_given?
           options = content if content.is_a?(Hash)
@@ -139,7 +138,7 @@ module Padrino
 
       ##
       # Like #content_tag, but assumes its input to be safe and doesn't
-      # escape. It also returns safe html.
+      # escape. It also returns safe HTML.
       #
       # @see #content_tag
       #
@@ -148,7 +147,7 @@ module Padrino
       end
 
       ##
-      # Creates an HTML input field with the given type and options
+      # Creates an HTML input field with the given type and options.
       #
       # @param [Symbol] type
       #   The type of input to create.
@@ -178,14 +177,14 @@ module Padrino
       # @option options [Boolean] :autofocus
       #   Specifies whether or not the input should automatically get focus when the page loads.
       # @option options [Boolean] :required
-      #   Specifies whether or not the input is required to be completeled before the form is submitted.
+      #   Specifies whether or not the input is required to be completed before the form is submitted.
       # @option options [Boolean] :readonly
       #   Specifies whether or not the input is read only.
       # @option options [Boolean] :disabled
       #   Specifies whether or not the input is disabled.
       #
       # @return [String]
-      #   Generated HTML with specified +options+
+      #   Generated HTML with specified +options+.
       #
       # @example
       #   input_tag :text, :name => 'handle'
@@ -200,13 +199,12 @@ module Padrino
       #   input_tag :number, :name => 'credit_card', :autocomplete => :off
       #   # => <input type="number" autocomplete="off" />
       #
-      # @api semipublic
       def input_tag(type, options = {})
         tag(:input, options.reverse_merge!(:type => type))
       end
 
       ##
-      # Creates an HTML tag with the given name and options
+      # Creates an HTML tag with the given name and options.
       #
       # @param [Symbol] name
       #  The name of the HTML tag to create.
@@ -216,7 +214,7 @@ module Padrino
       # @macro global_html_attributes
       #
       # @return [String]
-      #   Generated HTML with specified +options+
+      #   Generated HTML with specified +options+.
       #
       # @example
       #   tag :hr, :class => 'dotted'
@@ -231,7 +229,6 @@ module Padrino
       #   tag :img, :src => 'sinatra.jpg, :data => { :nsfw => false, :geo => [34.087, -118.407] }
       #   # => <img src="sinatra.jpg" data-nsfw="false" data-geo="34.087 -118.407" />
       #
-      # @api public
       def tag(name, options = nil, open = false)
         options    = parse_data_options(name, options)
         attributes = tag_attributes(options)
@@ -240,8 +237,8 @@ module Padrino
 
       private
       ##
-      # Returns a compiled list of HTML attributes
-      ##
+      # Returns a compiled list of HTML attributes.
+      #
       def tag_attributes(options)
         return '' if options.nil?
         attributes = options.map do |k, v|
@@ -259,13 +256,13 @@ module Padrino
 
       ##
       # Escape tag values to their HTML/XML entities.
-      ##
+      #
       def escape_value(string)
         string.to_s.gsub(ESCAPE_REGEXP) { |c| ESCAPE_VALUES[c] }
       end
 
       ##
-      # Iterate through nested values
+      # Iterate through nested values.
       #
       def nested_values(attribute, hash)
         hash.map do |k, v|
@@ -278,7 +275,7 @@ module Padrino
       end
 
       ##
-      # Parses custom data attributes
+      # Parses custom data attributes.
       #
       def parse_data_options(tag, options)
         return if options.nil?
@@ -290,6 +287,6 @@ module Padrino
         end
         parsed_options
       end
-    end # TagHelpers
-  end # Helpers
-end # Padrino
+    end
+  end
+end

data/lib/padrino-helpers/translation_helpers.rb

@@ -1,7 +1,7 @@
 module Padrino
   module Helpers
     ##
-    # Helpers related to locale1 i18n translation within templates.
+    # Helpers related to locale i18n translation within templates.
     #
     module TranslationHelpers
       ##
@@ -13,7 +13,6 @@ module Padrino
       # @return [String]
       #  The translation for the specified keys.
       #
-      # @api public
       def translate(*args)
         I18n.translate(*args)
       end
@@ -28,11 +27,10 @@ module Padrino
       # @return [String]
       #  The translation for the specified keys.
       #
-      # @api public
       def localize(*args)
         I18n.localize(*args)
       end
       alias :l :localize
-    end # TranslationHelpers
-  end # Helpers
-end # Padrino
+    end
+  end
+end

data/test/fixtures/markup_app/app.rb

@@ -10,11 +10,15 @@ class MarkupDemo < Sinatra::Base
   register Padrino::Helpers
 
   configure do
+    set :logging, false
+    set :padrino_logging, false
+    set :environment, :test
     set :root, File.dirname(__FILE__)
     set :erb, :engine_class => Padrino::Erubis::SafeBufferTemplate
     set :haml, :escape_html => true
-    set :slim, :generator => Temple::Generators::RailsOutputBuffer,
-               :buffer => "out_buf"
+    set :slim, :generator => Temple::Generators::RailsOutputBuffer, :buffer => "out_buf"
+    set :sessions, true
+    set :protect_from_csrf, true
   end
 
   get '/:engine/:file' do
@@ -50,7 +54,7 @@ class MarkupDemo < Sinatra::Base
 end
 
 class MarkupUser
-  def errors; { :fake => "must be valid", :second => "must be present", :third  => "must be a number", :email => "must be a email"}; end
+  def errors; { :fake => "must be valid", :second => "must be present", :third  => "must be a number", :email => "must be an email"}; end
   def session_id; 45; end
   def gender; 'male'; end
   def remember_me; '1'; end

data/test/fixtures/render_app/app.rb

@@ -16,6 +16,7 @@ class RenderDemo < Padrino::Application
   configure do
     set :logging, false
     set :padrino_logging, false
+    set :environment, :test
     set :erb, :engine_class => Padrino::Erubis::SafeBufferTemplate
     set :haml, :escape_html => true
     set :slim, :generator => Temple::Generators::RailsOutputBuffer

data/test/test_asset_tag_helpers.rb

@@ -5,7 +5,7 @@ describe "AssetTagHelpers" do
   include Padrino::Helpers::AssetTagHelpers
 
   def app
-    MarkupDemo.tap { |app| app.set :environment, :test }
+    MarkupDemo
   end
 
   def flash

data/test/test_form_builder.rb

@@ -4,6 +4,10 @@ require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 describe "FormBuilder" do
   include Padrino::Helpers::FormHelpers
 
+  def app
+    MarkupDemo
+  end
+
   # Dummy form builder for testing
   module Padrino::Helpers::FormBuilder
     class FakeFormBuilder < AbstractFormBuilder
@@ -11,10 +15,6 @@ describe "FormBuilder" do
     end
   end
 
-  def app
-    MarkupDemo.tap { |app| app.set :environment, :test }
-  end
-
   def setup
     role_types = [mock_model('Role', :name => "Admin", :id => 1),
       mock_model('Role', :name => 'Moderate', :id => 2),  mock_model('Role', :name => 'Limited', :id => 3)]
@@ -49,8 +49,7 @@ describe "FormBuilder" do
     end
 
     should "display form specifying default builder setting" do
-      self.expects(:settings).returns(stub(:default_builder => 'FakeFormBuilder')).once
-      actual_html = ""
+      self.expects(:settings).returns(stub(:default_builder => 'FakeFormBuilder', :protect_from_csrf => false)).at_least_once
       actual_html = form_for(@user, '/register', :id => 'register', :"accept-charset" => "UTF-8", :method => 'post') { |f| f.foo_field }
       assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :method => 'post') { actual_html }
       assert_has_tag('span', :content => "bar") { actual_html }

data/test/test_form_helpers.rb

@@ -5,12 +5,14 @@ describe "FormHelpers" do
   include Padrino::Helpers::FormHelpers
 
   def app
-    MarkupDemo.tap { |app| app.set :environment, :test }
+    MarkupDemo
   end
 
-  context 'for #form_tag method' do
-    after(:each) { app.set :protect_from_csrf, true }
+  class UnprotectedApp
+    def protect_from_csrf; false; end
+  end
 
+  context 'for #form_tag method' do
     should "display correct forms in ruby" do
       actual_html = form_tag('/register', :"accept-charset" => "UTF-8", :class => 'test', :method => "post") { "Demo" }
       assert_has_tag(:form, :"accept-charset" => "UTF-8", :class => "test") { actual_html }
@@ -73,19 +75,24 @@ describe "FormHelpers" do
       assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
     end
 
-    should "not have an authenticity_token if passing protect_from_csrf: false" do
-      actual_html = form_tag('/superadmindelete', :protect_from_csrf => false) { "Demo" }
-      assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+    should "create csrf meta tags with token and param - #csrf_meta_tags" do
+      actual_html = csrf_meta_tags
+      assert_has_tag(:meta, :name => 'csrf-param') { actual_html }
+      assert_has_tag(:meta, :name => 'csrf-token') { actual_html }
     end
 
-    should "have an authenticity_token if protect_from_csrf is not set on app settings" do
-      app.set :protect_from_csrf, nil
+    should "have an authenticity_token by default" do
       actual_html = form_tag('/superadmindelete') { "Demo" }
       assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
     end
 
+    should "not have an authenticity_token if passing protect_from_csrf: false" do
+      actual_html = form_tag('/superadmindelete', :protect_from_csrf => false) { "Demo" }
+      assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
     should "not have an authenticity_token if protect_from_csrf is false on app settings" do
-      app.set :protect_from_csrf, false
+      self.expects(:settings).returns(UnprotectedApp.new)
       actual_html = form_tag('/superadmindelete') { "Demo" }
       assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
     end
@@ -166,7 +173,7 @@ describe "FormHelpers" do
       assert_have_selector 'form.advanced-form .field-errors p', :content => "There were problems with the following fields:"
       assert_have_selector 'form.advanced-form .field-errors ul'
       assert_have_selector 'form.advanced-form .field-errors ul li', :count => 4
-      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Email must be a email"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Email must be an email"
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Fake must be valid"
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Second must be present"
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
@@ -180,7 +187,7 @@ describe "FormHelpers" do
       assert_have_selector 'form.advanced-form .field-errors p',  :content => "There were problems with the following fields:"
       assert_have_selector 'form.advanced-form .field-errors ul'
       assert_have_selector 'form.advanced-form .field-errors ul li', :count => 4
-      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Email must be a email"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Email must be an email"
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Fake must be valid"
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Second must be present"
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
@@ -194,7 +201,7 @@ describe "FormHelpers" do
       assert_have_selector 'form.advanced-form .field-errors p',  :content => "There were problems with the following fields:"
       assert_have_selector 'form.advanced-form .field-errors ul'
       assert_have_selector 'form.advanced-form .field-errors ul li', :count => 4
-      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Email must be a email"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Email must be an email"
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Fake must be valid"
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Second must be present"
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
@@ -961,6 +968,11 @@ describe "FormHelpers" do
       assert_has_tag('form button', :type => 'submit', :content => "My button's content", :title => "My button") { actual_html }
     end
 
+    should "pass options on submit button when submit_options are given" do
+      actual_html = button_to("Fancy button", '/users/1', :submit_options => { :class => :fancy })
+      assert_has_tag('form input', :type => 'submit', :value => 'Fancy button', :class => 'fancy') { actual_html }
+    end
+
     should 'display correct button_to in erb' do
       visit '/erb/button_to'
       assert_have_selector('form', :action => '/foo')