show_for 0.1 → 0.1.1

data/README.rdoc

@@ -137,10 +137,14 @@ You can also pass a block which expects an argument to association. In such case
 a wrapper for the collection is still created and the block just iterates over the
 collection objects.
 
-== Contributors
+== Maintainers
 
 * José Valim (http://github.com/josevalim)
 
+== Contributors
+
+* Jonas Grimfelt (http://github.com/grimen)
+
 == Bugs and Feedback
 
 If you discover any bugs or want to drop a line, feel free to create an issue on GitHub.

data/generators/show_for_install/templates/show_for.rb

@@ -12,6 +12,9 @@ ShowFor.setup do |config|
   # The tag used to wrap each content (value). Default is nil.
   # config.content_tag = :dd
 
+  # The DOM class set for blank content tags. Default is "blank".
+  # config.blank_content_class = 'no_content'
+
   # The separator between label and content. Default is "<br />".
   # config.separator = "<br />"
 

data/lib/show_for/content.rb

@@ -1,7 +1,10 @@
 module ShowFor
   module Content
     def content(value, options={}, apply_options=true, &block)
-      value = options.delete(:if_blank) if value.blank? && value != false
+      if value.blank? && value != false
+        value = options.delete(:if_blank) || I18n.t(:'show_for.blank', :default => "Not specified")
+        options[:class] = [options[:class], ShowFor.blank_content_class].join(' ')
+      end
 
       content = case value
         when Date, Time, DateTime

data/lib/show_for/helper.rb

@@ -15,9 +15,7 @@ module ShowFor
       html_options[:id]  ||= dom_id(object)
       html_options[:class] = "show_for #{dom_class(object)} #{html_options[:class]}".strip
 
-      concat(content_tag(tag, html_options) do
-        yield ShowFor::Builder.new(object, self)
-      end)
+      content_tag(tag, yield(ShowFor::Builder.new(object, self)), html_options)
     end
   end
 end

data/lib/show_for/locale/en.yml

@@ -1,4 +1,5 @@
 en:
   show_for:
-    "yes": 'Yes'
-    "no": 'No'
+    blank: "Not specified"
+    "yes": "Yes"
+    "no": "No""

data/lib/show_for/version.rb

@@ -1,3 +1,3 @@
 module ShowFor
-  VERSION = "0.1".freeze
+  VERSION = "0.1.1".freeze
 end

data/lib/show_for.rb

@@ -15,6 +15,12 @@ module ShowFor
   mattr_accessor :content_tag
   @@content_tag = nil
 
+  mattr_accessor :blank_content_class
+  @@blank_content_class = "blank"
+
+  mattr_accessor :blank_content
+  @@blank_content = ""
+
   mattr_accessor :wrapper_tag
   @@wrapper_tag = :p
 

data/test/builder_test.rb

@@ -3,27 +3,27 @@ require 'test_helper'
 class BuilderTest < ActionView::TestCase
 
   def with_attribute_for(object, attribute, options={}, &block)
-    show_for object do |o|
-      concat(o.attribute(attribute, options, &block))
-    end
+    concat(show_for(object) do |o|
+      o.attribute(attribute, options, &block)
+    end)
   end
 
   def with_association_for(object, association, options={}, &block)
-     show_for object do |o|
-       concat(o.association(association, options, &block))
-     end
+     concat(show_for(object) do |o|
+       o.association(association, options, &block)
+     end)
    end
 
   def with_label_for(object, attribute, options={})
-    show_for object do |o|
-      concat o.label attribute, options
-    end
+    concat(show_for(object) do |o|
+      o.label attribute, options
+    end)
   end
 
   def with_content_for(object, value, options={})
-    show_for object do |o|
-      concat o.content value, options
-    end
+    concat(show_for(object) do |o|
+      o.content value, options
+    end)
   end
 
   # WRAPPER 
@@ -169,7 +169,14 @@ class BuilderTest < ActionView::TestCase
 
   test "show_for accepts nil and or blank attributes" do
     with_attribute_for @user, :description
-    assert_select "div.show_for p.wrapper", "Description"
+    assert_select "div.show_for p.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!/
+    end
   end
 
   test "show_for uses :if_blank if attribute is blank" do
@@ -211,6 +218,20 @@ 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
+      assert_select "div.show_for b.nothing"
+    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

data/test/helper_test.rb

@@ -2,29 +2,29 @@ require "test_helper"
 
 class HelperTest < ActionView::TestCase
   test "show for yields an instance of ShowFor::Builder" do
-    show_for @user do |f|
+    concat(show_for(@user) do |f|
       assert f.instance_of?(ShowFor::Builder)
-    end
+    end)
   end
 
   test "show for should add default class to form" do
-    show_for @user do |f| end
+    concat(show_for(@user) do |f| end)
     assert_select "div.show_for"
   end
 
   test "show for should add object class name as css class to form" do
-    show_for @user do |f| end
+    concat(show_for(@user) do |f| end)
     assert_select "div.show_for.user"
   end
 
   test "show for should pass options" do
-    show_for @user, :id => "my_div", :class => "common" do |f| end
+    concat(show_for(@user, :id => "my_div", :class => "common") do |f| end)
     assert_select "div#my_div.show_for.user.common"
   end
 
   test "show for tag should be configurable" do
     swap ShowFor, :show_for_tag => :p do
-      show_for @user do |f| end
+      concat(show_for(@user) do |f| end)
       assert_select "p.show_for"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: show_for
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-01-09 00:00:00 +01:00
 default_executable: 
 dependencies: []