jbuilder 2.2.4 → 2.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/jbuilder.gemspec +1 -1
- data/lib/jbuilder.rb +4 -5
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 327d1fd696c5deb95c440da757d4a1f5d951b822
|
|
4
|
+
data.tar.gz: 3bdea2532516e563a08ff55bb73aea0ed5f81595
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: eac994b55dd166f41861870cb54b283dc0e39dbcd90231cb71f7a4e358a66369714ddb70cf70566b932259137d449d51d830054b4c5ce2df35fcd546b6466ef0
|
|
7
|
+
data.tar.gz: 8640e6f7b797616b0bdf55691f225c96f239a33fa3b3fee9529caf94c95b60c0863cb0e557c520719ab37d6726f67b63ce937ba99c2aa305da80b6aa0277d13f
|
data/jbuilder.gemspec
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
s.name = 'jbuilder'
|
|
3
|
-
s.version = '2.2.
|
|
3
|
+
s.version = '2.2.5'
|
|
4
4
|
s.authors = ['David Heinemeier Hansson', 'Pavel Pravosud']
|
|
5
5
|
s.email = ['david@37signals.com', 'pavel@pravosud.com']
|
|
6
6
|
s.summary = 'Create JSON structures via a Builder-style DSL'
|
data/lib/jbuilder.rb
CHANGED
|
@@ -265,15 +265,14 @@ class Jbuilder
|
|
|
265
265
|
elsif _blank?(current_value) || updates.nil?
|
|
266
266
|
updates
|
|
267
267
|
elsif ::Array === updates
|
|
268
|
-
|
|
269
|
-
|
|
268
|
+
::Array === current_value ? current_value + updates : updates
|
|
269
|
+
elsif ::Hash === current_value
|
|
270
|
+
current_value.merge(updates)
|
|
270
271
|
else
|
|
271
|
-
|
|
272
|
-
current_value.update updates
|
|
272
|
+
raise "Can't merge #{updates.inspect} with #{current_value.inspect}"
|
|
273
273
|
end
|
|
274
274
|
end
|
|
275
275
|
|
|
276
|
-
|
|
277
276
|
def _write(key, value)
|
|
278
277
|
@attributes = {} if _blank?
|
|
279
278
|
@attributes[_key(key)] = value
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: jbuilder
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.2.
|
|
4
|
+
version: 2.2.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- David Heinemeier Hansson
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-
|
|
12
|
+
date: 2014-11-15 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: activesupport
|
|
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
105
105
|
version: '0'
|
|
106
106
|
requirements: []
|
|
107
107
|
rubyforge_project:
|
|
108
|
-
rubygems_version: 2.
|
|
108
|
+
rubygems_version: 2.4.3
|
|
109
109
|
signing_key:
|
|
110
110
|
specification_version: 4
|
|
111
111
|
summary: Create JSON structures via a Builder-style DSL
|