jbuilder 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 158b02263bd156e812d95710565da2a08996111a
-  data.tar.gz: 83c5430a9382a9a074d0fcca66999b605f18bd22
+  metadata.gz: f96d267675b1f3a2c1b8362acec6cb5d6041594a
+  data.tar.gz: 16a89009d403703f5c2bab75b7db39e8a976043e
 SHA512:
-  metadata.gz: 6d1cbb500554eb7367065d90c36034324ce4234f7bb3cb6642f5d76afde7f123ac5101adb511f89d82c072864cd96b1d2aafb3906b8b7af4c7efab6568f2c005
-  data.tar.gz: b60816efa65a497f3841f6d6e677461307e04873d2b23acbf2be274a9027c938a73414c73155292b1b945346cbe4b879326ed4d944eeebe4e35123bbc1f579eb
+  metadata.gz: 03e2efc5e9463f76a49560f1c61db48b02ad2d456399bc5aeed9a2cf47e8c919d59632c79141d696bf33ccd4cc1466fcb17dfab1d2f5f929924c6e386083ee9d
+  data.tar.gz: bcd576dd31be8b43e423612409ffae5051994bec4351f6fac4bd1ba0b1a5cf94ae091cb39570767c8949ea7a0d6f806ab13b2bbca5fbf7bc4bb6af91238717f0

data/Rakefile

@@ -4,10 +4,10 @@ require 'rake/testtask'
 Bundler.require
 
 Rake::TestTask.new do |test|
-  if defined?(::Rails::Railtie)
-    test.test_files = FileList['test/*_test.rb']
-  else
+  if /old$/ === ENV['BUNDLE_GEMFILE']
     test.test_files = %w(test/jbuilder_template_test.rb test/jbuilder_test.rb)
+  else
+    test.test_files = FileList['test/*_test.rb']
   end
 end
 

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'jbuilder'
-  s.version = '1.5.2'
+  s.version = '1.5.3'
   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/jbuilder_template.rb

@@ -1,3 +1,4 @@
+require 'jbuilder'
 require 'action_dispatch/http/mime_type'
 
 class JbuilderTemplate < Jbuilder

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

data/test/jbuilder_template_test.rb

@@ -3,7 +3,7 @@ require 'mocha/setup'
 require 'action_view'
 require 'action_view/testing/resolvers'
 require 'active_support/cache'
-require 'jbuilder'
+require 'jbuilder/jbuilder_template'
 
 
 BLOG_POST_PARTIAL = <<-JBUILDER

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 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
@@ -93,4 +93,3 @@ test_files:
 - test/jbuilder_template_test.rb
 - test/jbuilder_test.rb
 - test/scaffold_controller_generator_test.rb
-has_rdoc: