Skip to content

Commit f4ced37

Browse files
chillaqchillaq
committed
polish
1 parent aa33699 commit f4ced37

42 files changed

Lines changed: 9 additions & 94 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ 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-
)
41+
if split.key?(:prerequisites) && !split[:prerequisites].nil?
42+
prerequisites_matcher = SplitIoClient::PrerequisitesMatcher.new(split[:prerequisites], @config.split_logger)
43+
return treatment_hash(Models::Label::PREREQUISITES_NOT_MET, split[:defaultTreatment], split[:changeNumber], split_configurations(split[:defaultTreatment], split)) unless prerequisites_matcher.match?(
44+
matching_key: keys[:matching_key],
45+
bucketing_key: keys[:bucketing_key],
46+
evaluator: self,
47+
attributes: attributes
48+
)
49+
end
4850

4951
in_rollout = false
5052
key = keys[:bucketing_key] ? keys[:bucketing_key] : keys[:matching_key]

‎spec/test_data/integrations/splits.json‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"impressionsDisabled": false,
55
"trafficTypeName": "account",
66
"name": "FACUNDO_TEST",
7-
"prerequisites": [],
87
"trafficAllocation": 59,
98
"trafficAllocationSeed": -2108186082,
109
"seed": -1947050785,
@@ -125,7 +124,6 @@
125124
"impressionsDisabled": false,
126125
"trafficTypeName": "account",
127126
"name": "testing",
128-
"prerequisites": [],
129127
"trafficAllocation": 100,
130128
"trafficAllocationSeed": 527505678,
131129
"seed": -1716462249,
@@ -240,7 +238,6 @@
240238
"impressionsDisabled": false,
241239
"trafficTypeName": "account",
242240
"name": "testing222",
243-
"prerequisites": [],
244241
"trafficAllocation": 100,
245242
"trafficAllocationSeed": -397360967,
246243
"seed": 1058132210,
@@ -295,7 +292,6 @@
295292
"impressionsDisabled": false,
296293
"trafficTypeName": "account",
297294
"name": "a_new_split_2",
298-
"prerequisites": [],
299295
"trafficAllocation": 99,
300296
"trafficAllocationSeed": -1349440646,
301297
"seed": -1536389703,
@@ -562,7 +558,6 @@
562558
"impressionsDisabled": false,
563559
"trafficTypeName": "account",
564560
"name": "test_string_without_attr",
565-
"prerequisites": [],
566561
"trafficAllocation": 100,
567562
"trafficAllocationSeed": -782597068,
568563
"seed": -1682478887,
@@ -633,7 +628,6 @@
633628
"impressionsDisabled": false,
634629
"trafficTypeName": "user",
635630
"name": "Test",
636-
"prerequisites": [],
637631
"trafficAllocation": 100,
638632
"trafficAllocationSeed": 217539832,
639633
"seed": 52164426,
@@ -760,7 +754,6 @@
760754
"impressionsDisabled": false,
761755
"trafficTypeName": "account",
762756
"name": "Test_Save_1",
763-
"prerequisites": [],
764757
"trafficAllocation": 100,
765758
"trafficAllocationSeed": -257595325,
766759
"seed": -665945237,
@@ -908,7 +901,6 @@
908901
"impressionsDisabled": false,
909902
"trafficTypeName": "account",
910903
"name": "TEST",
911-
"prerequisites": [],
912904
"trafficAllocation": 100,
913905
"trafficAllocationSeed": -673356676,
914906
"seed": -511119211,
@@ -958,7 +950,6 @@
958950
"impressionsDisabled": false,
959951
"trafficTypeName": "user",
960952
"name": "benchmark_jw_1",
961-
"prerequisites": [],
962953
"trafficAllocation": 100,
963954
"trafficAllocationSeed": 987354894,
964955
"seed": 1292874260,
@@ -1046,7 +1037,6 @@
10461037
"impressionsDisabled": false,
10471038
"trafficTypeName": "user",
10481039
"name": "nico_tests",
1049-
"prerequisites": [],
10501040
"trafficAllocation": 100,
10511041
"trafficAllocationSeed": 1409699192,
10521042
"seed": -1997241870,
@@ -1093,7 +1083,6 @@
10931083
"impressionsDisabled": false,
10941084
"trafficTypeName": "account",
10951085
"name": "testo2222",
1096-
"prerequisites": [],
10971086
"trafficAllocation": 100,
10981087
"trafficAllocationSeed": 1164474086,
10991088
"seed": 1270508512,
@@ -1307,7 +1296,6 @@
13071296
"impressionsDisabled": false,
13081297
"trafficTypeName": "user",
13091298
"name": "Tagging",
1310-
"prerequisites": [],
13111299
"trafficAllocation": 100,
13121300
"trafficAllocationSeed": 1910132597,
13131301
"seed": -311493896,
@@ -1357,7 +1345,6 @@
13571345
"impressionsDisabled": false,
13581346
"trafficTypeName": "account",
13591347
"name": "Welcome_Page_UI",
1360-
"prerequisites": [],
13611348
"trafficAllocation": 100,
13621349
"trafficAllocationSeed": 1848523960,
13631350
"seed": 1608586361,
@@ -1410,7 +1397,6 @@
14101397
"impressionsDisabled": false,
14111398
"trafficTypeName": "test",
14121399
"name": "pato_test_3",
1413-
"prerequisites": [],
14141400
"trafficAllocation": 100,
14151401
"trafficAllocationSeed": 458647735,
14161402
"seed": 95677506,
@@ -1460,7 +1446,6 @@
14601446
"impressionsDisabled": false,
14611447
"trafficTypeName": "account",
14621448
"name": "testo23",
1463-
"prerequisites": [],
14641449
"trafficAllocation": 100,
14651450
"trafficAllocationSeed": -689658216,
14661451
"seed": 1711156051,
@@ -1510,7 +1495,6 @@
15101495
"impressionsDisabled": false,
15111496
"trafficTypeName": "account",
15121497
"name": "testo909090",
1513-
"prerequisites": [],
15141498
"trafficAllocation": 100,
15151499
"trafficAllocationSeed": -1196467266,
15161500
"seed": -1998101827,
@@ -1678,7 +1662,6 @@
16781662
"impressionsDisabled": false,
16791663
"trafficTypeName": "account",
16801664
"name": "testo22",
1681-
"prerequisites": [],
16821665
"trafficAllocation": 100,
16831666
"trafficAllocationSeed": 1223277820,
16841667
"seed": -1152948537,
@@ -1728,7 +1711,6 @@
17281711
"impressionsDisabled": false,
17291712
"trafficTypeName": "user",
17301713
"name": "test-net",
1731-
"prerequisites": [],
17321714
"trafficAllocation": 100,
17331715
"trafficAllocationSeed": -2038196969,
17341716
"seed": -862203077,
@@ -1778,7 +1760,6 @@
17781760
"impressionsDisabled": false,
17791761
"trafficTypeName": "account",
17801762
"name": "test_dep_2",
1781-
"prerequisites": [],
17821763
"trafficAllocation": 100,
17831764
"trafficAllocationSeed": -806171485,
17841765
"seed": 922684950,
@@ -1872,7 +1853,6 @@
18721853
"impressionsDisabled": false,
18731854
"trafficTypeName": "account",
18741855
"name": "Definition_As_Of_Clickable_UI",
1875-
"prerequisites": [],
18761856
"trafficAllocation": 100,
18771857
"trafficAllocationSeed": -198035199,
18781858
"seed": -151947071,
@@ -1954,7 +1934,6 @@
19541934
"impressionsDisabled": false,
19551935
"trafficTypeName": "account",
19561936
"name": "Identify_UI",
1957-
"prerequisites": [],
19581937
"trafficAllocation": 100,
19591938
"trafficAllocationSeed": -139516103,
19601939
"seed": 1543172523,
@@ -2004,7 +1983,6 @@
20041983
"impressionsDisabled": false,
20051984
"trafficTypeName": "account",
20061985
"name": "test_definition_as_of",
2007-
"prerequisites": [],
20081986
"trafficAllocation": 100,
20091987
"trafficAllocationSeed": 1025823325,
20101988
"seed": -554248124,
@@ -2054,7 +2032,6 @@
20542032
"impressionsDisabled": false,
20552033
"trafficTypeName": "user",
20562034
"name": "Test-jw-go",
2057-
"prerequisites": [],
20582035
"trafficAllocation": 100,
20592036
"trafficAllocationSeed": 768122971,
20602037
"seed": 1539205707,
@@ -2134,7 +2111,6 @@
21342111
"impressionsDisabled": false,
21352112
"trafficTypeName": "user",
21362113
"name": "benchmark_jw_7",
2137-
"prerequisites": [],
21382114
"trafficAllocation": 100,
21392115
"trafficAllocationSeed": -1340337178,
21402116
"seed": -1091938685,
@@ -2184,7 +2160,6 @@
21842160
"impressionsDisabled": false,
21852161
"trafficTypeName": "user",
21862162
"name": "benchmark_jw_6",
2187-
"prerequisites": [],
21882163
"trafficAllocation": 100,
21892164
"trafficAllocationSeed": -1202331834,
21902165
"seed": -48445256,
@@ -2234,7 +2209,6 @@
22342209
"impressionsDisabled": false,
22352210
"trafficTypeName": "user",
22362211
"name": "benchmark_jw_5",
2237-
"prerequisites": [],
22382212
"trafficAllocation": 100,
22392213
"trafficAllocationSeed": 2119994290,
22402214
"seed": -227092192,
@@ -2284,7 +2258,6 @@
22842258
"impressionsDisabled": false,
22852259
"trafficTypeName": "user",
22862260
"name": "benchmark_jw_4",
2287-
"prerequisites": [],
22882261
"trafficAllocation": 100,
22892262
"trafficAllocationSeed": 1066635158,
22902263
"seed": -850704283,
@@ -2334,7 +2307,6 @@
23342307
"impressionsDisabled": false,
23352308
"trafficTypeName": "user",
23362309
"name": "benchmark_jw_3",
2337-
"prerequisites": [],
23382310
"trafficAllocation": 100,
23392311
"trafficAllocationSeed": 1252392550,
23402312
"seed": 971538037,
@@ -2384,7 +2356,6 @@
23842356
"impressionsDisabled": false,
23852357
"trafficTypeName": "user",
23862358
"name": "benchmark_jw_2",
2387-
"prerequisites": [],
23882359
"trafficAllocation": 100,
23892360
"trafficAllocationSeed": -285565213,
23902361
"seed": -1992295819,
@@ -2434,7 +2405,6 @@
24342405
"impressionsDisabled": false,
24352406
"trafficTypeName": "account",
24362407
"name": "MAURO_TEST",
2437-
"prerequisites": [],
24382408
"trafficAllocation": 59,
24392409
"trafficAllocationSeed": -2108186082,
24402410
"seed": -1947050766,

