Skip to content

Commit 117a962

Browse files
authored
Revert "Updated evaluator"
1 parent 71c04c2 commit 117a962

File tree

4 files changed

+4
-110
lines changed

4 files changed

+4
-110
lines changed

lib/splitclient-rb/engine/models/label.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ class SplitIoClient::Engine::Models::Label
66
NOT_IN_SPLIT = 'not in split'.freeze
77
NOT_READY = 'not ready'.freeze
88
NOT_FOUND = 'definition not found'.freeze
9-
PREREQUISITES_NOT_MET = 'prerequisites not met'.freeze
109
end

lib/splitclient-rb/engine/parser/evaluator.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ def split_configurations(treatment, split)
3838
end
3939

4040
def match(split, keys, attributes)
41-
prerequisites_matcher = SplitIoClient::PrerequisitesMatcher.new(split[:prerequisites], @config.split_logger)
42-
return treatment_hash(Models::Label::PREREQUISITES_NOT_MET, split[:defaultTreatment], split[:changeNumber], split_configurations(split[:defaultTreatment], split)) unless prerequisites_matcher.match?(
43-
matching_key: keys[:matching_key],
44-
bucketing_key: keys[:bucketing_key],
45-
evaluator: self,
46-
attributes: attributes
47-
)
48-
4941
in_rollout = false
5042
key = keys[:bucketing_key] ? keys[:bucketing_key] : keys[:matching_key]
5143
legacy_algo = (split[:algo] == 1 || split[:algo] == nil) ? true : false

spec/engine/parser/evaluator_spec.rb

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
require 'spec_helper'
44

55
describe SplitIoClient::Engine::Parser::Evaluator do
6-
let(:config) { SplitIoClient::SplitConfig.new(logger: Logger.new(StringIO.new)) }
7-
let(:segments_repository) { SplitIoClient::Cache::Repositories::SegmentsRepository.new(config) }
8-
let(:rule_based_segments_repository) { SplitIoClient::Cache::Repositories::RuleBasedSegmentsRepository.new(config) }
6+
let(:segments_repository) { SplitIoClient::Cache::Repositories::SegmentsRepository.new(@default_config) }
7+
let(:rule_based_segments_repository) { SplitIoClient::Cache::Repositories::RuleBasedSegmentsRepository.new(@default_config) }
98
let(:flag_sets_repository) {SplitIoClient::Cache::Repositories::MemoryFlagSetsRepository.new([])}
109
let(:flag_set_filter) {SplitIoClient::Cache::Filter::FlagSetsFilter.new([])}
11-
let(:splits_repository) { SplitIoClient::Cache::Repositories::SplitsRepository.new(config, flag_sets_repository, flag_set_filter) }
12-
let(:evaluator) { described_class.new(segments_repository, splits_repository, rule_based_segments_repository, config) }
10+
let(:splits_repository) { SplitIoClient::Cache::Repositories::SplitsRepository.new(@default_config, flag_sets_repository, flag_set_filter) }
11+
let(:evaluator) { described_class.new(segments_repository, splits_repository, rule_based_segments_repository, true) }
1312

1413
let(:killed_split) { { killed: true, defaultTreatment: 'default' } }
1514
let(:archived_split) { { status: 'ARCHIVED' } }
@@ -18,11 +17,6 @@
1817
SplitIoClient.root, 'spec/test_data/splits/engine/dependency_matcher.json'
1918
)), symbolize_names: true)
2019
end
21-
let(:split_data_prereq) do
22-
JSON.parse(File.read(File.join(
23-
SplitIoClient.root, 'spec/test_data/splits/engine/prerequisites_matcher.json'
24-
)), symbolize_names: true)
25-
end
2620

2721
it 'returns killed treatment' do
2822
expect(evaluator.evaluate_feature_flag({ matching_key: 'foo' }, killed_split))
@@ -46,16 +40,4 @@
4640
evaluator.evaluate_feature_flag({ bucketing_key: nil, matching_key: 'fake_user_id_1' }, split_data[:ff][:d][1])
4741
end
4842
end
49-
50-
context 'prerequisites matcher' do
51-
it 'test match' do
52-
splits_repository.update([split_data_prereq[:ff][:d][0], split_data_prereq[:ff][:d][1]], [], 1234)
53-
54-
result = evaluator.evaluate_feature_flag({ bucketing_key: nil, matching_key: 'fake_user' }, 'test_prereq')
55-
expect(result[:treatment]).to eq('off_default')
56-
57-
result = evaluator.evaluate_feature_flag({ bucketing_key: nil, matching_key: 'fake_user_id_1' }, 'test_prereq')
58-
expect(result[:treatment]).to eq('on')
59-
end
60-
end
6143
end

spec/test_data/splits/engine/prerequisites_matcher.json

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)