jbuilder 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2772c97d74b0d758e3c0d5ea5f9a3b4c6e183ca2
-  data.tar.gz: 90cd6541479870d8f980c16efb259610a8f3c84e
+  metadata.gz: 5ce8173d024f2eb565369d2e8f26ea09dc5235e7
+  data.tar.gz: b73633ccd806484d4f5c2a11533f1787fbf90d2b
 SHA512:
-  metadata.gz: ccb161cc31da1151f75abb7d28d9c3c0fcb66945d22ebe6e93442cc2aa6b3be8e95eb53067d6f546ff86f05efa1de304b96b2afeed4424a998b8d52e5285886f
-  data.tar.gz: a2e3d859a9a5fb8909cdfe085f99f9881c2ca24da64c906d804cb7714ad636512e4de12e8a970f9dcf159c7394f9bc2db6f7be90886b5877bd1b5d4f5bb9dc27
+  metadata.gz: 63ab27131b380962043ca8c17440ee0d8da28196c17793d61c2fbacf19045799a4c652402ec5d65afa6d899cc91e54c56cf460e86c809c402d37024ecc734469
+  data.tar.gz: 8d0def4d3db80aa215246f3b8fb2df57943adc02fbe9e678c88d2f40523959ecf285a36f905fe0ac1a566b583a2abb9432feb1064bf6f1a7d276db6e2382c104

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+2.5.0
+-----
+
+* [Rails 5 compatibility](https://github.com/rails/jbuilder/commit/64c510ec69d9e63b73ffd5942e802d21a7d14701)
+
 2.4.1
 -----
 
@@ -42,12 +47,12 @@
 2.2.13
 ------
 
-* Several peformance optimizations: [#260](https://github.com/rails/jbuilder/pull/260) & [#261](https://github.com/rails/jbuilder/pull/261)
+* Several performance optimizations: [#260](https://github.com/rails/jbuilder/pull/260) & [#261](https://github.com/rails/jbuilder/pull/261)
 
 2.2.12
 ------
 
-* [Replace explici block calls with yield for performance](https://github.com/rails/jbuilder/commit/3184f941276ad03a071cf977133d1a32302afa47)
+* [Replace explicit block calls with yield for performance](https://github.com/rails/jbuilder/commit/3184f941276ad03a071cf977133d1a32302afa47)
 
 2.2.11
 ------
@@ -191,7 +196,7 @@
 -----
 * [Add quick collection attribute extraction](https://github.com/rails/jbuilder/commit/c2b966cf653ea4264fbb008b8cc6ce5359ebe40a)
 * [Block has priority over attributes extraction](https://github.com/rails/jbuilder/commit/77c24766362c02769d81dac000b1879a9e4d4a00)
-* [Meaningfull error messages when adding properties to null](https://github.com/rails/jbuilder/commit/e26764602e34b3772e57e730763d512e59489e3b)
+* [Meaningful error messages when adding properties to null](https://github.com/rails/jbuilder/commit/e26764602e34b3772e57e730763d512e59489e3b)
 * [Do not enforce template format, enforce handlers instead](https://github.com/rails/jbuilder/commit/72576755224b15da45e50cbea877679800ab1398)
 
 1.3.0

data/README.md

@@ -168,7 +168,7 @@ json.partial! partial: 'posts/post', collection: @posts, as: :post
 
 # or
 
-json.comments @post.comments, partial: 'comment/comment', as: :comment
+json.comments @post.comments, partial: 'comments/comment', as: :comment
 ```
 
 You can pass any objects into partial templates with or without `:locals` option.

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.4.1'
+  s.version  = '2.5.0'
   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/railtie.rb

@@ -9,11 +9,18 @@ class Jbuilder
         require 'jbuilder/dependency_tracker'
       end
 
-      if app.config.respond_to?(:api_only) && app.config.api_only
+      if Rails::VERSION::MAJOR >= 5
+        module ::ActionController
+          module ApiRendering
+            include ActionView::Rendering
+          end
+        end
+
         ActiveSupport.on_load :action_controller do
-          include ActionView::Rendering
-          include ActionController::Helpers
-          include ActionController::ImplicitRender
+          if self == ActionController::API
+            include ActionController::Helpers
+            include ActionController::ImplicitRender
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL