jbuilder 1.0.1 → 1.0.2

data/jbuilder.gemspec

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

@@ -292,7 +292,7 @@ class Jbuilder < JbuilderProxy
             value
           end
         else
-          if value.kind_of?(::Enumerable)
+          if value.respond_to?(:map)
             # json.comments(@post.comments, :content, :created_at)
             # { "comments": [ { "content": "hello", "created_at": "..." }, { "content": "world", "created_at": "..." } ] }
             _map_collection(value) do |element|
@@ -342,4 +342,4 @@ require 'jbuilder_template' if defined?(ActionView::Template)
 begin
   require 'railtie' if Rails::VERSION::MAJOR == 4
 rescue NameError
-end
+end

data/test/jbuilder_generator_test.rb

@@ -20,13 +20,12 @@ class JbuilderGeneratorTest < Rails::Generators::TestCase
 
     assert_file 'app/views/posts/index.json.jbuilder' do |content|
       assert_match /json\.array!\(@posts\) do \|post\|/, content
-      assert_match /json\.extract! post, :title, :body, :created_at, :updated_at/, content
-      assert_match /json\.url post_url\(post\)/, content
+      assert_match /json\.extract! post, :title, :body/, content
+      assert_match /json\.url post_url\(post, format: :json\)/, content
     end
 
     assert_file 'app/views/posts/show.json.jbuilder' do |content|
       assert_match /json\.extract! @post, :title, :body, :created_at, :updated_at/, content
-      assert_match /json\.url post_url\(@post\)/, content
     end
   end
 end

data/test/jbuilder_test.rb

@@ -11,6 +11,16 @@ class JbuilderProxy
   end
 end if ::RUBY_VERSION < '1.9'
 
+class NonEnumerable
+  def initialize(collection)
+    @collection = collection
+  end
+
+  def map(&block)
+    @collection.map(&block)
+  end
+end
+
 class JbuilderTest < ActiveSupport::TestCase
   test 'single key' do
     json = Jbuilder.encode do |json|
@@ -193,6 +203,36 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_equal [], MultiJson.load(json)['comments']
   end
 
+  test 'nesting multiple children from a non-Enumerable that responds to #map' do
+    comments = NonEnumerable.new([ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ])
+
+    json = Jbuilder.encode do |json|
+      json.comments comments, :content
+    end
+
+    MultiJson.load(json).tap do |parsed|
+      assert_equal ['content'], parsed['comments'].first.keys
+      assert_equal 'hello', parsed['comments'].first['content']
+      assert_equal 'world', parsed['comments'].second['content']
+    end
+  end
+
+  test 'nesting multiple chilren from a non-Enumerable that responds to #map with inline loop' do
+    comments = NonEnumerable.new([ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ])
+
+    json = Jbuilder.encode do |json|
+      json.comments comments do |comment|
+        json.content comment.content
+      end
+    end
+
+    MultiJson.load(json).tap do |parsed|
+      assert_equal ['content'], parsed['comments'].first.keys
+      assert_equal 'hello', parsed['comments'].first['content']
+      assert_equal 'world', parsed['comments'].second['content']
+    end
+  end
+
   test 'nesting multiple children from array with inline loop with old api' do
     comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,6 +53,7 @@ files:
 - ./Gemfile-1.8
 - ./jbuilder-0.9.0.gem
 - ./jbuilder-1.0.0.gem
+- ./jbuilder-1.0.1.gem
 - ./jbuilder.gemspec
 - ./lib/generators/rails/jbuilder_generator.rb
 - ./lib/generators/rails/jbuilder_scaffold_controller_generator.rb