show_for 0.2.1 → 0.2.2

data/lib/show_for.rb

@@ -18,9 +18,6 @@ module ShowFor
   mattr_accessor :blank_content_class
   @@blank_content_class = "blank"
 
-  mattr_accessor :blank_content
-  @@blank_content = ""
-
   mattr_accessor :wrapper_tag
   @@wrapper_tag = :p
 

data/lib/show_for/builder.rb

@@ -48,7 +48,7 @@ module ShowFor
         content
       end
 
-      html.html_safe
+      html
     end
 
     # Returns true if the block is supposed to iterate through a collection,

data/lib/show_for/content.rb

@@ -6,6 +6,10 @@ module ShowFor
         options[:class] = [options[:class], ShowFor.blank_content_class].join(' ')
       end
 
+      # We need to convert value to_a because when dealing with ActiveRecord
+      # Array proxies, the follow statement Array# === value return false
+      value = value.to_a if value.is_a?(Array)
+
       content = case value
         when Date, Time, DateTime
           I18n.l value, :format => options.delete(:format) || ShowFor.i18n_format
@@ -14,18 +18,15 @@ module ShowFor
         when FalseClass
           I18n.t :"show_for.no", :default => "No"
         when Array, Hash
-          options[:escape] = false
           collection_handler(value, options, &block)
         when Proc
-          options[:escape] = false
-          @template.capture(&value).html_safe
+          @template.capture(&value)
         when NilClass
           ""
         else
           value
       end
 
-      content = @template.send(:h, content) unless options.delete(:escape) == false
       options[:content_html] = options.dup if apply_options
       wrap_with(:content, content, options)
     end

data/lib/show_for/helper.rb

@@ -14,11 +14,9 @@ module ShowFor
 
       html_options[:id]  ||= dom_id(object)
       html_options[:class] = "show_for #{dom_class(object)} #{html_options[:class]}".strip
-      builder_class = html_options.delete(:builder) || ShowFor::Builder
 
-      content = with_output_buffer do
-        yield builder_class.new(object, self)
-      end
+      builder = html_options.delete(:builder) || ShowFor::Builder
+      content = capture(builder.new(object, self), &block)
 
       content_tag(tag, content, html_options)
     end

data/lib/show_for/label.rb

@@ -11,6 +11,7 @@ module ShowFor
 
       return "" if label == false
       options[:label_html] = options.dup if apply_options
+
       label = ShowFor.label_proc.call(label) if options.fetch(:wrap_label, true) && ShowFor.label_proc
       wrap_with :label, label, options
     end

data/lib/show_for/version.rb

@@ -1,3 +1,3 @@
 module ShowFor
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.2".freeze
 end

data/test/builder_test.rb

@@ -212,9 +212,9 @@ class BuilderTest < ActionView::TestCase
     assert_select "div.show_for p.wrapper", /&lt;b&gt;/
   end
 
-  test "show_for does not escape content if chosen" do
-    @user.name = "<b>hack you!</b>"
-    with_attribute_for @user, :name, :escape => false
+  test "show_for works with html_safe marked strings" do
+    @user.name = "<b>hack you!</b>".html_safe
+    with_attribute_for @user, :name
     assert_select "div.show_for p.wrapper b", "hack you!"
   end
 
@@ -240,13 +240,6 @@ class BuilderTest < ActionView::TestCase
     end
   end
 
-  test "show_for#content with blank value fallbacks on a default value" do
-    swap ShowFor, :blank_content => "Not specified" do
-      with_content_for @user, nil, :content_tag => :b
-      assert_select "div.show_for b", "Not specified"
-    end
-  end
-
   # COLLECTIONS
   test "show_for accepts an attribute as a collection" do
     with_attribute_for @user, :scopes

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 +02:00
+date: 2010-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: []