jbuilder 2.2.5 → 2.2.6

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.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +8 -0
  3. data/jbuilder.gemspec +1 -1
  4. data/lib/jbuilder.rb +0 -1
  5. data/lib/jbuilder/railtie.rb +1 -0
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 327d1fd696c5deb95c440da757d4a1f5d951b822
4
- data.tar.gz: 3bdea2532516e563a08ff55bb73aea0ed5f81595
3
+ metadata.gz: 73870fb0e93ae950755c3fc00c29374b754f68d2
4
+ data.tar.gz: 4c28da6568a999deb23d029e383ec9665b856cf4
5
5
  SHA512:
6
- metadata.gz: eac994b55dd166f41861870cb54b283dc0e39dbcd90231cb71f7a4e358a66369714ddb70cf70566b932259137d449d51d830054b4c5ce2df35fcd546b6466ef0
7
- data.tar.gz: 8640e6f7b797616b0bdf55691f225c96f239a33fa3b3fee9529caf94c95b60c0863cb0e557c520719ab37d6726f67b63ce937ba99c2aa305da80b6aa0277d13f
6
+ metadata.gz: 639230d912f28d68a0da66ea5e0a37a8f726f95656341c16bc44c3478cba79c079f8cfe173bb234590b43c5b59ccfcb5f73e9306968492523ce8cc2ec099b98e
7
+ data.tar.gz: 5afb99713b59703654d49d3161e617a9bfc9500fbc61729645c9a37975e475e0907841e8e77604ce2e7dd8d7e4399057556e86956cde64c692475a88703a93a4
data/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # Changelog
2
2
 
3
+ 2.2.6
4
+ -----
5
+ * [Make sure dependency tracker loads after template handler](https://github.com/rails/jbuilder/commit/3ba404b1207b557e14771c90b8832bc01ae67a42)
6
+
7
+ 2.2.5
8
+ -----
9
+ * [Refactor merge block behavior to raise error for unexpected values](https://github.com/rails/jbuilder/commit/4503162fb26f53f613fc83ac081fd244748b6fe9)
10
+
3
11
  2.2.4
4
12
  -----
5
13
  * [Typecast locals hash key during collection render](https://github.com/rails/jbuilder/commit/a6b0c8651a08e01cb53eee38e211c65423f275f7)
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.5'
3
+ s.version = '2.2.6'
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
@@ -313,5 +313,4 @@ class Jbuilder
313
313
  end
314
314
  end
315
315
 
316
- require 'jbuilder/dependency_tracker'
317
316
  require 'jbuilder/railtie' if defined?(Rails)
data/lib/jbuilder/railtie.rb CHANGED
@@ -6,6 +6,7 @@ class Jbuilder
6
6
  initializer :jbuilder do |app|
7
7
  ActiveSupport.on_load :action_view do
8
8
  ActionView::Template.register_template_handler :jbuilder, JbuilderHandler
9
+ require 'jbuilder/dependency_tracker'
9
10
  end
10
11
  end
11
12
 
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.5
4
+ version: 2.2.6
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-11-15 00:00:00.000000000 Z
12
+ date: 2014-12-18 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport