jbuilder 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 327d1fd696c5deb95c440da757d4a1f5d951b822
-  data.tar.gz: 3bdea2532516e563a08ff55bb73aea0ed5f81595
+  metadata.gz: 73870fb0e93ae950755c3fc00c29374b754f68d2
+  data.tar.gz: 4c28da6568a999deb23d029e383ec9665b856cf4
 SHA512:
-  metadata.gz: eac994b55dd166f41861870cb54b283dc0e39dbcd90231cb71f7a4e358a66369714ddb70cf70566b932259137d449d51d830054b4c5ce2df35fcd546b6466ef0
-  data.tar.gz: 8640e6f7b797616b0bdf55691f225c96f239a33fa3b3fee9529caf94c95b60c0863cb0e557c520719ab37d6726f67b63ce937ba99c2aa305da80b6aa0277d13f
+  metadata.gz: 639230d912f28d68a0da66ea5e0a37a8f726f95656341c16bc44c3478cba79c079f8cfe173bb234590b43c5b59ccfcb5f73e9306968492523ce8cc2ec099b98e
+  data.tar.gz: 5afb99713b59703654d49d3161e617a9bfc9500fbc61729645c9a37975e475e0907841e8e77604ce2e7dd8d7e4399057556e86956cde64c692475a88703a93a4

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+2.2.6
+-----
+* [Make sure dependency tracker loads after template handler](https://github.com/rails/jbuilder/commit/3ba404b1207b557e14771c90b8832bc01ae67a42)
+
+2.2.5
+-----
+* [Refactor merge block behavior to raise error for unexpected values](https://github.com/rails/jbuilder/commit/4503162fb26f53f613fc83ac081fd244748b6fe9)
+
 2.2.4
 -----
 * [Typecast locals hash key during collection render](https://github.com/rails/jbuilder/commit/a6b0c8651a08e01cb53eee38e211c65423f275f7)

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.2.5'
+  s.version  = '2.2.6'
   s.authors  = ['David Heinemeier Hansson', 'Pavel Pravosud']
   s.email    = ['david@37signals.com', 'pavel@pravosud.com']
   s.summary  = 'Create JSON structures via a Builder-style DSL'

data/lib/jbuilder.rb

@@ -313,5 +313,4 @@ class Jbuilder
   end
 end
 
-require 'jbuilder/dependency_tracker'
 require 'jbuilder/railtie' if defined?(Rails)

data/lib/jbuilder/railtie.rb

@@ -6,6 +6,7 @@ class Jbuilder
     initializer :jbuilder do |app|
       ActiveSupport.on_load :action_view do
         ActionView::Template.register_template_handler :jbuilder, JbuilderHandler
+        require 'jbuilder/dependency_tracker'
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport