show_for 0.3.0 → 0.4.0

data/test/builder_test.rb

@@ -13,18 +13,18 @@ class BuilderTest < ActionView::TestCase
 
   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"
-    assert_select "div.show_for p.wrapper strong.label"
-    assert_select "div.show_for p.wrapper"
+    assert_select "div.show_for div.user_name.wrapper"
+    assert_select "div.show_for div.wrapper strong.label"
+    assert_select "div.show_for div.wrapper"
   end
 
   test "show_for properly deals with namespaced models" do
     @user = Namespaced::User.new(:id => 1, :name => "ShowFor")
 
     with_attribute_for @user, :name
-    assert_select "div.show_for p.namespaced_user_name.wrapper"
-    assert_select "div.show_for p.wrapper strong.label"
-    assert_select "div.show_for p.wrapper"
+    assert_select "div.show_for div.namespaced_user_name.wrapper"
+    assert_select "div.show_for div.wrapper strong.label"
+    assert_select "div.show_for div.wrapper"
   end
 
   test "show_for allows wrapper tag to be changed by attribute" do
@@ -34,19 +34,41 @@ class BuilderTest < ActionView::TestCase
 
   test "show_for allows wrapper html to be configured by attribute" do
     with_attribute_for @user, :name, :wrapper_html => { :id => "thewrapper", :class => "special" }
-    assert_select "div.show_for p#thewrapper.user_name.wrapper.special"
+    assert_select "div.show_for div#thewrapper.user_name.wrapper.special"
   end
 
   # SEPARATOR
+  test "show_for allows separator to be configured globally" do
+    swap ShowFor, :separator => '<span class="separator"></span>' do
+      with_attribute_for @user, :name
+      assert_select "div.show_for div.user_name span.separator"
+      assert_select "div.show_for div.wrapper span.separator"
+      assert_no_select "div.show_for br"
+    end
+  end
+
+  test "show_for allows separator to be changed by attribute"do
+    with_attribute_for @user, :name, :separator => '<span class="separator"></span>'
+    assert_select "div.show_for div.wrapper span.separator"
+    assert_no_select "div.show_for br"
+  end
+
+  test "show_for allows disabling separator by attribute" do
+    with_attribute_for @user, :name, :separator => false
+    assert_no_select "div.show_for div.wrapper span.separator"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_no_select "div.show_for div.wrapper", /false/
+  end
+
   test "show_for uses a separator if requested" do
     with_attribute_for @user, :name
-    assert_select "div.show_for p.wrapper br"
+    assert_select "div.show_for div.wrapper br"
   end
 
   test "show_for does not blow if a separator is not set" do
     swap ShowFor, :separator => nil do
       with_attribute_for @user, :name
-      assert_select "div.show_for p.wrapper"
+      assert_select "div.show_for div.wrapper"
     end
   end
 end

data/test/content_test.rb

@@ -23,4 +23,11 @@ class ContentTest < ActionView::TestCase
       assert_select "div.show_for b.nothing"
     end
   end
+
+  test "show_for#content with blank value does not display content if skip_blanks option is passed" do
+    swap ShowFor, :skip_blanks => true do
+      with_content_for @user, nil, :content_tag => :b
+      assert_no_select "div.show_for b"
+    end
+  end
 end

data/test/generators/show_for_generator_test.rb

@@ -17,7 +17,7 @@ class ShowForGeneratorTest < Rails::Generators::TestCase
       /config.show_for_tag = :div/
   end
 
-  %W(erb haml).each do |engine|
+  %W(erb haml slim).each do |engine|
     test "generates the scaffold template when using #{engine}" do
       run_generator ['-e', engine]
       assert_file "lib/templates/#{engine}/scaffold/show.html.#{engine}"

data/test/label_test.rb

@@ -3,40 +3,40 @@ require 'test_helper'
 class LabelTest < ActionView::TestCase
   test "show_for shows a label using the humanized attribute name from model" do
     with_attribute_for @user, :name
-    assert_select "div.show_for p.wrapper strong.label", "Super User Name!"
+    assert_select "div.show_for div.wrapper strong.label", "Super User Name!"
   end
 
   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"
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
   end
 
   test "show_for uses custom content_tag and skips label if requested" do
     with_attribute_for @user, :name, :label => false, :content_tag => :h2
-    assert_select "div.show_for p.wrapper h2.content", "ShowFor"
+    assert_select "div.show_for div.wrapper h2.content", "ShowFor"
   end
 
   test "show_for allows label to be configured globally" do
     swap ShowFor, :label_tag => :span, :label_class => "my_label" do
       with_attribute_for @user, :name
-      assert_select "div.show_for p.wrapper span.my_label"
+      assert_select "div.show_for div.wrapper span.my_label"
     end
   end
 
   test "show_for allows label to be changed by attribute" do
     with_attribute_for @user, :name, :label_tag => :span
-    assert_select "div.show_for p.wrapper span.label"
+    assert_select "div.show_for div.wrapper span.label"
   end
 
   test "show_for allows label html to be configured by attribute" do
     with_attribute_for @user, :name, :label_html => { :id => "thelabel", :class => "special" }
