padrino-helpers 0.8.1 → 0.8.2

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/lib/padrino-helpers/output_helpers.rb

@@ -122,13 +122,18 @@ module Padrino
           !@_out_buf.nil?
         end
 
-        ##
-        # Used to determine if a block is called from ERB.
-        # NOTE: This doesn't actually work yet because the variable __in_erb_template
-        # hasn't been defined in ERB. We need to find a way to fix this.
-        # 
-        def block_is_erb?(block)
-          has_erb_buffer? || block && eval('defined? __in_erb_template', block)
+        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_erb?(block)
+            has_erb_buffer? || block && eval('defined? __in_erb_template', block)
+          end
+        else
+          def block_is_erb?(block)
+            has_erb_buffer? || block && eval('defined? __in_erb_template', block.binding)
+          end
         end
 
         ##

data/lib/padrino-helpers/tag_helpers.rb

@@ -40,6 +40,7 @@ module Padrino
       # 
       def tag(name, options={})
         content, open_tag = options.delete(:content), options.delete(:open)
+        content = content.join("\n") if content.respond_to?(:join)
         identity_tag_attributes.each { |attr| options[attr] = attr.to_s if options[attr]  }
         html_attrs = options.collect { |a, v| v.blank? ? nil : "#{a}=\"#{v}\"" }.compact.join(" ")
         base_tag = (html_attrs.present? ? "<#{name} #{html_attrs}" : "<#{name}")

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-02-14}
+  s.date = %q{2010-02-17}
   s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -84,7 +84,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.8.1"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.8.2"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -92,7 +92,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<padrino-core>, ["= 0.8.1"])
+      s.add_dependency(%q<padrino-core>, ["= 0.8.2"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -101,7 +101,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.8.1"])
+    s.add_dependency(%q<padrino-core>, ["= 0.8.2"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/fixtures/markup_app/app.rb

@@ -16,7 +16,7 @@ class MarkupDemo < Sinatra::Base
     # show :erb, :index
     # show :haml, :index
     def show(kind, template)
-      eval("#{kind.to_s} #{template.to_sym.inspect}")
+      send kind.to_sym, template.to_sym
     end
 
     def captured_content(&block)

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

@@ -2,7 +2,7 @@
   <h1>This is content yielded from a content_for</h1>
 <% end %>
   
-<div class='demo'><%= yield_content :demo %></p>
+<div class='demo'><%= yield_content :demo %></div>
   
 <% content_for :demo2 do |fname, lname| %>
   <h1>This is content yielded with name <%= fname + " " + lname %></h1>

data/test/test_form_builder.rb

@@ -58,7 +58,7 @@ class TestFormBuilder < Test::Unit::TestCase
     end
 
     should "support changing form builder type" do
-      form_html = lambda { form_for(@user, '/register', :builder => "AbstractFormBuilder") { |f| f.text_field_block(:name) } }
+      form_html = proc { form_for(@user, '/register', :builder => "AbstractFormBuilder") { |f| f.text_field_block(:name) } }
       assert_raise(NoMethodError) { form_html.call }
     end
 

data/test/test_format_helpers.rb

@@ -54,10 +54,10 @@ class TestFormatHelpers < Test::Unit::TestCase
       assert_equal "Once\nupon\na\ntime", actual_text
     end
     should "return proper formatting for default width" do
-      actual_text = word_wrap(1.upto(50).map.join(" "))
-      assert_equal 1.upto(30).map.join(" ") + "\n" + 31.upto(50).map.join(" "), actual_text
-      actual_text = word_wrap(1.upto(50).map.join(" "), 80)
-      assert_equal 1.upto(30).map.join(" ") + "\n" + 31.upto(50).map.join(" "), actual_text
+      actual_text = word_wrap(1.upto(50).to_a.join(" "))
+      assert_equal 1.upto(30).to_a.join(" ") + "\n" + 31.upto(50).to_a.join(" "), actual_text
+      actual_text = word_wrap(1.upto(50).to_a.join(" "), 80)
+      assert_equal 1.upto(30).to_a.join(" ") + "\n" + 31.upto(50).to_a.join(" "), actual_text
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 +01:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml