jbuilder 2.0.0.beta → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3abb8f97fbc68d58021fc1c5bc66fec71d338da7
-  data.tar.gz: 1f5eac2118e6f0762d41d7b6ce1ea559a10feca9
+  metadata.gz: 2b0b628cdf50af7a4e659568d35ff32f8012c95f
+  data.tar.gz: b11afc7dbd0b7dde47149238490f8599dc0e1d80
 SHA512:
-  metadata.gz: fe7ee8dc65453809938c89bfd35f037ae6113e30f648eb66da2ab844bd9dc0574a9c79c381198ec667077dd648cb30946cf81d433085ff31de2d8acba45a00bd
-  data.tar.gz: bcbf4fa794515f477a809d33b18b9ac7e9df227f3fbe1f708bea2f1b1f90d340439f783ff96f1b40c413c9ec539703f267745183761d9c3d8e945f3288ae20ce
+  metadata.gz: a1809fd60109a55c20893f0349837c809e83892d3b0e116a280b1cac9bf493c0902ad43ede7b5530b12daae854349ba03194056b0d3e3ae0b9803604ac6be461
+  data.tar.gz: aa8981b12fdf1783a9d9607d4320191c873b0cdd4de0038c90163bd88977ab82cbdbc32fb224187a5a3cd699762431fd422b23e34854420f6a8e84c97ec9a4a2

data/README.md

@@ -204,4 +204,4 @@ Libraries similar to this in some form or another include:
 * JsonBuilder: https://github.com/nov/jsonbuilder
 * JSON Builder: https://github.com/dewski/json_builder
 * Jsonify: https://github.com/bsiggelkow/jsonify
-* RepresentationView: https://github.com/mdub/representative_view
+* Representative View: https://github.com/mdub/representative_view

data/jbuilder.gemspec

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

data/lib/generators/rails/jbuilder_generator.rb

@@ -24,6 +24,10 @@ module Rails
 
 
       protected
+        def attributes_names
+          [:id] + super
+        end
+
         def filename_with_extensions(name)
           [name, :json, :jbuilder] * '.'
         end

data/lib/jbuilder.rb

@@ -273,6 +273,16 @@ class Jbuilder < JbuilderProxy
     @attributes
   end
 
+  # Merges hash or array into current builder.
+  def merge!(hash_or_array)
+    if ::Array === hash_or_array
+      @attributes = [] unless ::Array === @attributes
+      @attributes.concat hash_or_array
+    else
+      @attributes.update hash_or_array
+    end
+  end
+
   # Encodes the current builder as JSON.
   def target!
     ::MultiJson.dump(@attributes)
@@ -312,15 +322,6 @@ class Jbuilder < JbuilderProxy
       @attributes, @key_formatter = parent_attributes, parent_formatter
     end
 
-    def _merge(hash_or_array)
-      if ::Array === hash_or_array
-        @attributes = [] unless ::Array === @attributes
-        @attributes.concat hash_or_array
-      else
-        @attributes.update hash_or_array
-      end
-    end
-
     def _mapable_arguments?(value, *args)
       value.respond_to?(:map)
     end

data/lib/jbuilder/jbuilder_template.rb

@@ -54,7 +54,7 @@ class JbuilderTemplate < Jbuilder
         _scope { yield self }
       end
 
-      _merge(value)
+      merge! value
     else
       yield
     end

data/test/jbuilder_generator_test.rb

@@ -20,12 +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/, content
+      assert_match /json\.extract! post, :id, :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\.extract! @post, :id, :title, :body, :created_at, :updated_at/, content
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL
@@ -96,4 +96,3 @@ test_files:
 - test/jbuilder_template_test.rb
 - test/jbuilder_test.rb
 - test/scaffold_controller_generator_test.rb
-has_rdoc: