jbuilder 2.2.12 → 2.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e20ebff9d84c8c417da4626184d5c0360d96039c
-  data.tar.gz: 73e44d30685bdd6db5655c8cd3c6c6e5087f21e6
+  metadata.gz: 332d9c49a287b19d5b1afb7c64af39cbda9ccfc4
+  data.tar.gz: 332ccfb496127ea17c8f3def19a2fb28c2c8c17e
 SHA512:
-  metadata.gz: 4447541e8d14944f440ff55d1bdc88a2b64a14aadcf43de76aaa1ae308e430ceadb25e9bd60707963655ef407b9b27b5f6eaa298bc5b800e6392736cee3d3847
-  data.tar.gz: 87ec45135f3d1fb89f20cc51b51e9f62cf69b270af5ef55fe52e5706aac70da2799b4f5b71e584816e74a2727703a6471e3370e4589e81a79599727caa01db66
+  metadata.gz: 149866f11d9ae0814d83a40faa89380149516a50fef38829274092323b7ad74a5d2c05bce5443d8cb7a289e02b1307dd8b547530369d1127e338eadf3dbbcc9d
+  data.tar.gz: 3a6ce99d14c7ed4b67d29c0c6a1e840ef44074796ff3052de2e7148d31aa40ae106cbca923fb6b6f382cbb1cee41d36dba7bf048cd581eaa1e2bd9f1faad4c2a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+2.2.13
+------
+
+* Several peformance optimizations: [#260](https://github.com/rails/jbuilder/pull/260) & [#261](https://github.com/rails/jbuilder/pull/261)
+
 2.2.12
 ------
 

data/jbuilder.gemspec

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

@@ -5,13 +5,13 @@ require 'jbuilder/errors'
 require 'multi_json'
 
 class Jbuilder
-  @@key_formatter = KeyFormatter.new
+  @@key_formatter = nil
   @@ignore_nil    = false
 
   def initialize(options = {})
     @attributes = {}
 
-    @key_formatter = options.fetch(:key_formatter){ @@key_formatter.clone }
+    @key_formatter = options.fetch(:key_formatter){ @@key_formatter ? @@key_formatter.clone : nil}
     @ignore_nil = options.fetch(:ignore_nil, @@ignore_nil)
 
     yield self if ::Kernel.block_given?
@@ -207,9 +207,9 @@ class Jbuilder
   #   json.(@person, :name, :age)
   def extract!(object, *attributes)
     if ::Hash === object
-      _extract_hash_values(object, *attributes)
+      _extract_hash_values(object, attributes)
     else
-      _extract_method_values(object, *attributes)
+      _extract_method_values(object, attributes)
     end
   end
 
@@ -245,11 +245,11 @@ class Jbuilder
 
   private
 
-  def _extract_hash_values(object, *attributes)
+  def _extract_hash_values(object, attributes)
     attributes.each{ |key| _set_value key, object.fetch(key) }
   end
 
-  def _extract_method_values(object, *attributes)
+  def _extract_method_values(object, attributes)
     attributes.each{ |key| _set_value key, object.public_send(key) }
   end
 
@@ -275,7 +275,7 @@ class Jbuilder
   end
 
   def _key(key)
-    @key_formatter.format(key)
+    @key_formatter ? @key_formatter.format(key) : key.to_s
   end
 
   def _set_value(key, value)

data/test/jbuilder_test.rb

@@ -51,6 +51,10 @@ end
 
 
 class JbuilderTest < ActiveSupport::TestCase
+  setup do
+    Jbuilder.send :class_variable_set, '@@key_formatter', Jbuilder::KeyFormatter.new
+  end
+
   test 'single key' do
     result = jbuild do |json|
       json.content 'hello'
@@ -564,12 +568,12 @@ class JbuilderTest < ActiveSupport::TestCase
     Jbuilder.key_format camelize: :lower
     result = jbuild{ |json| json.camel_style 'for JS' }
     assert_equal ['camelStyle'], result.keys
-    Jbuilder.send :class_variable_set, '@@key_formatter', Jbuilder::KeyFormatter.new
   end
 
   test 'do not use default key formatter directly' do
     jbuild{ |json| json.key 'value' }
-    cache = Jbuilder.send(:class_variable_get, '@@key_formatter').instance_variable_get('@cache')
+    formatter = Jbuilder.send(:class_variable_get, '@@key_formatter')
+    cache = formatter.instance_variable_get('@cache')
     assert_empty cache
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.2.12
+  version: 2.2.13
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL