Skip to content

Commit 68d5233

Browse files
bf4Yohan Robert
authored andcommitted
Address rubocop warnings
1 parent a26d3e4 commit 68d5233

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

lib/active_model/serializer/collection_serializer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def initialize(resources, options = {})
1414
serializer_context_class = options.fetch(:serializer_context_class, ActiveModel::Serializer)
1515
serializer_class = options.fetch(:serializer) { serializer_context_class.serializer_for(resource) }
1616

17-
if serializer_class.nil?
17+
if serializer_class.nil? # rubocop:disable Style/GuardClause
1818
fail NoSerializerError, "No serializer found for resource: #{resource.inspect}"
1919
else
2020
serializer_class.new(resource, options.except(:serializer))

lib/active_model_serializers/adapter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module ActiveModelSerializers
22
module Adapter
33
UnknownAdapterError = Class.new(ArgumentError)
4-
ADAPTER_MAP = {}.freeze
4+
ADAPTER_MAP = {} # rubocop:disable Style/MutableConstant
55
private_constant :ADAPTER_MAP if defined?(private_constant)
66
require 'active_model_serializers/adapter/fragment_cache'
77
require 'active_model_serializers/adapter/cached_serializer'

lib/active_model_serializers/adapter/json_api/relationship.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@ def as_json
3838
def data_for(serializer, options)
3939
if serializer.respond_to?(:each)
4040
serializer.map { |s| ResourceIdentifier.new(s).as_json }
41-
else
42-
if options[:virtual_value]
43-
options[:virtual_value]
44-
elsif serializer && serializer.object
45-
ResourceIdentifier.new(serializer).as_json
46-
end
41+
elsif options[:virtual_value]
42+
options[:virtual_value]
43+
elsif serializer && serializer.object
44+
ResourceIdentifier.new(serializer).as_json
4745
end
4846
end
4947
end

0 commit comments

Comments
 (0)