Address rubocop warnings

This commit is contained in:
Benjamin Fleischer 2016-02-04 22:45:36 -06:00 committed by Yohan Robert
parent a26d3e4425
commit 68d5233b31
3 changed files with 6 additions and 8 deletions

View File

@ -14,7 +14,7 @@ module ActiveModel
serializer_context_class = options.fetch(:serializer_context_class, ActiveModel::Serializer)
serializer_class = options.fetch(:serializer) { serializer_context_class.serializer_for(resource) }
if serializer_class.nil?
if serializer_class.nil? # rubocop:disable Style/GuardClause
fail NoSerializerError, "No serializer found for resource: #{resource.inspect}"
else
serializer_class.new(resource, options.except(:serializer))

View File

@ -1,7 +1,7 @@
module ActiveModelSerializers
module Adapter
UnknownAdapterError = Class.new(ArgumentError)
ADAPTER_MAP = {}.freeze
ADAPTER_MAP = {} # rubocop:disable Style/MutableConstant
private_constant :ADAPTER_MAP if defined?(private_constant)
require 'active_model_serializers/adapter/fragment_cache'
require 'active_model_serializers/adapter/cached_serializer'

View File

@ -38,8 +38,7 @@ module ActiveModelSerializers
def data_for(serializer, options)
if serializer.respond_to?(:each)
serializer.map { |s| ResourceIdentifier.new(s).as_json }
else
if options[:virtual_value]
elsif options[:virtual_value]
options[:virtual_value]
elsif serializer && serializer.object
ResourceIdentifier.new(serializer).as_json
@ -48,5 +47,4 @@ module ActiveModelSerializers
end
end
end
end
end