Skip to content

Commit bdfe13c

Browse files
bf4bf4
committed
Style/StringLiterals single quote all the things
1 parent 09c97de commit bdfe13c

36 files changed

+347
-347
lines changed

‎lib/action_controller/serialization.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def serialization_scope
2121

2222
def get_serializer(resource, options = {})
2323
if ! use_adapter?
24-
warn "ActionController::Serialization#use_adapter? has been removed. "\
24+
warn 'ActionController::Serialization#use_adapter? has been removed. '\
2525
"Please pass 'adapter: false' or see ActiveSupport::SerializableResource#serialize"
2626
options[:adapter] = false
2727
end

‎lib/active_model/serializer/adapter.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def self.create(resource, options = {})
1515
end
1616

1717
def self.adapter_class(adapter)
18-
adapter_name = adapter.to_s.classify.sub("API", "Api")
18+
adapter_name = adapter.to_s.classify.sub('API', 'Api')
1919
"ActiveModel::Serializer::Adapter::#{adapter_name}".safe_constantize
2020
end
2121

@@ -68,12 +68,12 @@ def cache_key
6868
parts = []
6969
parts << object_cache_key
7070
parts << @klass._cache_digest unless @klass._cache_options && @klass._cache_options[:skip_digest]
71-
parts.join("/")
71+
parts.join('/')
7272
end
7373

7474
def object_cache_key
7575
object_time_safe = @cached_serializer.object.updated_at
76-
object_time_safe = object_time_safe.strftime("%Y%m%d%H%M%S%9N") if object_time_safe.respond_to?(:strftime)
76+
object_time_safe = object_time_safe.strftime('%Y%m%d%H%M%S%9N') if object_time_safe.respond_to?(:strftime)
7777
(@klass._cache_key) ? "#{@klass._cache_key}/#{@cached_serializer.object.id}-#{object_time_safe}" : @cached_serializer.object.cache_key
7878
end
7979

@@ -82,7 +82,7 @@ def meta
8282
end
8383

8484
def meta_key
85-
serializer.meta_key || "meta"
85+
serializer.meta_key || 'meta'
8686
end
8787

8888
def root

‎lib/active_model/serializer/lint.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module Tests
2323
# <tt>serializable_hash</tt> returns a hash representation of a object's attributes.
2424
# Typically, it is implemented by including ActiveModel::Serialization.
2525
def test_serializable_hash
26-
assert_respond_to resource, :serializable_hash, "The resource should respond to serializable_hash"
26+
assert_respond_to resource, :serializable_hash, 'The resource should respond to serializable_hash'
2727
resource.serializable_hash
2828
resource.serializable_hash(nil)
2929
end
@@ -35,7 +35,7 @@ def test_serializable_hash
3535
# <tt>read_attribute_for_serialization</tt> gets the attribute value for serialization
3636
# Typically, it is implemented by including ActiveModel::Serialization.
3737
def test_read_attribute_for_serialization
38-
assert_respond_to resource, :read_attribute_for_serialization, "The resource should respond to read_attribute_for_serialization"
38+
assert_respond_to resource, :read_attribute_for_serialization, 'The resource should respond to read_attribute_for_serialization'
3939
actual_arity = resource.method(:read_attribute_for_serialization).arity
4040
if defined?(::Rubinius)
4141
# 1 for def read_attribute_for_serialization(name); end

‎lib/active_model/serializer/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module ActiveModel
22
class Serializer
3-
VERSION = "0.10.0.rc2"
3+
VERSION = '0.10.0.rc2'
44
end
55
end

‎lib/generators/serializer/serializer_generator.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module Rails
22
module Generators
33
class SerializerGenerator < NamedBase
4-
source_root File.expand_path("../templates", __FILE__)
5-
check_class_collision :suffix => "Serializer"
4+
source_root File.expand_path('../templates', __FILE__)
5+
check_class_collision :suffix => 'Serializer'
66

7-
argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
7+
argument :attributes, :type => :array, :default => [], :banner => 'field:type field:type'
88

9-
class_option :parent, :type => :string, :desc => "The parent class for the generated serializer"
9+
class_option :parent, :type => :string, :desc => 'The parent class for the generated serializer'
1010

