Skip to content

Commit 6a6a129

Browse files
committed
feat: misc
1 parent 741ceeb commit 6a6a129

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/flagsmith/engine/segments/evaluator.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ module Engine
99
module Segments
1010
# Evaluator methods
1111
module Evaluator
12-
extend self
1312
include Flagsmith::Engine::Segments::Constants
1413
include Flagsmith::Engine::Utils::HashFunc
1514

15+
module_function
1616
# Context-based segment evaluation (new approach)
1717
# Returns all segments that the identity belongs to based on segment rules evaluation
1818
#
@@ -111,7 +111,7 @@ def traits_match_segment_rule_from_context(rule, segment_key, context)
111111
# @param context [Hash] The evaluation context
112112
# @return [Boolean] True if conditions match according to rule type
113113
def evaluate_conditions_from_context(rule, segment_key, context)
114-
return true if rule[:conditions].nil? || rule[:conditions].empty?
114+
return true unless rule[:conditions]&.any?
115115

116116
condition_results = rule[:conditions].map do |condition|
117117
traits_match_segment_condition_from_context(condition, segment_key, context)

lib/flagsmith/engine/segments/models.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def match_trait_value?(trait_value)
5858
if @value.is_a?(String) && @value.match?(/:semver$/)
5959
begin
6060
trait_value = Semantic::Version.new(trait_value.to_s.gsub(/:semver$/, ''))
61-
rescue StandardError
61+
rescue ArgumentError, Semantic::Version::ValidationFailed => _e
6262
return false
6363
end
6464
end

0 commit comments

Comments
 (0)