jbuilder 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ed3f4d4cc774f72e1fc5c90566f7e9a62820a17
-  data.tar.gz: e1e6cd0221562a24c384c4fdc0cbd1ca89ee7a44
+  metadata.gz: f4fdd523704c197ce14437d1a214a73b2e5b62f8
+  data.tar.gz: 3ebc55bfe588bedd2526887fd729984ac98b3343
 SHA512:
-  metadata.gz: 73ac812c548d0a49805415b5ac66f3562d4d2e0f587c0d04d9dcc8b179dbbd906458a4b83f27e85ae30621db3f8e1765e4216df8ecd607f797847e422d88bc27
-  data.tar.gz: 3b93e2700b834d6b1bf894678eb07d1575a635c9f0a359264a6640e6678351ec1844b6f873ce95b2f89331229740b49d8fb548c5500e599bb84f76a069ef5144
+  metadata.gz: bb49f0356be9f9a726a45b6b640e12a56d85a16c186f6e0681bf06b7352fd1c950d547cb42822261fba5884d6a26564ba54cbb60f648b12b88fb490f4625e5ef
+  data.tar.gz: 3ea321bd4ccf783086baab268c3081511c76d91ee8d4c47a48c4915ef8dc0cbf7688a02f4e5f07d56dda6b2403d05bd48873eccabc9a98ab55e35e3bc3c99bca

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.0.5'
+  s.version  = '2.0.6'
   s.author   = 'David Heinemeier Hansson'
   s.email    = 'david@37signals.com'
   s.summary  = 'Create JSON structures via a Builder-style DSL'
@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'activesupport', '>= 3.0.0'
-  s.add_dependency 'multi_json',    '>= 1.2.0'
+  s.add_dependency 'activesupport', '>= 3.0.0', '< 5'
+  s.add_dependency 'multi_json',    '~> 1.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")

data/lib/generators/rails/templates/controller.rb

@@ -34,9 +34,9 @@ class <%= controller_class_name %>Controller < ApplicationController
     respond_to do |format|
       if @<%= orm_instance.save %>
         format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %> }
-        format.json { render action: 'show', status: :created, location: <%= "@#{singular_table_name}" %> }
+        format.json { render :show, status: :created, location: <%= "@#{singular_table_name}" %> }
       else
-        format.html { render action: 'new' }
+        format.html { render :new }
         format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
       end
     end
@@ -48,9 +48,9 @@ class <%= controller_class_name %>Controller < ApplicationController
     respond_to do |format|
       if @<%= orm_instance.update("#{singular_table_name}_params") %>
         format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %> }
-        format.json { render action: 'show', status: :ok, location: <%= "@#{singular_table_name}" %> }
+        format.json { render :show, status: :ok, location: <%= "@#{singular_table_name}" %> }
       else
-        format.html { render action: 'edit' }
+        format.html { render :edit }
         format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
       end
     end

data/test/scaffold_controller_generator_test.rb

@@ -31,15 +31,15 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
         assert_match /@post = Post\.new\(post_params\)/, m
         assert_match /@post\.save/, m
         assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully created\.' \}/, m
-        assert_match /format\.json \{ render action: 'show', status: :created, location: @post \}/, m
-        assert_match /format\.html \{ render action: 'new' \}/, m
+        assert_match /format\.json \{ render :show, status: :created, location: @post \}/, m
+        assert_match /format\.html \{ render :new \}/, m
         assert_match /format\.json \{ render json: @post\.errors, status: :unprocessable_entity \}/, m
       end
 
       assert_instance_method :update, content do |m|
         assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully updated\.' \}/, m
-        assert_match /format\.json \{ render action: 'show', status: :ok, location: @post \}/, m
-        assert_match /format\.html \{ render action: 'edit' \}/, m
+        assert_match /format\.json \{ render :show, status: :ok, location: @post \}/, m
+        assert_match /format\.html \{ render :edit \}/, m
         assert_match /format\.json \{ render json: @post.errors, status: :unprocessable_entity \}/, m
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,20 +27,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 description: 
 email: david@37signals.com
 executables: []
@@ -87,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL