padrino-helpers 0.9.26 → 0.9.27

data/lib/padrino-helpers/form_helpers.rb

@@ -417,7 +417,7 @@ module Padrino
         #   configured_form_builder_class(nil) => StandardFormBuilder
         #
         def configured_form_builder_class(explicit_builder=nil)
-          default_builder    = self.respond_to?(:options) && self.options.default_builder
+          default_builder    = self.respond_to?(:settings) && self.settings.default_builder
           configured_builder = explicit_builder || default_builder || 'StandardFormBuilder'
           configured_builder = "Padrino::Helpers::FormBuilder::#{configured_builder}".constantize if configured_builder.is_a?(String)
           configured_builder

data/lib/padrino-helpers/render_helpers.rb

@@ -9,13 +9,15 @@ module Padrino
       #   partial 'photo/item', :object => @photo
       #   partial 'photo/item', :collection => @photos
       #   partial 'photo/item', :locals => { :foo => :bar }
+      #   partial 'photo/item', :engine => :erb
       #
       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]}"
-        template_path = File.join(path)
+        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)
@@ -23,13 +25,13 @@ module Padrino
           collection.map { |member|
             counter += 1
             options[:locals].merge!(object_name => member, "#{object_name}_counter".to_sym => counter)
-            render(template_path, nil, options.dup)
+            render(explicit_engine, template_path, options.dup)
           }.join("\n")
         else
           if member = options.delete(:object)
             options[:locals].merge!(object_name => member)
           end
-          render(template_path, nil, options.dup)
+          render(explicit_engine, template_path, options.dup)
         end
       end
       alias :render_partial :partial

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

@@ -0,0 +1 @@
+<p class="erb"><%= partial 'partials/erb', :engine => "erb" %></p>

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

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

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

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

data/test/fixtures/render_app/app.rb

@@ -2,6 +2,7 @@ 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
@@ -21,6 +22,11 @@ class RenderDemo < Padrino::Application
     render :current_engine
   end
 
+  # get current engines from explicit engine partials
+  get '/explicit_engine' do
+    render :explicit_engine
+  end
+
   # partial with object
   get '/partial/object' do
     partial 'template/user', :object => RenderUser.new('John'), :locals => { :extra => "bar" }

data/test/fixtures/render_app/views/current_engines/_erb.erb

@@ -1 +1 @@
-<%= current_engine %>
+<span><%= current_engine %></span>

data/test/fixtures/render_app/views/current_engines/_haml.haml

@@ -1 +1 @@
-=current_engine
+%span=current_engine

data/test/fixtures/render_app/views/current_engines/_slim.slim

@@ -1 +1 @@
-=current_engine
+span=current_engine

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

@@ -0,0 +1,5 @@
+%p.start= current_engine
+%p.haml= partial "current_engines/haml", :engine => :haml
+%p.erb= partial 'current_engines/erb', :engine => :erb
+%p.slim= partial 'current_engines/slim', :engine => :slim
+%p.end= current_engine

data/test/test_form_builder.rb

@@ -4,6 +4,13 @@ require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 class TestFormBuilder < Test::Unit::TestCase
   include Padrino::Helpers::FormHelpers
 
+  # Dummy form builder for testing
+  module Padrino::Helpers::FormBuilder
+    class FakeFormBuilder < AbstractFormBuilder
+      def foo_field; @template.content_tag(:span, "bar"); end
+    end
+  end
+
   def app
     MarkupDemo.tap { |app| app.set :environment, :test }
   end
@@ -41,6 +48,16 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_has_tag('form input', :type => 'text', :name => 'outer_user_account[username]') { actual_html }
     end
 
+    should "display form specifying default builder setting" do
+      self.expects(:settings).returns(stub(:default_builder => 'FakeFormBuilder')).once
+      actual_html = ""
+      assert_nothing_raised do
+        actual_html = form_for(@user, '/register', :id => 'register', :"accept-charset" => "UTF-8", :method => 'post') { |f| f.foo_field }
+      end
+      assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :method => 'post') { actual_html }
+      assert_has_tag('span', :content => "bar") { actual_html }
+    end
+
     should "display correct form html with remote option" do
       actual_html = form_for(@user, '/update', :"accept-charset" => "UTF-8", :remote => true) { "Demo" }
       assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/update', :method => 'post', "data-remote" => 'true') { actual_html }

data/test/test_output_helpers.rb

@@ -113,4 +113,21 @@ class TestOutputHelpers < Test::Unit::TestCase
       assert_have_selector 'p.end',   :content => "slim"
     end
   end
+
+  context 'for #partial method in simple sinatra application' do
+    should 'properly output in erb' do
+      visit '/erb/simple_partial'
+      assert_have_selector 'p.erb',  :content => "erb"
+    end
+
+    should 'properly output in haml' do
+      visit '/haml/simple_partial'
+      assert_have_selector 'p.haml',  :content => "haml"
+    end
+
+    should 'properly output in slim' do
+      visit '/slim/simple_partial'
+      assert_have_selector 'p.slim',  :content => "slim"
+    end
+  end
 end

data/test/test_render_helpers.rb

@@ -51,9 +51,18 @@ class TestRenderHelpers < Test::Unit::TestCase
     should 'detect correctly current engine for a padrino application' do
       visit '/current_engine'
       assert_have_selector 'p.start', :content => "haml"
-      assert_have_selector 'p.haml',  :content => "haml"
-      assert_have_selector 'p.erb',   :content => "erb"
-      assert_have_selector 'p.slim',  :content => "slim"
+      assert_have_selector 'p.haml span',  :content => "haml"
+      assert_have_selector 'p.erb span',   :content => "erb"
+      assert_have_selector 'p.slim span',  :content => "slim"
+      assert_have_selector 'p.end',   :content => "haml"
+    end
+
+    should "detect correctly current engine for explicit engine on partials" do
+      visit '/explicit_engine'
+      assert_have_selector 'p.start', :content => "haml"
+      assert_have_selector 'p.haml span',  :content => "haml"
+      assert_have_selector 'p.erb span',   :content => "erb"
+      assert_have_selector 'p.slim span',  :content => "slim"
       assert_have_selector 'p.end',   :content => "haml"
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 9
-  - 26
-  version: 0.9.26
+  - 27
+  version: 0.9.27
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 Z
+date: 2011-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
         - 9
-        - 26
-        version: 0.9.26
+        - 27
+        version: 0.9.27
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -133,12 +133,16 @@ files:
 - test/fixtures/markup_app/views/partials/_erb.erb
 - test/fixtures/markup_app/views/partials/_haml.haml
 - test/fixtures/markup_app/views/partials/_slim.slim
+- test/fixtures/markup_app/views/simple_partial.erb
+- test/fixtures/markup_app/views/simple_partial.haml
+- test/fixtures/markup_app/views/simple_partial.slim
 - test/fixtures/render_app/app.rb
 - test/fixtures/render_app/views/current_engine.haml
 - test/fixtures/render_app/views/current_engines/_erb.erb
 - test/fixtures/render_app/views/current_engines/_haml.haml
 - test/fixtures/render_app/views/current_engines/_slim.slim
 - test/fixtures/render_app/views/erb/test.erb
+- test/fixtures/render_app/views/explicit_engine.haml
 - test/fixtures/render_app/views/haml/test.haml
 - test/fixtures/render_app/views/template/_user.haml
 - test/fixtures/render_app/views/template/haml_template.haml
@@ -222,12 +226,16 @@ test_files:
 - test/fixtures/markup_app/views/partials/_erb.erb
 - test/fixtures/markup_app/views/partials/_haml.haml
 - test/fixtures/markup_app/views/partials/_slim.slim
+- test/fixtures/markup_app/views/simple_partial.erb
+- test/fixtures/markup_app/views/simple_partial.haml
+- test/fixtures/markup_app/views/simple_partial.slim
 - test/fixtures/render_app/app.rb
 - test/fixtures/render_app/views/current_engine.haml
 - test/fixtures/render_app/views/current_engines/_erb.erb
 - test/fixtures/render_app/views/current_engines/_haml.haml
 - test/fixtures/render_app/views/current_engines/_slim.slim
 - test/fixtures/render_app/views/erb/test.erb
+- test/fixtures/render_app/views/explicit_engine.haml
 - test/fixtures/render_app/views/haml/test.haml
 - test/fixtures/render_app/views/template/_user.haml
 - test/fixtures/render_app/views/template/haml_template.haml