jbuilder 2.6.4 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e35bd234795a5d5f23c73a30d259ca195e42f6e5
-  data.tar.gz: 3e884978c900ea0ef14aa7e68e611246b2b74814
+  metadata.gz: 45c3afb337be47562a40f26a3ca88c30c866a6bf
+  data.tar.gz: 735bc2cec1ed339e9ed9ab106d039fb6c877f486
 SHA512:
-  metadata.gz: de29407995773a316901cee9012d9f363366ac02ecd4faeb98ab58099536dc5377d53e3c07242f24f17e039111a7f45842ecb5cfc37be67af5852e4ce7c471de
-  data.tar.gz: 9bc528a7c2f5fe784567d0d62012a51b3e398debf13a72e68496f7345be69f0f62c401b6dfa07e1a38773a4d4d952b768e63b83c32fa24e64041fe62b6dd3778
+  metadata.gz: e2ba8f0402fb0f931a85a7a3d64af40908076ed3a0acdc47af4c250ed77b19606ac0203bc30640b832bf7a73ae5ee69448f2a837eea4347838f6beb23c7ea40c
+  data.tar.gz: c8c798a98892a6b131944a1d3eba848cee0e7ec8a3a4a81bac765dec866c03f5d3c6e70c736692d81c2680d46f7d6d74eb4ac56a270250c2bcb9148685cb278e

data/Appraisals

@@ -1,36 +1,3 @@
-appraise "rails-3-0" do
-  gem "test-unit"
-  gem "railties",    "~> 3.0.0"
-  gem "actionpack",  "~> 3.0.0"
-  gem "activemodel", "~> 3.0.0"
-end
-
-appraise "rails-3-1" do
-  gem "test-unit"
-  gem "railties",    "~> 3.1.0"
-  gem "actionpack",  "~> 3.1.0"
-  gem "activemodel", "~> 3.1.0"
-end
-
-appraise "rails-3-2" do
-  gem "test-unit"
-  gem "railties",    "~> 3.2.0"
-  gem "actionpack",  "~> 3.2.0"
-  gem "activemodel", "~> 3.2.0"
-end
-
-appraise "rails-4-0" do
-  gem "railties",    "~> 4.0.0"
-  gem "actionpack",  "~> 4.0.0"
-  gem "activemodel", "~> 4.0.0"
-end
-
-appraise "rails-4-1" do
-  gem "railties",    "~> 4.1.0"
-  gem "actionpack",  "~> 4.1.0"
-  gem "activemodel", "~> 4.1.0"
-end
-
 appraise "rails-4-2" do
   gem "railties",    "~> 4.2.0"
   gem "actionpack",  "~> 4.2.0"

data/Rakefile

@@ -12,11 +12,7 @@ else
 
     test.libs << "test"
 
-    if Rails::VERSION::MAJOR == 3
-      test.test_files = %w[test/jbuilder_template_test.rb test/jbuilder_test.rb]
-    else
-      test.test_files = FileList["test/*_test.rb"]
-    end
+    test.test_files = FileList["test/*_test.rb"]
   end
 
   task default: :test

data/gemfiles/rails_4_2.gemfile

@@ -3,12 +3,11 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "mocha", :require => false
+gem "mocha", require: false
 gem "appraisal"
 gem "pry"
 gem "railties", "~> 4.2.0"
 gem "actionpack", "~> 4.2.0"
 gem "activemodel", "~> 4.2.0"
-gem "nokogiri", "< 1.7" if RUBY_VERSION < "2.1"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5_0.gemfile

@@ -3,11 +3,11 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "mocha", :require => false
+gem "mocha", require: false
 gem "appraisal"
 gem "pry"
 gem "railties", "~> 5.0.0"
 gem "actionpack", "~> 5.0.0"
 gem "activemodel", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -3,11 +3,11 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "mocha", :require => false
+gem "mocha", require: false
 gem "appraisal"
 gem "pry"
 gem "railties", ">= 5.1.0", "< 5.2"
 gem "actionpack", ">= 5.1.0", "< 5.2"
 gem "activemodel", ">= 5.1.0", "< 5.2"
 
-gemspec :path => "../"
+gemspec path: "../"

data/jbuilder.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.6.4'
-  s.authors  = ['David Heinemeier Hansson']
-  s.email    = ['david@37signals.com']
+  s.version  = '2.7.0'
+  s.authors  = 'David Heinemeier Hansson'
+  s.email    = 'david@basecamp.com'
   s.summary  = 'Create JSON structures via a Builder-style DSL'
   s.homepage = 'https://github.com/rails/jbuilder'
   s.license  = 'MIT'
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'activesupport', '>= 3.0.0'
+  s.add_dependency 'activesupport', '>= 4.2.0'
   s.add_dependency 'multi_json',    '>= 1.2'
 
   s.files         = `git ls-files`.split("\n")

data/lib/jbuilder/jbuilder_template.rb

@@ -188,7 +188,7 @@ class JbuilderTemplate < Jbuilder
       _scope{ _render_partial_with_options options.merge(collection: object) }
     else
       locals = ::Hash[options[:as], object]
-      _scope{ _render_partial options.merge(locals: locals) }
+      _scope{ _render_partial_with_options options.merge(locals: locals) }
     end
 
     set! name, value

data/test/jbuilder_template_test.rb

@@ -62,9 +62,9 @@ class JbuilderTemplateTest < ActionView::TestCase
     Rails.cache.clear
   end
 
-  def jbuild(source)
+  def jbuild(source, options = {})
     @rendered = []
-    partials = PARTIALS.clone
+    partials = options.fetch(:partials, PARTIALS).clone
     partials["test.json.jbuilder"] = source
     resolver = ActionView::FixtureResolver.new(partials)
     lookup_context.view_paths = [resolver]
@@ -438,4 +438,20 @@ class JbuilderTemplateTest < ActionView::TestCase
     assert_equal 123, result["id"]
     assert_equal "Chris Harris", result["name"]
   end
+
+  test "renders partial via set! with same name as HTML partial" do
+    partials = {
+      "_blog_post.html.erb" => "Hello!",
+      "_blog_post.json.jbuilder" => BLOG_POST_PARTIAL
+    }
+
+    @post = BLOG_POST_COLLECTION.first
+
+    result = jbuild(<<-JBUILDER, partials: partials)
+      json.post @post, partial: "blog_post", as: :blog_post
+    JBUILDER
+
+    assert_not_nil result["post"]
+    assert_equal 1, result["post"]["id"]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.7.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -39,8 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 description: 
-email:
-- david@37signals.com
+email: david@basecamp.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -54,11 +53,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_3_0.gemfile
-- gemfiles/rails_3_1.gemfile
-- gemfiles/rails_3_2.gemfile
-- gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
@@ -105,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL

data/gemfiles/rails_3_0.gemfile

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

data/gemfiles/rails_3_1.gemfile

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

data/gemfiles/rails_3_2.gemfile

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

data/gemfiles/rails_4_0.gemfile

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

data/gemfiles/rails_4_1.gemfile

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