weppos-helperful 0.3.0 → 0.3.1

data/CHANGELOG.rdoc

@@ -1,6 +1,11 @@
 = Changelog
 
 
+== Release 0.3.1
+
+* FIXED: #javascript_content_for doesn't properly concat output when called with block (closes #183).
+
+
 == Release 0.3.0
 
 * ADDED: Added #javascript_content_for helper. #javascript_content_for combines the features of #content_for and #javascript_tag (closes #149).

data/helperful.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{helperful}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = %q{2009-03-11}
+  s.date = %q{2009-03-24}
   s.description = %q{Helperful aims to be a collection of useful and reusable Rails helpers.}
   s.email = %q{weppos@weppos.net}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/helperful/affiliations_helper.rb", "lib/helperful/content_helper.rb", "lib/helperful/deprecations.rb", "lib/helperful/javascript_helper.rb", "lib/helperful/title_helper.rb", "lib/helperful/version.rb", "lib/helperful.rb", "LICENSE.rdoc", "README.rdoc"]

data/lib/helperful/javascript_helper.rb

@@ -74,7 +74,7 @@ module Helperful
     #
     def javascript_content_for(name, content_or_options_with_block = nil, html_options = {}, &block)
       if block_given?
-        content_for(name, javascript_tag(content_or_options_with_block, &block))
+        content_for(name, javascript_tag(capture(&block), content_or_options_with_block || {}))
       else
         content_for(name, javascript_tag(content_or_options_with_block, html_options))
       end

data/lib/helperful/version.rb

@@ -20,7 +20,7 @@ module Helperful
   module Version
     MAJOR = 0
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/javascript_helper_test.rb

@@ -16,6 +16,21 @@ class JavascriptHelperTest < ActionView::TestCase
       @content_for_name
   end
 
+  def test_javascript_content_for_with_block_in_erb
+    __in_erb_template = ''
+    javascript_content_for(:name) { concat "alert('hello')" }
+    
+    assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
+      @content_for_name
+  end
+
+  def test_javascript_content_for_with_block_out_of_erb
+    javascript_content_for(:name) { "alert('hello')" }
+    
+    assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
+      @content_for_name
+  end
+
   def test_javascript_content_for_with_options
     javascript_content_for(:name, "alert('hello')", :id => "the_js_tag")
 
@@ -23,18 +38,17 @@ class JavascriptHelperTest < ActionView::TestCase
       @content_for_name
   end
 
-  def test_javascript_content_for_with_block_in_erb
+  def test_javascript_content_for_with_options_and_block_in_erb
     __in_erb_template = ''
-    javascript_content_for(:name) { concat "alert('hello')" }
+    javascript_content_for(:name, :id => "the_js_tag") { concat "alert('hello')" }
 
-    assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
+    assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
       @content_for_name
   end
 
-  def test_javascript_content_for_with_block_in_erb_and_options
-    __in_erb_template = ''
-    javascript_content_for(:name, :id => "the_js_tag") { concat "alert('hello')" }
-
+  def test_javascript_content_for_with_options_and_block_out_of_erb
+    javascript_content_for(:name, :id => "the_js_tag") { "alert('hello')" }
+    
     assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
       @content_for_name
   end
@@ -50,4 +64,28 @@ class JavascriptHelperTest < ActionView::TestCase
       @content_for_name
   end
 
+  def test_javascript_content_for_with_subsequent_calls_and_block_in_erb
+    __in_erb_template = ''
+
+    javascript_content_for(:name) { concat "alert('hello')" }
+    javascript_content_for(:name) { concat "alert('world')" }
+
+    expected  = "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>"
+    expected += "<script type=\"text/javascript\">\n//<![CDATA[\nalert('world')\n//]]>\n</script>"
+
+    assert_dom_equal expected,
+      @content_for_name
+  end
+
+  def test_javascript_content_for_with_subsequent_calls_and_block_out_of_erb
+    javascript_content_for(:name) { "alert('hello')" }
+    javascript_content_for(:name) { "alert('world')" }
+
+    expected  = "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>"
+    expected += "<script type=\"text/javascript\">\n//<![CDATA[\nalert('world')\n//]]>\n</script>"
+
+    assert_dom_equal expected,
+      @content_for_name
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weppos-helperful
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Simone Carletti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-11 00:00:00 -07:00
+date: 2009-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency