show_for 0.1.6 → 0.2.0

data/README.rdoc

@@ -7,12 +7,12 @@ ShowFor allows you to quickly show a model information with I18n features.
     <%= 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"
+    <%= u.attribute :last_sign_in_at, :if_blank => "User did not access yet",
                     :wrapper_html => { :id => "sign_in_timestamp" } %>
 
-    <% u.attribute :photo do %>
-      <%= image_tag(@user.photo_url) %>
-    <% end %>
+    <% u.attribute :photo do
+      <%= image_url(@user.photo_url) %>
+    end %>
 
     <%= u.association :company %>
     <%= u.association :tags, :to_sentence => true %>
@@ -22,17 +22,16 @@ ShowFor allows you to quickly show a model information with I18n features.
 
 Install the gem:
 
-  sudo gem install show_for --version=0.1.3
-
-Configure simple_form gem inside your app:
-
-  config.gem 'show_for'
+  sudo gem install show_for --version=0.2
 
 Run the generator:
 
-  ruby script/generate show_for_install
+  rails generate show_for_install
+
+And you are ready to go. Since this branch is aims Rails 3 support,
+if you want to use it with Rails 2.3 you should check this branch:
 
-And you're ready to go.
+  http://github.com/plataformatec/show_for/tree/v0.1
 
 == Usage
 
@@ -46,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_tag(@admin.photo_url) %>
+      <%= image_url(@admin.photo_url) %>
     <% end %>
   <% end %>
 
@@ -101,8 +100,8 @@ 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                     #=> <strong class="label">Name</strong>
-  a.label "Name", :id => "my_name"  #=> <strong class="label" id="my_name">Name</strong>
+  a.label :name                     #=> <b class="label">Name</b>
+  a.label "Name", :id => "my_name"  #=> <b class="label" id="my_name">Name</b>
 
 == Associations
 

data/init.rb

@@ -1 +1 @@
-require 'show_for'
+require 'show_for'

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

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

data/lib/generators/show_for_install/show_for_install_generator.rb

@@ -0,0 +1,19 @@
+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

data/lib/generators/show_for_install/templates/show.html.erb

@@ -0,0 +1,8 @@
+<%% show_for @<%= singular_name %> do |o| %>
+<% attributes.each do |attribute| -%>
+  <%%= o.<%= attribute.reference? ? :association : :attribute %> :<%= attribute.name %> %>
+<% end -%>
+<%% end %>
+
+<%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
+<%%= link_to 'Back', <%= plural_name %>_path %>

data/lib/show_for/builder.rb

@@ -23,10 +23,8 @@ module ShowFor
     end
 
     def wrap_label_and_content(name, value, options, &block) #:nodoc:
-      label = label(name, options, false)
-      label += html_safe(ShowFor.separator.to_s) if label.present?
-      wrap_with(:wrapper, label + content(value, options, false, &block),
-                options, true, (value.is_a?(Proc) or collection_block?(block)))
+      wrap_with(:wrapper, label(name, options, false) + ShowFor.separator.to_s.html_safe +
+        content(value, options, false, &block), options, value.is_a?(Proc))
     end
 
     # Set "#{object_name}_#{attribute_name}" as in the wrapper tag.
@@ -39,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, safe=false, concat=false) #:nodoc:
+    def wrap_with(type, content, options, concat=false) #:nodoc:
       tag = options.delete(:"#{type}_tag") || ShowFor.send(:"#{type}_tag")
 
       html = if tag
@@ -50,8 +48,7 @@ module ShowFor
         content
       end
 
-      html = html_safe(html) if safe
-      concat ? @template.concat(html) : html
+      concat ? @template.safe_concat(html) : html.html_safe
     end
 
     # Returns true if the block is supposed to iterate through a collection,
@@ -59,16 +56,5 @@ module ShowFor
     def collection_block?(block) #:nodoc:
       block && block.arity == 1
     end
-
-    # Ensure we make html safe only if it responds to it.
-    def html_safe(content)
-      if content.respond_to?(:html_safe)
-        content.html_safe
-      elsif content.respond_to?(:html_safe!)
-        content.html_safe!
-      else
-        content
-      end
-    end
   end
-end
+end

data/lib/show_for/content.rb

@@ -5,8 +5,6 @@ module ShowFor
         value = options.delete(:if_blank) || I18n.t(:'show_for.blank', :default => "Not specified")
         options[:class] = [options[:class], ShowFor.blank_content_class].join(' ')
       end
-      
-      value = value.to_a if value.is_a?(Array)
 
       content = case value
         when Date, Time, DateTime
@@ -45,4 +43,4 @@ module ShowFor
       wrap_with(:collection, response, options)
     end
   end
-end
+end

data/lib/show_for/label.rb

@@ -9,7 +9,7 @@ module ShowFor
         human_attribute_name(text_or_attribute)
       end
 
-      return nil.to_s if label == false
+      return "" if label == false
       options[:label_html] = options.dup if apply_options
       wrap_with :label, label, options
     end
@@ -20,4 +20,4 @@ module ShowFor
       @object.class.human_attribute_name(attribute.to_s)
     end
   end
-end
+end

data/lib/show_for/version.rb

@@ -1,3 +1,3 @@
 module ShowFor
-  VERSION = "0.1.6".freeze
-end
+  VERSION = "0.2.0".freeze
+end

data/lib/show_for.rb

@@ -18,6 +18,9 @@ module ShowFor
   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

@@ -26,7 +26,7 @@ class BuilderTest < ActionView::TestCase
     end
   end
 
-  # WRAPPER
+  # 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"
@@ -66,7 +66,6 @@ class BuilderTest < ActionView::TestCase
   test "show_for skips label if requested" do
     with_attribute_for @user, :name, :label => false
     assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
   end
 
   test "show_for allows label to be configured globally" do
@@ -219,7 +218,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
@@ -227,6 +226,13 @@ class BuilderTest < ActionView::TestCase
     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
     with_attribute_for @user, :scopes
@@ -328,4 +334,4 @@ 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
-end
+end

data/test/support/models.rb

@@ -1,12 +1,16 @@
 require 'ostruct'
 
 class Company < Struct.new(:id, :name)
+  extend ActiveModel::Naming
+
   def alternate_name
     "Alternate #{self.name}"
   end
 end
 
 class Tag < Struct.new(:id, :name)
+  extend ActiveModel::Naming
+
   def self.all(options={})
     (1..3).map{ |i| Tag.new(i, "Tag #{i}") }
   end
@@ -17,6 +21,8 @@ class Tag < Struct.new(:id, :name)
 end
 
 class User < OpenStruct
+  extend ActiveModel::Naming
+
   # Get rid of deprecation warnings
   undef_method :id
 

data/test/test_helper.rb

@@ -1,8 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 
-gem 'actionpack', '2.3.9'
-
+require 'active_model'
 require 'action_controller'
 require 'action_view/test_case'
 

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: show_for
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -03:00
+date: 2010-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -28,10 +22,12 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- generators/show_for_install/USAGE
-- generators/show_for_install/show_for_install_generator.rb
-- generators/show_for_install/templates/show_for.rb
 - 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/show_for.rb
 - lib/show_for/association.rb
 - lib/show_for/attribute.rb
@@ -39,14 +35,8 @@ files:
 - lib/show_for/content.rb
 - lib/show_for/helper.rb
 - lib/show_for/label.rb
-- lib/show_for/locale/en.yml
 - 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: []
@@ -57,27 +47,21 @@ 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"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Wrap your objects with a helper to easily show them

data/generators/show_for_install/show_for_install_generator.rb

@@ -1,19 +0,0 @@
-class ShowForInstallGenerator < Rails::Generator::Base
-
-  def manifest
-    record do |m|
-      m.directory 'config/initializers'
-      m.template  'show_for.rb', 'config/initializers/show_for.rb'
-
-      m.directory 'config/locales'
-      m.template  locale_file, 'config/locales/show_for.en.yml'
-    end
-  end
-
-  private
-
-    def locale_file
-      @locale_file ||= '../../../lib/show_for/locale/en.yml'
-    end
-
-end