show_for 0.3.0 → 0.4.0

data/lib/show_for/content.rb

@@ -1,13 +1,12 @@
 module ShowFor
   module Content
     def content(value, options={}, apply_options=true, &block)
-
       # cache value for apply_wrapper_options!
       sample_value = value
 
       # 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)
+      value = value.to_a if value.respond_to?(:to_ary)
 
       content = case value
         when Date, Time, DateTime
@@ -17,25 +16,23 @@ module ShowFor
         when FalseClass
           I18n.t :"show_for.no", :default => "No"
         when Array, Hash
-          collection_handler(value, options, &block)
+          collection_handler(value, options, &block) unless value.empty?
         when Proc
           @template.capture(&value)
-        when NilClass, Numeric
+        when Numeric
           value.to_s
         else
-          if block
-            template.capture(value, &block)
-          else
-            value
+          unless value.blank?
+            block ? template.capture(value, &block) : value
           end
       end
 
-      if content.blank?
+      if content.blank? && !ShowFor.skip_blanks
         content = blank_value(options)
       end
 
       options[:content_html] = options.except(:content_tag) if apply_options
-      wrap_with(:content, content, apply_wrapper_options!(:content, options, sample_value) )
+      wrap_with(:content, content, apply_wrapper_options!(:content, options, sample_value))
     end
 
   protected

data/lib/show_for/version.rb

@@ -1,3 +1,3 @@
 module ShowFor
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/test/association_test.rb

@@ -3,31 +3,31 @@ require 'test_helper'
 class AssociationTest < ActionView::TestCase
   test "show_for works with belongs_to/has_one associations" do
     with_association_for @user, :company
-    assert_select "div.show_for p.wrapper", /PlataformaTec/
+    assert_select "div.show_for div.wrapper", /Plataformatec/
   end
 
   test "show_for accepts :using as option to tell how to retrieve association value" do
     with_association_for @user, :company, :using => :alternate_name
-    assert_select "div.show_for p.wrapper", /Alternate PlataformaTec/
+    assert_select "div.show_for div.wrapper", /Alternate Plataformatec/
   end
 
   test "show_for accepts :in to tell to retrieve an attribute from association" do
     with_attribute_for @user, :alternate_name, :in => :company
-    assert_select "div.show_for p.wrapper", /Alternate PlataformaTec/
+    assert_select "div.show_for div.wrapper", /Alternate Plataformatec/
   end
 
   test "show_for forwards all options send with :in to association" do
     with_attribute_for @user, :alternate_name, :in => :tags, :to_sentence => true
-    assert_no_select "div.show_for p.wrapper ul.collection"
-    assert_select "div.show_for p.wrapper", /Alternate Tag 1, Alternate Tag 2, and Alternate Tag 3/
+    assert_no_select "div.show_for div.wrapper ul.collection"
+    assert_select "div.show_for div.wrapper", /Alternate Tag 1, Alternate Tag 2, and Alternate Tag 3/
   end
 
   test "show_for works with has_many/has_and_belongs_to_many associations" do
     with_association_for @user, :tags
-    assert_select "div.show_for p.wrapper ul.collection"
-    assert_select "div.show_for p.wrapper ul.collection li", "Tag 1"
-    assert_select "div.show_for p.wrapper ul.collection li", "Tag 2"
-    assert_select "div.show_for p.wrapper ul.collection li", "Tag 3"
+    assert_select "div.show_for div.wrapper ul.collection"
+    assert_select "div.show_for div.wrapper ul.collection li", "Tag 1"
+    assert_select "div.show_for div.wrapper ul.collection li", "Tag 2"
+    assert_select "div.show_for div.wrapper ul.collection li", "Tag 3"
   end
 
   test "show_for works with has_many/has_and_belongs_to_many blank associations" do
@@ -37,45 +37,83 @@ class AssociationTest < ActionView::TestCase
 
     swap ShowFor, :association_methods => [:name] do
       with_association_for @user, :tags