-    assert_select "div.show_for p.wrapper strong#thelabel.special.label"
+    assert_select "div.show_for div.wrapper strong#thelabel.special.label"
   end
 
   test "show_for allows label to be set without lookup" do
     with_attribute_for @user, :name, :label => "Special Label"
-    assert_select "div.show_for p.wrapper strong.label", "Special Label"
+    assert_select "div.show_for div.wrapper strong.label", "Special Label"
   end
 
   test "show_for#label accepts the text" do

data/test/support/misc_helpers.rb

@@ -38,10 +38,10 @@ module MiscHelpers
   end
 
   def with_association_for(object, association, options={}, &block)
-     concat(show_for(object) do |o|
-       concat o.association(association, options, &block)
-     end)
-   end
+    concat(show_for(object) do |o|
+      concat o.association(association, options, &block)
+    end)
+  end
 
   def with_label_for(object, attribute, options={})
     concat(show_for(object) do |o|

data/test/support/models.rb

@@ -1,6 +1,6 @@
 require 'ostruct'
 
-class Company < Struct.new(:id, :name)
+Company = Struct.new(:id, :name) do
   extend ActiveModel::Naming
 
   def alternate_name
@@ -8,7 +8,8 @@ class Company < Struct.new(:id, :name)
   end
 end
 
-class Tag < Struct.new(:id, :name)
+
+Tag = Struct.new(:id, :name) do
   extend ActiveModel::Naming
 
   def self.all(options={})
@@ -31,7 +32,7 @@ class User < OpenStruct
   end
 
   def company
-    Company.new(1, "PlataformaTec")
+    Company.new(1, "Plataformatec")
   end
 
   def self.human_attribute_name(attribute)

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'bundler/setup'
 
-require 'test/unit'
+require 'minitest/autorun'
 
 require 'active_model'
 require 'action_controller'
@@ -18,6 +18,8 @@ Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
 I18n.enforce_available_locales = true
 I18n.default_locale = :en
 
+ActiveSupport::TestCase.test_order = :random if ActiveSupport::TestCase.respond_to?(:test_order=)
+
 class ActionView::TestCase
   include MiscHelpers
   include ShowFor::Helper
@@ -37,4 +39,9 @@ class ActionView::TestCase
       :updated_at => Date.today
     }.merge(options))
   end
+
+  # TODO: remove after supporting Rails 4.2+ only.
+  def rails_42?
+    ActiveModel::VERSION::STRING >= "4.2.0"
+  end
 end

data/test/value_test.rb

@@ -4,86 +4,87 @@ class ValueTest < ActionView::TestCase
   test "show_for allows content tag to be configured globally, without label and separator" do
     swap ShowFor, :content_tag => :span do
       with_value_for @user, :name
-      assert_no_select "div.show_for p.wrapper strong.label"
-      assert_no_select "div.show_for p.wrapper br"
-      assert_select "div.show_for p.wrapper span.content"
+      assert_no_select "div.show_for div.wrapper strong.label"
+      assert_no_select "div.show_for div.wrapper br"
+      assert_select "div.show_for div.wrapper span.content"
     end
   end
 
   test "show_for allows content with tag to be changed by attribute, without label and separator" do
-    with_value_for @user, :name, :content_tag => :p
-    assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
-    assert_select "div.show_for p.wrapper p.content"
+    with_value_for @user, :name, :content_tag => :span
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_select "div.show_for div.wrapper span.content"
   end
 
   test "show_for allows content tag html to be configured by attribute, without label and separator" do
     with_value_for @user, :name, :content_tag => :span, :content_html => { :id => "thecontent", :class => "special" }
-    assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
-    assert_select "div.show_for p.wrapper span#thecontent.special.content"
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_select "div.show_for div.wrapper span#thecontent.special.content"
   end
 
   test "show_for accepts an attribute as string, without label and separator" do
     with_value_for @user, :name
-    assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
-    assert_select "div.show_for p.wrapper", /ShowFor/
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_select "div.show_for div.wrapper", /ShowFor/
   end
 
   test "show_for accepts an attribute as time, without label and separator" do
     with_value_for @user, :created_at
-    assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
-    assert_select "div.show_for p.wrapper", /#{Regexp.escape(I18n.l(@user.created_at))}/
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_select "div.show_for div.wrapper", /#{Regexp.escape(I18n.l(@user.created_at))}/
   end
 
   test "show_for accepts an attribute as date, without label and separator" do
     with_value_for @user, :updated_at
-    assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
-    assert_select "div.show_for p.wrapper", /#{Regexp.escape(I18n.l(@user.updated_at))}/
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_select "div.show_for div.wrapper", /#{Regexp.escape(I18n.l(@user.updated_at))}/
   end
 
   test "show_for accepts an attribute as time with format options, without label and separator" do
     with_value_for @user, :created_at, :format => :long
-    assert_select "div.show_for p.wrapper", /#{Regexp.escape(I18n.l(@user.created_at, :format => :long))}/
+    assert_select "div.show_for div.wrapper", /#{Regexp.escape(I18n.l(@user.created_at, :format => :long))}/
   end
 
   test "show_for accepts an attribute as nil, without label and separator" do
     c = with_value_for @user, :birthday
-    assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
-    assert_select "div.show_for p.wrapper", /Not specified/
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_select "div.show_for div.wrapper", /Not specified/
   end
 
   test "show_for accepts blank attributes, without label and separator" do
     with_value_for @user, :description
-    assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
-    assert_select "div.show_for p.wrapper", /Not specified/
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_select "div.show_for div.wrapper", /Not specified/
   end
 
   test "show_for uses :if_blank if attribute is nil, without label and separator" do
     with_value_for @user, :birthday, :if_blank => "No description provided"
-    assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
-    assert_select "div.show_for p.wrapper", /No description provided/
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_select "div.show_for div.wrapper", /No description provided/
   end
 
   test "show_for uses :if_blank if attribute is blank, without label and separator" do
     with_value_for @user, :description, :if_blank => "No description provided"
-    assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
-    assert_select "div.show_for p.wrapper", /No description provided/
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_select "div.show_for div.wrapper", /No description provided/
   end
 
   test "show_for escapes content by default, without label and separator" do
     @user.name = "<b>hack you!</b>"
     with_value_for @user, :name
-    assert_no_select "div.show_for p.wrapper strong.label"
-    assert_no_select "div.show_for p.wrapper br"
-    assert_no_select "div.show_for p.wrapper b"
-    assert_select "div.show_for p.wrapper", /&lt;b&gt;/
+    assert_no_select "div.show_for div.wrapper strong.label"
+    assert_no_select "div.show_for div.wrapper br"
+    assert_no_select "div.show_for div.wrapper b"
+    assert_select "div.show_for div.wrapper",
+      rails_42? ? "<b>hack you!</b>" : "&lt;b&gt;hack you!&lt;/b&gt;"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: show_for
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - José Valim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -56,13 +56,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.rdoc
+- CHANGELOG.md
 - MIT-LICENSE
+- README.md
 - 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.html.haml
+- lib/generators/show_for/templates/show.html.slim
 - lib/generators/show_for/templates/show_for.rb
 - lib/show_for.rb
 - lib/show_for/association.rb
@@ -102,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: show_for
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Wrap your objects with a helper to easily show them

data/CHANGELOG.rdoc

@@ -1,100 +0,0 @@
-== 0.3.0
-
-* bug fix
-  * Fix blank value not being applied when using a block. (by github.com/tfwright)
-
-== 0.3.0.rc
-
-* enhancements
-  * Support Rails 4.
-  * Drop support to Rails < 3.2 and Ruby 1.8.
-
-== 0.2.6
-
-* enhancements
-  * Ruby 2.0 support.
-  * Add Haml template. (by github.com/nashby) Closes #12.
-  * Add `blank_html` tanslation. (by github.com/nashby)
-  * Add `show_for_class` configuration option. (by github.com/nashby)
-
-* bug fix
-  * Make show_for works with namespaced models. (by github.com/fabiokr)
-  * Add `blank_content_class` to the attributes. (by github.com/blakehilscher). Closes #24.
-  * Don't call `association.map` if association method is nil (by github.com/nashby). Closes #40.
-
-== 0.2.5
-
-* enhancements
-  * Add a :value option for attribute (by github.com/ml-gt)
-  * Add label_class, content_class, wrapper_class and content_class configuration options (by github.com/wojtekmach)
-
-* bug fix
-  * Fix problem with label => false and html_safe (label => false) (by github.com/nashby)
-
-== 0.2.4
-
-* enhancements
-  * Do not add separator if label is not present (by github.com/eugenebolshakov)
-  * Add method for output value only (by github.com/jenkek)
-
-* bug fix
-  * Fix empty labels to be html_safe (label => false) (by github.com/eugenebolshakov)
-
-== 0.2.3
-
-* enhancements
-  * added :attributes method to generate all attributes given
-  * update generator to use the new syntax show_for:install
-
-* bug fix
-  * fix numeric types
-
-== 0.2.2
-
-* bug fix
-  * allow show_for to work with AR association proxies
-
-* enhancements
-  * improvements on html safe and output buffers
-
-== 0.2.1
-
-* enhancements
-  * added label_proc
-  * compatibility with latest Rails
-
-== 0.2.0
-
-* enhancements
-  * Rails 3 compatibility
-
-== 0.1.4
-
-* bug fix
-  * allow show_for to work with AR association proxies
-
-== 0.1.3
-
-* enhancements
-  * allow builder to be given to show_for
-
-* bugfix
-  * Fix typo in yaml
-
-== 0.1.2
-
-* enhancements
-  * allow f.attribute :nickname, :in => :profile as association shortcut
-
-* deprecations
-  * :method now becomes :using
-
-== 0.1.1
-
-* enhancements
-  * HAML compatibility (by github.com/grimen)
-  * blank_content support (by github.com/grimen)
-
-== 0.1
-
-* First release