show_for 0.2.0 → 0.2.1

data/README.rdoc

@@ -10,9 +10,9 @@ ShowFor allows you to quickly show a model information with I18n features.
     <%= u.attribute :last_sign_in_at, :if_blank => "User did not access yet",
                     :wrapper_html => { :id => "sign_in_timestamp" } %>
 
-    <% u.attribute :photo do
-      <%= image_url(@user.photo_url) %>
-    end %>
+    <% u.attribute :photo do %>
+      <%= image_tag(@user.photo_url) %>
+    <% end %>
 
     <%= u.association :company %>
     <%= u.association :tags, :to_sentence => true %>
@@ -22,7 +22,7 @@ ShowFor allows you to quickly show a model information with I18n features.
 
 Install the gem:
 
-  sudo gem install show_for --version=0.2
+  sudo gem install show_for
 
 Run the generator:
 
@@ -45,7 +45,7 @@ ShowFor allows you to quickly show a model information with I18n features.
                     :wrapper_html => { :id => "sign_in_timestamp" } %>
 
     <% a.attribute :photo do %>
-      <%= image_url(@admin.photo_url) %>
+      <%= image_tag(@admin.photo_url) %>
     <% end %>
   <% end %>
 
@@ -100,8 +100,17 @@ options. Containers can have their tags configured on demand as well through
 show_for also exposes the label method. In case you want to use the default
 human_attribute_name lookup and the default wrapping:
 
-  a.label :name                     #=> <b class="label">Name</b>
-  a.label "Name", :id => "my_name"  #=> <b class="label" id="my_name">Name</b>
+  a.label :name                     #=> <strong class="label">Name</strong>
+  a.label "Name", :id => "my_name"  #=> <strong class="label" id="my_name">Name</strong>
+  
+Optionally, if you want to wrap the inner part of the label with some text
+(e.g. adding a semicolon), you can do so by specifying a proc for ShowFor.label_proc
+that will be called with any label text. E.g.:
+  
+  ShowFor.label_proc = lambda { |l| l + ":" }
+
+When taking this route, you can also skip on a per label basis by passing the
+:wrap_label option with a value of false.
 
 == Associations
 

data/lib/generators/show_for_install/templates/show_for.rb

@@ -30,4 +30,9 @@ ShowFor.setup do |config|
   # Whenever a association is given, the first method in association_methods
   # in which the association responds to is used to retrieve the association labels.
   # config.association_methods = [ :name, :title, :to_s ]
+  
+  # If you want to wrap the text inside a label (e.g. to append a semicolon),
+  # specify label_proc - it will be automatically called, passing in the label text.
+  # config.label_proc = lambda { |l| c + ":" }
+  
 end

data/lib/show_for/builder.rb

@@ -24,7 +24,7 @@ module ShowFor
 
     def wrap_label_and_content(name, value, options, &block) #:nodoc:
       wrap_with(:wrapper, label(name, options, false) + ShowFor.separator.to_s.html_safe +
-        content(value, options, false, &block), options, value.is_a?(Proc))
+        content(value, options, false, &block), options)
     end
 
     # Set "#{object_name}_#{attribute_name}" as in the wrapper tag.
@@ -37,7 +37,7 @@ module ShowFor
     # Gets the default tag set in ShowFor module and apply (if defined)
     # around the given content. It also check for html_options in @options
     # hash related to the current type.
-    def wrap_with(type, content, options, concat=false) #:nodoc:
+    def wrap_with(type, content, options) #:nodoc:
       tag = options.delete(:"#{type}_tag") || ShowFor.send(:"#{type}_tag")
 
       html = if tag
@@ -48,7 +48,7 @@ module ShowFor
         content
       end
 
-      concat ? @template.safe_concat(html) : html.html_safe
+      html.html_safe
     end
 
     # Returns true if the block is supposed to iterate through a collection,

data/lib/show_for/content.rb

@@ -18,7 +18,7 @@ module ShowFor
           collection_handler(value, options, &block)
         when Proc
           options[:escape] = false
-          @template.capture(&value)
+          @template.capture(&value).html_safe
         when NilClass
           ""
         else
@@ -40,7 +40,7 @@ module ShowFor
         response << template.capture(item, &iterator)
       end
 
-      wrap_with(:collection, response, options)
+      wrap_with(:collection, response.html_safe, options)
     end
   end
 end

data/lib/show_for/helper.rb

@@ -16,7 +16,11 @@ module ShowFor
       html_options[:class] = "show_for #{dom_class(object)} #{html_options[:class]}".strip
       builder_class = html_options.delete(:builder) || ShowFor::Builder
 
-      concat content_tag(tag, capture(builder_class.new(object, self), &block), html_options)
+      content = with_output_buffer do
+        yield builder_class.new(object, self)
+      end
+
+      content_tag(tag, content, html_options)
     end
   end
 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.0".freeze
+  VERSION = "0.2.1".freeze
 end

data/lib/show_for.rb

@@ -35,6 +35,9 @@ module ShowFor
 
   mattr_accessor :association_methods
   @@association_methods = [ :name, :title, :to_s ]
+  
+  mattr_accessor :label_proc
+  @@label_proc = nil
 
   # Yield self for configuration block:
   #

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|
-      o.attribute(attribute, options, &block)
-    end
+    concat(show_for(object) do |o|
+      concat o.attribute(attribute, options, &block)
+    end)
   end
 
   def with_association_for(object, association, options={}, &block)
-     show_for(object) do |o|
-       o.association(association, options, &block)
-     end
+     concat(show_for(object) do |o|
+       concat o.association(association, options, &block)
+     end)
    end
 
   def with_label_for(object, attribute, options={})
-    show_for(object) do |o|
-      o.label attribute, options
-    end
+    concat(show_for(object) do |o|
+      concat o.label(attribute, options)
+    end)
   end
 
   def with_content_for(object, value, options={})
-    show_for(object) do |o|
-      o.content value, options
-    end
+    concat(show_for(object) do |o|
+      concat o.content(value, options)
+    end)
   end
 
   # WRAPPER 
@@ -154,6 +154,20 @@ class BuilderTest < ActionView::TestCase
       assert_select "div.show_for p.wrapper", /Hell yeah!/
     end
   end
+  
+  test "should let you override the label wrapper" do
+    swap ShowFor, :label_proc => proc { |l| l + ":" } do
+      with_label_for @user, "Special Label"
+      assert_select "div.show_for strong.label", "Special Label:"
+    end
+  end
+  
+  test "should you skip wrapping the label on a per item basis" do
+    swap ShowFor, :label_proc => proc { |l| l + ":" } do
+      with_label_for @user, "Special Label", :wrap_label => false
+      assert_select "div.show_for strong.label", "Special Label"
+    end
+  end
 
   test "show_for accepts an attribute as false" do
     with_attribute_for @user, :invalid

data/test/helper_test.rb

@@ -17,23 +17,23 @@ class HelperTest < ActionView::TestCase
   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

data/test/test_helper.rb

@@ -3,6 +3,8 @@ require 'test/unit'
 
 require 'active_model'
 require 'action_controller'
+require 'action_view'
+require 'action_view/template'
 require 'action_view/test_case'
 
 begin

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: show_for
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +01:00
+date: 2010-04-03 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -50,18 +55,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Wrap your objects with a helper to easily show them