Skip to content

Commit a26d3e4

Browse files
bf4Yohan Robert
authored andcommitted
Rubocop autocorrect
1 parent ec36ab7 commit a26d3e4

21 files changed

+39
-39
lines changed

lib/active_model/serializable_resource.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def serialization_scope_name=(scope_name)
3333
def adapter
3434
@adapter ||= ActiveModelSerializers::Adapter.create(serializer_instance, adapter_opts)
3535
end
36-
alias_method :adapter_instance, :adapter
36+
alias adapter_instance adapter
3737

3838
def serializer_instance
3939
@serializer_instance ||= serializer.new(resource, serializer_opts)
@@ -54,7 +54,7 @@ def serializer
5454
@serializer
5555
end
5656
end
57-
alias_method :serializer_class, :serializer
57+
alias serializer_class serializer
5858

5959
# True when no explicit adapter given, or explicit appear is truthy (non-nil)
6060
# False when explicit adapter is falsy (nil or false)
@@ -63,7 +63,7 @@ def use_adapter?
6363
end
6464

6565
def serializer?
66-
use_adapter? && !!(serializer)
66+
use_adapter? && !!serializer
6767
end
6868

6969
protected

lib/active_model/serializer/caching.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def cache(options = {})
9292
self._cache_key = options.delete(:key)
9393
self._cache_only = options.delete(:only)
9494
self._cache_except = options.delete(:except)
95-
self._cache_options = (options.empty?) ? nil : options
95+
self._cache_options = options.empty? ? nil : options
9696
end
9797
end
9898
end
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.rc4'
3+
VERSION = '0.10.0.rc4'.freeze
44
end
55
end

lib/active_model_serializers/adapter.rb

Lines changed: 2 additions & 2 deletions
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 = {}
4+
ADAPTER_MAP = {}.freeze
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'
@@ -49,7 +49,7 @@ def adapters
4949
# 'Json' will both register as 'json'.
5050
def register(name, klass = name)
5151
name = name.to_s.gsub(/\AActiveModelSerializers::Adapter::/, ''.freeze)
52-
adapter_map.update(name.underscore => klass)
52+
adapter_map[name.underscore] = klass
5353
self
5454
end
5555

lib/active_model_serializers/adapter/cached_serializer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def cache_key
3838
def object_cache_key
3939
object_time_safe = @cached_serializer.object.updated_at
4040
object_time_safe = object_time_safe.strftime('%Y%m%d%H%M%S%9N') if object_time_safe.respond_to?(:strftime)
41-
(@klass._cache_key) ? "#{@klass._cache_key}/#{@cached_serializer.object.id}-#{object_time_safe}" : @cached_serializer.object.cache_key
41+
@klass._cache_key ? "#{@klass._cache_key}/#{@cached_serializer.object.id}-#{object_time_safe}" : @cached_serializer.object.cache_key
4242
end
4343

4444
# find all cache_key for the collection_serializer

lib/active_model_serializers/adapter/fragment_cache.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def fetch
4646
# 3. Add non-cached attributes to non-cached Serializer
4747
def cached_attributes(klass, serializers)
4848
attributes = serializer.class._attributes
49-
cached_attributes = (klass._cache_only) ? klass._cache_only : attributes.reject { |attr| klass._cache_except.include?(attr) }
49+
cached_attributes = klass._cache_only ? klass._cache_only : attributes.reject { |attr| klass._cache_except.include?(attr) }
5050
non_cached_attributes = attributes - cached_attributes
5151

5252
cached_attributes.each do |attribute|

lib/active_model_serializers/adapter/json_api/deserialization.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def parse_relationship(assoc_name, assoc_data, options)
188188
end
189189

190190
polymorphic = (options[:polymorphic] || []).include?(assoc_name.to_sym)
191-
hash.merge!("#{prefix_key}_type".to_sym => assoc_data['type']) if polymorphic
191+
hash["#{prefix_key}_type".to_sym] = assoc_data['type'] if polymorphic
192192

193193
hash
194194
end

lib/active_model_serializers/adapter/json_api/fragment_cache.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def fragment_cache(root, cached_hash, non_cached_hash)
88
no_root_cache = cached_hash.delete_if { |key, _value| key == core_cached[0] }
99
no_root_non_cache = non_cached_hash.delete_if { |key, _value| key == core_non_cached[0] }
1010
cached_resource = (core_cached[1]) ? core_cached[1].deep_merge(core_non_cached[1]) : core_non_cached[1]
11-
hash = (root) ? { root => cached_resource } : cached_resource
11+
hash = root ? { root => cached_resource } : cached_resource
1212

1313
hash.deep_merge no_root_non_cache.deep_merge no_root_cache
1414
end

lib/active_model_serializers/deprecate.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def deprecate(name, replacement)
3333
alias_method old, name
3434
class_eval do
3535
define_method(name) do |*args, &block|
36-
target = self.is_a?(Module) ? "#{self}." : "#{self.class}#"
36+
target = is_a?(Module) ? "#{self}." : "#{self.class}#"
3737
msg = ["NOTE: #{target}#{name} is deprecated",
3838
replacement == :none ? ' with no replacement' : "; use #{replacement} instead",
3939
"\n#{target}#{name} called from #{ActiveModelSerializers.location_of_caller.join(":")}"

test/action_controller/adapter_selector_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def test_render_using_adapter_override
3636
type: 'profiles',
3737
attributes: {
3838
name: 'Name 1',
39-
description: 'Description 1',
39+
description: 'Description 1'
4040
}
4141
}
4242
}

0 commit comments

Comments
 (0)