Skip to content

Commit

Permalink
Fix Rubocop offences
Browse files Browse the repository at this point in the history
  • Loading branch information
Nitemaeric committed Oct 27, 2024
1 parent b8f3ae7 commit b39c7fe
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
inherit_from: .rubocop_todo.yml

AllCops:
TargetRubyVersion: 3.0
TargetRubyVersion: 3.2.5
NewCops: disable
SuggestExtensions: false

Expand Down
4 changes: 2 additions & 2 deletions lib/transmutation/class_attributes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ def class_attribute(
instance_writer: instance_accessor,
default: nil
)
class_attribute_reader(*names, instance_reader: instance_reader, default: default)
class_attribute_writer(*names, instance_writer: instance_writer, default: default)
class_attribute_reader(*names, instance_reader:, default:)
class_attribute_writer(*names, instance_writer:, default:)
end

def class_attribute_reader(*names, instance_reader: true, default: nil)
Expand Down
4 changes: 4 additions & 0 deletions lib/transmutation/object_serializer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# frozen_string_literal: true

module Transmutation
# Default object serializer.
# This is used when no serializer is found for the given object.
class ObjectSerializer < Serializer
def as_json(options = {})
object.as_json(options)
Expand Down
8 changes: 4 additions & 4 deletions lib/transmutation/serialization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ module Serialization
def serialize(object, namespace: nil, serializer: nil, depth: 0, max_depth: 1)
if object.respond_to?(:map) && !object.respond_to?(:to_hash)
return object.map do |item|
serialize(item, namespace: namespace, serializer: serializer, depth: depth, max_depth: max_depth)
serialize(item, namespace:, serializer:, depth:, max_depth:)
end
end

lookup_serializer(object, namespace: namespace, serializer: serializer)
.new(object, depth: depth, max_depth: max_depth)
lookup_serializer(object, namespace:, serializer:)
.new(object, depth:, max_depth:)
end

# Lookup the serializer for the given object.
Expand All @@ -32,7 +32,7 @@ def serialize(object, namespace: nil, serializer: nil, depth: 0, max_depth: 1)
# @return [Class<Transmutation::Serializer>] The serializer for the given object.
#
def lookup_serializer(object, namespace: nil, serializer: nil)
Lookup.new(self, namespace: namespace).serializer_for(object, serializer: serializer)
Lookup.new(self, namespace:).serializer_for(object, serializer:)
end

private_class_method def self.included(base)
Expand Down
6 changes: 3 additions & 3 deletions lib/transmutation/serialization/lookup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ def initialize(caller, namespace: nil)
# - Api::Chat::UserSerializer
# - Chat::UserSerializer
def serializer_for(object, serializer: nil)
serializer_name = serializer_name_for(object, serializer: serializer)
serializer_name = serializer_name_for(object, serializer:)

return constantize_serializer!(Object, serializer_name, object: object) if serializer_name.start_with?("::")
return constantize_serializer!(Object, serializer_name, object:) if serializer_name.start_with?("::")

potential_namespaces.each do |potential_namespace|
return potential_namespace.const_get(serializer_name) if potential_namespace.const_defined?(serializer_name)
Expand Down Expand Up @@ -76,7 +76,7 @@ def caller_namespace
end

def constantize_serializer!(namespace, name, object:)
raise SerializerNotFound.new(object, namespace: namespace, name: name) unless namespace.const_defined?(name)
raise SerializerNotFound.new(object, namespace:, name:) unless namespace.const_defined?(name)

namespace.const_get(name)
end
Expand Down
4 changes: 2 additions & 2 deletions lib/transmutation/serialization/rendering.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ module Serialization
module Rendering
def render(json: nil, serialize: true, namespace: nil, serializer: nil, max_depth: 1, **args)
return super(**args) unless json
return super(**args, json: json) unless serialize
return super(**args, json:) unless serialize

super(**args, json: serialize(json, namespace: namespace, serializer: serializer, max_depth: max_depth))
super(**args, json: serialize(json, namespace:, serializer:, max_depth:))
end
end
end
Expand Down
8 changes: 4 additions & 4 deletions lib/transmutation/serializer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class << self
# end
# end
def attribute(attribute_name, &block)
attributes_config[attribute_name] = { block: block }
attributes_config[attribute_name] = { block: }
end

# Define an association to be serialized
Expand All @@ -76,14 +76,14 @@ def association(association_name, namespace: nil, serializer: nil)
block = lambda do
serialize(
object.send(association_name),
namespace: namespace,
serializer: serializer,
namespace:,
serializer:,
depth: @depth + 1,
max_depth: @max_depth
)
end

attributes_config[association_name] = { block: block, association: true }
attributes_config[association_name] = { block:, association: true }
end

alias belongs_to association
Expand Down
4 changes: 2 additions & 2 deletions spec/support/markdown_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def parse_markdown_table(markdown, nil_value: "nil")
header_names = header_row.delete_prefix("|").split("|")&.map(&:strip)

rows.map do |raw_row|
parse_markdown_row(raw_row, nil_value: nil_value, header_names: header_names)
parse_markdown_row(raw_row, nil_value:, header_names:)
end
end

Expand All @@ -20,7 +20,7 @@ def parse_markdown_row(raw_row, nil_value:, header_names:)
row = raw_row.delete_prefix("|").split("|")&.map(&:strip)

row.each_with_object({}).with_index do |(value, hash), index|
hash[header_names[index].to_sym] = cast_nil_value(value, nil_value: nil_value)
hash[header_names[index].to_sym] = cast_nil_value(value, nil_value:)
end
end
end
2 changes: 1 addition & 1 deletion spec/system/dummy/models/post.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def to_json(options = {})

def as_json(_options = {})
{
id: id,
id:,
title: first_name,
body: last_name
}
Expand Down
10 changes: 5 additions & 5 deletions spec/system/dummy/models/product.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ def to_json(options = {})

def as_json(_options = {})
{
id: id,
name: name,
description: description,
price_subunit: price_subunit,
price_currency: price_currency
id:,
name:,
description:,
price_subunit:,
price_currency:
}
end
end
6 changes: 3 additions & 3 deletions spec/system/dummy/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ def to_json(options = {})

def as_json(_options = {})
{
id: id,
first_name: first_name,
last_name: last_name
id:,
first_name:,
last_name:
}
end
end
2 changes: 1 addition & 1 deletion transmutation.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "zeitwerk", "~> 2.6.15"
spec.add_dependency "activesupport", "~> 7.2"
spec.add_dependency "zeitwerk", "~> 2.6.15"

# For more information and examples about making a new gem, check out our
# guide at: https://bundler.io/guides/creating_gem.html
Expand Down

0 comments on commit b39c7fe

Please sign in to comment.