padrino-helpers 0.11.4 → 0.12.0.rc1

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

@@ -2,62 +2,24 @@ module Padrino
   module Helpers
     module OutputHelpers
       ##
-      # Handler for reading and writing from a haml template.
+      # Handler for Haml templates.
       #
       class HamlHandler < AbstractHandler
         ##
-        # Returns true if the current template type is same as this handlers; false otherwise.
+        # Returns true if the block is for Haml
         #
-        # @example
-        #   @handler.is_type? => true
-        #
-        def is_type?
-          template.respond_to?(:is_haml?) && template.is_haml?
-        end
-
-        ##
-        # Returns true if the block given is of the handler's template type; false otherwise.
-        #
-        # @example
-        #   @handler.block_is_type?(block) => true
-        #
-        def block_is_type?(block)
+        def engine_matches?(block)
           template.block_is_haml?(block)
         end
 
         ##
         # 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)
-          template.capture_haml(*args, &block)
-        end
-
-        ##
-        # Outputs the given text to the templates buffer directly.
-        #
-        # @example
-        #   @handler.concat_to_template("This will be output to the template buffer")
-        #
-        def concat_to_template(text="")
-          template.haml_concat(text)
-          nil
-        end
-
-        ##
-        # Returns an array of engines used for the template.
-        #
-        # @example
-        #   @handler.engines => [:haml]
-        #
-        def engines
-          @_engines ||= [:haml]
+          engine_matches?(block) ? template.capture_haml(*args, &block) : block.call(*args)
         end
       end
-      OutputHelpers.register(HamlHandler)
+      OutputHelpers.register(:haml, HamlHandler)
     end
   end
 end

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

@@ -2,77 +2,17 @@ module Padrino
   module Helpers
     module OutputHelpers
       ##
-      # Handler for reading and writing from a slim template.
+      # Handler for Slim templates.
       #
       class SlimHandler < AbstractHandler
-        attr_reader :output_buffer
-
-        def initialize(template)
-          super
-          @output_buffer = template.instance_variable_get(:@_out_buf)
-        end
-
-        ##
-        # Returns true if the current template type is same as this handlers; false otherwise.
-        #
-        # @example
-        #   @handler.is_type? => true
-        #
-        def is_type?
-          !self.output_buffer.nil?
-        end
-
         ##
-        # 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)
-          self.output_buffer, _buf_was = ActiveSupport::SafeBuffer.new, self.output_buffer
-          captured_block = block.call(*args)
-          ret = eval("@_out_buf", block.binding)
-          self.output_buffer = _buf_was
-          [ ret, captured_block ]
-        end
-
-        ##
-        # Outputs the given text to the templates buffer directly.
-        #
-        # @example
-        #   @handler.concat_to_template("This will be output to the template buffer")
+        # Returns true if the block is for Slim.
         #
-        def concat_to_template(text="")
-          self.output_buffer << text if is_type? && text
-          nil
-        end
-
-        ##
-        # Returns true if the block given is of the handler's template type; false otherwise.
-        #
-        # @example
-        #   @handler.block_is_type?(block) => true
-        #
-        def block_is_type?(block)
-          is_type? || (block && eval('defined? __in_erb_template', block.binding))
-        end
-
-        ##
-        # Returns an array of engines used for the template.
-        #
-        # @example
-        #   @handler.engines => [:erb, :erubis]
-        #
-        def engines
-          @_engines ||= [:slim]
-        end
-
-        protected
-        def output_buffer=(val)
-          template.instance_variable_set(:@_out_buf, val)
+        def engine_matches?(block)
+          block.binding.eval('defined? __in_slim_template')
         end
       end
-      OutputHelpers.register(SlimHandler)
+      OutputHelpers.register(:slim, SlimHandler)
     end
   end
 end

data/lib/padrino-helpers/output_helpers.rb

@@ -8,6 +8,20 @@ module Padrino
         base.send(:include, SinatraCurrentEngine) unless base.method_defined?(:current_engine)
       end
 
+      ##
+      # Returns the list of all available template handlers.
+      #
+      def self.handlers
+        @_template_handlers ||= {}
+      end
+
+      ##
+      # Registers a new handler as available to the output helpers.
+      #
+      def self.register(engine, handler)
+        handlers[engine] = handler
+      end
+
       ##
       # Module used to detect the current engine in vanilla Sinatra apps.
       #
@@ -45,14 +59,11 @@ module Padrino
       #   # => "<foo>"
       #
       def capture_html(*args, &block)
-        handler = find_proper_handler
-        captured_block, captured_html = nil, ""
-        if handler && handler.is_type? && handler.block_is_type?(block)
-          captured_html, captured_block = handler.capture_from_template(*args, &block)
+        if handler = find_proper_handler
+          handler.capture_from_template(*args, &block)
+        else
+          block.call(*args)
         end
-        # invoking the block directly if there was no template
-        captured_html = block_given? && ( captured_block || block.call(*args) )  if captured_html.blank?
-        captured_html
       end
       alias :capture :capture_html
 
@@ -68,10 +79,9 @@ module Padrino
       #   concat_content("This will be output to the template buffer")
       #
       def concat_content(text="")
-        handler = find_proper_handler
-        if handler && handler.is_type?
+        if handler = find_proper_handler
           handler.concat_to_template(text)
-        else # theres no template to concat, return the text directly
+        else
           text
         end
       end
@@ -105,7 +115,7 @@ module Padrino
       #
       def block_is_template?(block)
         handler = find_proper_handler
-        block && handler && handler.block_is_type?(block)
+        block && handler && handler.engine_matches?(block)
       end
 
       ##
@@ -124,7 +134,9 @@ module Padrino
       #   content_for(:name) { |name| ...content... }
       #   content_for(:name, "I'm Jeff")
       #
-      def content_for(key, content = nil, &block)
+      def content_for(key, content = nil, options = {}, &block)
+        options = content if content.is_a?(Hash)
+        content_blocks[key.to_sym].clear if options[:flush]
         content_blocks[key.to_sym] << (block_given? ? block : Proc.new { content })
       end
 
@@ -185,7 +197,8 @@ module Padrino
       #   find_proper_handler => <OutputHelpers::HamlHandler>
       #
       def find_proper_handler
-        OutputHelpers.handlers.map { |h| h.new(self) }.find { |h| h.engines.include?(current_engine) && h.is_type? }
+        handler_class = OutputHelpers.handlers[current_engine]
+        handler_class && handler_class.new(self)
       end
 
       ##

data/lib/padrino-helpers/render_helpers.rb

@@ -30,27 +30,30 @@ module Padrino
       #
       # @note If using this from Sinatra, pass explicit +:engine+ option
       #
-      def partial(template, options={})
-        options.reverse_merge!(:locals => {}, :layout => false)
-        path            = template.to_s.split(File::SEPARATOR)
-        object_name     = path[-1].to_sym
-        path[-1]        = "_#{path[-1]}"
+      def partial(template, options={}, &block)
+        options = options.reverse_merge(:locals => {}, :layout => false)
         explicit_engine = options.delete(:engine)
-        template_path   = File.join(path).to_sym
-        raise 'Partial collection specified but is nil' if options.has_key?(:collection) && options[:collection].nil?
-        if collection = options.delete(:collection)
-          options.delete(:object)
-          counter = 0
-          collection.map { |member|
-            counter += 1
-            options[:locals].merge!(object_name => member, "#{object_name}_counter".to_sym => counter)
-            render(explicit_engine, template_path, options.dup)
-          }.join("\n").html_safe
+
+        path,_,name = template.to_s.rpartition(File::SEPARATOR)
+        template_path = File.join(path,"_#{name}").to_sym
+        object_name = name.to_sym
+
+        objects, counter = if options[:collection].respond_to?(:inject)
+          [options.delete(:collection), 0]
         else
-          if member = options.delete(:object)
-            options[:locals].merge!(object_name => member)
+          [[options.delete(:object)], nil]
+        end
+
+        locals = options[:locals]
+        objects.inject(''.html_safe) do |html,object|
+          locals[object_name] = object if object
+          locals["#{object_name}_counter".to_sym] = counter += 1 if counter
+          if block_given?
+            output = render(explicit_engine, template_path, options){ capture_html(&block) }.html_safe
+            html << (block_is_template?(block) ? concat_content(output) : output)
+          else
+            html << render(explicit_engine, template_path, options).html_safe
           end
-          render(explicit_engine, template_path, options.dup).html_safe
         end
       end
       alias :render_partial :partial

data/lib/padrino-helpers.rb

@@ -9,6 +9,7 @@ require 'active_support/inflector'                    # humanize
 
 FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__)
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-helpers/locale/*.yml"]
+I18n.enforce_available_locales = true
 
 module Padrino
   ##

data/padrino-helpers.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
   s.date = Time.now.strftime("%Y-%m-%d")
+  s.license = "MIT"
 
   s.extra_rdoc_files = Dir["*.rdoc"]
   s.files         = `git ls-files`.split("\n")
@@ -23,5 +24,5 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-core", Padrino.version)
-  s.add_dependency("i18n", "~> 0.6")
+  s.add_dependency("i18n", "~> 0.6", ">= 0.6.7")
 end

data/test/fixtures/markup_app/app.rb

@@ -1,22 +1,14 @@
-require 'sinatra/base'
-require 'haml'
-require 'erubis'
-require 'slim'
-require 'padrino-core/application/rendering/extensions/erubis'
-require 'padrino-core/application/rendering/extensions/haml'
-require 'padrino-core/application/rendering/extensions/slim'
+require 'padrino-core'
 
 class MarkupDemo < Sinatra::Base
   register Padrino::Helpers
+  register Padrino::Rendering
 
   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 :sessions, true
     set :protect_from_csrf, true
   end
@@ -50,6 +42,18 @@ class MarkupDemo < Sinatra::Base
         content_tag(:span, "This not a template block")
       end
     end
+
+    def content_tag_with_block
+      one = content_tag(:p) do
+        "one"
+      end
+      two = content_tag(:p) do
+        "two"
+      end
+      one << two
+    rescue
+      "<p>failed</p>".html_safe
+    end
   end
 end
 

data/test/fixtures/markup_app/views/button_to.haml

@@ -1,5 +1,5 @@
-- button_to 'Foo button', '/foo', :class => 'foo-form' do
-  - field_set_tag do
+= button_to 'Foo button', '/foo', :class => 'foo-form' do
+  = field_set_tag do
     = label_tag :username
 = content_tag(:p, 'button_to test', :id => 'test-point')
 = button_to 'Bar button', '/bar'

data/test/fixtures/markup_app/views/capture_concat.haml

@@ -3,10 +3,10 @@
   %span Captured Line 2
 = @content
 
-- concat_in_p('Concat Line 3')
+= concat_in_p('Concat Line 3')
 
-- concat_if_block_is_template('haml') do
+= concat_if_block_is_template('haml') do
   %span This is haml
   %span This is haml
 
-- concat_ruby_not_template_block
+= concat_ruby_not_template_block

data/test/fixtures/markup_app/views/capture_concat.slim

@@ -3,10 +3,10 @@
   span Captured Line 2
 = @content
 
-- concat_in_p('Concat Line 3')
+= concat_in_p('Concat Line 3')
 
-- concat_if_block_is_template('slim') do
+= concat_if_block_is_template('slim') do
   span This is slim
   span This is slim
 
-- concat_ruby_not_template_block
+= concat_ruby_not_template_block

data/test/fixtures/markup_app/views/content_for.erb

@@ -11,4 +11,13 @@
 <div class='demo2'><%= yield_content :demo2, "Johnny", "Smith" %></div>
 
 <div class="demo_has_content"><%= content_for?(:demo).to_s %>
-<div class="fake_has_content"><%= content_for?(:fake).to_s %>
+<div class="fake_has_content"><%= content_for?(:fake).to_s %>
+
+<% content_for :demo3 do %>
+  <p class="duplication">One</p>
+<% end %>
+<% content_for :demo3, :flush => true do %>
+  <p class="duplication">Two</p>
+<% end %>
+
+<div class="demo3"><%= yield_content :demo3 %></div>

data/test/fixtures/markup_app/views/content_for.haml

@@ -10,3 +10,10 @@
 
 .demo_has_content= content_for?(:demo)
 .fake_has_content= content_for?(:fake)
+
+- content_for :demo3 do
+  %p{:class => "duplication"} One
+- content_for :demo3, :flush => true do
+  %p{:class => "duplication"} Two
+
+.demo3= yield_content :demo3

data/test/fixtures/markup_app/views/content_for.slim

@@ -9,4 +9,11 @@
 .demo2= yield_content :demo2, "Johnny", "Smith"
 
 .demo_has_content= content_for?(:demo)
-.fake_has_content= content_for?(:fake)
+.fake_has_content= content_for?(:fake)
+
+- content_for :demo3 do
+  p.duplication One
+- content_for :demo3, :flush => true do
+  p.duplication Two
+
+.demo3= yield_content :demo3

data/test/fixtures/markup_app/views/content_tag.erb

@@ -9,3 +9,5 @@
 <% content_tag(:p) do %>
   <span>Test 4</span>
 <% end %>
+
+<%= content_tag_with_block %>

data/test/fixtures/markup_app/views/content_tag.haml

@@ -2,8 +2,10 @@
 
 = content_tag :p, "Test 2"
 
-- content_tag(:p, :class => 'test', :id => 'test3') do
+= content_tag(:p, :class => 'test', :id => 'test3') do
   %span Test 3
 
-- content_tag(:p) do
+= content_tag(:p) do
   %span Test 4
+
+= content_tag_with_block

data/test/fixtures/markup_app/views/content_tag.slim

@@ -6,4 +6,6 @@
   span Test 3
 
 =content_tag(:p) do
-  span Test 4
+  span Test 4
+
+= content_tag_with_block

data/test/fixtures/markup_app/views/fields_for.haml

@@ -1,13 +1,13 @@
 - @user = MarkupUser.new
-- form_for @user , '/demo1', :id => 'demo-fields-for' do |f|
+= form_for @user , '/demo1', :id => 'demo-fields-for' do |f|
   = f.text_field :gender
-  - fields_for @user.permission do |permission|
+  = fields_for @user.permission do |permission|
     = permission.check_box :can_edit
     = permission.check_box :can_delete
-  - f.fields_for :telephone do |child_form|
+  = f.fields_for :telephone do |child_form|
     = child_form.label :number
     = child_form.text_field :number
-  - f.fields_for :addresses do |child_form|
+  = f.fields_for :addresses do |child_form|
     = child_form.label :name
     = child_form.text_field :name
     - unless child_form.object.new_record?

data/test/fixtures/markup_app/views/form_for.haml

@@ -1,4 +1,4 @@
-- form_for MarkupUser.new, '/demo', :id => 'demo' do |f|
+= form_for MarkupUser.new, '/demo', :id => 'demo' do |f|
   = f.error_messages(:header_message => "custom MarkupUser cannot be saved!")
   = f.hidden_field :session_id
   %p
@@ -43,7 +43,7 @@
   %p
     = f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button'
 
-- form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f|
+= form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f|
   = f.error_messages :header_message => "custom MarkupUser cannot be saved!"
   = f.hidden_field :session_id
   = f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname: ', :class => 'label' }
@@ -55,5 +55,5 @@
   = f.submit_block "Create", { :class => 'button' }
   = f.image_submit_block "buttons/ok.png", { :class => 'image' }
 
-- form_for :markup_user, '/third_demo', :id => 'demo3', :method => 'get' do |f|
+= form_for :markup_user, '/third_demo', :id => 'demo3', :method => 'get' do |f|
   = f.text_field_block :username

data/test/fixtures/markup_app/views/form_tag.haml

@@ -1,6 +1,6 @@
-- form_tag '/simple', :class => 'simple-form' do
+= form_tag '/simple', :class => 'simple-form' do
   = error_messages_for nil
-  - field_set_tag do
+  = field_set_tag do
     = hidden_field_tag :session_id, :value => "__secret__"
     = label_tag :username
     = text_field_tag :username
@@ -26,10 +26,10 @@
     = check_box_tag :remember_me
     = submit_tag
 
-- form_tag '/advanced', :id => 'advanced', :class => 'advanced-form', :method => 'get' do
+= form_tag '/advanced', :id => 'advanced', :class => 'advanced-form', :method => 'get' do
   = error_messages_for MarkupUser.new, :header_message => "There are problems with saving user!"
   = hidden_field_tag :session_id, :value => "__secret__"
-  - field_set_tag "Advanced", :class => 'advanced-field-set' do
+  = field_set_tag "Advanced", :class => 'advanced-field-set' do
     %p
       = label_tag :username, :class => 'first', :caption => "Nickname"
       = text_field_tag :username, :value => params[:username], :id => 'the_username'
@@ -69,10 +69,10 @@
     %p
       = range_field_tag('ranger_with_min_max', :min => 1, :max => 50)
       = range_field_tag('ranger_with_range', :range => 1..5)
-  - field_set_tag(:class => 'buttons') do
+  = field_set_tag(:class => 'buttons') do
     = submit_tag "Login"
     = button_tag "Cancel"
     = image_submit_tag "buttons/submit.png"
 
-- form_tag '/dontprotect', :class => 'no-protection', :protect_from_csrf => false do
+= form_tag '/dontprotect', :class => 'no-protection', :protect_from_csrf => false do
   = submit_tag "Login"

data/test/fixtures/markup_app/views/link_to.haml

@@ -1,4 +1,4 @@
 = link_to "Test 1 No Block", '/test1', :class => 'test', :id => 'test1'
 
-- link_to("/test2", :class => 'test', :id => 'test2') do
+= link_to("/test2", :class => 'test', :id => 'test2') do
   %span Test 2 With Block

data/test/fixtures/markup_app/views/simple_partial.slim

@@ -1 +1 @@
-p.slim= partial 'partials/slim', :engine => "slim"
+p.slim= partial 'partials/slim', :engine => "slim"

data/test/fixtures/render_app/app.rb

@@ -2,7 +2,6 @@ PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 PADRINO_ENV = 'test' unless defined? PADRINO_ENV
 
 require 'padrino-core'
-require 'slim'
 
 class RenderUser
   attr_accessor :name
@@ -17,9 +16,6 @@ class RenderDemo < Padrino::Application
     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
   end
 
   # get current engines from partials
@@ -36,6 +32,10 @@ class RenderDemo < Padrino::Application
     render "double_capture_#{params[:ext]}"
   end
 
+  get '/wrong_capture_:ext' do
+    render "wrong_capture_#{params[:ext]}"
+  end
+
   # partial with object
   get '/partial/object' do
     partial 'template/user', :object => RenderUser.new('John'), :locals => { :extra => "bar" }
@@ -55,4 +55,16 @@ class RenderDemo < Padrino::Application
   get '/partial/foward_slash' do
     partial '/template/user', :object => RenderUser.new('John'), :locals => { :extra => "bar" }
   end
+
+  get '/render_block_:ext' do
+    render "render_block_#{params[:ext]}" do
+      content_tag :div, 'go block!'
+    end
+  end
+
+  get '/partial_block_:ext' do
+    partial "partial_block_#{params[:ext]}" do
+      content_tag :div, 'go block!'
+    end
+  end
 end

data/test/fixtures/render_app/views/_deep.erb

@@ -0,0 +1,3 @@
+<div class="deep">
+<%= yield %>
+</div>

data/test/fixtures/render_app/views/_deep.haml

@@ -0,0 +1,2 @@
+.deep
+  = yield

data/test/fixtures/render_app/views/_deep.slim

@@ -0,0 +1,2 @@
+.deep
+  = yield

data/test/fixtures/render_app/views/_partial_block_erb.erb

@@ -0,0 +1,10 @@
+<h1>prefix</h1>
+<div class="erb-block">
+<%= yield %>
+</div>
+<div class="go-deep">
+<% partial 'deep.erb' do %>
+Done
+<% end %>
+</div>
+<h3>postfix</h3>

data/test/fixtures/render_app/views/_partial_block_haml.haml

@@ -0,0 +1,7 @@
+%h1 prefix
+.haml-block
+  = yield
+.go-deep
+  = partial 'deep.haml' do
+    Done
+%h3 postfix

data/test/fixtures/render_app/views/_partial_block_slim.slim

@@ -0,0 +1,7 @@
+h1 prefix
+.slim-block
+  = yield
+.go-deep
+  = partial 'deep.slim' do
+    | Done
+h3 postfix

data/test/fixtures/render_app/views/double_capture_erb.erb

@@ -1,3 +1,3 @@
-<% form_for( :object, '/' ) do |f| %>
+<% form_for( :object, '/' ) do |f| %>
   <%= $number_of_captures += 1 %>
-<% end %>
+<% end %>

data/test/fixtures/render_app/views/double_capture_haml.haml

@@ -1,2 +1,2 @@
-- form_for :object, '/' do |f|
+= form_for :object, '/' do |f|
   = $number_of_captures += 1

data/test/fixtures/render_app/views/double_capture_slim.slim

@@ -1,2 +1,2 @@
-- form_for :object, '/' do |f|
+= form_for :object, '/' do |f|
   = $number_of_captures += 1

data/test/fixtures/render_app/views/render_block_erb.erb

@@ -0,0 +1,5 @@
+<h1>prefix</h1>
+<div class="erb-block">
+<%= yield %>
+</div>
+<h3>postfix</h3>