show_for 0.4.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf7d8896e8ef6cf4029dec5b1be980ab4fdda13c
-  data.tar.gz: 8bcebe6966ece81c1485ce5fb94b691601817433
+SHA256:
+  metadata.gz: f887e097d4512d2b054ca7dde3017a18c4389d6fe376a254518474fb266e99da
+  data.tar.gz: 6f1be23083f6459f303f87a5060d3ae7494c15d9754db16d0a2565aa1ef595d3
 SHA512:
-  metadata.gz: 2f87342c9090ec41e3e52e12a2aa5b78f54707060c26240b23d91f50a2f1883aa3c3e95c87b6d53064bf9c1168e2f12105db5c7c16caef43a5b9f1d0c287ec74
-  data.tar.gz: 90ae998a6a90834359f9df100d55e7fb525a3e5d97ecc0b90e6c70fcb311f93b9a6cfd2aee8e2931ef18448f9c46017298577306b337829562c10d8b4a5c77de
+  metadata.gz: 73ca01b5978117f4b942f7784cb8da9d7b3651ab1ad3c8b6995864fd057e7af172e17f7035d24467fdc1171bb00385a9314b26b71abdfe9d6cf5d05a1d50bcb4
+  data.tar.gz: b122b66cdc14e4db341337e37b1f23726354580448e3e311c4d3ba49b54d06bb4bd448a3edec6a29aaad5274999ec5f021268dd25c0120591eef9c0d15f68f76

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## 0.8.0
+
+* Respect `nil` value when provided, by skipping model attribute value.
+* Add support for Ruby 3.0, drop support for Ruby < 2.5.
+* Add support for Rails 6.1, drop support for Rails < 5.2.
+* Move CI to GitHub Actions.
+
+## 0.7.0
+
+* Add support for Rails 6.0.
+* Drop support for Rails < 5.0 and Ruby < 2.4.
+
+## 0.6.1
+
+* Add support for Rails 5.2.
+*  Fix issue causing blank class not being applied to field wrapper when the result of a Proc is empty.
+
+## 0.6.0
+
+* Relaxed dependencies to support Rails 5.1.
+
+## 0.5.0
+
+* Relaxed dependencies to support Rails 5.
+* Removed support for Rails `3.2` and `4.0` and Ruby `1.9.3` and `2.0.0`.
+
+### enhancements
+  * Do not generate label/content/wrapper/collection classes when config is set to `nil`.
+
 ## 0.4.0
 
 ### enhancements
@@ -101,7 +130,7 @@
 ## 0.1.2
 
 ### enhancements
-  * allow `f.attribute :nickname, :in => :profile` as association shortcut
+  * allow `f.attribute :nickname, in: :profile` as association shortcut
 
 ### deprecations
   * `:method` now becomes `:using`

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015 Plataformatec http://plataformatec.com.br/
+Copyright (c) 2012-2019 Plataformatec http://plataformatec.com.br/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,26 +1,25 @@
 # ShowFor
 
 [![Gem Version](https://fury-badge.herokuapp.com/rb/show_for.png)](http://badge.fury.io/rb/show_for)
-[![Build Status](https://api.travis-ci.org/plataformatec/show_for.png?branch=master)](http://travis-ci.org/plataformatec/show_for)
-[![Code Climate](https://codeclimate.com/github/plataformatec/show_for.png)](https://codeclimate.com/github/plataformatec/show_for)
+[![Code Climate](https://codeclimate.com/github/heartcombo/show_for.png)](https://codeclimate.com/github/heartcombo/show_for)
 
 ShowFor allows you to quickly show a model information with I18n features.
 
 ```erb
 <%= show_for @user do |u| %>
   <%= u.attribute :name %>
-  <%= u.attribute :nickname, :in => :profile %>
+  <%= 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",
-                  :wrapper_html => { :id => "sign_in_timestamp" } %>
+  <%= u.attribute :created_at, format: :short %>
+  <%= 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.association :company %>
-  <%= u.association :tags, :to_sentence => true %>
+  <%= u.association :tags, to_sentence: true %>
 <% end %>
 ```
 
@@ -40,7 +39,7 @@ Run the generator:
 
 And you are ready to go.
 
-Note: This branch aims Rails 3.2 and 4 support, so if you want to use it with
+Note: This branch aims Rails 5 and 6 support, so if you want to use it with
 older versions of Rails, check out the available branches.
 
 ## Usage
@@ -50,11 +49,11 @@ ShowFor allows you to quickly show a model information with I18n features.
 ```erb
 <%= show_for @admin do |a| %>
   <%= a.attribute :name %>
-  <%= a.attribute :login, :value => :upcase %>
+  <%= a.attribute :login, value: :upcase %>
   <%= a.attribute :confirmed? %>
-  <%= a.attribute :created_at, :format => :short %>
-  <%= a.attribute :last_sign_in_at, :if_blank => "Administrator did not access yet"
-                  :wrapper_html => { :id => "sign_in_timestamp" } %>
+  <%= a.attribute :created_at, format: :short %>
+  <%= a.attribute :last_sign_in_at, if_blank: "Administrator did not access yet"
+                  wrapper_html: { id: "sign_in_timestamp" } %>
 
   <%= a.attribute :photo do %>
     <%= image_tag(@admin.photo_url) %>
@@ -141,8 +140,8 @@ ShowFor also exposes the label method. In case you want to use the default
 `human_attribute_name` lookup and the default wrapping:
 
 ```ruby
-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                  #=> <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
@@ -163,16 +162,16 @@ ShowFor also supports associations.
 ```erb
 <%= show_for @artwork do |a| %>
   <%= a.association :artist %>
-  <%= a.association :artist, :using => :name_with_title %>
-  <%= a.attribute :name_with_title, :in => :artist %>
+  <%= a.association :artist, using: :name_with_title %>
+  <%= a.attribute :name_with_title, in: :artist %>
 
   <%= a.association :tags %>
-  <%= a.association :tags, :to_sentence => true %>
+  <%= a.association :tags, to_sentence: true %>
   <%= a.association :tags do
     @artwork.tags.map(&:name).to_sentence
   end %>
 
-  <%= a.association :fans, :collection_tag => :ol do |fan| %>
+  <%= a.association :fans, collection_tag: :ol do |fan| %>
     <li><%= link_to fan.name, fan %></li>
   <% end %>
 <% end %>
@@ -196,7 +195,7 @@ collection objects.
 Here are some other examples of the many possibilites to custom the output content:
 
 ```erb
-<%= u.association :relationships, :label => 'test' do  %>
+<%= u.association :relationships, label: 'test' do  %>
   <% @user.relationships.each do |relation| %>
     <%= relation.related_user.name if relation.related_user_role == 'supervisor' %>
   <% end %>
@@ -216,10 +215,17 @@ Here are some other examples of the many possibilites to custom the output conte
 
 * Jonas Grimfelt (http://github.com/grimen)
 
+## Supported Ruby / Rails versions
+
+We intend to maintain support for all Ruby / Rails versions that haven't reached end-of-life.
+
+For more information about specific versions please check [Ruby](https://www.ruby-lang.org/en/downloads/branches/)
+and [Rails](https://guides.rubyonrails.org/maintenance_policy.html) maintenance policies, and our test matrix.
+
 ## Bugs and Feedback
 
 If you discover any bugs or want to drop a line, feel free to create an issue on GitHub.
 
-http://github.com/plataformatec/show_for/issues
+http://github.com/heartcombo/show_for/issues
 
-MIT License. Copyright 2012-2015 Plataformatec. http://plataformatec.com.br
+MIT License. Copyright 2012-2019 Plataformatec. http://plataformatec.com.br

data/lib/generators/show_for/install_generator.rb

@@ -2,7 +2,7 @@ module ShowFor
   module Generators
     class InstallGenerator < Rails::Generators::Base
       desc "Copy ShowFor installation files"
-      class_option :template_engine, :desc => 'Template engine to be invoked (erb or haml or slim).'
+      class_option :template_engine, desc: 'Template engine to be invoked (erb or haml or slim).'
       source_root File.expand_path('../templates', __FILE__)
 
       def copy_initializers

data/lib/show_for/association.rb

@@ -1,6 +1,6 @@
 module ShowFor
   module Association
-    def attribute(attribute_name, options={}, &block)
+    def attribute(attribute_name, options = {}, &block)
       if association_name = options.delete(:in)
         options[:using] = attribute_name
         association(association_name, options, &block)
@@ -9,7 +9,7 @@ module ShowFor
       end
     end
 
-    def association(association_name, options={}, &block)
+    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

data/lib/show_for/attribute.rb

@@ -1,6 +1,6 @@
 module ShowFor
   module Attribute
-    def attribute(attribute_name, options={}, &block)
+    def attribute(attribute_name, options = {}, &block)
       apply_default_options!(attribute_name, options)
       block = block_from_value_option(attribute_name, options) unless block
       collection_block, block = block, nil if collection_block?(block)
@@ -10,7 +10,7 @@ module ShowFor
       wrap_label_and_content(attribute_name, value, options, &collection_block)
     end
 
-    def value(attribute_name, options={}, &block)
+    def value(attribute_name, options = {}, &block)
       apply_default_options!(attribute_name, options)
       collection_block, block = block, nil if collection_block?(block)
 
@@ -38,10 +38,9 @@ module ShowFor
     end
 
     def block_from_value_option(attribute_name, options)
-      case options[:value]
-      when nil
+      if !options.has_key?(:value)
         nil
-      when Symbol
+      elsif options[:value].is_a?(Symbol)
         block_from_symbol(attribute_name, options)
       else
         lambda { options[:value].to_s }
@@ -59,4 +58,3 @@ module ShowFor
     end
   end
 end
-

data/lib/show_for/builder.rb

@@ -53,7 +53,7 @@ module ShowFor
 
     def apply_wrapper_options!(type, options, value)
       options[:"#{type}_html"] ||= {}
-      options[:"#{type}_html"][:class] = [options[:"#{type}_html"][:class], ShowFor.blank_content_class].join(' ') if value.blank? && value != false
+      options[:"#{type}_html"][:class] = [options[:"#{type}_html"][:class], ShowFor.blank_content_class].join(' ') if is_empty?(value)
       options
     end
 
@@ -67,7 +67,7 @@ module ShowFor
       if tag
         type_class = ShowFor.send :"#{type}_class"
         html_options = options.delete(:"#{type}_html") || {}
-        html_options[:class] = "#{type_class} #{html_options[:class]}".rstrip
+        html_options[:class] = [type_class, html_options[:class]].compact.presence
         @template.content_tag(tag, content, html_options)
       else
         content
@@ -84,6 +84,11 @@ module ShowFor
     def skip_blanks?(value) #:nodoc:
       ShowFor.skip_blanks && value.blank? && value != false
     end
+
+    def is_empty?(value) #:nodoc:
+      value = @template.capture(&value) if value.is_a?(Proc)
+      value.blank? && value != false
+    end
   end
 end
 

data/lib/show_for/content.rb

@@ -1,6 +1,6 @@
 module ShowFor
   module Content
-    def content(value, options={}, apply_options=true, &block)
+    def content(value, options = {}, apply_options = true, &block)
       # cache value for apply_wrapper_options!
       sample_value = value
 
@@ -10,11 +10,11 @@ module ShowFor
 
       content = case value
         when Date, Time, DateTime
-          I18n.l value, :format => options.delete(:format) || ShowFor.i18n_format
+          I18n.l value, format: options.delete(:format) || ShowFor.i18n_format
         when TrueClass
-          I18n.t :"show_for.yes", :default => "Yes"
+          I18n.t :"show_for.yes", default: "Yes"
         when FalseClass
-          I18n.t :"show_for.no", :default => "No"
+          I18n.t :"show_for.no", default: "No"
         when Array, Hash
           collection_handler(value, options, &block) unless value.empty?
         when Proc
@@ -48,11 +48,11 @@ module ShowFor
     end
 
     def translate_blank_html
-      template.t(:'show_for.blank_html', :default => translate_blank_text)
+      template.t(:'show_for.blank_html', default: translate_blank_text)
     end
 
     def translate_blank_text
-      I18n.t(:'show_for.blank', :default => "Not specified")
+      I18n.t(:'show_for.blank', default: "Not specified")
     end
 
     def blank_value(options)

data/lib/show_for/helper.rb

@@ -9,7 +9,7 @@ module ShowFor
     #     f.attribute :email
     #   end
     #
-    def show_for(object, html_options={}, &block)
+    def show_for(object, html_options = {}, &block)
       html_options = html_options.dup
 
       tag = html_options.delete(:show_for_tag) || ShowFor.show_for_tag

data/lib/show_for/label.rb

@@ -1,6 +1,6 @@
 module ShowFor
   module Label
-    def label(text_or_attribute, options={}, apply_options=true)
+    def label(text_or_attribute, options = {}, apply_options = true)
       label = if text_or_attribute.is_a?(String)
         text_or_attribute
       elsif options.key?(:label)

data/lib/show_for/version.rb

@@ -1,3 +1,3 @@
 module ShowFor
-  VERSION = "0.4.0".freeze
+  VERSION = "0.8.0".freeze
 end

data/test/association_test.rb

@@ -7,17 +7,17 @@ class AssociationTest < ActionView::TestCase
   end
 
   test "show_for accepts :using as option to tell how to retrieve association value" do
-    with_association_for @user, :company, :using => :alternate_name
+    with_association_for @user, :company, using: :alternate_name
     assert_select "div.show_for div.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
+    with_attribute_for @user, :alternate_name, in: :company
     assert_select "div.show_for div.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
+    with_attribute_for @user, :alternate_name, in: :tags, to_sentence: true
     assert_no_select "div.show_for div.wrapper ul.collection"
     assert_select "div.show_for div.wrapper", /Alternate Tag 1, Alternate Tag 2, and Alternate Tag 3/
   end
@@ -35,7 +35,7 @@ class AssociationTest < ActionView::TestCase
       []
     end
 
-    swap ShowFor, :association_methods => [:name] do
+    swap ShowFor, association_methods: [:name] do
       with_association_for @user, :tags
       assert_no_select "div.show_for div.wrapper ul.collection"
       assert_no_select "div.show_for div.wrapper", /Enumerator/
@@ -47,7 +47,7 @@ class AssociationTest < ActionView::TestCase
       []
     end
 
-    swap ShowFor, :association_methods => [:name] do
+    swap ShowFor, association_methods: [:name] do
       with_association_for @user, :tags do |tag|
         tag.name
       end
@@ -89,7 +89,7 @@ class AssociationTest < ActionView::TestCase
   end
 
   test "show_for accepts :using as option to tell how to retrieve association values" do
-    with_association_for @user, :tags, :using => :alternate_name
+    with_association_for @user, :tags, using: :alternate_name
     assert_select "div.show_for div.wrapper ul.collection"
     assert_select "div.show_for div.wrapper ul.collection li", "Alternate Tag 1"
     assert_select "div.show_for div.wrapper ul.collection li", "Alternate Tag 2"
@@ -97,13 +97,13 @@ class AssociationTest < ActionView::TestCase
   end
 
   test "show_for accepts :to_sentence as option in collection associations" do
-    with_association_for @user, :tags, :to_sentence => true
+    with_association_for @user, :tags, to_sentence: true
     assert_no_select "div.show_for div.wrapper ul.collection"
     assert_select "div.show_for div.wrapper", /Tag 1, Tag 2, and Tag 3/
   end
 
   test "show_for accepts :join as option in collection associations" do
-    with_association_for @user, :tags, :join => ", "
+    with_association_for @user, :tags, join: ", "
     assert_no_select "div.show_for div.wrapper ul.collection"
     assert_select "div.show_for div.wrapper", /Tag 1, Tag 2, Tag 3/
   end
@@ -117,7 +117,7 @@ class AssociationTest < ActionView::TestCase
   end
 
   test "show_for accepts a block with argument in collection associations" do
-    with_association_for @user, :tags, :collection_tag => :p do |tag|
+    with_association_for @user, :tags, collection_tag: :p do |tag|
       assert_kind_of Tag, tag
       content_tag(:span, tag.name)
     end
@@ -133,7 +133,7 @@ class AssociationTest < ActionView::TestCase
       []
     end
 
-    swap ShowFor, :skip_blanks => true do
+    swap ShowFor, skip_blanks: true do
       with_association_for @user, :tags
       assert_no_select "div.show_for div.wrapper"
     end
@@ -144,7 +144,7 @@ class AssociationTest < ActionView::TestCase
       nil
     end
 
-    swap ShowFor, :skip_blanks => true do
+    swap ShowFor, skip_blanks: true do
       with_association_for @user, :company
       assert_no_select "div.show_for div.wrapper"
     end

data/test/attribute_test.rb

@@ -5,7 +5,7 @@ class AttributeTest < ActionView::TestCase
   test "show_for accepts an attribute as a collection" do
     with_attribute_for @user, :scopes
     assert_select "div.show_for div.wrapper ul.collection"
-    assert_select "div.show_for div.wrapper ul.collection li", :count => 3
+    assert_select "div.show_for div.wrapper ul.collection li", count: 3
   end
 
   test "show_for accepts an attribute as a collection with a block to iterate the collection" do
@@ -13,48 +13,64 @@ class AttributeTest < ActionView::TestCase
       content_tag :span, scope
     end
     assert_select "div.show_for div.wrapper ul.collection"
-    assert_select "div.show_for div.wrapper ul.collection span", :count => 3
+    assert_select "div.show_for div.wrapper ul.collection span", count: 3
   end
 
   test "show_for treats symbol for :value as method on each element of collection" do
-    with_attribute_for @user, :scopes, :value => :upcase
+    with_attribute_for @user, :scopes, value: :upcase
     @user.scopes.each do |scope|
       assert_select "div.show_for div.wrapper ul.collection", /#{scope.upcase}/
     end
   end
 
   test "show_for allows collection tag to be configured globally" do
-    swap ShowFor, :collection_tag => :ol, :collection_class => "my_collection" do
+    swap ShowFor, collection_tag: :ol, collection_class: "my_collection" do
       with_attribute_for @user, :scopes
       assert_select "div.show_for div.wrapper ol.my_collection"
     end
   end
 
+  test "show_for allows collection class to be disabled globally" do
+    swap ShowFor, collection_tag: :ol, collection_class: nil do
+      with_attribute_for @user, :scopes
+      assert_select "div.show_for div.wrapper ol"
+      assert_no_select "ol[class]"
+    end
+  end
+
   test "show_for allows collection tag to be changed by attribute" do
-    with_attribute_for @user, :scopes, :collection_tag => :ol
+    with_attribute_for @user, :scopes, collection_tag: :ol
     assert_select "div.show_for div.wrapper ol.collection"
   end
 
   test "show_for allows collection tag html to be configured by attribute" do
-    with_attribute_for @user, :scopes, :collection_html => { :id => "thecollection", :class => "special" }
+    with_attribute_for @user, :scopes, collection_html: { id: "thecollection", class: "special" }
     assert_select "div.show_for div.wrapper ul#thecollection.special.collection"
   end
 
   # CONTENT
   test "show_for allows content tag to be configured globally" do
-    swap ShowFor, :content_tag => :span, :content_class => :my_content do
+    swap ShowFor, content_tag: :span, content_class: :my_content do
       with_attribute_for @user, :name
       assert_select "div.show_for div.wrapper span.my_content"
     end
   end
 
+  test "show_for allows content class to be disabled globally" do
+    swap ShowFor, content_tag: :span, content_class: nil do
+      with_attribute_for @user, :name
+      assert_select "div.show_for div.wrapper span"
+      assert_no_select "span[class]"
+    end
+  end
+
   test "show_for allows content tag to be changed by attribute" do
-    with_attribute_for @user, :name, :content_tag => :span
+    with_attribute_for @user, :name, content_tag: :span
     assert_select "div.show_for div.wrapper span.content"
   end
 
   test "show_for allows content tag html to be configured by attribute" do
-    with_attribute_for @user, :name, :content_tag => :span, :content_html => { :id => "thecontent", :class => "special" }
+    with_attribute_for @user, :name, content_tag: :span, content_html: { id: "thecontent", class: "special" }
     assert_select "div.show_for div.wrapper span#thecontent.special.content"
   end
 
@@ -74,8 +90,8 @@ class AttributeTest < ActionView::TestCase
   end
 
   test "show_for accepts an attribute as time with format options" do
-    with_attribute_for @user, :created_at, :format => :long
-    assert_select "div.show_for div.wrapper", /#{Regexp.escape(I18n.l(@user.created_at, :format => :long))}/
+    with_attribute_for @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 true" do
@@ -84,7 +100,7 @@ class AttributeTest < ActionView::TestCase
   end
 
   test "show_for accepts an attribute as true which can be localized" do
-    store_translations(:en, :show_for => { :yes => "Hell yeah!" }) do
+    store_translations(:en, show_for: { yes: "Hell yeah!" }) do
       with_attribute_for @user, :active
       assert_select "div.show_for div.wrapper", /Hell yeah!/
     end
@@ -96,7 +112,7 @@ class AttributeTest < ActionView::TestCase
   end
 
   test "show_for accepts an attribute as false which can be localized" do
-    store_translations(:en, :show_for => { :no => "Hell no!" }) do
+    store_translations(:en, show_for: { no: "Hell no!" }) do
       with_attribute_for @user, :invalid
       assert_select "div.show_for div.wrapper", /Hell no!/
     end
@@ -108,21 +124,21 @@ class AttributeTest < ActionView::TestCase
   end
 
   test "show_for accepts not spcified message can be localized" do
-    store_translations(:en, :show_for => { :blank => "OMG! It's blank!" }) do
+    store_translations(:en, show_for: { blank: "OMG! It's blank!" }) do
       with_attribute_for @user, :description
       assert_select "div.show_for div.wrapper", /OMG! It's blank!/
     end
   end
 
   test "show_for accepts not spcified message can be localized with html" do
-    store_translations(:en, :show_for => { :blank_html => "<span>OMG! It's blank!</span>" }) do
+    store_translations(:en, show_for: { blank_html: "<span>OMG! It's blank!</span>" }) do
       with_attribute_for @user, :description
       assert_select "div.show_for div.wrapper span", "OMG! It's blank!"
     end
   end
 
   test "show_for uses :if_blank if attribute is blank" do
-    with_attribute_for @user, :description, :if_blank => "No description provided"
+    with_attribute_for @user, :description, if_blank: "No description provided"
     assert_select "div.show_for div.wrapper", /No description provided/
   end
 
@@ -134,7 +150,7 @@ class AttributeTest < ActionView::TestCase
   end
 
   test "show_for uses :if_blank if the block content is blank" do
-    with_attribute_for @user, :description, :if_blank => "No description provided" do
+    with_attribute_for @user, :description, if_blank: "No description provided" do
       ""
     end
     assert_select "div.show_for div.wrapper", /No description provided/
@@ -151,8 +167,7 @@ class AttributeTest < ActionView::TestCase
     @user.name = "<b>hack you!</b>"
     with_attribute_for @user, :name
     assert_no_select "div.show_for div.wrapper b"
-    assert_select "div.show_for div.wrapper",
-      rails_42? ? "Super User Name!<b>hack you!</b>" : "Super User Name!&lt;b&gt;hack you!&lt;/b&gt;"
+    assert_select "div.show_for div.wrapper", "Super User Name!<b>hack you!</b>"
   end
 
   test "show_for works with html_safe marked strings" do
@@ -162,36 +177,41 @@ class AttributeTest < ActionView::TestCase
   end
 
   test "show_for uses :value if supplied" do
-    with_attribute_for @user, :name, :value => "Calculated Value"
+    with_attribute_for @user, :name, value: "Calculated Value"
     assert_select "div.show_for div.wrapper", /Calculated Value/
   end
 
   test "show_for uses :value and casts to string if supplied" do
-    with_attribute_for @user, :name, :value => 123
+    with_attribute_for @user, :name, value: 123
     assert_select "div.show_for div.wrapper", /123/
   end
 
+  test "show_for ignores attribute if :value supplied but with nil value" do
+    with_attribute_for @user, :name, value: nil
+    assert_select "div.show_for div.wrapper", /Not specified/
+  end
+
   test "show_for ignores :value if a block is supplied" do
-    with_attribute_for @user, :name, :value => "Calculated Value" do
+    with_attribute_for @user, :name, value: "Calculated Value" do
       @user.name.upcase
     end
     assert_select "div.show_for div.wrapper", /#{@user.name.upcase}/
   end
 
   test "show_for treats symbol for :value as method on attribute" do
-    with_attribute_for @user, :name, :value => :upcase
+    with_attribute_for @user, :name, value: :upcase
     assert_select "div.show_for div.wrapper", /#{@user.name.upcase}/
   end
 
   test "show_for does not display blank attribute if skip_blanks option is passed" do
-    swap ShowFor, :skip_blanks => true do
+    swap ShowFor, skip_blanks: true do
       with_attribute_for @user, :description
       assert_no_select "div.show_for div.wrapper"
     end
   end
 
   test "show_for display false attribute if skip_blanks option is passed" do
-    swap ShowFor, :skip_blanks => true do
+    swap ShowFor, skip_blanks: true do
       with_attribute_for @user, :invalid
       assert_select "div.show_for div.wrapper", /No/
     end
@@ -207,9 +227,10 @@ class AttributeTest < ActionView::TestCase
   end
 
   test "show_for should wrap blank attributes with no_attribute" do
-    swap ShowFor, :blank_content_class => 'no_attribute' do
-      with_attributes_for @user, :name, :birthday
+    swap ShowFor, blank_content_class: 'no_attribute' do
+      with_attributes_for @user, :name, :birthday, :karma
       assert_select ".wrapper.user_birthday.no_attribute"
+      assert_select ".wrapper.user_karma.no_attribute"
       assert_select ".wrapper.user_name.no_attribute", false
     end
   end

data/test/builder_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class BuilderTest < ActionView::TestCase
   # WRAPPER
   test "show_for allows wrapper to be configured globally" do
-    swap ShowFor, :wrapper_tag => "li", :wrapper_class => "my_wrapper" do
+    swap ShowFor, wrapper_tag: "li", wrapper_class: "my_wrapper" do
       with_attribute_for @user, :name
       assert_select "div.show_for li.user_name.my_wrapper"
       assert_select "div.show_for li.my_wrapper strong.label"
@@ -11,6 +11,13 @@ class BuilderTest < ActionView::TestCase
     end
   end
 
+  test "show_for allows wrapper class to be disabled globally" do
+    swap ShowFor, wrapper_tag: "li", wrapper_class: nil do
+      with_attribute_for @user, :name
+      assert_select "div.show_for li[class='user_name']"
+    end
+  end
+
   test "show_for attribute wraps each attribute with a label and content" do
     with_attribute_for @user, :name
     assert_select "div.show_for div.user_name.wrapper"
@@ -19,7 +26,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "show_for properly deals with namespaced models" do
-    @user = Namespaced::User.new(:id => 1, :name => "ShowFor")
+    @user = Namespaced::User.new(id: 1, name: "ShowFor")
 
     with_attribute_for @user, :name
     assert_select "div.show_for div.namespaced_user_name.wrapper"
@@ -28,18 +35,18 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "show_for allows wrapper tag to be changed by attribute" do
-    with_attribute_for @user, :name, :wrapper_tag => :span
+    with_attribute_for @user, :name, wrapper_tag: :span
     assert_select "div.show_for span.user_name.wrapper"
   end
 
   test "show_for allows wrapper html to be configured by attribute" do
-    with_attribute_for @user, :name, :wrapper_html => { :id => "thewrapper", :class => "special" }
+    with_attribute_for @user, :name, wrapper_html: { id: "thewrapper", class: "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
+    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"
@@ -48,13 +55,13 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "show_for allows separator to be changed by attribute"do
-    with_attribute_for @user, :name, :separator => '<span class="separator"></span>'
+    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
+    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/
@@ -66,7 +73,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "show_for does not blow if a separator is not set" do
-    swap ShowFor, :separator => nil do
+    swap ShowFor, separator: nil do
       with_attribute_for @user, :name
       assert_select "div.show_for div.wrapper"
     end

data/test/content_test.rb

@@ -7,26 +7,26 @@ class ContentTest < ActionView::TestCase
   end
 
   test "show_for#content accepts :if_blank as option" do
-     with_content_for @user, "", :if_blank => "Got blank"
+     with_content_for @user, "", if_blank: "Got blank"
      assert_select "div.show_for", "Got blank"
    end
 
   test "show_for#content accepts html options" do
-    with_content_for @user, "Special content", :content_tag => :b, :id => "thecontent", :class => "special"
+    with_content_for @user, "Special content", content_tag: :b, id: "thecontent", class: "special"
     assert_select "div.show_for b#thecontent.special.content", "Special content"
     assert_no_select "div.show_for b[content_tag]"
   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
+    swap ShowFor, blank_content_class: "nothing" do
+      with_content_for @user, nil, content_tag: :b
       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
+    swap ShowFor, skip_blanks: true do
+      with_content_for @user, nil, content_tag: :b
       assert_no_select "div.show_for b"
     end
   end

data/test/helper_test.rb

@@ -11,7 +11,7 @@ class HelperTest < ActionView::TestCase
   end
 
   test "show for yields an instance of builder class specified by builder option" do
-    show_for(@user, :builder => CustomBuilder) do |f|
+    show_for(@user, builder: CustomBuilder) do |f|
       assert f.instance_of?(CustomBuilder)
     end
   end
@@ -27,28 +27,28 @@ class HelperTest < ActionView::TestCase
   end
 
   test "show for should pass options" do
-    concat(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
+    swap ShowFor, show_for_tag: :p do
       concat(show_for(@user) do |f| end)
       assert_select "p.show_for"
     end
   end
 
   test "show for class should be configurable" do
-    swap ShowFor, :show_for_class => :awesome do
+    swap ShowFor, show_for_class: :awesome do
       concat(show_for(@user) do |f| end)
       assert_select "div.show_for.user.awesome"
     end
   end
   
   test "show for options hash should not be modified" do
-    html_options = { :show_for_tag => :li }
+    html_options = { show_for_tag: :li }
     concat(show_for(@user, html_options) do |f| end)
-    assert_equal({ :show_for_tag => :li }, html_options)
+    assert_equal({ show_for_tag: :li }, html_options)
   end
   
 end

data/test/label_test.rb

@@ -7,35 +7,43 @@ class LabelTest < ActionView::TestCase
   end
 
   test "show_for skips label if requested" do
-    with_attribute_for @user, :name, :label => false
+    with_attribute_for @user, :name, label: false
     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
+    with_attribute_for @user, :name, label: false, content_tag: :h2
     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
+    swap ShowFor, label_tag: :span, label_class: "my_label" do
       with_attribute_for @user, :name
       assert_select "div.show_for div.wrapper span.my_label"
     end
   end
 
+  test "show_for allows label class to be disabled globally" do
+    swap ShowFor, label_tag: :span, label_class: nil do
+      with_attribute_for @user, :name
+      assert_select "div.show_for div.wrapper span"
+      assert_no_select "span[class]"
+    end
+  end
+
   test "show_for allows label to be changed by attribute" do
-    with_attribute_for @user, :name, :label_tag => :span
+    with_attribute_for @user, :name, label_tag: :span
     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" }
+    with_attribute_for @user, :name, label_html: { id: "thelabel", class: "special" }
     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"
+    with_attribute_for @user, :name, label: "Special Label"
     assert_select "div.show_for div.wrapper strong.label", "Special Label"
   end
 
@@ -50,20 +58,20 @@ class LabelTest < ActionView::TestCase
   end
 
   test "show_for#label accepts html options" do
-    with_label_for @user, :name, :id => "thelabel", :class => "special"
+    with_label_for @user, :name, id: "thelabel", class: "special"
     assert_select "div.show_for strong#thelabel.special.label"
   end
 
   test "should let you override the label wrapper" do
-    swap ShowFor, :label_proc => proc { |l| l + ":" } 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
+    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

data/test/support/misc_helpers.rb

@@ -8,8 +8,8 @@ module MiscHelpers
     end
   end
 
-  def assert_no_select(selector, value=nil)
-    assert_select(selector, :text => value, :count => 0)
+  def assert_no_select(selector, value = nil)
+    assert_select(selector, text: value, count: 0)
   end
 
   def swap(object, new_values)
@@ -25,31 +25,31 @@ module MiscHelpers
     end
   end
 
-  def with_attribute_for(object, attribute, options={}, &block)
+  def with_attribute_for(object, attribute, options = {}, &block)
     concat(show_for(object) do |o|
       concat o.attribute(attribute, options, &block)
     end)
   end
 
-  def with_value_for(object, attribute, options={}, &block)
+  def with_value_for(object, attribute, options = {}, &block)
     concat(show_for(object) do |o|
       concat o.value(attribute, options, &block)
     end)
   end
 
-  def with_association_for(object, association, options={}, &block)
+  def with_association_for(object, association, options = {}, &block)
     concat(show_for(object) do |o|
       concat o.association(association, options, &block)
     end)
   end
 
-  def with_label_for(object, attribute, options={})
+  def with_label_for(object, attribute, options = {})
     concat(show_for(object) do |o|
       concat o.label(attribute, options)
     end)
   end
 
-  def with_content_for(object, value, options={})
+  def with_content_for(object, value, options = {})
     concat(show_for(object) do |o|
       concat o.content(value, options)
     end)

data/test/support/models.rb

@@ -12,7 +12,7 @@ end
 Tag = Struct.new(:id, :name) do
   extend ActiveModel::Naming
 
-  def self.all(options={})
+  def self.all(options = {})
     (1..3).map{ |i| Tag.new(i, "Tag #{i}") }
   end
 

data/test/test_helper.rb

@@ -26,22 +26,18 @@ class ActionView::TestCase
 
   setup :setup_new_user
 
-  def setup_new_user(options={})
+  def setup_new_user(options = {})
     @user = User.new({
-      :id => 1,
-      :name => 'ShowFor',
-      :description => '',
-      :active => true,
-      :invalid => false,
-      :scopes => ["admin", "manager", "visitor"],
-      :birthday => nil,
-      :created_at => Time.now,
-      :updated_at => Date.today
+      id: 1,
+      name: 'ShowFor',
+      description: '',
+      active: true,
+      invalid: false,
+      scopes: ["admin", "manager", "visitor"],
+      birthday: nil,
+      karma: Proc.new { nil },
+      created_at: Time.now,
+      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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 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
+    swap ShowFor, content_tag: :span do
       with_value_for @user, :name
       assert_no_select "div.show_for div.wrapper strong.label"
       assert_no_select "div.show_for div.wrapper br"
@@ -11,14 +11,14 @@ class ValueTest < ActionView::TestCase
   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 => :span
+    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" }
+    with_value_for @user, :name, content_tag: :span, content_html: { id: "thecontent", class: "special" }
     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"
@@ -46,12 +46,12 @@ class ValueTest < ActionView::TestCase
   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 div.wrapper", /#{Regexp.escape(I18n.l(@user.created_at, :format => :long))}/
+    with_value_for @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
+    with_value_for @user, :birthday
     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/
@@ -65,14 +65,14 @@ class ValueTest < ActionView::TestCase
   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"
+    with_value_for @user, :birthday, if_blank: "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"
+    with_value_for @user, :description, if_blank: "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/
@@ -84,7 +84,6 @@ class ValueTest < ActionView::TestCase
     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;"
+    assert_select "div.show_for div.wrapper", "<b>hack you!</b>"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: show_for
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.8.0
 platform: ruby
 authors:
 - José Valim
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,40 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
 description: Wrap your objects with a helper to easily show them
 email: contact@plataformatec.com.br
 executables: []
@@ -86,9 +74,10 @@ files:
 - test/test_helper.rb
 - test/value_test.rb
 homepage: http://github.com/plataformatec/show_for
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,27 +85,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: show_for
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Wrap your objects with a helper to easily show them
 test_files:
-- test/association_test.rb
-- test/attribute_test.rb
 - test/builder_test.rb
-- test/content_test.rb
-- test/generators/show_for_generator_test.rb
-- test/helper_test.rb
-- test/label_test.rb
+- test/attribute_test.rb
+- test/value_test.rb
 - test/support/misc_helpers.rb
 - test/support/models.rb
+- test/label_test.rb
 - test/test_helper.rb
-- test/value_test.rb
+- test/helper_test.rb
+- test/association_test.rb
+- test/generators/show_for_generator_test.rb
+- test/content_test.rb