jbuilder 2.2.13 → 2.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 332d9c49a287b19d5b1afb7c64af39cbda9ccfc4
-  data.tar.gz: 332ccfb496127ea17c8f3def19a2fb28c2c8c17e
+  metadata.gz: 8a60b857eac6c1b2059ad61636a8929b6c6ef6be
+  data.tar.gz: 48234dc178d3336434a4911eb2edde2bb59cc3cc
 SHA512:
-  metadata.gz: 149866f11d9ae0814d83a40faa89380149516a50fef38829274092323b7ad74a5d2c05bce5443d8cb7a289e02b1307dd8b547530369d1127e338eadf3dbbcc9d
-  data.tar.gz: 3a6ce99d14c7ed4b67d29c0c6a1e840ef44074796ff3052de2e7148d31aa40ae106cbca923fb6b6f382cbb1cee41d36dba7bf048cd581eaa1e2bd9f1faad4c2a
+  metadata.gz: dea7079d397c923ae895a5da9c59e728750c4aae47f2a95234c14d0083d77373a9df7cb579f6b7234e6d7c5e0daa0b16135d8be67d4e177a5c1f26e1f4f943f2
+  data.tar.gz: 089f9a14f9e73fdd8f73b15e343273c6093b005413c8bc42a378644d9f002683506aa47c22c98e8dc3eb0d2e261b6f58974c8bcc63e76ed350597a80a5b033b1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+2.2.14
+------
+
+* [Make Jbuilder compatible with Rails API](https://github.com/rails/jbuilder/commit/29c0014a9c954c990075d42c45c66075260e924b)
+
 2.2.13
 ------
 

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.2.13'
+  s.version  = '2.2.14'
   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/generators/rails/scaffold_controller_generator.rb

@@ -4,9 +4,9 @@ require 'rails/generators/rails/scaffold_controller/scaffold_controller_generato
 module Rails
   module Generators
     class ScaffoldControllerGenerator
-      source_root File.expand_path('../templates', __FILE__)
+      source_paths.unshift File.expand_path('../templates', __FILE__)
 
       hook_for :jbuilder, default: true
     end
   end
-end
+end

data/lib/jbuilder.rb

@@ -18,8 +18,8 @@ class Jbuilder
   end
 
   # Yields a builder and automatically turns the result into a JSON string
-  def self.encode(*args)
-    new(*args, &::Proc.new).target!
+  def self.encode(*args, &block)
+    new(*args, &block).target!
   end
 
   BLANK = Blank.new

data/lib/jbuilder/railtie.rb

@@ -8,6 +8,12 @@ class Jbuilder
         ActionView::Template.register_template_handler :jbuilder, JbuilderHandler
         require 'jbuilder/dependency_tracker'
       end
+
+      if app.config.try(:api_only)
+        ActiveSupport.on_load :action_controller do
+          include ActionView::Rendering
+        end
+      end
     end
 
     if Rails::VERSION::MAJOR >= 4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.2.13
+  version: 2.2.14
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport