Skip to content

Commit cbbd3c2

Browse files
committed
feat: linter
1 parent 6420d15 commit cbbd3c2

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

lib/flagsmith/engine/evaluation/core.rb

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,7 @@ def evaluate_segments(evaluation_context)
3434
identity_segments = get_segments_from_context(evaluation_context)
3535

3636
segments = identity_segments.map do |segment|
37-
result = {
38-
name: segment[:name]
39-
}
40-
41-
result[:metadata] = segment[:metadata] if segment[:metadata]
42-
43-
result
37+
{ name: segment[:name], metadata: segment[:metadata] }.compact
4438
end
4539

4640
segment_overrides = process_segment_overrides(identity_segments)
@@ -131,7 +125,7 @@ def get_multivariate_feature_value(feature, identity_key)
131125
# returns boolean
132126
def should_apply_override(override, existing_overrides)
133127
current_override = existing_overrides[override[:name]]
134-
!current_override || is_stronger_priority?(override[:priority], current_override[:feature][:priority])
128+
!current_override || stronger_priority?(override[:priority], current_override[:feature][:priority])
135129
end
136130

137131
private
@@ -148,7 +142,7 @@ def get_identity_key(evaluation_context)
148142
end
149143

150144
# returns boolean
151-
def is_stronger_priority?(priority_a, priority_b)
145+
def stronger_priority?(priority_a, priority_b)
152146
(priority_a || WEAKEST_PRIORITY) < (priority_b || WEAKEST_PRIORITY)
153147
end
154148
end

lib/flagsmith/engine/segments/evaluator.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ def evaluate_rule_conditions(rule_type, condition_results)
196196
def get_trait_value(property, context)
197197
if property.start_with?('$.')
198198
context_value = get_context_value(property, context)
199-
return context_value if !context_value.nil? && is_primitive?(context_value)
199+
return context_value if !context_value.nil? && primitive?(context_value)
200200
end
201201

202202
traits = context.dig(:identity, :traits) || {}
@@ -232,7 +232,7 @@ def get_identity_key_from_context(context)
232232
#
233233
# @param value [Object] The value to check
234234
# @return [Boolean] True if value is primitive (not an object or array)
235-
def is_primitive?(value)
235+
def primitive?(value)
236236
return true if value.nil?
237237

238238
!(value.is_a?(Hash) || value.is_a?(Array))

lib/flagsmith/engine/segments/models.rb

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def initialize(operator:, value:, property: nil)
5454
@property = property
5555
end
5656

57-
def match_trait_value?(trait_value)
57+
def match_trait_value?(trait_value) # rubocop:disable Metrics/MethodLength
5858
if @value.is_a?(String) && @value.match?(/:semver$/)
5959
begin
6060
trait_value = Semantic::Version.new(trait_value.to_s.gsub(/:semver$/, ''))
@@ -73,8 +73,7 @@ def match_trait_value?(trait_value)
7373
MATCHING_FUNCTIONS[operator]&.call(trait_value, formatted_value)
7474
end
7575

76-
# rubocop:disable Metrics/AbcSize
77-
def format_to_type_of(input)
76+
def format_to_type_of(input) # rubocop:disable Metrics/AbcSize
7877
{
7978
'String' => ->(v) { v.to_s },
8079
'Semantic::Version' => ->(v) { Semantic::Version.new(v.to_s.gsub(/:semver$/, '')) },
@@ -91,7 +90,6 @@ def format_to_type_of(input)
9190
}
9291
}[input.class.to_s]
9392
end
94-
# rubocop:enable Metrics/AbcSize
9593

9694
def match_modulo_value(trait_value)
9795
divisor, remainder = @value.split('|')
@@ -100,10 +98,8 @@ def match_modulo_value(trait_value)
10098
false
10199
end
102100

103-
def match_in_value(trait_value)
104-
return false if trait_value.nil? || trait_value.is_a?(TrueClass) || trait_value.is_a?(FalseClass)
105-
106-
return false if [true, false].include? trait_value
101+
def match_in_value(trait_value) # rubocop:disable Metrics/AbcSize
102+
return false if trait_value.nil? || trait_value.is_a?(TrueClass) || trait_value.is_a?(FalseClass) || ([true, false].include? trait_value)
107103

108104
return @value.include?(trait_value.to_s) if @value.is_a?(Array)
109105

@@ -114,7 +110,6 @@ def match_in_value(trait_value)
114110
rescue JSON::ParserError
115111
end
116112
end
117-
118113
@value.to_s.split(',').include?(trait_value.to_s)
119114
end
120115

0 commit comments

Comments
 (0)