jbuilder 1.5.1 → 1.5.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Njk5MjUxMDExMjc4YWZkZGY3ODM0MWFhY2FhYTE0MWUyNTE2YjdjNg==
-  data.tar.gz: !binary |-
-    YjViMzY4ZmE2ZTVmNGVmZGNiZjM1N2JiOGZlN2NlNjgxYTA3YzIxNg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YjRjMDgyNWI1OGU2ZGFjZGZiMWRjZmYyOWZkYzI2N2NhY2MzOWY1MjYwNjM4
-    ZGMzNzBlN2RlYjM0MWZhMjdlZGZhODJhZDIyYTA3MjQ0YjVhYjY2YTY2NjY5
-    MTA3N2RkZDE3NTRlOGQxMzIyZTQ0Mzg1M2NlNDNmYWQwYzY0NDI=
-  data.tar.gz: !binary |-
-    YThmNWY1NDU5MmUwMTY0MTgzMDNlYWIyZDI2ODI4MWM2YTJkOWRjZjg1Yzky
-    YWRlYmUxZGVlZmVkMGQxMjJkZGMzNjlkNmIxNmMzYTA0NzVjYzgwNmY2ZDE5
-    NmY2NmIyNjI3ODJlN2EwMGVjNjhjYjM2YTMyMjIzZDhlNWZiMWU=
+SHA1:
+  metadata.gz: 158b02263bd156e812d95710565da2a08996111a
+  data.tar.gz: 83c5430a9382a9a074d0fcca66999b605f18bd22
+SHA512:
+  metadata.gz: 6d1cbb500554eb7367065d90c36034324ce4234f7bb3cb6642f5d76afde7f123ac5101adb511f89d82c072864cd96b1d2aafb3906b8b7af4c7efab6568f2c005
+  data.tar.gz: b60816efa65a497f3841f6d6e677461307e04873d2b23acbf2be274a9027c938a73414c73155292b1b945346cbe4b879326ed4d944eeebe4e35123bbc1f579eb

data/.gitignore

@@ -1,4 +1,4 @@
 tmp
 Gemfile.lock
-Gemfile.edge.lock
+Gemfile.old.lock
 .ruby-version

data/.travis.yml

@@ -13,21 +13,21 @@ rvm:
   - rbx-19mode
 
 gemfile:
+  - Gemfile.old
   - Gemfile
-  - Gemfile.edge
 
 matrix:
   exclude:
     # Edge Rails is only compatible with 1.9.3+
-    - gemfile: Gemfile.edge
+    - gemfile: Gemfile
       rvm: 1.8.7
-    - gemfile: Gemfile.edge
+    - gemfile: Gemfile
       rvm: 1.9.2
-    - gemfile: Gemfile.edge
+    - gemfile: Gemfile
       rvm: ree
-    - gemfile: Gemfile.edge
+    - gemfile: Gemfile
       rvm: jruby-18mode
-    - gemfile: Gemfile.edge
+    - gemfile: Gemfile
       rvm: rbx-18mode
   allow_failures:
     - rvm: ruby-head

data/Gemfile

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'mocha', :require => false
-gem 'actionpack', '~> 3.0'
+gem 'railties',   '~> 4.0.0'
+gem 'actionpack', '~> 4.0.0'
+gem 'mocha', require: false

data/Gemfile.old

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'rake'
+gem 'mocha', :require => false
+gem 'actionpack', '~> 3.0'

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 David Heinemeier Hansson, 37signals
+Copyright (c) 2011-2013 David Heinemeier Hansson, 37signals
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/jbuilder.gemspec

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

data/lib/jbuilder.rb

@@ -62,7 +62,7 @@ class Jbuilder < JbuilderProxy
     @attributes = ::ActiveSupport::OrderedHash.new
 
     options = args.extract_options!
-    @key_formatter = options.fetch(:key_formatter, @@key_formatter.clone)
+    @key_formatter = options.fetch(:key_formatter){ @@key_formatter.clone }
     @ignore_nil = options.fetch(:ignore_nil, @@ignore_nil)
     yield self if block
   end
@@ -92,7 +92,7 @@ class Jbuilder < JbuilderProxy
         # { "age": 32 }
         value
       end
-    elsif value.respond_to?(:map)
+    elsif _mapable_arguments?(value, *args)
       # json.comments @post.comments, :content, :created_at
       # { "comments": [ { "content": "hello", "created_at": "..." }, { "content": "world", "created_at": "..." } ] }
       _scope{ array! value, *args }
@@ -125,7 +125,7 @@ class Jbuilder < JbuilderProxy
   #
   # You can pass parameters to the method using a hash pair.
   #
-  #   json.key_format! :camelize => :lower
+  #   json.key_format! camelize: :lower
   #   json.first_name "David"
   #
   #   { "firstName": "David" }
@@ -221,7 +221,7 @@ class Jbuilder < JbuilderProxy
   #   json.array! [1, 2, 3]
   #
   #   [1,2,3]
-  def array!(collection, *attributes, &block)
+  def array!(collection = [], *attributes, &block)
     @attributes = if block && block.arity == 2
       _two_arguments_map_collection(collection, &block)
     elsif block
@@ -237,17 +237,17 @@ class Jbuilder < JbuilderProxy
   #
   # Example:
   #
