Skip to content

Commit df80ba6

Browse files
authored
Merge pull request #2465 from Shopify/0-9-stable-frozen-string-literal
Make the gem compatible with `--enable-frozen-string-literal`
2 parents 91f57c1 + f44c664 commit df80ba6

18 files changed

+45
-10
lines changed

lib/action_controller/serialization.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'active_support/core_ext/class/attribute'
24

35
module ActionController

lib/action_controller/serialization_test_case.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module ActionController
24
module SerializationAssertions
35
extend ActiveSupport::Concern

lib/active_model/array_serializer.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'active_model/default_serializer'
24
require 'active_model/serializable'
35

lib/active_model/default_serializer.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'active_model/serializable'
24

35
module ActiveModel

lib/active_model/serializable.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
# frozen_string_literal: true
2+
13
require 'active_model/serializable/utils'
24

35
module ActiveModel
46
module Serializable
5-
INSTRUMENTATION_KEY = '!serialize.active_model_serializers'.freeze
7+
INSTRUMENTATION_KEY = '!serialize.active_model_serializers'
68

79
def self.included(base)
810
base.extend Utils

lib/active_model/serializable/utils.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module ActiveModel
24
module Serializable
35
module Utils

lib/active_model/serializer.rb

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'active_model/array_serializer'
24
require 'active_model/serializable'
35
require 'active_model/serializer/association'
@@ -130,14 +132,13 @@ def build_serializer_class_list(resource, options)
130132
end
131133

132134
def build_serializer_class(resource, options)
133-
"".tap do |klass_name|
134-
klass_name << "#{options[:namespace]}::" if options[:namespace]
135-
klass_name << options[:prefix].to_s.classify if options[:prefix]
136-
if resource.is_a?(String)
137-
klass_name << "#{resource}Serializer"
138-
else
139-
klass_name << "#{resource.class.name}Serializer"
140-
end
135+
klass_name = +""
136+
klass_name << "#{options[:namespace]}::" if options[:namespace]
137+
klass_name << options[:prefix].to_s.classify if options[:prefix]
138+
if resource.is_a?(String)
139+
klass_name << "#{resource}Serializer"
140+
else
141+
klass_name << "#{resource.class.name}Serializer"
141142
end
142143
end
143144

lib/active_model/serializer/association.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'active_model/default_serializer'
24
require 'active_model/serializer/association/has_one'
35
require 'active_model/serializer/association/has_many'

lib/active_model/serializer/association/has_many.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module ActiveModel
24
class Serializer
35
class Association

lib/active_model/serializer/association/has_one.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module ActiveModel
24
class Serializer
35
class Association

0 commit comments

Comments
 (0)