show_for 0.1.1 → 0.1.2

data/README.rdoc

@@ -4,6 +4,7 @@ ShowFor allows you to quickly show a model information with I18n features.
 
   <% show_for @user do |u| %>
     <%= u.attribute :name %>
+    <%= u.attribute :nickname, :in => :profile %>
     <%= u.attribute :confirmed? %>
     <%= u.attribute :created_at, :format => :short %>
     <%= u.attribute :last_sign_in_at, :if_blank => "User did not access yet"
@@ -109,7 +110,8 @@ show_for also supports associations.
 
   <% show_for @artwork do |a| %>
     <%= a.association :artist %>
-    <%= a.association :artist, :method => :name_with_title %>
+    <%= a.association :artist, :using => :name_with_title %>
+    <%= a.attribute :name_with_title, :in => :artist %>
 
     <%= a.association :tags %>
     <%= a.association :tags, :to_sentence => true %>
@@ -125,7 +127,7 @@ show_for also supports associations.
 The first is a has_one or belongs_to association, which works like an attribute
 to show_for, except it will retrieve the artist association and try to find a
 proper method from ShowFor.association_methods to be used. You can pass
-the option :method to tell (and not guess) which method from the association
+the option :using to tell (and not guess) which method from the association
 to use.
 
 :tags is a has_and_belongs_to_many association which will return a collection.

data/lib/show_for/association.rb

@@ -0,0 +1,52 @@
+module ShowFor
+  module Association
+    def attribute(attribute_name, options={}, &block)
+      if association_name = options.delete(:in)
+        options[:using] = attribute_name
+        association(association_name, options, &block)
+      else
+        super
+      end
+    end
+
+    def association(association_name, options={}, &block)
+      apply_default_options!(association_name, options)
+
+      # If a block with an iterator was given, no need to calculate the labels
+      # since we want the collection to be yielded. Otherwise, calculate the values.
+      value = if collection_block?(block)
+        collection_block = block
+        @object.send(association_name)
+      elsif block
+        block
+      else
+        association = @object.send(association_name)
+        values = retrieve_values_from_association(association, options)
+
+        if options.delete(:to_sentence)
+          values.to_sentence
+        elsif joiner = options.delete(:join)
+          values.join(joiner)
+        else
+          values
+        end
+      end
+
+      wrap_label_and_content(association_name, value, options, &collection_block)
+    end
+
+  protected
+
+    def retrieve_values_from_association(association, options) #:nodoc:
+      sample = association.is_a?(Array) ? association.first : association
+
+      if options[:method]
+        options[:using] = options.delete(:method)
+        ActiveSupport::Deprecation.warn ":method is deprecated. Please use :using instead", caller
+      end
+
+      method = options.delete(:using) || ShowFor.association_methods.find { |m| sample.respond_to?(m) }
+      association.is_a?(Array) ? association.map(&method) : association.try(method)
+    end
+  end
+end

data/lib/show_for/attribute.rb

@@ -0,0 +1,18 @@
+module ShowFor
+  module Attribute
+    def attribute(attribute_name, options={}, &block)
+      apply_default_options!(attribute_name, options)
+      collection_block, block = block, nil if collection_block?(block)
+
+      value = if block
+        block
+      elsif @object.respond_to?(:"human_#{attribute_name}")
+        @object.send :"human_#{attribute_name}"
+      else
+        @object.send(attribute_name)
+      end
+
+      wrap_label_and_content(attribute_name, value, options, &collection_block)
+    end 
+  end
+end

data/lib/show_for/builder.rb

@@ -1,8 +1,12 @@
+require 'show_for/attribute'
+require 'show_for/association'
 require 'show_for/content'
 require 'show_for/label'
 
 module ShowFor
   class Builder
+    include ShowFor::Attribute
+    include ShowFor::Association
     include ShowFor::Content
     include ShowFor::Label
 
@@ -12,47 +16,6 @@ module ShowFor
       @object, @template = object, template
     end
 
