Skip to content

Commit 228cc1c

Browse files
committed
Rubocop: Consistent spacing
1 parent bdfe13c commit 228cc1c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+278
-339
lines changed

.rubocop_todo.yml

Lines changed: 123 additions & 155 deletions
Large diffs are not rendered by default.

active_model_serializers.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
99
spec.platform = Gem::Platform::RUBY
1010
spec.authors = ['Steve Klabnik']
1111
spec.email = ['[email protected]']
12-
spec.summary = %q{Conventions-based JSON generation for Rails.}
13-
spec.description = %q{ActiveModel::Serializers allows you to generate your JSON in an object-oriented and convention-driven manner.}
12+
spec.summary = 'Conventions-based JSON generation for Rails.'
13+
spec.description = 'ActiveModel::Serializers allows you to generate your JSON in an object-oriented and convention-driven manner.'
1414
spec.homepage = 'https://github.com/rails-api/active_model_serializers'
1515
spec.license = 'MIT'
1616

lib/action_controller/serialization.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def serialization_scope
2020
end
2121

2222
def get_serializer(resource, options = {})
23-
if ! use_adapter?
23+
if !use_adapter?
2424
warn 'ActionController::Serialization#use_adapter? has been removed. '\
2525
"Please pass 'adapter: false' or see ActiveSupport::SerializableResource#serialize"
2626
options[:adapter] = false

lib/active_model/serializable_resource.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require 'set'
22
module ActiveModel
33
class SerializableResource
4-
54
ADAPTER_OPTION_KEYS = Set.new([:include, :fields, :adapter])
65

76
def initialize(resource, options = {})
@@ -79,6 +78,5 @@ def serializer?
7978
ActiveModelSerializers.silence_warnings do
8079
attr_reader :resource, :adapter_opts, :serializer_opts
8180
end
82-
8381
end
8482
end

lib/active_model/serializer.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ class Serializer
1313
include Configuration
1414
include Associations
1515

16-
1716
# Matches
1817
# "c:/git/emberjs/ember-crm-backend/app/serializers/lead_serializer.rb:1:in `<top (required)>'"
1918
# AND

lib/active_model/serializer/adapter/fragment_cache.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ module ActiveModel
22
class Serializer
33
class Adapter
44
class FragmentCache
5-
65
attr_reader :serializer
76

87
def initialize(adapter, serializer, options)
@@ -35,7 +34,7 @@ def fetch
3534

3635
def cached_attributes(klass, serializers)
3736
attributes = serializer.class._attributes
38-
cached_attributes = (klass._cache_only) ? klass._cache_only : attributes.reject {|attr| klass._cache_except.include?(attr) }
37+
cached_attributes = (klass._cache_only) ? klass._cache_only : attributes.reject { |attr| klass._cache_except.include?(attr) }
3938
non_cached_attributes = attributes - cached_attributes
4039

4140
cached_attributes.each do |attribute|
@@ -60,15 +59,15 @@ def fragment_serializer(name, klass)
6059
Object.const_set cached, Class.new(ActiveModel::Serializer) unless Object.const_defined?(cached)
6160
Object.const_set non_cached, Class.new(ActiveModel::Serializer) unless Object.const_defined?(non_cached)
6261

63-
klass._cache_options ||= {}
62+
klass._cache_options ||= {}
6463
klass._cache_options[:key] = klass._cache_key if klass._cache_key
6564

6665
cached.constantize.cache(klass._cache_options)
6766

6867
cached.constantize.fragmented(serializer)
6968
non_cached.constantize.fragmented(serializer)
7069

71-
serializers = {cached: cached, non_cached: non_cached}
70+
serializers = { cached: cached, non_cached: non_cached }
7271
cached_attributes(klass, serializers)
7372
serializers
7473
end

lib/active_model/serializer/adapter/json.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ def serializable_hash(options = nil)
4646
def fragment_cache(cached_hash, non_cached_hash)
4747
Json::FragmentCache.new().fragment_cache(cached_hash, non_cached_hash)
4848
end
49-
5049
end
5150
end
5251
end

lib/active_model/serializer/adapter/json/fragment_cache.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ class Serializer
44
class Adapter
55
class Json < Adapter
66
class FragmentCache
7-
87
def fragment_cache(cached_hash, non_cached_hash)
98
non_cached_hash.merge cached_hash
109
end
11-
1210
end
1311
end
1412
end

lib/active_model/serializer/adapter/json_api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def add_relationships(resource, name, serializers)
5050
resource[:relationships][name][:data] += serializers.map { |serializer| { type: serializer.json_api_type, id: serializer.id.to_s } }
5151
end
5252

53-
def add_relationship(resource, name, serializer, val=nil)
53+
def add_relationship(resource, name, serializer, val = nil)
5454
resource[:relationships] ||= {}
5555
resource[:relationships][name] = { data: val }
5656

lib/active_model/serializer/adapter/json_api/fragment_cache.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ class Serializer
44
class Adapter
55
class JsonApi < Adapter
66
class FragmentCache
7-
87
def fragment_cache(root, cached_hash, non_cached_hash)
98
hash = {}
109
core_cached = cached_hash.first
1110
core_non_cached = non_cached_hash.first
12-
no_root_cache = cached_hash.delete_if {|key, value| key == core_cached[0] }
13-
no_root_non_cache = non_cached_hash.delete_if {|key, value| key == core_non_cached[0] }
11+
no_root_cache = cached_hash.delete_if { |key, value| key == core_cached[0] }
12+
no_root_non_cache = non_cached_hash.delete_if { |key, value| key == core_non_cached[0] }
1413
cached_resource = (core_cached[1]) ? core_cached[1].deep_merge(core_non_cached[1]) : core_non_cached[1]
1514
hash = (root) ? { root => cached_resource } : cached_resource
1615

1716
hash.deep_merge no_root_non_cache.deep_merge no_root_cache
1817
end
19-
2018
end
2119
end
2220
end

0 commit comments

Comments
 (0)