jbuilder 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f0f1117607f1ce588b332bf20b2632688b59402
-  data.tar.gz: d46da468729687703e46e268464f56f2f93566d4
+  metadata.gz: 2d59129031b5d4863366f26212729fe78079237e
+  data.tar.gz: 9d77187b141e1f62c7393c3c721ad4fc54759026
 SHA512:
-  metadata.gz: 6bddcfa86d3e8d8129dc23916b2521397737b111ead9249900e82f216e7d50a5f77b1f3babfdb489d58744813c5ed8d7623144be10596f5752ea0a6953a1c336
-  data.tar.gz: 0dc6deeefefa9327a4ecff277ccd254f5ba4df32dd027eb0f8bad0b5f79492a4bf9eb6ed827f40df5a84dcf7f6cb5a3a2e5f0f58fbe64267d423f8f9d5300087
+  metadata.gz: 0bab7d7b62fcd543458780a892a94752a5fe1f2f34d163cefd9a0b69cea277ce00b602b2854ad5f6175b164e42400c68bf746000b5a39928c3aae63ea25ab306
+  data.tar.gz: ea31d042bb585dbbfdaac96feb13ee78cc7b66d169bef2802e9d2dbad168f8021c38bcf4a02d5793b36ad6ebc1dff6e6668da5a84a61c6e33e0ab848408fd647

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+2.2.3
+-----
+* [Move template handler registration into railtie](https://github.com/rails/jbuilder/commit/c8acc5cea6da2a79b7b345adc301cb5ff2517647)
+* [Do not capture the block where it is possible](https://github.com/rails/jbuilder/commit/973b382c3924cb59fc0e4e25266b18e74d41d646)
+
 2.2.2
 -----
 * [Fix `Jbuilder#merge!` inside block](https://github.com/rails/jbuilder/commit/a7b328552eb0d36315f75bff813bea7eecf8c1d7)

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.2.2'
+  s.version  = '2.2.3'
   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

@@ -7,13 +7,13 @@ class Jbuilder
   @@key_formatter = KeyFormatter.new
   @@ignore_nil    = false
 
-  def initialize(options = {}, &block)
+  def initialize(options = {})
     @attributes = {}
 
     @key_formatter = options.fetch(:key_formatter){ @@key_formatter.clone }
     @ignore_nil = options.fetch(:ignore_nil, @@ignore_nil)
 
-    yield self if block
+    yield self if ::Kernel.block_given?
   end
 
   # Yields a builder and automatically turns the result into a JSON string
@@ -252,7 +252,7 @@ class Jbuilder
     attributes.each{ |key| _set_value key, object.public_send(key) }
   end
 
-  def _merge_block(key, &block)
+  def _merge_block(key)
     current_value = _blank? ? BLANK : @attributes.fetch(_key(key), BLANK)
     raise NullError.build(key) if current_value.nil?
     new_value = _scope{ yield self }
@@ -314,6 +314,5 @@ class Jbuilder
   end
 end
 
-require 'jbuilder/jbuilder_template' if defined?(ActionView::Template)
 require 'jbuilder/dependency_tracker'
-require 'jbuilder/railtie' if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR == 4
+require 'jbuilder/railtie' if defined?(Rails)

data/lib/jbuilder/jbuilder_template.rb

@@ -30,7 +30,7 @@ class JbuilderTemplate < Jbuilder
     _render_partial_with_options options
   end
 
-  def array!(collection = [], *attributes, &block)
+  def array!(collection = [], *attributes)
     options = attributes.extract_options!
 
     if options.key?(:partial)
@@ -48,7 +48,7 @@ class JbuilderTemplate < Jbuilder
   #   json.cache! ['v1', @person], expires_in: 10.minutes do
   #     json.extract! @person, :name, :age
   #   end
-  def cache!(key=nil, options={}, &block)
+  def cache!(key=nil, options={})
     if @context.controller.perform_caching
       value = ::Rails.cache.fetch(_cache_key(key, options), options) do
         _scope { yield self }
@@ -137,5 +137,3 @@ class JbuilderHandler
       json.target! unless (__already_defined && __already_defined != "method")}
   end
 end
-
-ActionView::Template.register_template_handler :jbuilder, JbuilderHandler

data/lib/jbuilder/railtie.rb

@@ -1,11 +1,20 @@
 require 'rails/railtie'
+require 'jbuilder/jbuilder_template'
 
 class Jbuilder
   class Railtie < ::Rails::Railtie
-    generators do |app|
-      Rails::Generators.configure! app.config.generators
-      Rails::Generators.hidden_namespaces.uniq!
-      require 'generators/rails/scaffold_controller_generator'
+    initializer :jbuilder do |app|
+      ActiveSupport.on_load :action_view do
+        ActionView::Template.register_template_handler :jbuilder, JbuilderHandler
+      end
+    end
+
+    if Rails::VERSION::MAJOR == 4
+      generators do |app|
+        Rails::Generators.configure! app.config.generators
+        Rails::Generators.hidden_namespaces.uniq!
+        require 'generators/rails/scaffold_controller_generator'
+      end
     end
   end
-end
+end

data/test/jbuilder_template_test.rb

@@ -5,7 +5,6 @@ require 'action_view/testing/resolvers'
 require 'active_support/cache'
 require 'jbuilder/jbuilder_template'
 
-
 BLOG_POST_PARTIAL = <<-JBUILDER
   json.extract! blog_post, :id, :body
   json.author do
@@ -25,6 +24,8 @@ blog_authors = [ 'David Heinemeier Hansson', 'Pavel Pravosud' ].cycle
 BLOG_POST_COLLECTION = 10.times.map{ |i| BlogPost.new(i+1, "post body #{i+1}", blog_authors.next) }
 COLLECTION_COLLECTION = 5.times.map{ |i| Collection.new(i+1, "collection #{i+1}") }
 
+ActionView::Template.register_template_handler :jbuilder, JbuilderHandler
+
 module Rails
   def self.cache
     @cache ||= ActiveSupport::Cache::MemoryStore.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL