show_for 0.3.0.rc → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a197ce44c9dfc514f8efba3aed8446e9c92a77b9
-  data.tar.gz: 06cdd44e843b9c1902f8756937b9be90ff4cd753
+  metadata.gz: 4e66b71c090111795d5eefc080a133ef63f3c752
+  data.tar.gz: 6751105eb644a59ced4b9f3e96ce94c3ad791dc3
 SHA512:
-  metadata.gz: 0ac8cbc74a5cf716f98c42b014c3fb7d3dc11ac657d6defa52705f928992999e22b3b66a64aa9a8577f68865502363de6c5032b4e940373a91ea3931d4ff8c2c
-  data.tar.gz: 3658bddd5ba20a9ad7e8c23611f22d80556522477f4df60bd125102c17d186b75a32dae834629fcb55eed6266d05f36157fa5c01139fbf919d34ccffe1186440
+  metadata.gz: 0e139c076881532aca65b6678797499cd4fafe74e32d620a993d17bc6ac4cfa734988f44b445b2ac245ae4cd86c5949ded1afad7fe5b12c2b3f4078b6f62936a
+  data.tar.gz: 4626283fc1e8e5f72b987f986010e8f591e20a25cfb95a77553e0b9c9f86af356bc7670a610f310b1c9c73048f33e408b9a04aef0585b0801817896bfe0043db

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.3.0
+
+* bug fix
+  * Fix blank value not being applied when using a block. (by github.com/tfwright)
+
 == 0.3.0.rc
 
 * enhancements

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 PlataformaTec http://blog.plataformatec.com.br/
+Copyright (c) 2012-2014 PlataformaTec http://blog.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/lib/show_for/attribute.rb

@@ -44,7 +44,7 @@ module ShowFor
       when Symbol
         block_from_symbol(attribute_name, options)
       else
-        lambda { options[:value] }
+        lambda { options[:value].to_s }
       end
     end
 

data/lib/show_for/content.rb

@@ -5,10 +5,6 @@ module ShowFor
       # cache value for apply_wrapper_options!
       sample_value = value
 
-      if value.blank? && value != false
-        value = blank_value(options)
-      end
-
       # We need to convert value to_a because when dealing with ActiveRecord
       # Array proxies, the follow statement Array# === value return false
       value = value.to_a if value.is_a?(Array)
@@ -34,6 +30,10 @@ module ShowFor
           end
       end
 
+      if content.blank?
+        content = blank_value(options)
+      end
+
       options[:content_html] = options.except(:content_tag) if apply_options
       wrap_with(:content, content, apply_wrapper_options!(:content, options, sample_value) )
     end

data/lib/show_for/version.rb

@@ -1,3 +1,3 @@
 module ShowFor
-  VERSION = "0.3.0.rc".freeze
+  VERSION = "0.3.0".freeze
 end

data/test/attribute_test.rb

@@ -133,6 +133,13 @@ class AttributeTest < ActionView::TestCase
     assert_select "div.show_for p.wrapper", /This description/
   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
+      ""
+    end
+    assert_select "div.show_for p.wrapper", /No description provided/
+  end
+
   test "show_for#content given a block should be wrapped in the result" do
     with_attribute_for @user, :name do |name|
       "<div class='block'>#{name}</div>".html_safe
@@ -158,6 +165,11 @@ class AttributeTest < ActionView::TestCase
     assert_select "div.show_for p.wrapper", /Calculated Value/
   end
 
+  test "show_for uses :value and casts to string if supplied" do
+    with_attribute_for @user, :name, :value => 123
+    assert_select "div.show_for p.wrapper", /123/
+  end
+
   test "show_for ignores :value if a block is supplied" do
     with_attribute_for @user, :name, :value => "Calculated Value" do
       @user.name.upcase

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'bundler/setup'
 
 require 'test/unit'
@@ -16,6 +15,7 @@ $:.unshift File.expand_path("../../lib", __FILE__)
 require 'show_for'
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
+I18n.enforce_available_locales = true
 I18n.default_locale = :en
 
 class ActionView::TestCase

metadata

@@ -1,53 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: show_for
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc
+  version: 0.3.0
 platform: ruby
 authors:
 - José Valim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 description: Wrap your objects with a helper to easily show them
@@ -58,12 +58,13 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.rdoc
 - MIT-LICENSE
+- 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_for.rb
-- lib/generators/show_for/USAGE
+- lib/show_for.rb
 - lib/show_for/association.rb
 - lib/show_for/attribute.rb
 - lib/show_for/builder.rb
@@ -71,7 +72,6 @@ files:
 - lib/show_for/helper.rb
 - lib/show_for/label.rb
 - lib/show_for/version.rb
-- lib/show_for.rb
 - test/association_test.rb
 - test/attribute_test.rb
 - test/builder_test.rb
@@ -92,17 +92,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: show_for
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Wrap your objects with a helper to easily show them