show_for 0.2.2 → 0.2.3

data/README.rdoc

@@ -2,7 +2,7 @@
 
 ShowFor allows you to quickly show a model information with I18n features.
 
-  <% show_for @user do |u| %>
+  <%= show_for @user do |u| %>
     <%= u.attribute :name %>
     <%= u.attribute :nickname, :in => :profile %>
     <%= u.attribute :confirmed? %>
@@ -37,7 +37,7 @@ if you want to use it with Rails 2.3 you should check this branch:
 
 ShowFor allows you to quickly show a model information with I18n features.
 
-  <% show_for @admin do |a| %>
+  <%= show_for @admin do |a| %>
     <%= a.attribute :name %>
     <%= a.attribute :confirmed? %>
     <%= a.attribute :created_at, :format => :short %>
@@ -74,6 +74,12 @@ Will generate something like:
     </p>
   </div>
 
+You also have the possibility to show a list of attributes, useful if you don't need to change any configuration:
+
+  <%= show_for @admin do |a| %>
+    <%= a.attributes :name, :confirmed?, :created_at %>
+  <% end %>
+
 == Value lookup
 
 To show the proper value, before retrieving the attribute value, show_for first looks if a
@@ -102,11 +108,11 @@ human_attribute_name lookup and the default wrapping:
 
   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
@@ -116,7 +122,7 @@ When taking this route, you can also skip on a per label basis by passing the
 
 show_for also supports associations.
 
-  <% show_for @artwork do |a| %>
+  <%= show_for @artwork do |a| %>
     <%= a.association :artist %>
     <%= a.association :artist, :using => :name_with_title %>
     <%= a.attribute :name_with_title, :in => :artist %>

data/lib/generators/{show_for_install → show_for}/USAGE

@@ -1,3 +1,3 @@
 To copy a ShowFor initializer to your Rails App, with some configuration values, just do:
 
-    rails generate show_for_install
+    rails generate show_for:install

data/lib/generators/show_for/install_generator.rb

@@ -0,0 +1,20 @@
+module ShowFor
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      desc "Copy ShowFor installation files"
+      source_root File.expand_path('../templates', __FILE__)
+
+      def copy_initializers
+        copy_file 'show_for.rb', 'config/initializers/show_for.rb'
+      end
+
+      def copy_locale_file
+        copy_file 'en.yml', 'config/locales/show_for.en.yml'
+      end
+
+      def copy_generator_template
+        copy_file 'show.html.erb', 'lib/templates/erb/scaffold/show.html.erb'
+      end
+    end
+  end
+end

data/lib/generators/{show_for_install → show_for}/templates/show.html.erb

@@ -1,6 +1,6 @@
-<%% show_for @<%= singular_name %> do |o| %>
+<%%= show_for @<%= singular_name %> do |s| %>
 <% attributes.each do |attribute| -%>
-  <%%= o.<%= attribute.reference? ? :association : :attribute %> :<%= attribute.name %> %>
+  <%%= s.<%= attribute.reference? ? :association : :attribute %> :<%= attribute.name %> %>
 <% end -%>
 <%% end %>
 

data/lib/generators/{show_for_install → show_for}/templates/show_for.rb

@@ -30,9 +30,8 @@ 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/attribute.rb

@@ -13,6 +13,12 @@ module ShowFor
       end
 
       wrap_label_and_content(attribute_name, value, options, &collection_block)
-    end 
+    end
+
+    def attributes(*attribute_names)
+      attribute_names.map do |attribute_name|
+        attribute(attribute_name)
+      end.join.html_safe
+    end
   end
 end

data/lib/show_for/content.rb

@@ -21,8 +21,8 @@ module ShowFor
           collection_handler(value, options, &block)
         when Proc
           @template.capture(&value)
-        when NilClass
-          ""
+        when NilClass, Numeric
+          value.to_s
         else
           value
       end

data/lib/show_for/version.rb

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

data/test/builder_test.rb

@@ -26,7 +26,13 @@ class BuilderTest < ActionView::TestCase
     end)
   end
 
-  # WRAPPER 
+  def with_attributes_for(object, *attributes)
+    concat(show_for(object) do |o|
+      concat o.attributes(*attributes)
+    end)
+  end
+
+  # WRAPPER
   test "show_for attribute wraps each attribute with a label and content" do
     with_attribute_for @user, :name
     assert_select "div.show_for p.user_name.wrapper"
@@ -154,14 +160,14 @@ 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
@@ -232,7 +238,7 @@ 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
@@ -341,4 +347,13 @@ class BuilderTest < ActionView::TestCase
     assert_select "div.show_for p.wrapper p.collection span", "Tag 2"
     assert_select "div.show_for p.wrapper p.collection span", "Tag 3"
   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"
+  end
 end

data/test/test_helper.rb

@@ -1,4 +1,8 @@
 require 'rubygems'
+require 'bundler'
+
+Bundler.setup
+
 require 'test/unit'
 
 require 'active_model'
@@ -7,12 +11,7 @@ require 'action_view'
 require 'action_view/template'
 require 'action_view/test_case'
 
-begin
-  require 'ruby-debug'
-rescue LoadError
-end
-
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib', 'show_for')
+$:.unshift File.expand_path("../../lib", __FILE__)
 require 'show_for'
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
@@ -20,8 +19,7 @@ I18n.default_locale = :en
 
 class ActionView::TestCase
   include MiscHelpers
-
-  tests ShowFor::Helper
+  include ShowFor::Helper
 
   setup :setup_new_user
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: show_for
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 +02:00
+date: 2010-07-25 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,11 +29,11 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - init.rb
-- lib/generators/show_for_install/USAGE
-- lib/generators/show_for_install/show_for_install_generator.rb
-- lib/generators/show_for_install/templates/en.yml
-- lib/generators/show_for_install/templates/show.html.erb
-- lib/generators/show_for_install/templates/show_for.rb
+- lib/generators/show_for/USAGE
+- lib/generators/show_for/install_generator.rb
+- lib/generators/show_for/templates/en.yml
+- lib/generators/show_for/templates/show.html.erb
+- lib/generators/show_for/templates/show_for.rb
 - lib/show_for.rb
 - lib/show_for/association.rb
 - lib/show_for/attribute.rb
@@ -42,6 +43,11 @@ files:
 - lib/show_for/label.rb
 - lib/show_for/version.rb
 - README.rdoc
+- test/builder_test.rb
+- test/helper_test.rb
+- test/support/misc_helpers.rb
+- test/support/models.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/plataformatec/show_for
 licenses: []
@@ -52,23 +58,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Wrap your objects with a helper to easily show them

data/lib/generators/show_for_install/show_for_install_generator.rb

@@ -1,19 +0,0 @@
-class ShowForInstallGenerator < Rails::Generators::Base
-  desc "Copy ShowFor installation files"
-
-  def self.source_root
-    @_source_root = File.expand_path('../templates', __FILE__)
-  end
-
-  def copy_initializers
-    copy_file 'show_for.rb', 'config/initializers/show_for.rb'
-  end
-
-  def copy_locale_file
-    copy_file 'en.yml', 'config/locales/show_for.en.yml'
-  end
-
-  def copy_generator_template
-    copy_file 'show.html.erb', 'lib/templates/erb/scaffold/show.html.erb'
-  end
-end