jbuilder 1.4.0 → 1.4.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjJiMmFlM2Y1OTVhZjU3MTY2YmRjZTM5ODE0ZGNmMmRmOTEyMWQ1OA==
+  data.tar.gz: !binary |-
+    N2MxMGNkZjE5YzQ0MTUxYjM4MDNjNzIxMTc0MWM5NmNlOTYzNjY5OA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NzRhMjZmNThhYzcxN2M2YzJhOWJlODUyNzgzNWVlNDcxOGFlZTMxMzc5MzM3
+    MTljYjhkODA1MGVmYTY2ZmExNTU1YTA2ZTEzOGFlNjkxN2Y4NjkzM2M3Njg1
+    YzE2ZjUwMDQ2ODYyNTljMzYxZDMwYTI0MmY0YmQ3ZjFkYWY0NGQ=
+  data.tar.gz: !binary |-
+    N2EyZjUwZWIzNDAzYWY1ZWE3Y2NjMWFkYThkM2RhNTczYzI5NGM5NzhkN2Yw
+    OWU4OTQ0ZjQwYWZiYzA0ZTVkYmFiODU0YWM4YjNmOWUxYjE4MTAwZTUyYzhl
+    N2EyYjU5YzhiODY2NjgzZTg5NmQzNjAyNDA3Mzc2ZWFmYjE5YTQ=

data/README.md

@@ -133,7 +133,7 @@ if current_user.admin?
 end
 
 # You can use partials as well. The following line will render the file
-# RAILS_ROOT/app/views/api/comments/_comments, and set a local variable
+# RAILS_ROOT/app/views/api/comments/_comments.json.jbuilder, and set a local variable
 # 'comments' with all this message's comments, which you can use inside
 # the partial.
 json.partial! 'api/comments/comments', comments: @message.comments

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'jbuilder'
-  s.version = '1.4.0'
+  s.version = '1.4.1'
   s.author  = 'David Heinemeier Hansson'
   s.email   = 'david@37signals.com'
   s.summary = 'Create JSON structures via a Builder-style DSL'

data/lib/jbuilder.rb

@@ -41,7 +41,7 @@ class Jbuilder < JbuilderProxy
     def format(key)
       @cache[key] ||= @format.inject(key.to_s) do |result, args|
         func, args = args
-        if func.is_a?(::Proc)
+        if ::Proc === func
           func.call result, *args
         else
           result.send func, *args
@@ -64,15 +64,6 @@ class Jbuilder < JbuilderProxy
     options = args.extract_options!
     @key_formatter = options.fetch(:key_formatter, @@key_formatter.clone)
     @ignore_nil = options.fetch(:ignore_nil, @@ignore_nil)
-
-    # old-style initialization compatibility
-    if args.any?
-      @key_formatter = args.shift
-      @ignore_nil = args.shift if args.any?
-      ::ActiveSupport::Deprecation.warn 'Initialization with positioned ' +
-        'arguments is deprecated. Use hash syntax instead.'
-    end
-
     yield self if block
   end
 
@@ -104,7 +95,7 @@ class Jbuilder < JbuilderProxy
     elsif value.respond_to?(:map)
       # json.comments @post.comments, :content, :created_at
       # { "comments": [ { "content": "hello", "created_at": "..." }, { "content": "world", "created_at": "..." } ] }
-      _map_collection(value){ |element| extract! element, *args }
+      _scope{ array! value, *args }
     else
       # json.author @post.creator, :name, :email_address
       # { "author": { "name": "David", "email_address": "david@loudthinking.com" } }
@@ -196,7 +187,7 @@ class Jbuilder < JbuilderProxy
   #     json.content comment.formatted_content
   #   end
   def child!
-    @attributes = [] unless @attributes.is_a?(::Array)
+    @attributes = [] unless ::Array === @attributes
     @attributes << _scope { yield self }
   end
 
@@ -231,8 +222,10 @@ class Jbuilder < JbuilderProxy
   #
   #   [1,2,3]
   def array!(collection, *attributes, &block)
-    @attributes = if block
-      _map_collection(collection) { |element| block.arity == 2 ? block[self, element] : block[element] }
+    @attributes = if block && block.arity == 2
+      _two_arguments_map_collection(collection, &block)
+    elsif block
+      _map_collection(collection, &block)
     elsif attributes.any?
       _map_collection(collection) { |element| extract! element, *attributes }
     else
@@ -258,13 +251,21 @@ class Jbuilder < JbuilderProxy
   #
   #   json.(@person, :name, :age)
   def extract!(object, *attributes)
-    if object.is_a?(::Hash)
+    if ::Hash === object
       attributes.each { |attribute| _set_value attribute, object.fetch(attribute) }
     else
       attributes.each { |attribute| _set_value attribute, object.send(attribute) }
     end
   end
 
+  def call(object, *attributes, &block)
+    if block
+      array! object, &block
+    else
+      extract! object, *attributes
+    end
+  end
+
   # Returns the nil JSON.
   def nil!
     @attributes = nil
@@ -272,15 +273,6 @@ class Jbuilder < JbuilderProxy
 
   alias_method :null!, :nil!
 
-
-  def call(object = nil, *attributes)
-    if attributes.empty?
-      array! object, &::Proc.new
-    else
-      extract! object, *attributes
-    end
-  end
-
   # Returns the attributes of the current builder.
   def attributes!
     @attributes
@@ -318,13 +310,29 @@ class Jbuilder < JbuilderProxy
     end
 
     def _merge(hash_or_array)
-      if hash_or_array.is_a?(::Array)
-        @attributes = [] unless @attributes.is_a?(::Array)
+      if ::Array === hash_or_array
+        @attributes = [] unless ::Array === @attributes
         @attributes.concat hash_or_array
       else
         @attributes.update hash_or_array
       end
     end
+
+    def _two_arguments_map_collection(collection, &block)
+      message = "Passing jbuilder object to block is " \
+        "deprecated and will be removed soon."
+
+      if block.respond_to?(:parameters)
+        arguments  = block.parameters.map(&:last)
+        actual     = "|#{arguments.drop(1) * ', '}|"
+        deprecated = "|#{arguments * ', '}|"
+        message   += "\nUse #{actual} instead of #{deprecated} as block arguments"
+      end
+
+      ::ActiveSupport::Deprecation.warn message, ::Kernel.caller(5)
+
+      _map_collection(collection){ |element| block[self, element] }
+    end
 end
 
 require 'jbuilder/jbuilder_template' if defined?(ActionView::Template)

data/test/jbuilder_test.rb

@@ -226,8 +226,10 @@ class JbuilderTest < ActiveSupport::TestCase
     comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
     json = Jbuilder.encode do |json|
-      json.comments comments do |json, comment|
-        json.content comment.content
+      ::ActiveSupport::Deprecation.silence do
+        json.comments comments do |json, comment|
+          json.content comment.content
+        end
       end
     end
 
@@ -255,8 +257,10 @@ class JbuilderTest < ActiveSupport::TestCase
     comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
     json = Jbuilder.encode do |json|
-      json.call(comments) do |json, comment|
-        json.content comment.content
+      ::ActiveSupport::Deprecation.silence do
+        json.call(comments) do |json, comment|
+          json.content comment.content
+        end
       end
     end
 
@@ -317,10 +321,12 @@ class JbuilderTest < ActiveSupport::TestCase
   test 'directly set an array nested in another array with old api' do
     data = [ { :department => 'QA', :not_in_json => 'hello', :names => ['John', 'David'] } ]
     json = Jbuilder.encode do |json|
-      json.array! data do |json, object|
-        json.department object[:department]
-        json.names do
-          json.array! object[:names]
+      ::ActiveSupport::Deprecation.silence do
+        json.array! data do |json, object|
+          json.department object[:department]
+          json.names do
+            json.array! object[:names]
+          end
         end
       end
     end
@@ -457,14 +463,6 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_equal 50, parsed['relations'][1]['age']
   end
 
-  test 'initialize with positioned arguments (deprecated)' do
-    ::ActiveSupport::Deprecation.silence do
-      jbuilder = Jbuilder.new(1, 2)
-      assert_equal 1, jbuilder.instance_eval('@key_formatter')
-      assert_equal 2, jbuilder.instance_eval('@ignore_nil')
-    end
-  end
-
   test 'initialize via options hash' do
     jbuilder = Jbuilder.new(:key_formatter => 1, :ignore_nil => 2)
     assert_equal 1, jbuilder.instance_eval('@key_formatter')

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: multi_json
   type: :runtime
+  prerelease: false
+  name: activesupport
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
+  type: :runtime
+  prerelease: false
+  name: multi_json
 - !ruby/object:Gem::Dependency
-  name: rake
-  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
+  type: :development
+  prerelease: false
+  name: rake
 description: 
 email: david@37signals.com
 executables: []
@@ -88,30 +81,30 @@ files:
 homepage: 
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Create JSON structures via a Builder-style DSL
 test_files:
 - test/jbuilder_generator_test.rb
 - test/jbuilder_template_test.rb
 - test/jbuilder_test.rb
 - test/scaffold_controller_generator_test.rb
+has_rdoc: