Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[0.9 stable] Make the gem compatible with --enable-frozen-string-literal #2465

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/action_controller/serialization.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'active_support/core_ext/class/attribute'

module ActionController
Expand Down
2 changes: 2 additions & 0 deletions lib/action_controller/serialization_test_case.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActionController
module SerializationAssertions
extend ActiveSupport::Concern
Expand Down
2 changes: 2 additions & 0 deletions lib/active_model/array_serializer.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'active_model/default_serializer'
require 'active_model/serializable'

Expand Down
2 changes: 2 additions & 0 deletions lib/active_model/default_serializer.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'active_model/serializable'

module ActiveModel
Expand Down
4 changes: 3 additions & 1 deletion lib/active_model/serializable.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# frozen_string_literal: true

require 'active_model/serializable/utils'

module ActiveModel
module Serializable
INSTRUMENTATION_KEY = '!serialize.active_model_serializers'.freeze
INSTRUMENTATION_KEY = '!serialize.active_model_serializers'

def self.included(base)
base.extend Utils
Expand Down
2 changes: 2 additions & 0 deletions lib/active_model/serializable/utils.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveModel
module Serializable
module Utils
Expand Down
17 changes: 9 additions & 8 deletions lib/active_model/serializer.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'active_model/array_serializer'
require 'active_model/serializable'
require 'active_model/serializer/association'
Expand Down Expand Up @@ -130,14 +132,13 @@ def build_serializer_class_list(resource, options)
end

def build_serializer_class(resource, options)
"".tap do |klass_name|
klass_name << "#{options[:namespace]}::" if options[:namespace]
klass_name << options[:prefix].to_s.classify if options[:prefix]
if resource.is_a?(String)
klass_name << "#{resource}Serializer"
else
klass_name << "#{resource.class.name}Serializer"
end
klass_name = +""
klass_name << "#{options[:namespace]}::" if options[:namespace]
klass_name << options[:prefix].to_s.classify if options[:prefix]
if resource.is_a?(String)
klass_name << "#{resource}Serializer"
else
klass_name << "#{resource.class.name}Serializer"
end
end

Expand Down
2 changes: 2 additions & 0 deletions lib/active_model/serializer/association.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'active_model/default_serializer'
require 'active_model/serializer/association/has_one'
require 'active_model/serializer/association/has_many'
Expand Down
2 changes: 2 additions & 0 deletions lib/active_model/serializer/association/has_many.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveModel
class Serializer
class Association
Expand Down
2 changes: 2 additions & 0 deletions lib/active_model/serializer/association/has_one.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveModel
class Serializer
class Association
Expand Down
2 changes: 2 additions & 0 deletions lib/active_model/serializer/config.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveModel
class Serializer
class Config
Expand Down
2 changes: 2 additions & 0 deletions lib/active_model/serializer/generators/resource_override.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'rails/generators'
require 'rails/generators/rails/resource/resource_generator'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'rails/generators'
require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module Rails
module Generators
class SerializerGenerator < NamedBase
Expand Down
2 changes: 2 additions & 0 deletions lib/active_model/serializer/railtie.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveModel
class Railtie < Rails::Railtie
initializer 'generators' do |app|
Expand Down
4 changes: 3 additions & 1 deletion lib/active_model/serializer/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# frozen_string_literal: true

module ActiveModel
class Serializer
VERSION = '0.9.9'.freeze
VERSION = '0.9.9'
end
end
2 changes: 2 additions & 0 deletions lib/active_model/serializer_support.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveModel
module SerializerSupport
alias read_attribute_for_serialization send
Expand Down
2 changes: 2 additions & 0 deletions lib/active_model_serializers.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'active_model'
require 'active_model/serializer'
require 'active_model/serializer_support'
Expand Down
Loading