jbuilder 2.0.5 → 2.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/jbuilder.gemspec +3 -3
- data/lib/generators/rails/templates/controller.rb +4 -4
- data/test/scaffold_controller_generator_test.rb +4 -4
- metadata +13 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f4fdd523704c197ce14437d1a214a73b2e5b62f8
|
4
|
+
data.tar.gz: 3ebc55bfe588bedd2526887fd729984ac98b3343
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bb49f0356be9f9a726a45b6b640e12a56d85a16c186f6e0681bf06b7352fd1c950d547cb42822261fba5884d6a26564ba54cbb60f648b12b88fb490f4625e5ef
|
7
|
+
data.tar.gz: 3ea321bd4ccf783086baab268c3081511c76d91ee8d4c47a48c4915ef8dc0cbf7688a02f4e5f07d56dda6b2403d05bd48873eccabc9a98ab55e35e3bc3c99bca
|
data/jbuilder.gemspec
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
s.name = 'jbuilder'
|
3
|
-
s.version = '2.0.
|
3
|
+
s.version = '2.0.6'
|
4
4
|
s.author = 'David Heinemeier Hansson'
|
5
5
|
s.email = 'david@37signals.com'
|
6
6
|
s.summary = 'Create JSON structures via a Builder-style DSL'
|
@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
|
|
9
9
|
|
10
10
|
s.required_ruby_version = '>= 1.9.3'
|
11
11
|
|
12
|
-
s.add_dependency 'activesupport', '>= 3.0.0'
|
13
|
-
s.add_dependency 'multi_json', '
|
12
|
+
s.add_dependency 'activesupport', '>= 3.0.0', '< 5'
|
13
|
+
s.add_dependency 'multi_json', '~> 1.2'
|
14
14
|
|
15
15
|
s.files = `git ls-files`.split("\n")
|
16
16
|
s.test_files = `git ls-files -- test/*`.split("\n")
|
@@ -34,9 +34,9 @@ class <%= controller_class_name %>Controller < ApplicationController
|
|
34
34
|
respond_to do |format|
|
35
35
|
if @<%= orm_instance.save %>
|
36
36
|
format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %> }
|
37
|
-
format.json { render
|
37
|
+
format.json { render :show, status: :created, location: <%= "@#{singular_table_name}" %> }
|
38
38
|
else
|
39
|
-
format.html { render
|
39
|
+
format.html { render :new }
|
40
40
|
format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
|
41
41
|
end
|
42
42
|
end
|
@@ -48,9 +48,9 @@ class <%= controller_class_name %>Controller < ApplicationController
|
|
48
48
|
respond_to do |format|
|
49
49
|
if @<%= orm_instance.update("#{singular_table_name}_params") %>
|
50
50
|
format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %> }
|
51
|
-
format.json { render
|
51
|
+
format.json { render :show, status: :ok, location: <%= "@#{singular_table_name}" %> }
|
52
52
|
else
|
53
|
-
format.html { render
|
53
|
+
format.html { render :edit }
|
54
54
|
format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
|
55
55
|
end
|
56
56
|
end
|
@@ -31,15 +31,15 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
|
|
31
31
|
assert_match /@post = Post\.new\(post_params\)/, m
|
32
32
|
assert_match /@post\.save/, m
|
33
33
|
assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully created\.' \}/, m
|
34
|
-
assert_match /format\.json \{ render
|
35
|
-
assert_match /format\.html \{ render
|
34
|
+
assert_match /format\.json \{ render :show, status: :created, location: @post \}/, m
|
35
|
+
assert_match /format\.html \{ render :new \}/, m
|
36
36
|
assert_match /format\.json \{ render json: @post\.errors, status: :unprocessable_entity \}/, m
|
37
37
|
end
|
38
38
|
|
39
39
|
assert_instance_method :update, content do |m|
|
40
40
|
assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully updated\.' \}/, m
|
41
|
-
assert_match /format\.json \{ render
|
42
|
-
assert_match /format\.html \{ render
|
41
|
+
assert_match /format\.json \{ render :show, status: :ok, location: @post \}/, m
|
42
|
+
assert_match /format\.html \{ render :edit \}/, m
|
43
43
|
assert_match /format\.json \{ render json: @post.errors, status: :unprocessable_entity \}/, m
|
44
44
|
end
|
45
45
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jbuilder
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- David Heinemeier Hansson
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-04-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -17,6 +17,9 @@ dependencies:
|
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 3.0.0
|
20
|
+
- - "<"
|
21
|
+
- !ruby/object:Gem::Version
|
22
|
+
version: '5'
|
20
23
|
type: :runtime
|
21
24
|
prerelease: false
|
22
25
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -24,20 +27,23 @@ dependencies:
|
|
24
27
|
- - ">="
|
25
28
|
- !ruby/object:Gem::Version
|
26
29
|
version: 3.0.0
|
30
|
+
- - "<"
|
31
|
+
- !ruby/object:Gem::Version
|
32
|
+
version: '5'
|
27
33
|
- !ruby/object:Gem::Dependency
|
28
34
|
name: multi_json
|
29
35
|
requirement: !ruby/object:Gem::Requirement
|
30
36
|
requirements:
|
31
|
-
- - "
|
37
|
+
- - "~>"
|
32
38
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.2
|
39
|
+
version: '1.2'
|
34
40
|
type: :runtime
|
35
41
|
prerelease: false
|
36
42
|
version_requirements: !ruby/object:Gem::Requirement
|
37
43
|
requirements:
|
38
|
-
- - "
|
44
|
+
- - "~>"
|
39
45
|
- !ruby/object:Gem::Version
|
40
|
-
version: 1.2
|
46
|
+
version: '1.2'
|
41
47
|
description:
|
42
48
|
email: david@37signals.com
|
43
49
|
executables: []
|
@@ -87,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
87
93
|
version: '0'
|
88
94
|
requirements: []
|
89
95
|
rubyforge_project:
|
90
|
-
rubygems_version: 2.2.
|
96
|
+
rubygems_version: 2.2.0
|
91
97
|
signing_key:
|
92
98
|
specification_version: 4
|
93
99
|
summary: Create JSON structures via a Builder-style DSL
|