Hello community,
here is the log from the commit of package rubygem-jbuilder for
openSUSE:Factory checked in at 2017-03-21 22:50:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-jbuilder (Old)
and /work/SRC/openSUSE:Factory/.rubygem-jbuilder.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-jbuilder"
Tue Mar 21 22:50:47 2017 rev:17 rq:479939 version:2.6.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-jbuilder/rubygem-jbuilder.changes
2016-12-11 13:29:08.384259306 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-jbuilder.new/rubygem-jbuilder.changes
2017-03-21 22:50:49.787919489 +0100
@@ -1,0 +2,22 @@
+Thu Mar 16 05:33:29 UTC 2017 - co...@suse.com
+
+- updated to version 2.6.3
+ see installed CHANGELOG.md
+
+ 2.6.3
+ -----
+
+ * Support Rails 5.1
+
+-------------------------------------------------------------------
+Thu Feb 23 05:37:52 UTC 2017 - co...@suse.com
+
+- updated to version 2.6.2
+ see installed CHANGELOG.md
+
+ 2.6.2
+ -----
+
+ * Fix thor warnings
+
+-------------------------------------------------------------------
Old:
----
jbuilder-2.6.1.gem
New:
----
jbuilder-2.6.3.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-jbuilder.spec ++++++
--- /var/tmp/diff_new_pack.Uh1atY/_old 2017-03-21 22:50:50.431828458 +0100
+++ /var/tmp/diff_new_pack.Uh1atY/_new 2017-03-21 22:50:50.435827893 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-jbuilder
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-jbuilder
-Version: 2.6.1
+Version: 2.6.3
Release: 0
%define mod_name jbuilder
%define mod_full_name %{mod_name}-%{version}
++++++ jbuilder-2.6.1.gem -> jbuilder-2.6.3.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.travis.yml new/.travis.yml
--- old/.travis.yml 2016-11-28 13:38:55.000000000 +0100
+++ new/.travis.yml 2017-02-24 03:45:36.000000000 +0100
@@ -9,6 +9,7 @@
- 2.1
- 2.2.5
- 2.3.1
+ - 2.4.0
- ruby-head
- jruby-19mode
- rbx
@@ -21,6 +22,7 @@
- gemfiles/rails_4_1.gemfile
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5_0.gemfile
+ - gemfiles/rails_5_1.gemfile
matrix:
allow_failures:
@@ -31,14 +33,34 @@
exclude:
- rvm: 1.9
gemfile: gemfiles/rails_5_0.gemfile
+ - rvm: 1.9
+ gemfile: gemfiles/rails_5_1.gemfile
- rvm: 2.0
gemfile: gemfiles/rails_5_0.gemfile
+ - rvm: 2.0
+ gemfile: gemfiles/rails_5_1.gemfile
- rvm: 2.1
gemfile: gemfiles/rails_5_0.gemfile
+ - rvm: 2.1
+ gemfile: gemfiles/rails_5_1.gemfile
- rvm: jruby-19mode
gemfile: gemfiles/rails_5_0.gemfile
+ - rvm: jruby-19mode
+ gemfile: gemfiles/rails_5_1.gemfile
- rvm: rbx
gemfile: gemfiles/rails_5_0.gemfile
+ - rvm: rbx
+ gemfile: gemfiles/rails_5_1.gemfile
+ - rvm: 2.4.0
+ gemfile: gemfiles/rails_3_0.gemfile
+ - rvm: 2.4.0
+ gemfile: gemfiles/rails_3_1.gemfile
+ - rvm: 2.4.0
+ gemfile: gemfiles/rails_3_2.gemfile
+ - rvm: 2.4.0
+ gemfile: gemfiles/rails_4_0.gemfile
+ - rvm: 2.4.0
+ gemfile: gemfiles/rails_4_1.gemfile
notifications:
email: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Appraisals new/Appraisals
--- old/Appraisals 2016-11-28 13:38:55.000000000 +0100
+++ new/Appraisals 2017-02-24 03:45:36.000000000 +0100
@@ -42,3 +42,9 @@
gem "actionpack", "~> 5.0.0"
gem "activemodel", "~> 5.0.0"
end
+
+appraise "rails-5-1" do
+ gem "railties", ">= 5.1.0.beta1", "< 5.2"
+ gem "actionpack", ">= 5.1.0.beta1", "< 5.2"
+ gem "activemodel", ">= 5.1.0.beta1", "< 5.2"
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md 2016-11-28 13:38:55.000000000 +0100
+++ new/CHANGELOG.md 2017-02-24 03:45:36.000000000 +0100
@@ -1,9 +1,19 @@
# Changelog
+2.6.3
+-----
+
+* Support Rails 5.1
+
+2.6.2
+-----
+
+* Fix thor warnings
+
2.6.1
-----
-* [Optimize root caches with
cache_root!][https://github.com/rails/jbuilder/pull/370]
+* [Optimize root caches with
cache_root!](https://github.com/rails/jbuilder/pull/370)
2.6.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2016-11-28 13:38:55.000000000 +0100
+++ new/README.md 2017-02-24 03:45:36.000000000 +0100
@@ -124,7 +124,7 @@
```
You can either use Jbuilder stand-alone or directly as an ActionView template
-language. When required in Rails, you can create views ala show.json.jbuilder
+language. When required in Rails, you can create views a la show.json.jbuilder
(the json is already yielded):
``` ruby
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_4_2.gemfile
new/gemfiles/rails_4_2.gemfile
--- old/gemfiles/rails_4_2.gemfile 2016-11-28 13:38:55.000000000 +0100
+++ new/gemfiles/rails_4_2.gemfile 2017-02-24 03:45:36.000000000 +0100
@@ -9,5 +9,6 @@
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 => "../"
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 1970-01-01 01:00:00.000000000 +0100
+++ new/gemfiles/rails_5_1.gemfile 2017-02-24 03:45:36.000000000 +0100
@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org";
+
+gem "rake"
+gem "mocha", :require => false
+gem "appraisal"
+gem "pry"
+gem "railties", ">= 5.1.0.beta1", "< 5.2"
+gem "actionpack", ">= 5.1.0.beta1", "< 5.2"
+gem "activemodel", ">= 5.1.0.beta1", "< 5.2"
+
+gemspec :path => "../"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jbuilder.gemspec new/jbuilder.gemspec
--- old/jbuilder.gemspec 2016-11-28 13:38:55.000000000 +0100
+++ new/jbuilder.gemspec 2017-02-24 03:45:36.000000000 +0100
@@ -1,15 +1,15 @@
Gem::Specification.new do |s|
s.name = 'jbuilder'
- s.version = '2.6.1'
- s.authors = ['David Heinemeier Hansson', 'Pavel Pravosud']
- s.email = ['da...@37signals.com', 'pa...@pravosud.com']
+ s.version = '2.6.3'
+ s.authors = ['David Heinemeier Hansson']
+ s.email = ['da...@37signals.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', '< 5.1'
+ s.add_dependency 'activesupport', '>= 3.0.0', '< 5.2'
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/generators/rails/scaffold_controller_generator.rb
new/lib/generators/rails/scaffold_controller_generator.rb
--- old/lib/generators/rails/scaffold_controller_generator.rb 2016-11-28
13:38:55.000000000 +0100
+++ new/lib/generators/rails/scaffold_controller_generator.rb 2017-02-24
03:45:36.000000000 +0100
@@ -6,7 +6,7 @@
class ScaffoldControllerGenerator
source_paths << File.expand_path('../templates', __FILE__)
- hook_for :jbuilder, default: true
+ hook_for :jbuilder, type: :boolean, default: true
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/generators/rails/templates/index.json.jbuilder
new/lib/generators/rails/templates/index.json.jbuilder
--- old/lib/generators/rails/templates/index.json.jbuilder 2016-11-28
13:38:55.000000000 +0100
+++ new/lib/generators/rails/templates/index.json.jbuilder 2017-02-24
03:45:36.000000000 +0100
@@ -1 +1 @@
-json.array! @<%= plural_table_name %>, partial: '<%= plural_table_name %>/<%=
singular_table_name %>', as: :<%= singular_table_name %>
\ No newline at end of file
+json.array! @<%= plural_table_name %>, partial: '<%= plural_table_name %>/<%=
singular_table_name %>', as: :<%= singular_table_name %>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/generators/rails/templates/partial.json.jbuilder
new/lib/generators/rails/templates/partial.json.jbuilder
--- old/lib/generators/rails/templates/partial.json.jbuilder 2016-11-28
13:38:55.000000000 +0100
+++ new/lib/generators/rails/templates/partial.json.jbuilder 2017-02-24
03:45:36.000000000 +0100
@@ -1,2 +1,2 @@
json.extract! <%= singular_table_name %>, <%= attributes_list_with_timestamps
%>
-json.url <%= singular_table_name %>_url(<%= singular_table_name %>, format:
:json)
\ No newline at end of file
+json.url <%= singular_table_name %>_url(<%= singular_table_name %>, format:
:json)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/generators/rails/templates/show.json.jbuilder
new/lib/generators/rails/templates/show.json.jbuilder
--- old/lib/generators/rails/templates/show.json.jbuilder 2016-11-28
13:38:55.000000000 +0100
+++ new/lib/generators/rails/templates/show.json.jbuilder 2017-02-24
03:45:36.000000000 +0100
@@ -1 +1 @@
-json.partial! "<%= plural_table_name %>/<%= singular_table_name %>", <%=
singular_table_name %>: @<%= singular_table_name %>
\ No newline at end of file
+json.partial! "<%= plural_table_name %>/<%= singular_table_name %>", <%=
singular_table_name %>: @<%= singular_table_name %>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/jbuilder/errors.rb new/lib/jbuilder/errors.rb
--- old/lib/jbuilder/errors.rb 2016-11-28 13:38:55.000000000 +0100
+++ new/lib/jbuilder/errors.rb 2017-02-24 03:45:36.000000000 +0100
@@ -14,4 +14,11 @@
new(message)
end
end
+
+ class MergeError < ::StandardError
+ def self.build(current_value, updates)
+ message = "Can't merge #{updates.inspect} into #{current_value.inspect}"
+ new(message)
+ end
+ end
end
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 2016-11-28 13:38:55.000000000
+0100
+++ new/lib/jbuilder/jbuilder_template.rb 2017-02-24 03:45:36.000000000
+0100
@@ -11,6 +11,7 @@
def initialize(context, *args)
@context = context
+ @cached_root = nil
super(*args)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/jbuilder.rb new/lib/jbuilder.rb
--- old/lib/jbuilder.rb 2016-11-28 13:38:55.000000000 +0100
+++ new/lib/jbuilder.rb 2017-02-24 03:45:36.000000000 +0100
@@ -270,14 +270,14 @@
def _merge_values(current_value, updates)
if _blank?(updates)
current_value
- elsif _blank?(current_value) || updates.nil?
+ elsif _blank?(current_value) || updates.nil? || current_value.empty? &&
::Array === updates
updates
- elsif ::Array === updates
- ::Array === current_value ? current_value + updates : updates
- elsif ::Hash === current_value
+ elsif ::Array === current_value && ::Array === updates
+ current_value + updates
+ elsif ::Hash === current_value && ::Hash === updates
current_value.merge(updates)
else
- raise "Can't merge #{updates.inspect} with #{current_value.inspect}"
+ raise MergeError.build(current_value, updates)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2016-11-28 13:38:55.000000000 +0100
+++ new/metadata 2017-02-24 03:45:36.000000000 +0100
@@ -1,15 +1,14 @@
--- !ruby/object:Gem::Specification
name: jbuilder
version: !ruby/object:Gem::Version
- version: 2.6.1
+ version: 2.6.3
platform: ruby
authors:
- David Heinemeier Hansson
-- Pavel Pravosud
autorequire:
bindir: bin
cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: activesupport
@@ -20,7 +19,7 @@
version: 3.0.0
- - "<"
- !ruby/object:Gem::Version
- version: '5.1'
+ version: '5.2'
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +29,7 @@
version: 3.0.0
- - "<"
- !ruby/object:Gem::Version
- version: '5.1'
+ version: '5.2'
- !ruby/object:Gem::Dependency
name: multi_json
requirement: !ruby/object:Gem::Requirement
@@ -48,7 +47,6 @@
description:
email:
- da...@37signals.com
-- pa...@pravosud.com
executables: []
extensions: []
extra_rdoc_files: []
@@ -69,6 +67,7 @@
- gemfiles/rails_4_1.gemfile
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
- jbuilder.gemspec
- lib/generators/rails/jbuilder_generator.rb
- lib/generators/rails/scaffold_controller_generator.rb
@@ -112,7 +111,7 @@
version: '0'
requirements: []
rubyforge_project:
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
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 2016-11-28 13:38:55.000000000 +0100
+++ new/test/jbuilder_template_test.rb 2017-02-24 03:45:36.000000000 +0100
@@ -307,18 +307,6 @@
assert_equal %w[a b c], result
end
- test "fragment caching works with previous version of cache digests" do
- undef_context_methods :cache_fragment_name
-
- @context.expects :fragment_name_with_digest
-
- jbuild <<-JBUILDER
- json.cache! "cachekey" do
- json.name "Cache"
- end
- JBUILDER
- end
-
test "fragment caching works with current cache digests" do
undef_context_methods :fragment_name_with_digest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/jbuilder_test.rb new/test/jbuilder_test.rb
--- old/test/jbuilder_test.rb 2016-11-28 13:38:55.000000000 +0100
+++ new/test/jbuilder_test.rb 2017-02-24 03:45:36.000000000 +0100
@@ -686,4 +686,31 @@
end
end
end
+
+ test "throws MergeError when trying to merge array with non-empty hash" do
+ assert_raise Jbuilder::MergeError do
+ jbuild do |json|
+ json.name "Daniel"
+ json.merge! []
+ end
+ end
+ end
+
+ test "throws MergeError when trying to merge hash with array" do
+ assert_raise Jbuilder::MergeError do
+ jbuild do |json|
+ json.array!
+ json.merge!({})
+ end
+ end
+ end
+
+ test "throws MergeError when trying to merge invalid objects" do
+ assert_raise Jbuilder::MergeError do
+ jbuild do |json|
+ json.name "Daniel"
+ json.merge! "Nope"
+ end
+ end
+ end
end