-      assert_no_select "div.show_for p.wrapper ul.collection"
-      assert_no_select "div.show_for p.wrapper", /Enumerator/
+      assert_no_select "div.show_for div.wrapper ul.collection"
+      assert_no_select "div.show_for div.wrapper", /Enumerator/
     end
   end
 
+  test "show_for accepts a block with has_many/has_and_belongs_to_many blank associations" do
+    def @user.tags
+      []
+    end
+
+    swap ShowFor, :association_methods => [:name] do
+      with_association_for @user, :tags do |tag|
+        tag.name
+      end
+      assert_no_select "div.show_for div.wrapper ul.collection"
+      assert_no_select "div.show_for div.wrapper", /Enumerator/
+    end
+  end
+
+  test "show_for uses :if_blank when has_many/has_and_belongs_to_many association is blank" do
+    def @user.tags
+      []
+    end
+
+    with_association_for @user, :tags, if_blank: 'No tags' do |tag|
+      tag.name
+    end
+    assert_select "div.show_for div.wrapper.blank", /No tags/
+    assert_no_select "div.show_for div.wrapper ul.collection"
+    assert_no_select "div.show_for div.wrapper", /Enumerator/
+  end
+
+  test "show_for uses :if_blank if given a block when has_many/has_and_belongs_to_many association is blank" do
+    def @user.tags
+      []
+    end
+
+    with_association_for @user, :tags, if_blank: 'No tags'
+    assert_select "div.show_for div.wrapper.blank", /No tags/
+    assert_no_select "div.show_for div.wrapper ul.collection"
+    assert_no_select "div.show_for div.wrapper", /Enumerator/
+  end
+
   test "show_for accepts a block with an argument in belongs_to associations" do
     with_association_for @user, :company do |company|
       company.name.upcase
     end
 
-    assert_select "div.show_for p.wrapper", /PLATAFORMATEC/
+    assert_select "div.show_for div.wrapper", /PLATAFORMATEC/
   end
 
   test "show_for accepts :using as option to tell how to retrieve association values" do
     with_association_for @user, :tags, :using => :alternate_name
-    assert_select "div.show_for p.wrapper ul.collection"
-    assert_select "div.show_for p.wrapper ul.collection li", "Alternate Tag 1"
-    assert_select "div.show_for p.wrapper ul.collection li", "Alternate Tag 2"
-    assert_select "div.show_for p.wrapper ul.collection li", "Alternate Tag 3"
+    assert_select "div.show_for div.wrapper ul.collection"
+    assert_select "div.show_for div.wrapper ul.collection li", "Alternate Tag 1"
+    assert_select "div.show_for div.wrapper ul.collection li", "Alternate Tag 2"
+    assert_select "div.show_for div.wrapper ul.collection li", "Alternate Tag 3"
   end
 
   test "show_for accepts :to_sentence as option in collection associations" do
     with_association_for @user, :tags, :to_sentence => true
-    assert_no_select "div.show_for p.wrapper ul.collection"
-    assert_select "div.show_for p.wrapper", /Tag 1, Tag 2, and Tag 3/
+    assert_no_select "div.show_for div.wrapper ul.collection"
+    assert_select "div.show_for div.wrapper", /Tag 1, Tag 2, and Tag 3/
   end
 
   test "show_for accepts :join as option in collection associations" do
     with_association_for @user, :tags, :join => ", "
-    assert_no_select "div.show_for p.wrapper ul.collection"
-    assert_select "div.show_for p.wrapper", /Tag 1, Tag 2, Tag 3/
+    assert_no_select "div.show_for div.wrapper ul.collection"
+    assert_select "div.show_for div.wrapper", /Tag 1, Tag 2, Tag 3/
   end
 
   test "show_for accepts a block without argument in collection associations" do
     with_association_for @user, :tags do
       @user.tags.map(&:name).to_sentence
     end
-    assert_no_select "div.show_for p.wrapper ul.collection"
-    assert_select "div.show_for p.wrapper", /Tag 1, Tag 2, and Tag 3/
+    assert_no_select "div.show_for div.wrapper ul.collection"
+    assert_select "div.show_for div.wrapper", /Tag 1, Tag 2, and Tag 3/
   end
 
   test "show_for accepts a block with argument in collection associations" do
