show_for 0.1.5 → 0.1.6

data/lib/show_for/builder.rb

@@ -23,8 +23,10 @@ module ShowFor
     end
 
     def wrap_label_and_content(name, value, options, &block) #:nodoc:
-      wrap_with(:wrapper, label(name, options, false) + ShowFor.separator.to_s +
-        content(value, options, false, &block), options, true, (value.is_a?(Proc) or collection_block?(block)))
+      label = label(name, options, false)
+      label += html_safe(ShowFor.separator.to_s) if label.present?
+      wrap_with(:wrapper, label + content(value, options, false, &block),
+                options, true, (value.is_a?(Proc) or collection_block?(block)))
     end
 
     # Set "#{object_name}_#{attribute_name}" as in the wrapper tag.
@@ -48,7 +50,7 @@ module ShowFor
         content
       end
 
-      html.html_safe if safe && html.respond_to?(:html_safe)
+      html = html_safe(html) if safe
       concat ? @template.concat(html) : html
     end
 
@@ -57,5 +59,16 @@ module ShowFor
     def collection_block?(block) #:nodoc:
       block && block.arity == 1
     end
+
+    # Ensure we make html safe only if it responds to it.
+    def html_safe(content)
+      if content.respond_to?(:html_safe)
+        content.html_safe
+      elsif content.respond_to?(:html_safe!)
+        content.html_safe!
+      else
+        content
+      end
+    end
   end
 end

data/lib/show_for/label.rb

@@ -9,7 +9,7 @@ module ShowFor
         human_attribute_name(text_or_attribute)
       end
 
-      return "" if label == false
+      return nil.to_s if label == false
       options[:label_html] = options.dup if apply_options
       wrap_with :label, label, options
     end
@@ -20,4 +20,4 @@ module ShowFor
       @object.class.human_attribute_name(attribute.to_s)
     end
   end
-end
+end

data/lib/show_for/version.rb

@@ -1,3 +1,3 @@
 module ShowFor
-  VERSION = "0.1.5".freeze
-end
+  VERSION = "0.1.6".freeze
+end

data/test/builder_test.rb

@@ -26,7 +26,7 @@ class BuilderTest < ActionView::TestCase
     end
   end
 
-  # WRAPPER 
+  # WRAPPER
   test "show_for attribute wraps each attribute with a label and content" do
     with_attribute_for @user, :name
     assert_select "div.show_for p.user_name.wrapper"
@@ -66,6 +66,7 @@ class BuilderTest < ActionView::TestCase
   test "show_for skips label if requested" do
     with_attribute_for @user, :name, :label => false
     assert_no_select "div.show_for p.wrapper strong.label"
+    assert_no_select "div.show_for p.wrapper br"
   end
 
   test "show_for allows label to be configured globally" do
@@ -218,7 +219,7 @@ class BuilderTest < ActionView::TestCase
     with_content_for @user, "Special content", :content_tag => :b, :id => "thecontent", :class => "special"
     assert_select "div.show_for b#thecontent.special.content", "Special content"
   end
-  
+
   test "show_for#content with blank value has a 'no value'-class" do
     swap ShowFor, :blank_content_class => "nothing" do
       with_content_for @user, nil, :content_tag => :b
@@ -327,4 +328,4 @@ class BuilderTest < ActionView::TestCase
     assert_select "div.show_for p.wrapper p.collection span", "Tag 2"
     assert_select "div.show_for p.wrapper p.collection span", "Tag 3"
   end
-end
+end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 
-gem 'actionpack', '2.3.5'
+gem 'actionpack', '2.3.9'
 
 require 'action_controller'
 require 'action_view/test_case'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: show_for
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 +02:00
+date: 2010-10-08 00:00:00 -03:00
 default_executable: 
 dependencies: []