-  #   @person = Struct.new(:name, :age).new("David", 32)
+  #   @person = Struct.new(:name, :age).new('David', 32)
   #
   #   or you can utilize a Hash
   #
-  #   @person = {:name => "David", :age => 32}
+  #   @person = { name: 'David', age: 32 }
   #
   #   json.extract! @person, :name, :age
   #
   #   { "name": David", "age": 32 }, { "name": Jamie", "age": 31 }
   #
-  # If you are using Ruby 1.9+, you can use the call syntax instead of an explicit extract! call:
+  # You can also use the call syntax instead of an explicit extract! call:
   #
   #   json.(@person, :name, :age)
   def extract!(object, *attributes)
@@ -349,6 +349,10 @@ class Jbuilder < JbuilderProxy
 
       _map_collection(collection){ |element| block[self, element] }
     end
+
+    def _mapable_arguments?(value, *args)
+      value.respond_to?(:map)
+    end
 end
 
 require 'jbuilder/jbuilder_template' if defined?(ActionView::Template)

data/lib/jbuilder/jbuilder_template.rb

@@ -22,13 +22,15 @@ class JbuilderTemplate < Jbuilder
       options = { :partial => name_or_options, :locals => locals }
       as = locals.delete(:as)
       options[:as] = as if as.present?
-      options[:collection] = locals[:collection]
+      options[:collection] = locals[:collection] if locals.key?(:collection)
     end
 
+    options[:collection] ||= [] if options.key?(:collection)
+
     _handle_partial_options options
   end
 
-  def array!(collection, *attributes, &block)
+  def array!(collection = [], *attributes, &block)
     options = attributes.extract_options!
 
     if options.key?(:partial)
@@ -43,7 +45,7 @@ class JbuilderTemplate < Jbuilder
   #
   # Example:
   #
-  #   json.cache! ['v1', @person], :expires_in => 10.minutes do
+  #   json.cache! ['v1', @person], expires_in: 10.minutes do
   #     json.extract! @person, :name, :age
   #   end
   def cache!(key=nil, options={}, &block)
@@ -92,6 +94,14 @@ class JbuilderTemplate < Jbuilder
         ::ActiveSupport::Cache.expand_cache_key(key.is_a?(::Hash) ? url_for(key).split('://').last : key, :jbuilder)
       end
     end
+
+  private
+
+    def _mapable_arguments?(value, *args)
+      return true if super
+      options = args.last
+      ::Hash === options && options.key?(:as)
+    end
 end
 
 class JbuilderHandler
@@ -105,4 +115,4 @@ class JbuilderHandler
   end
 end
 
-ActionView::Template.register_template_handler :jbuilder, JbuilderHandler
+ActionView::Template.register_template_handler :jbuilder, JbuilderHandler

data/test/jbuilder_template_test.rb

@@ -110,6 +110,14 @@ class JbuilderTemplateTest < ActionView::TestCase
     assert_collection_rendered json
   end
 
+  test 'partial! renders as empty array for nil-collection' do
+    json = render_jbuilder <<-JBUILDER
+      json.partial! 'blog_post', :collection => nil, :as => :blog_post
+    JBUILDER
+
+    assert_equal '[]', json
+  end
+
   test 'partial! renders collection (alt. syntax)' do
     json = render_jbuilder <<-JBUILDER
       json.partial! :partial => 'blog_post', :collection => BLOG_POST_COLLECTION, :as => :blog_post
@@ -118,6 +126,14 @@ class JbuilderTemplateTest < ActionView::TestCase
     assert_collection_rendered json
   end
 
+  test 'partial! renders as empty array for nil-collection (alt. syntax)' do
+    json = render_jbuilder <<-JBUILDER
+      json.partial! :partial => 'blog_post', :collection => nil, :as => :blog_post
+    JBUILDER
+
+    assert_equal '[]', json
+  end
+
   test 'render array of partials' do
     json = render_jbuilder <<-JBUILDER
       json.array! BLOG_POST_COLLECTION, :partial => 'blog_post', :as => :blog_post
@@ -126,6 +142,14 @@ class JbuilderTemplateTest < ActionView::TestCase
     assert_collection_rendered json
   end
 
+  test 'render array of partials as empty array with nil-collection' do
+    json = render_jbuilder <<-JBUILDER
+      json.array! nil, :partial => 'blog_post', :as => :blog_post
+    JBUILDER
+
+    assert_equal '[]', json
+  end
+
   test 'render array if partials as a value' do
     json = render_jbuilder <<-JBUILDER
       json.posts BLOG_POST_COLLECTION, :partial => 'blog_post', :as => :blog_post
@@ -134,6 +158,14 @@ class JbuilderTemplateTest < ActionView::TestCase
     assert_collection_rendered json, 'posts'
   end
 
+  test 'render as empty array if partials as a nil value' do
+    json = render_jbuilder <<-JBUILDER
+      json.posts nil, :partial => 'blog_post', :as => :blog_post
+    JBUILDER
+
+    assert_equal '{"posts":[]}', json
+  end
+
   test 'fragment caching a JSON object' do
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
-  name: multi_json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: 
@@ -47,7 +47,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.edge
+- Gemfile.old
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -74,17 +74,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL

data/Gemfile.edge

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'rake'
-gem 'railties',   '~> 4.0.0'
-gem 'actionpack', '~> 4.0.0'
-gem 'mocha', require: false