ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-22 22:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rubocop autocorrect

Browse Source
This commit is contained in:
Benjamin Fleischer 2016-02-04 22:39:20 -06:00 committed by Yohan Robert
parent ec36ab7f60
commit a26d3e4425
21 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/active_model/serializable_resource.rb
View File

@ -33,7 +33,7 @@ module ActiveModel
def adapter
@adapter ||= ActiveModelSerializers::Adapter.create(serializer_instance, adapter_opts)
end
alias_method :adapter_instance, :adapter
alias adapter_instance adapter
def serializer_instance
@serializer_instance ||= serializer.new(resource, serializer_opts)
@ -54,7 +54,7 @@ module ActiveModel
@serializer
end
end
alias_method :serializer_class, :serializer
alias serializer_class serializer
# True when no explicit adapter given, or explicit appear is truthy (non-nil)
# False when explicit adapter is falsy (nil or false)
@ -63,7 +63,7 @@ module ActiveModel
end
def serializer?
use_adapter? && !!(serializer)
use_adapter? && !!serializer
end
protected

2
lib/active_model/serializer/caching.rb
View File

@ -92,7 +92,7 @@ module ActiveModel
self._cache_key = options.delete(:key)
self._cache_only = options.delete(:only)
self._cache_except = options.delete(:except)
self._cache_options = (options.empty?) ? nil : options
self._cache_options = options.empty? ? nil : options
end
end
end

2
lib/active_model/serializer/version.rb
View File

@ -1,5 +1,5 @@
module ActiveModel
class Serializer
VERSION = '0.10.0.rc4'
VERSION = '0.10.0.rc4'.freeze
end
end

4
lib/active_model_serializers/adapter.rb
View File

@ -1,7 +1,7 @@
module ActiveModelSerializers
module Adapter
UnknownAdapterError = Class.new(ArgumentError)
ADAPTER_MAP = {}
ADAPTER_MAP = {}.freeze
private_constant :ADAPTER_MAP if defined?(private_constant)
require 'active_model_serializers/adapter/fragment_cache'
require 'active_model_serializers/adapter/cached_serializer'
@ -49,7 +49,7 @@ module ActiveModelSerializers
# 'Json' will both register as 'json'.
def register(name, klass = name)
name = name.to_s.gsub(/\AActiveModelSerializers::Adapter::/, ''.freeze)
adapter_map.update(name.underscore => klass)
adapter_map[name.underscore] = klass
self
end

2
lib/active_model_serializers/adapter/cached_serializer.rb
View File

@ -38,7 +38,7 @@ module ActiveModelSerializers
def object_cache_key
object_time_safe = @cached_serializer.object.updated_at
object_time_safe = object_time_safe.strftime('%Y%m%d%H%M%S%9N') if object_time_safe.respond_to?(:strftime)
(@klass._cache_key) ? "#{@klass._cache_key}/#{@cached_serializer.object.id}-#{object_time_safe}" : @cached_serializer.object.cache_key
@klass._cache_key ? "#{@klass._cache_key}/#{@cached_serializer.object.id}-#{object_time_safe}" : @cached_serializer.object.cache_key
end
# find all cache_key for the collection_serializer

2
lib/active_model_serializers/adapter/fragment_cache.rb
View File

@ -46,7 +46,7 @@ module ActiveModelSerializers
# 3. Add non-cached attributes to non-cached Serializer
def cached_attributes(klass, serializers)
attributes = serializer.class._attributes
cached_attributes = (klass._cache_only) ? klass._cache_only : attributes.reject { |attr| klass._cache_except.include?(attr) }
cached_attributes = klass._cache_only ? klass._cache_only : attributes.reject { |attr| klass._cache_except.include?(attr) }
non_cached_attributes = attributes - cached_attributes
cached_attributes.each do |attribute|

2
lib/active_model_serializers/adapter/json_api/deserialization.rb
View File

@ -188,7 +188,7 @@ module ActiveModelSerializers
end
polymorphic = (options[:polymorphic] || []).include?(assoc_name.to_sym)
hash.merge!("#{prefix_key}_type".to_sym => assoc_data['type']) if polymorphic
hash["#{prefix_key}_type".to_sym] = assoc_data['type'] if polymorphic
hash
end

2
lib/active_model_serializers/adapter/json_api/fragment_cache.rb
View File

@ -8,7 +8,7 @@ module ActiveModelSerializers
no_root_cache = cached_hash.delete_if { |key, _value| key == core_cached[0] }
no_root_non_cache = non_cached_hash.delete_if { |key, _value| key == core_non_cached[0] }
cached_resource = (core_cached[1]) ? core_cached[1].deep_merge(core_non_cached[1]) : core_non_cached[1]
hash = (root) ? { root => cached_resource } : cached_resource
hash = root ? { root => cached_resource } : cached_resource
hash.deep_merge no_root_non_cache.deep_merge no_root_cache
end

2
lib/active_model_serializers/deprecate.rb
View File

@ -33,7 +33,7 @@ module ActiveModelSerializers
alias_method old, name
class_eval do
define_method(name) do |*args, &block|
target = self.is_a?(Module) ? "#{self}." : "#{self.class}#"
target = is_a?(Module) ? "#{self}." : "#{self.class}#"
msg = ["NOTE: #{target}#{name} is deprecated",
replacement == :none ? ' with no replacement' : "; use #{replacement} instead",
"\n#{target}#{name} called from #{ActiveModelSerializers.location_of_caller.join(":")}"

2
test/action_controller/adapter_selector_test.rb
View File

@ -36,7 +36,7 @@ module ActionController
type: 'profiles',
attributes: {
name: 'Name 1',
description: 'Description 1',
description: 'Description 1'
}
}
}

4
test/action_controller/json_api/pagination_test.rb
View File

@ -8,8 +8,8 @@ module ActionController
module Serialization
class JsonApi
class PaginationTest < ActionController::TestCase
KAMINARI_URI = 'http://test.host/action_controller/serialization/json_api/pagination_test/pagination_test/render_pagination_using_kaminari'
WILL_PAGINATE_URI = 'http://test.host/action_controller/serialization/json_api/pagination_test/pagination_test/render_pagination_using_will_paginate'
KAMINARI_URI = 'http://test.host/action_controller/serialization/json_api/pagination_test/pagination_test/render_pagination_using_kaminari'.freeze
WILL_PAGINATE_URI = 'http://test.host/action_controller/serialization/json_api/pagination_test/pagination_test/render_pagination_using_will_paginate'.freeze
class PaginationTestController < ActionController::Base
def setup

2
test/action_controller/serialization_test.rb
View File

@ -91,7 +91,7 @@ module ActionController
expires_in = [
PostSerializer._cache_options[:expires_in],
CommentSerializer._cache_options[:expires_in],
CommentSerializer._cache_options[:expires_in]
].max + 200
Timecop.travel(Time.zone.now + expires_in) do

2
test/adapter/json_api/belongs_to_test.rb
View File

@ -43,7 +43,7 @@ module ActiveModelSerializers
type: 'posts',
attributes: {
title: 'New Post',
body: 'Body',
body: 'Body'
},
relationships: {
comments: { data: [{ type: 'comments', id: '1' }] },

4
test/adapter/json_api/linked_test.rb
View File

@ -98,7 +98,7 @@ module ActiveModelSerializers
id: '2',
type: 'comments',
attributes: {
body: 'ZOMG ANOTHER COMMENT',
body: 'ZOMG ANOTHER COMMENT'
},
relationships: {
post: { data: { type: 'posts', id: '10' } },
@ -141,7 +141,7 @@ module ActiveModelSerializers
type: 'bios',
attributes: {
rating: nil,
content: 'Rails Contributor',
content: 'Rails Contributor'
},
relationships: {
author: { data: { type: 'authors', id: '2' } }

2
test/adapter/json_api/pagination_links_test.rb
View File

@ -8,7 +8,7 @@ module ActiveModelSerializers
module Adapter
class JsonApi
class PaginationLinksTest < ActiveSupport::TestCase
URI = 'http://example.com'
URI = 'http://example.com'.freeze
def setup
ActionController::Base.cache_store.clear

10
test/adapter/json_api/relationship_test.rb
View File

@ -77,22 +77,22 @@ module ActiveModelSerializers
end
def test_relationship_block_link
links = { self: proc { "#{object.id}" } }
expected = { links: { self: "#{@blog.id}" } }
links = { self: proc { object.id.to_s } }
expected = { links: { self: @blog.id.to_s } }
test_relationship(expected, links: links)
end
def test_relationship_block_link_with_meta
links = {
self: proc do
href "#{object.id}"
href object.id.to_s
meta(id: object.id)
end
}
expected = {
links: {
self: {
href: "#{@blog.id}",
href: @blog.id.to_s,
meta: { id: @blog.id }
}
}
@ -122,7 +122,7 @@ module ActiveModelSerializers
links = {
self: 'a link',
related: proc do
href "#{object.id}"
href object.id.to_s
meta object.id
end

2
test/support/rails5_shims.rb
View File

@ -1,7 +1,7 @@
module Rails5Shims
module ControllerTests
# https://github.com/rails/rails/blob/b217354/actionpack/lib/action_controller/test_case.rb
REQUEST_KWARGS = [:params, :session, :flash, :method, :body, :xhr]
REQUEST_KWARGS = [:params, :session, :flash, :method, :body, :xhr].freeze
# Fold kwargs from test request into args
# Band-aid for DEPRECATION WARNING

2
test/support/serialization_testing.rb
View File

@ -21,7 +21,7 @@ module SerializationTesting
ensure
ActiveModelSerializers.config.adapter = old_adapter
end
alias_method :with_configured_adapter, :with_adapter
alias with_configured_adapter with_adapter
def with_config(hash)
old_config = config.dup