@@ -83,10 +121,32 @@ class AssociationTest < ActionView::TestCase
       assert_kind_of Tag, tag
       content_tag(:span, tag.name)
     end
-    assert_no_select "div.show_for p.wrapper ul.collection"
-    assert_select "div.show_for p.wrapper p.collection"
-    assert_select "div.show_for p.wrapper p.collection span", "Tag 1"
-    assert_select "div.show_for p.wrapper p.collection span", "Tag 2"
-    assert_select "div.show_for p.wrapper p.collection span", "Tag 3"
+    assert_no_select "div.show_for div.wrapper ul.collection"
+    assert_select "div.show_for div.wrapper p.collection"
+    assert_select "div.show_for div.wrapper p.collection span", "Tag 1"
+    assert_select "div.show_for div.wrapper p.collection span", "Tag 2"
+    assert_select "div.show_for div.wrapper p.collection span", "Tag 3"
+  end
+
+  test "show_for does not display empty has_many/has_and_belongs_to_many association if skip_blanks option is passed" do
+    def @user.tags
+      []
+    end
+
+    swap ShowFor, :skip_blanks => true do
+      with_association_for @user, :tags
+      assert_no_select "div.show_for div.wrapper"
+    end
+  end
+
+  test "show_for does not display empty belongs_to/has_one association if skip_blanks option is passed" do
+    def @user.company
+      nil
+    end
+
+    swap ShowFor, :skip_blanks => true do
+      with_association_for @user, :company
+      assert_no_select "div.show_for div.wrapper"
+    end
   end
 end

data/test/attribute_test.rb

@@ -4,191 +4,206 @@ class AttributeTest < ActionView::TestCase
   # COLLECTIONS
   test "show_for accepts an attribute as a collection" do
     with_attribute_for @user, :scopes
-    assert_select "div.show_for p.wrapper ul.collection"
-    assert_select "div.show_for p.wrapper ul.collection li", :count => 3
+    assert_select "div.show_for div.wrapper ul.collection"
+    assert_select "div.show_for div.wrapper ul.collection li", :count => 3
   end
 
   test "show_for accepts an attribute as a collection with a block to iterate the collection" do
     with_attribute_for @user, :scopes do |scope|
       content_tag :span, scope
     end
-    assert_select "div.show_for p.wrapper ul.collection"
-    assert_select "div.show_for p.wrapper ul.collection span", :count => 3
+    assert_select "div.show_for div.wrapper ul.collection"
+    assert_select "div.show_for div.wrapper ul.collection span", :count => 3
   end
 
   test "show_for treats symbol for :value as method on each element of collection" do
     with_attribute_for @user, :scopes, :value => :upcase
     @user.scopes.each do |scope|
-      assert_select "div.show_for p.wrapper ul.collection", /#{scope.upcase}/
+      assert_select "div.show_for div.wrapper ul.collection", /#{scope.upcase}/
     end
   end
 
   test "show_for allows collection tag to be configured globally" do
     swap ShowFor, :collection_tag => :ol, :collection_class => "my_collection" do
       with_attribute_for @user, :scopes
-      assert_select "div.show_for p.wrapper ol.my_collection"
+      assert_select "div.show_for div.wrapper ol.my_collection"
     end
   end
 
   test "show_for allows collection tag to be changed by attribute" do
     with_attribute_for @user, :scopes, :collection_tag => :ol
-    assert_select "div.show_for p.wrapper ol.collection"
+    assert_select "div.show_for div.wrapper ol.collection"
   end
 
   test "show_for allows collection tag html to be configured by attribute" do
     with_attribute_for @user, :scopes, :collection_html => { :id => "thecollection", :class => "special" }
-    assert_select "div.show_for p.wrapper ul#thecollection.special.collection"
+    assert_select "div.show_for div.wrapper ul#thecollection.special.collection"
   end
 
   # CONTENT
   test "show_for allows content tag to be configured globally" do
     swap ShowFor, :content_tag => :span, :content_class => :my_content do
       with_attribute_for @user, :name
-      assert_select "div.show_for p.wrapper span.my_content"
+      assert_select "div.show_for div.wrapper span.my_content"
     end
   end
 
   test "show_for allows content tag to be changed by attribute" do
     with_attribute_for @user, :name, :content_tag => :span
-    assert_select "div.show_for p.wrapper span.content"
+    assert_select "div.show_for div.wrapper span.content"
   end
 
   test "show_for allows content tag html to be configured by attribute" do
     with_attribute_for @user, :name, :content_tag => :span, :content_html => { :id => "thecontent", :class => "special" }
-    assert_select "div.show_for p.wrapper span#thecontent.special.content"
+    assert_select "div.show_for div.wrapper span#thecontent.special.content"
   end
 
   test "show_for accepts an attribute as string" do
     with_attribute_for @user, :name
-    assert_select "div.show_for p.wrapper", /ShowFor/
+    assert_select "div.show_for div.wrapper", /ShowFor/
   end
 
   test "show_for accepts an attribute as time" do
     with_attribute_for @user, :created_at
-    assert_select "div.show_for p.wrapper", /#{Regexp.escape(I18n.l(@user.created_at))}/
+    assert_select "div.show_for div.wrapper", /#{Regexp.escape(I18n.l(@user.created_at))}/
   end
 
   test "show_for accepts an attribute as date" do
     with_attribute_for @user, :updated_at
-    assert_select "div.show_for p.wrapper", /#{Regexp.escape(I18n.l(@user.updated_at))}/
+    assert_select "div.show_for div.wrapper", /#{Regexp.escape(I18n.l(@user.updated_at))}/
   end
 
   test "show_for accepts an attribute as time with format options" do
     with_attribute_for @user, :created_at, :format => :long
-    assert_select "div.show_for p.wrapper", /#{Regexp.escape(I18n.l(@user.created_at, :format => :long))}/
+    assert_select "div.show_for div.wrapper", /#{Regexp.escape(I18n.l(@user.created_at, :format => :long))}/
   end
 
   test "show_for accepts an attribute as true" do
     with_attribute_for @user, :active
-    assert_select "div.show_for p.wrapper", /Yes/
+    assert_select "div.show_for div.wrapper", /Yes/
   end
 
   test "show_for accepts an attribute as true which can be localized" do
     store_translations(:en, :show_for => { :yes => "Hell yeah!" }) do
       with_attribute_for @user, :active
-      assert_select "div.show_for p.wrapper", /Hell yeah!/
+      assert_select "div.show_for div.wrapper", /Hell yeah!/
     end
   end
 
   test "show_for accepts an attribute as false" do
     with_attribute_for @user, :invalid
-    assert_select "div.show_for p.wrapper", /No/
+    assert_select "div.show_for div.wrapper", /No/
   end
 
   test "show_for accepts an attribute as false which can be localized" do
     store_translations(:en, :show_for => { :no => "Hell no!" }) do
       with_attribute_for @user, :invalid
-      assert_select "div.show_for p.wrapper", /Hell no!/
+      assert_select "div.show_for div.wrapper", /Hell no!/
     end
   end
 
   test "show_for accepts nil and or blank attributes" do
     with_attribute_for @user, :description
-    assert_select "div.show_for p.wrapper", /Not specified/
+    assert_select "div.show_for div.wrapper", /Not specified/
   end
 
   test "show_for accepts not spcified message can be localized" do
     store_translations(:en, :show_for => { :blank => "OMG! It's blank!" }) do
       with_attribute_for @user, :description
-      assert_select "div.show_for p.wrapper", /OMG! It's blank!/
+      assert_select "div.show_for div.wrapper", /OMG! It's blank!/
     end
   end
 
   test "show_for accepts not spcified message can be localized with html" do
     store_translations(:en, :show_for => { :blank_html => "<span>OMG! It's blank!</span>" }) do
       with_attribute_for @user, :description
-      assert_select "div.show_for p.wrapper span", "OMG! It's blank!"
+      assert_select "div.show_for div.wrapper span", "OMG! It's blank!"
     end
   end
 
   test "show_for uses :if_blank if attribute is blank" do
     with_attribute_for @user, :description, :if_blank => "No description provided"
-    assert_select "div.show_for p.wrapper", /No description provided/
+    assert_select "div.show_for div.wrapper", /No description provided/
   end
 
   test "show_for accepts a block to supply the content" do
     with_attribute_for @user, :description do
       "This description is not blank"
     end
-    assert_select "div.show_for p.wrapper", /This description/
+    assert_select "div.show_for div.wrapper", /This description/
   end
 
   test "show_for uses :if_blank if the block content is blank" do
     with_attribute_for @user, :description, :if_blank => "No description provided" do
       ""
     end
-    assert_select "div.show_for p.wrapper", /No description provided/
+    assert_select "div.show_for div.wrapper", /No description provided/
   end
 
   test "show_for#content given a block should be wrapped in the result" do
     with_attribute_for @user, :name do |name|
       "<div class='block'>#{name}</div>".html_safe
     end
-    assert_select "p.wrapper.user_name div.block", /ShowFor/
+    assert_select "div.wrapper.user_name div.block", /ShowFor/
   end
 
   test "show_for escapes content by default" do
     @user.name = "<b>hack you!</b>"
     with_attribute_for @user, :name
-    assert_no_select "div.show_for p.wrapper b"
-    assert_select "div.show_for p.wrapper", /&lt;b&gt;/
+    assert_no_select "div.show_for div.wrapper b"
+    assert_select "div.show_for div.wrapper",
+      rails_42? ? "Super User Name!<b>hack you!</b>" : "Super User Name!&lt;b&gt;hack you!&lt;/b&gt;"
   end
 
   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!"
+    assert_select "div.show_for div.wrapper b", "hack you!"
   end
 
   test "show_for uses :value if supplied" do
     with_attribute_for @user, :name, :value => "Calculated Value"
-    assert_select "div.show_for p.wrapper", /Calculated Value/
+    assert_select "div.show_for div.wrapper", /Calculated Value/
   end
 
   test "show_for uses :value and casts to string if supplied" do
     with_attribute_for @user, :name, :value => 123
-    assert_select "div.show_for p.wrapper", /123/
+    assert_select "div.show_for div.wrapper", /123/
   end
 
   test "show_for ignores :value if a block is supplied" do
     with_attribute_for @user, :name, :value => "Calculated Value" do
       @user.name.upcase
     end
-    assert_select "div.show_for p.wrapper", /#{@user.name.upcase}/
+    assert_select "div.show_for div.wrapper", /#{@user.name.upcase}/
   end
 
   test "show_for treats symbol for :value as method on attribute" do
     with_attribute_for @user, :name, :value => :upcase
-    assert_select "div.show_for p.wrapper", /#{@user.name.upcase}/
+    assert_select "div.show_for div.wrapper", /#{@user.name.upcase}/
+  end
+
+  test "show_for does not display blank attribute if skip_blanks option is passed" do
+    swap ShowFor, :skip_blanks => true do
+      with_attribute_for @user, :description
+      assert_no_select "div.show_for div.wrapper"
+    end
+  end
+
+  test "show_for display false attribute if skip_blanks option is passed" do
+    swap ShowFor, :skip_blanks => true do
+      with_attribute_for @user, :invalid
+      assert_select "div.show_for div.wrapper", /No/
+    end
   end
 
   # ATTRIBUTES
   test "show_for attributes wraps each attribute with a label and content" do
     with_attributes_for @user, :name, :email
-    assert_select "div.show_for p.user_name.wrapper", /ShowFor/
-    assert_select "p.user_name strong.label", "Super User Name!"
-    assert_select "div.show_for p.user_email.wrapper", /Not specified/
-    assert_select "p.user_email strong.label", "Email"
+    assert_select "div.show_for div.user_name.wrapper", /ShowFor/
+    assert_select "div.user_name strong.label", "Super User Name!"
+    assert_select "div.show_for div.user_email.wrapper", /Not specified/
+    assert_select "div.user_email strong.label", "Email"
   end
 
   test "show_for should wrap blank attributes with no_attribute" do