1111
def create_serializer_file
1212
template 'serializer.rb.erb', File.join('app/serializers', class_path, "#{file_name}_serializer.rb")
@@ -26,9 +26,9 @@ def parent_class_name
2626
if options[:parent]
2727
options[:parent]
2828
elsif defined?(::ApplicationSerializer)
29-
"ApplicationSerializer"
29+
'ApplicationSerializer'
3030
else
31-
"ActiveModel::Serializer"
31+
'ActiveModel::Serializer'
3232
end
3333
end
3434
end

‎test/action_controller/adapter_selector_test.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ def test_render_using_adapter_override
3333
expected = {
3434
data: {
3535
id: assigns(:profile).id.to_s,
36-
type: "profiles",
36+
type: 'profiles',
3737
attributes: {
38-
name: "Name 1",
39-
description: "Description 1",
38+
name: 'Name 1',
39+
description: 'Description 1',
4040
}
4141
}
4242
}

‎test/action_controller/explicit_serializer_test.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ def test_render_array_using_explicit_serializer_and_custom_serializers
100100
get :render_array_using_explicit_serializer_and_custom_serializers
101101

102102
expected = [
103-
{ "title" => "New Post",
104-
"body" => "Body",
105-
"id" => assigns(:post).id,
106-
"comments" => [{"id" => 1}, {"id" => 2}],
107-
"author" => { "id" => assigns(:author).id }
103+
{ 'title' => 'New Post',
104+
'body' => 'Body',
105+
'id' => assigns(:post).id,
106+
'comments' => [{'id' => 1}, {'id' => 2}],
107+
'author' => { 'id' => assigns(:author).id }
108108
}
109109
]
110110

@@ -116,13 +116,13 @@ def test_render_using_explicit_each_serializer
116116

117117
expected = {
118118
id: 1337,
119-
name: "Amazing Place",
119+
name: 'Amazing Place',
120120
locations: [
121121
{
122122
id: 42,
123-
lat: "-23.550520",
124-
lng: "-46.633309",
125-
place: "Nowhere" # is a virtual attribute on LocationSerializer
123+
lat: '-23.550520',
124+
lng: '-46.633309',
125+
place: 'Nowhere' # is a virtual attribute on LocationSerializer
126126
}
127127
]
128128
}

‎test/action_controller/json_api/linked_test.rb‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ def setup_post
2828
@first_comment.author = @author2
2929
@second_comment.post = @post
3030
@second_comment.author = nil
31-
@post2 = Post.new(id: 2, title: "Another Post", body: "Body")
31+
@post2 = Post.new(id: 2, title: 'Another Post', body: 'Body')
3232
@post2.author = @author
3333
@post2.comments = []
34-
@blog = Blog.new(id: 1, name: "My Blog!!")
34+
@blog = Blog.new(id: 1, name: 'My Blog!!')
3535
@post.blog = @blog
3636
@post2.blog = @blog
3737
end
@@ -100,37 +100,37 @@ def test_render_resource_with_nested_has_many_include
100100
response = JSON.parse(@response.body)
101101
expected_linked = [
102102
{
103-
"id" => "1",
104-
"type" => "authors",
105-
"attributes" => {
106-
"name" => "Steve K."
103+
'id' => '1',
104+
'type' => 'authors',
105+
'attributes' => {
106+
'name' => 'Steve K.'
107107
},
108-
"relationships" => {
109-
"posts" => { "data" => [] },
110-
"roles" => { "data" => [{ "type" =>"roles", "id" => "1" }, { "type" =>"roles", "id" => "2" }] },
111-
"bio" => { "data" => nil }
108+
'relationships' => {
109+
'posts' => { 'data' => [] },
110+
'roles' => { 'data' => [{ 'type' =>'roles', 'id' => '1' }, { 'type' =>'roles', 'id' => '2' }] },
111+
'bio' => { 'data' => nil }
112112
}
113113
}, {
114-
"id" => "1",
115-
"type" => "roles",
116-
"attributes" => {
117-
"name" => "admin",
118-
"description" => nil,
119-
"slug" => "admin-1"
114+
'id' => '1',
115+
'type' => 'roles',
116+
'attributes' => {
117+
'name' => 'admin',
118+
'description' => nil,
119+
'slug' => 'admin-1'
120120
},
121-
"relationships" => {
122-
"author" => { "data" => { "type" =>"authors", "id" => "1" } }
121+
'relationships' => {
122+
'author' => { 'data' => { 'type' =>'authors', 'id' => '1' } }
123123
}
124124
}, {
125-
"id" => "2",
126-
"type" => "roles",
127-
"attributes" => {
128-
"name" => "colab",
129-
"description" => nil,
130-
"slug" => "colab-2"
125+
'id' => '2',
126+
'type' => 'roles',
127+
'attributes' => {
128+
'name' => 'colab',
129+
'description' => nil,
130+
'slug' => 'colab-2'
131131
},
132-
"relationships" => {
133-
"author" => { "data" => { "type" =>"authors", "id" => "1" } }
132+
'relationships' => {
133+
'author' => { 'data' => { 'type' =>'authors', 'id' => '1' } }
134134
}
135135
}
136136
]

‎test/action_controller/json_api/pagination_test.rb‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,60 +47,60 @@ def render_array_without_pagination_links
4747
tests PaginationTestController
4848

4949
def test_render_pagination_links_with_will_paginate
50-
expected_links = { "self"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1",
51-
"first"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
52-
"prev"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
53-
"next"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
54-
"last"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1"}
50+
expected_links = { 'self'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1",
51+
'first'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
52+
'prev'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
53+
'next'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
54+
'last'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1"}
5555

5656
get :render_pagination_using_will_paginate, page: { number: 2, size: 1 }
5757
response = JSON.parse(@response.body)
5858
assert_equal expected_links, response['links']
5959
end
6060

6161
def test_render_only_last_and_next_pagination_links
62-
expected_links = { "self"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=2",
63-
"next"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2",
64-
"last"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2"}
62+
expected_links = { 'self'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=2",
63+
'next'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2",
64+
'last'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2"}
6565
get :render_pagination_using_will_paginate, page: { number: 1, size: 2 }
6666
response = JSON.parse(@response.body)
6767
assert_equal expected_links, response['links']
6868
end
6969

7070
def test_render_pagination_links_with_kaminari
71-
expected_links = { "self"=>"#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1",
72-
"first"=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
73-
"prev"=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
74-
"next"=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
75-
"last"=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1"}
71+
expected_links = { 'self'=>"#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1",
72+
'first'=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
73+
'prev'=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
74+
'next'=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
75+
'last'=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1"}
7676
get :render_pagination_using_kaminari, page: { number: 2, size: 1 }
7777
response = JSON.parse(@response.body)
7878
assert_equal expected_links, response['links']
7979
end
8080

8181
def test_render_only_prev_and_first_pagination_links
82-
expected_links = { "self"=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
83-
"first"=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
84-
"prev"=>"#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1"}
82+
expected_links = { 'self'=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
83+
'first'=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
84+
'prev'=>"#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1"}
8585
get :render_pagination_using_kaminari, page: { number: 3, size: 1 }
8686
response = JSON.parse(@response.body)
8787
assert_equal expected_links, response['links']
8888
end
8989

9090
def test_render_only_last_and_next_pagination_links_with_additional_params
91-
expected_links = { "self"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=2&teste=additional",
92-
"next"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2&teste=additional",
93-
"last"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2&teste=additional"}
94-
get :render_pagination_using_will_paginate, page: { number: 1, size: 2 }, teste: "additional"
91+
expected_links = { 'self'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=2&teste=additional",
92+
'next'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2&teste=additional",
93+
'last'=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2&teste=additional"}
94+
get :render_pagination_using_will_paginate, page: { number: 1, size: 2 }, teste: 'additional'
9595
response = JSON.parse(@response.body)
9696
assert_equal expected_links, response['links']
9797
end
9898

9999
def test_render_only_prev_and_first_pagination_links_with_additional_params
100-
expected_links = { "self"=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1&teste=additional",
101-
"first"=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1&teste=additional",
102-
"prev"=>"#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1&teste=additional"}
103-
get :render_pagination_using_kaminari, page: { number: 3, size: 1 }, teste: "additional"
100+
expected_links = { 'self'=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1&teste=additional",
101+
'first'=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1&teste=additional",
102+
'prev'=>"#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1&teste=additional"}
103+
get :render_pagination_using_kaminari, page: { number: 3, size: 1 }, teste: 'additional'
104104
response = JSON.parse(@response.body)
105105
assert_equal expected_links, response['links']
106106
end

0 commit comments

Comments
 (0)