-    def attribute(attribute_name, options={}, &block)
-      apply_default_options!(attribute_name, options)
-      collection_block, block = block, nil if collection_block?(block)
-
-      value = if block
-        block
-      elsif @object.respond_to?(:"human_#{attribute_name}")
-        @object.send :"human_#{attribute_name}"
-      else
-        @object.send(attribute_name)
-      end
-
-      wrap_label_and_content(attribute_name, value, options, &collection_block)
-    end
-
-    def association(association_name, options={}, &block)
-      apply_default_options!(association_name, options)
-    
-      # If a block with an iterator was given, no need to calculate the labels
-      # since we want the collection to be yielded. Otherwise, calculate the values.
-      value = if collection_block?(block)
-        collection_block = block
-        @object.send(association_name)
-      elsif block
-        block
-      else
-        association = @object.send(association_name)
-        values = retrieve_values_from_association(association, options)
-
-        if options.delete(:to_sentence)
-          values.to_sentence
-        elsif joiner = options.delete(:join)
-          values.join(joiner)
-        else
-          values
-        end
-      end
-
-      wrap_label_and_content(association_name, value, options, &collection_block)
-    end
-
   protected
 
     def object_name #:nodoc:
@@ -89,10 +52,10 @@ module ShowFor
       concat ? @template.concat(html) : html
     end
 
-    def retrieve_values_from_association(association, options) #:nodoc:
-      sample = association.is_a?(Array) ? association.first : association
-      method = options[:method] || ShowFor.association_methods.find { |m| sample.respond_to?(m) }
-      association.is_a?(Array) ? association.map(&method) : association.try(method)
+    # Returns true if the block is supposed to iterate through a collection,
+    # i.e. it has arity equals to one.
+    def collection_block?(block) #:nodoc:
+      block && block.arity == 1
     end
   end
 end

data/lib/show_for/content.rb

@@ -42,11 +42,5 @@ module ShowFor
 
       wrap_with(:collection, response, options)
     end
-
-    # Returns true if the block is supposed to iterate through a collection,
-    # i.e. it has arity equals to one.
-    def collection_block?(block) #:nodoc:
-      block && block.arity == 1
-    end
   end
 end

data/lib/show_for/helper.rb

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

data/lib/show_for/version.rb

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

data/test/builder_test.rb

@@ -3,27 +3,27 @@ require 'test_helper'
 class BuilderTest < ActionView::TestCase
 
   def with_attribute_for(object, attribute, options={}, &block)
-    concat(show_for(object) do |o|
+    show_for(object) do |o|
       o.attribute(attribute, options, &block)
-    end)
+    end
   end
 
   def with_association_for(object, association, options={}, &block)
-     concat(show_for(object) do |o|
+     show_for(object) do |o|
        o.association(association, options, &block)
-     end)
+     end
    end
 
   def with_label_for(object, attribute, options={})
-    concat(show_for(object) do |o|
+    show_for(object) do |o|
       o.label attribute, options
-    end)
+    end
   end
 
   def with_content_for(object, value, options={})
-    concat(show_for(object) do |o|
+    show_for(object) do |o|
       o.content value, options
-    end)
+    end
   end
 
   # WRAPPER 
@@ -271,11 +271,22 @@ class BuilderTest < ActionView::TestCase
     assert_select "div.show_for p.wrapper", /PlataformaTec/
   end
 
-  test "show_for accepts :method as option to tell how to retrieve association value" do
-    with_association_for @user, :company, :method => :alternate_name
+  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/
   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/
+  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/
+  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"
@@ -284,8 +295,8 @@ class BuilderTest < ActionView::TestCase
     assert_select "div.show_for p.wrapper ul.collection li", "Tag 3"
   end
 
-  test "show_for accepts :method as option to tell how to retrieve association values" do
-    with_association_for @user, :tags, :method => :alternate_name
+  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"

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
-    concat(show_for(@user) do |f|
+    show_for(@user) do |f|
       assert f.instance_of?(ShowFor::Builder)
-    end)
+    end
   end
 
   test "show for should add default class to form" do
-    concat(show_for(@user) do |f| end)
+    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
-    concat(show_for(@user) do |f| end)
+    show_for(@user) do |f| end
     assert_select "div.show_for.user"
   end
 
   test "show for should pass options" do
-    concat(show_for(@user, :id => "my_div", :class => "common") do |f| end)
+    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
-      concat(show_for(@user) do |f| end)
+      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.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -27,6 +27,8 @@ files:
 - generators/show_for_install/templates/show_for.rb
 - init.rb
 - lib/show_for.rb
+- lib/show_for/association.rb
+- lib/show_for/attribute.rb
 - lib/show_for/builder.rb
 - lib/show_for/content.rb
 - lib/show_for/helper.rb