Skip to content

Commit e79bfb5

Browse files
committed
Resolve some RuboCop offenses
1 parent bba715d commit e79bfb5

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

lib/grape-swagger/representable/parser.rb

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
module GrapeSwagger
44
module Representable
55
class Parser
6-
attr_reader :model
7-
attr_reader :endpoint
6+
attr_reader :model, :endpoint
87

98
def initialize(model, endpoint)
109
@model = model
@@ -61,7 +60,9 @@ def parse_representer_property(property)
6160
end
6261
end
6362

64-
def representer_mapping(representer, documentation, property, is_a_collection = false, is_a_decorator = false, nested = nil)
63+
def representer_mapping(
64+
representer, documentation, property, is_a_collection = false, is_a_decorator = false, nested = nil
65+
)
6566
if nested.nil? && is_a_decorator
6667
name = endpoint.send(:expose_params_from_model, representer)
6768

@@ -105,7 +106,9 @@ def parse_representer(representer)
105106
properties = representer.map.each_with_object({}) do |value, property|
106107
property_name = value[:as].try(:call) || value.name
107108
hidden_property = value[:documentation]&.[](:hidden)
109+
108110
next if hidden_property && (hidden_property.is_a?(Proc) ? hidden_property.call : hidden_property)
111+
109112
property[property_name] = parse_representer_property(value)
110113
end
111114

@@ -125,15 +128,17 @@ def combine(representer, nested)
125128

126129
overrided = (attributes.keys & nested_attributes.keys)
127130

128-
final_required = (required + nested_required)
129-
.uniq
130-
.select { |k| (overrided.include?(k) && nested_required.include?(k)) || !overrided.include?(k) }
131+
final_required =
132+
(required + nested_required)
133+
.uniq
134+
.select { |k| (overrided.include?(k) && nested_required.include?(k)) || !overrided.include?(k) }
131135

132136
[final_attributes, final_required]
133137
end
134138

135139
def with_required(hash, required)
136140
return hash if required.empty?
141+
137142
hash[:required] = required
138143
hash
139144
end

0 commit comments

Comments
 (0)