‎spec/test_data/splits/between_matcher/datetime_matcher_splits.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
55
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
66
"name":"test_feature",
7-
"prerequisites": [],
87
"trafficTypeId":"u",
98
"trafficTypeName":"User",
109
"seed":-195840228,

‎spec/test_data/splits/between_matcher/negate_number_matcher_splits.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
55
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
66
"name":"test_feature",
7-
"prerequisites": [],
87
"trafficTypeId":"u",
98
"trafficTypeName":"User",
109
"seed":-195840228,

‎spec/test_data/splits/between_matcher/negative_number_matcher_splits.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
55
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
66
"name":"test_feature",
7-
"prerequisites": [],
87
"trafficTypeId":"u",
98
"trafficTypeName":"User",
109
"seed":-195840228,

‎spec/test_data/splits/between_matcher/number_matcher_splits.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
55
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
66
"name":"test_feature",
7-
"prerequisites": [],
87
"trafficTypeId":"u",
98
"trafficTypeName":"User",
109
"seed":-195840228,

‎spec/test_data/splits/combining_matcher_splits.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{
44
"trafficTypeName": "user",
55
"name": "PASSENGER_anding",
6-
"prerequisites": [],
76
"trafficAllocation": 100,
87
"trafficAllocationSeed": -1740914610,
98
"seed": 1288528654,

‎spec/test_data/splits/engine/all_keys_matcher.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
55
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
66
"name":"test_feature",
7-
"prerequisites": [],
87
"trafficTypeId":"u",
98
"trafficTypeName":"User",
109
"seed":-195840228,

‎spec/test_data/splits/engine/configurations.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
55
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
66
"name":"test_feature",
7-
"prerequisites": [],
87
"trafficTypeId":"u",
98
"trafficTypeName":"User",
109
"seed":-195840228,
@@ -42,7 +41,6 @@
4241
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
4342
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
4443
"name":"killed_feature",
45-
"prerequisites": [],
4644
"trafficTypeId":"u",
4745
"trafficTypeName":"User",
4846
"seed":-195840228,
@@ -79,7 +77,6 @@
7977
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
8078
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
8179
"name":"no_configs_feature",
82-
"prerequisites": [],
8380
"trafficTypeId":"u",
8481
"trafficTypeName":"User",
8582
"seed":-195840228,
@@ -112,7 +109,6 @@
112109
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
113110
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
114111
"name":"no_configs_for_treatment_feature",
115-
"prerequisites": [],
116112
"trafficTypeId":"u",
117113
"trafficTypeName":"User",
118114
"seed":-195840228,

‎spec/test_data/splits/engine/dependency_matcher.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
55
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
66
"name":"test_whitelist",
7-
"prerequisites": [],
87
"trafficTypeId":"u",
98
"trafficTypeName":"User",
109
"seed":-1245274114,
@@ -43,7 +42,6 @@
4342
"orgId":"cee838c0-b3eb-11e5-855f-4eacec19f7bf",
4443
"environment":"cf2d09f0-b3eb-11e5-855f-4eacec19f7bf",
4544
"name":"test_dependency",
46-
"prerequisites": [],
4745
"trafficTypeId":"u",
4846
"trafficTypeName":"User",
4947
"seed":-1245274114,

0 commit comments

Comments
 (0)