jbuilder 2.2.11 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d378effeff78ae44875038cba11cbfddf21e6200
-  data.tar.gz: 340055def67dc3c0339d7e23f9fb7faf155ead92
+  metadata.gz: e20ebff9d84c8c417da4626184d5c0360d96039c
+  data.tar.gz: 73e44d30685bdd6db5655c8cd3c6c6e5087f21e6
 SHA512:
-  metadata.gz: 00a08de474d1d1ef4596a38c26d70a210cd58400397e85ffbeaf4d33b702ad176929372bf08eb17e854358eb1fd1bc3b7c34b9bcf4a8d553ca26ae520607f18a
-  data.tar.gz: 618d79b7be67c13317f262a95bc56e8c761af8e162e267f89949980f5a00749d8136e5017b1b325071760ad8a0cf3c335a18b5c2cd9792f7a4d2f0cb4465dc37
+  metadata.gz: 4447541e8d14944f440ff55d1bdc88a2b64a14aadcf43de76aaa1ae308e430ceadb25e9bd60707963655ef407b9b27b5f6eaa298bc5b800e6392736cee3d3847
+  data.tar.gz: 87ec45135f3d1fb89f20cc51b51e9f62cf69b270af5ef55fe52e5706aac70da2799b4f5b71e584816e74a2727703a6471e3370e4589e81a79599727caa01db66

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+2.2.12
+------
+
+* [Replace explici block calls with yield for performance](https://github.com/rails/jbuilder/commit/3184f941276ad03a071cf977133d1a32302afa47)
+
 2.2.11
 ------
 

data/jbuilder.gemspec

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

@@ -18,18 +18,18 @@ class Jbuilder
   end
 
   # Yields a builder and automatically turns the result into a JSON string
-  def self.encode(*args, &block)
-    new(*args, &block).target!
+  def self.encode(*args)
+    new(*args, &::Proc.new).target!
   end
 
   BLANK = Blank.new
 
-  def set!(key, value = BLANK, *args, &block)
-    result = if block
+  def set!(key, value = BLANK, *args)
+    result = if ::Kernel.block_given?
       if !_blank?(value)
         # json.comments @post.comments { |comment| ... }
         # { "comments": [ { ... }, { ... } ] }
-        _scope{ array! value, &block }
+        _scope{ array! value, &::Proc.new }
       else
         # json.comments { ... }
         # { "comments": ... }
@@ -174,11 +174,11 @@ class Jbuilder
   #   json.array! [1, 2, 3]
   #
   #   [1,2,3]
-  def array!(collection = [], *attributes, &block)
+  def array!(collection = [], *attributes)
     array = if collection.nil?
       []
-    elsif block
-      _map_collection(collection, &block)
+    elsif ::Kernel.block_given?
+      _map_collection(collection, &::Proc.new)
     elsif attributes.any?
       _map_collection(collection) { |element| extract! element, *attributes }
     else
@@ -213,9 +213,9 @@ class Jbuilder
     end
   end
 
-  def call(object, *attributes, &block)
-    if block
-      array! object, &block
+  def call(object, *attributes)
+    if ::Kernel.block_given?
+      array! object, &::Proc.new
     else
       extract! object, *attributes
     end

data/lib/jbuilder/jbuilder_template.rb

@@ -9,9 +9,9 @@ class JbuilderTemplate < Jbuilder
 
   self.template_lookup_options = { handlers: [:jbuilder] }
 
-  def initialize(context, *args, &block)
+  def initialize(context, *args)
     @context = context
-    super(*args, &block)
+    super(*args)
   end
 
   def partial!(name_or_options, locals = {})
@@ -74,8 +74,8 @@ class JbuilderTemplate < Jbuilder
   #   json.cache_if! !admin?, @person, expires_in: 10.minutes do
   #     json.extract! @person, :name, :age
   #   end
-  def cache_if!(condition, *args, &block)
-    condition ? cache!(*args, &block) : yield
+  def cache_if!(condition, *args)
+    condition ? cache!(*args, &::Proc.new) : yield
   end
 
   protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.2.12
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport