Hello community, here is the log from the commit of package rubygem-jbuilder for openSUSE:Factory checked in at 2017-06-15 11:24:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-jbuilder (Old) and /work/SRC/openSUSE:Factory/.rubygem-jbuilder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-jbuilder" Thu Jun 15 11:24:27 2017 rev:19 rq:503440 version:2.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-jbuilder/rubygem-jbuilder.changes 2017-06-08 15:01:27.748069297 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-jbuilder.new/rubygem-jbuilder.changes 2017-06-15 11:24:29.526092441 +0200 @@ -1,0 +2,6 @@ +Tue Jun 6 05:36:41 UTC 2017 - [email protected] + +- updated to version 2.7.0 + see installed CHANGELOG.md + +------------------------------------------------------------------- Old: ---- jbuilder-2.6.4.gem New: ---- jbuilder-2.7.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-jbuilder.spec ++++++ --- /var/tmp/diff_new_pack.s5Hg0Z/_old 2017-06-15 11:24:30.026021869 +0200 +++ /var/tmp/diff_new_pack.s5Hg0Z/_new 2017-06-15 11:24:30.030021305 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-jbuilder -Version: 2.6.4 +Version: 2.7.0 Release: 0 %define mod_name jbuilder %define mod_full_name %{mod_name}-%{version} ++++++ jbuilder-2.6.4.gem -> jbuilder-2.7.0.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Appraisals new/Appraisals --- old/Appraisals 2017-05-10 18:21:08.000000000 +0200 +++ new/Appraisals 2017-06-05 12:08:10.000000000 +0200 @@ -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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Rakefile new/Rakefile --- old/Rakefile 2017-05-10 18:21:08.000000000 +0200 +++ new/Rakefile 2017-06-05 12:08:10.000000000 +0200 @@ -12,11 +12,7 @@ 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 Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gemfiles/rails_3_0.gemfile new/gemfiles/rails_3_0.gemfile --- old/gemfiles/rails_3_0.gemfile 2017-05-10 18:21:08.000000000 +0200 +++ new/gemfiles/rails_3_0.gemfile 1970-01-01 01:00:00.000000000 +0100 @@ -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 => "../" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gemfiles/rails_3_1.gemfile new/gemfiles/rails_3_1.gemfile --- old/gemfiles/rails_3_1.gemfile 2017-05-10 18:21:08.000000000 +0200 +++ new/gemfiles/rails_3_1.gemfile 1970-01-01 01:00:00.000000000 +0100 @@ -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 => "../" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gemfiles/rails_3_2.gemfile new/gemfiles/rails_3_2.gemfile --- old/gemfiles/rails_3_2.gemfile 2017-05-10 18:21:08.000000000 +0200 +++ new/gemfiles/rails_3_2.gemfile 1970-01-01 01:00:00.000000000 +0100 @@ -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 => "../" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gemfiles/rails_4_0.gemfile new/gemfiles/rails_4_0.gemfile --- old/gemfiles/rails_4_0.gemfile 2017-05-10 18:21:08.000000000 +0200 +++ new/gemfiles/rails_4_0.gemfile 1970-01-01 01:00:00.000000000 +0100 @@ -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 => "../" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gemfiles/rails_4_1.gemfile new/gemfiles/rails_4_1.gemfile --- old/gemfiles/rails_4_1.gemfile 2017-05-10 18:21:08.000000000 +0200 +++ new/gemfiles/rails_4_1.gemfile 1970-01-01 01:00:00.000000000 +0100 @@ -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 => "../" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gemfiles/rails_4_2.gemfile new/gemfiles/rails_4_2.gemfile --- old/gemfiles/rails_4_2.gemfile 2017-05-10 18:21:08.000000000 +0200 +++ new/gemfiles/rails_4_2.gemfile 2017-06-05 12:08:10.000000000 +0200 @@ -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: "../" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gemfiles/rails_5_0.gemfile new/gemfiles/rails_5_0.gemfile --- old/gemfiles/rails_5_0.gemfile 2017-05-10 18:21:08.000000000 +0200 +++ new/gemfiles/rails_5_0.gemfile 2017-06-05 12:08:10.000000000 +0200 @@ -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: "../" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gemfiles/rails_5_1.gemfile new/gemfiles/rails_5_1.gemfile --- old/gemfiles/rails_5_1.gemfile 2017-05-10 18:21:08.000000000 +0200 +++ new/gemfiles/rails_5_1.gemfile 2017-06-05 12:08:10.000000000 +0200 @@ -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: "../" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jbuilder.gemspec new/jbuilder.gemspec --- old/jbuilder.gemspec 2017-05-10 18:21:08.000000000 +0200 +++ new/jbuilder.gemspec 2017-06-05 12:08:10.000000000 +0200 @@ -1,15 +1,15 @@ Gem::Specification.new do |s| s.name = 'jbuilder' - s.version = '2.6.4' - s.authors = ['David Heinemeier Hansson'] - s.email = ['[email protected]'] + s.version = '2.7.0' + s.authors = 'David Heinemeier Hansson' + s.email = '[email protected]' 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") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/jbuilder/jbuilder_template.rb new/lib/jbuilder/jbuilder_template.rb --- old/lib/jbuilder/jbuilder_template.rb 2017-05-10 18:21:08.000000000 +0200 +++ new/lib/jbuilder/jbuilder_template.rb 2017-06-05 12:08:10.000000000 +0200 @@ -188,7 +188,7 @@ _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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2017-05-10 18:21:08.000000000 +0200 +++ new/metadata 2017-06-05 12:08:10.000000000 +0200 @@ -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 @@ 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 @@ - !ruby/object:Gem::Version version: '1.2' description: -email: -- [email protected] +email: [email protected] executables: [] extensions: [] extra_rdoc_files: [] @@ -54,11 +53,6 @@ - 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 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/jbuilder_template_test.rb new/test/jbuilder_template_test.rb --- old/test/jbuilder_template_test.rb 2017-05-10 18:21:08.000000000 +0200 +++ new/test/jbuilder_template_test.rb 2017-06-05 12:08:10.000000000 +0200 @@ -62,9 +62,9 @@ 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 @@ 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
