jbuilder 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73870fb0e93ae950755c3fc00c29374b754f68d2
-  data.tar.gz: 4c28da6568a999deb23d029e383ec9665b856cf4
+  metadata.gz: e99a9ab21f1d52d88b6de5b930ca5bd8a504948f
+  data.tar.gz: 8cd28fb1bd10fd3d22ef5a5455c0b7855f4d0e0c
 SHA512:
-  metadata.gz: 639230d912f28d68a0da66ea5e0a37a8f726f95656341c16bc44c3478cba79c079f8cfe173bb234590b43c5b59ccfcb5f73e9306968492523ce8cc2ec099b98e
-  data.tar.gz: 5afb99713b59703654d49d3161e617a9bfc9500fbc61729645c9a37975e475e0907841e8e77604ce2e7dd8d7e4399057556e86956cde64c692475a88703a93a4
+  metadata.gz: b1364a2ff7640fc119b93e410877fb6979d28306176bb894f4511c05671ef79c2288829959d1c12960b9fe63662eb8606a9588452867fbedab42904408200317
+  data.tar.gz: 53dd379414c1c9c66caa31a43555d05904922bb32e661ac440530549bb32bce282eea873e85c691330f30f42715113a2295f2ab3dd48a99792d8fcc8e1a47baa

data/.travis.yml

@@ -15,10 +15,18 @@ gemfile:
   - gemfiles/rails_3_2.gemfile
   - gemfiles/rails_4_0.gemfile
   - gemfiles/rails_4_1.gemfile
+  - gemfiles/rails_4_2.gemfile
 
 matrix:
-  allow_failures:
+  exclude:
+    - rvm: 2.2
+      gemfile: gemfiles/rails_3_0.gemfile
+    - rvm: 2.2
+      gemfile: gemfiles/rails_3_1.gemfile
     - rvm: 2.2
+      gemfile: gemfiles/rails_3_2.gemfile
+
+  allow_failures:
     - rvm: jruby-19mode
     - rvm: rbx
     - rvm: ruby-head

data/Appraisals

@@ -22,3 +22,8 @@ appraise "rails-4-1" do
   gem "railties",   "~> 4.1.0"
   gem "actionpack", "~> 4.1.0"
 end
+
+appraise "rails-4-2" do
+  gem "railties",   "~> 4.2.0"
+  gem "actionpack", "~> 4.2.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+2.2.7
+-----
+* [Make Blank object serializable with Marshal](https://github.com/rails/jbuilder/commit/7083f28d8b665aa60d0d1b1927ae88bb5c6290ba)
+
 2.2.6
 -----
 * [Make sure dependency tracker loads after template handler](https://github.com/rails/jbuilder/commit/3ba404b1207b557e14771c90b8832bc01ae67a42)

data/gemfiles/rails_4_2.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "mocha", :require => false
+gem "appraisal"
+gem "railties", "~> 4.2.0"
+gem "actionpack", "~> 4.2.0"
+
+gemspec :path => "../"

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.2.6'
+  s.version  = '2.2.7'
   s.authors  = ['David Heinemeier Hansson', 'Pavel Pravosud']
   s.email    = ['david@37signals.com', 'pavel@pravosud.com']
   s.summary  = 'Create JSON structures via a Builder-style DSL'

data/lib/jbuilder.rb

@@ -1,4 +1,5 @@
 require 'jbuilder/jbuilder'
+require 'jbuilder/blank'
 require 'jbuilder/key_formatter'
 require 'jbuilder/errors'
 require 'multi_json'
@@ -21,7 +22,7 @@ class Jbuilder
     new(*args, &block).target!
   end
 
-  BLANK = ::Object.new
+  BLANK = Blank.new
 
   def set!(key, value = BLANK, *args, &block)
     result = if block

data/lib/jbuilder/blank.rb

@@ -0,0 +1,7 @@
+class Jbuilder
+  class Blank
+    def ==(other)
+      super || Blank === other
+    end
+  end
+end

data/test/jbuilder_template_test.rb

@@ -190,6 +190,27 @@ class JbuilderTemplateTest < ActionView::TestCase
     assert_equal '{"posts":[]}', json
   end
 
+  test 'cache an empty block' do
+    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
+
+    render_jbuilder <<-JBUILDER
+      json.cache! 'nothing' do
+      end
+    JBUILDER
+
+    json = nil
+
+    assert_nothing_raised do
+      json = render_jbuilder <<-JBUILDER
+        json.foo 'bar'
+        json.cache! 'nothing' do
+        end
+      JBUILDER
+    end
+
+    assert_equal 'bar', MultiJson.load(json)['foo']
+  end
+
   test 'fragment caching a JSON object' do
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
 

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require "bundler/setup"
+require "active_support"
 require "rails/version"
 
 if Rails::VERSION::STRING > "4.0"
@@ -7,4 +8,7 @@ else
   require "test/unit"
 end
 
-require "active_support/test_case"
+
+if ActiveSupport.respond_to?(:test_order=)
+  ActiveSupport.test_order = :random
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,7 @@ files:
 - gemfiles/rails_3_2.gemfile
 - gemfiles/rails_4_0.gemfile
 - gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_2.gemfile
 - jbuilder.gemspec
 - lib/generators/rails/jbuilder_generator.rb
 - lib/generators/rails/scaffold_controller_generator.rb
@@ -73,6 +74,7 @@ files:
 - lib/generators/rails/templates/index.json.jbuilder
 - lib/generators/rails/templates/show.json.jbuilder
 - lib/jbuilder.rb
+- lib/jbuilder/blank.rb
 - lib/jbuilder/dependency_tracker.rb
 - lib/jbuilder/errors.rb
 - lib/jbuilder/jbuilder.rb
@@ -105,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL