jbuilder 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480dacfaafb41be4517c97fe4feaac06ca419a0a
-  data.tar.gz: 743ad605818ab2e8c7d1fe9656ce417f6ac19db6
+  metadata.gz: 1fceb6a04cc18c49f17915a51c83bca202c7ab76
+  data.tar.gz: 73e81db0ff0a9b97c9f4a46a87d96c369743b5d5
 SHA512:
-  metadata.gz: d87af4a001cd83a919991616c7f5ed825ec84c80a2552c1b7e135b154f758ba62155acc343b0ff6a4fe97ce670f46f093468a86a84335679afeff319d0ecc278
-  data.tar.gz: 7156d387cd06d96bde5ae5f0fe1768eb283868e4e964a88c1b138357ddfeda1b51ca1eecba7f2bde75bbf157773c02fa117f722ee3a4bdb0281ecd054ff441e1
+  metadata.gz: e92b20eab5ff8230db42f7d0b205807fcae78fd3d084f40a9b6242bff1a737f65f914ad57b7086e808c742f552d9a9d9f6f38e5372bb2d7b28ec0a81486d15ef
+  data.tar.gz: 0ce214cdf9671b2a43b565ead95d1a9ac18c5c8ae2af1a851382e9b65c3cef03088eea89753a4b8d760f5beb18ec2cdec8636c67ae5e18ca12eccf619ddc68a4

data/.travis.yml

@@ -22,6 +22,7 @@ gemfile:
   - gemfiles/rails_4_1.gemfile
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_5_1.gemfile
 
 matrix:
   allow_failures:
@@ -32,14 +33,24 @@ matrix:
   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

data/Appraisals

@@ -42,3 +42,9 @@ appraise "rails-5-0" do
   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

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+2.6.3
+-----
+
+* Support Rails 5.1
+
 2.6.2
 -----
 

data/gemfiles/rails_5_1.gemfile

@@ -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 => "../"

data/jbuilder.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.6.2'
-  s.authors  = ['David Heinemeier Hansson', 'Pavel Pravosud']
-  s.email    = ['david@37signals.com', 'pavel@pravosud.com']
+  s.version  = '2.6.3'
+  s.authors  = ['David Heinemeier Hansson']
+  s.email    = ['david@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")

data/lib/jbuilder.rb

@@ -270,14 +270,14 @@ class Jbuilder
   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
 

data/lib/jbuilder/errors.rb

@@ -14,4 +14,11 @@ class Jbuilder
       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

data/test/jbuilder_test.rb

@@ -686,4 +686,31 @@ class JbuilderTest < ActiveSupport::TestCase
       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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
-- Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 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 @@ dependencies:
         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 @@ dependencies:
         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 @@ dependencies:
 description: 
 email:
 - david@37signals.com
-- pavel@pravosud.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -69,6 +67,7 @@ files:
 - 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