Skip to content

Commit 222aa09

Browse files
Mike NgMatt Auerbach
Mike Ng
authored and
Matt Auerbach
committed
Remove references to V2 and make everything standard.
Summary: Since we will be making additive datafile changes only, we are going to remove versioning references. This cleanup will pave the way for adding Features et al to the datafile parsing and project config. Test Plan: Unit and e2e Reviewers: #oasis_team_review Differential Revision: https://phabricator.optimizely.com/D17130
1 parent 3620e5c commit 222aa09

File tree

11 files changed

+27
-242
lines changed

11 files changed

+27
-242
lines changed

‎lib/optimizely.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def initialize(datafile, event_dispatcher = nil, logger = nil, error_handler = n
8080
end
8181

8282
@decision_service = DecisionService.new(@config, @user_profile_service)
83-
@event_builder = EventBuilderV2.new(@config)
83+
@event_builder = EventBuilder.new(@config)
8484
end
8585

8686
def activate(experiment_key, user_id, attributes = nil)

‎lib/optimizely/event_builder.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def add_common_params(user_id, attributes)
6666
end
6767
end
6868

69-
class EventBuilderV2 < BaseEventBuilder
69+
class EventBuilder < BaseEventBuilder
7070
CONVERSION_EVENT_ENDPOINT = 'https://logx.optimizely.com/log/event'
7171
IMPRESSION_EVENT_ENDPOINT = 'https://logx.optimizely.com/log/decision'
7272
POST_HEADERS = { 'Content-Type' => 'application/json' }

‎lib/optimizely/project_config.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ module Optimizely
2525

2626
class ProjectConfig
2727
# Representation of the Optimizely project config.
28-
29-
PROJECT_CONFIG_LINK_TEMPLATE = 'https://cdn.optimizely.com/json/%{project_id}.json'
30-
REVENUE_GOAL_KEY = 'Total Revenue'
31-
REQUEST_TIMEOUT = 10
3228
RUNNING_EXPERIMENT_STATUS = ['Running']
3329

3430
# Gets project config attributes.

‎spec/audience_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
describe Optimizely::Audience do
1919
before(:context) do
20-
@config_body = OptimizelySpec::V2_CONFIG_BODY
21-
@config_body_JSON = OptimizelySpec::V2_CONFIG_BODY_JSON
20+
@config_body = OptimizelySpec::VALID_CONFIG_BODY
21+
@config_body_JSON = OptimizelySpec::VALID_CONFIG_BODY_JSON
2222
end
2323

2424
before(:example) do

‎spec/bucketing_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
require 'optimizely/logger'
1919

2020
describe Optimizely::Bucketer do
21-
let(:config_body) { OptimizelySpec::V2_CONFIG_BODY }
22-
let(:config_body_JSON) { OptimizelySpec::V2_CONFIG_BODY_JSON }
21+
let(:config_body) { OptimizelySpec::VALID_CONFIG_BODY }
22+
let(:config_body_JSON) { OptimizelySpec::VALID_CONFIG_BODY_JSON }
2323
let(:error_handler) { Optimizely::NoOpErrorHandler.new }
2424
let(:spy_logger) { spy('logger') }
2525
let(:config) { Optimizely::ProjectConfig.new(config_body_JSON, spy_logger, error_handler) }

‎spec/condition_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
describe Optimizely::ConditionEvaluator do
2020
before(:context) do
21-
@config_body = OptimizelySpec::V2_CONFIG_BODY
21+
@config_body = OptimizelySpec::VALID_CONFIG_BODY
2222
end
2323

2424
before(:example) do

‎spec/decision_service_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
require 'optimizely/logger'
1919

2020
describe Optimizely::DecisionService do
21-
let(:config_body) { OptimizelySpec::V2_CONFIG_BODY }
22-
let(:config_body_JSON) { OptimizelySpec::V2_CONFIG_BODY_JSON }
21+
let(:config_body) { OptimizelySpec::VALID_CONFIG_BODY }
22+
let(:config_body_JSON) { OptimizelySpec::VALID_CONFIG_BODY_JSON }
2323
let(:error_handler) { Optimizely::NoOpErrorHandler.new }
2424
let(:spy_logger) { spy('logger') }
2525
let(:spy_user_profile_service) { spy('user_profile_service') }

‎spec/event_builder_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
require 'optimizely/event_builder'
2020
require 'optimizely/logger'
2121

22-
describe Optimizely::EventBuilderV2 do
22+
describe Optimizely::EventBuilder do
2323
before(:context) do
24-
@config_body = OptimizelySpec::V2_CONFIG_BODY
25-
@config_body_JSON = OptimizelySpec::V2_CONFIG_BODY_JSON
24+
@config_body = OptimizelySpec::VALID_CONFIG_BODY
25+
@config_body_JSON = OptimizelySpec::VALID_CONFIG_BODY_JSON
2626
@error_handler = Optimizely::NoOpErrorHandler.new
2727
@logger = Optimizely::SimpleLogger.new
2828
end
2929

3030
before(:example) do
3131
config = Optimizely::ProjectConfig.new(@config_body_JSON, @logger, @error_handler)
32-
@event_builder = Optimizely::EventBuilderV2.new(config)
32+
@event_builder = Optimizely::EventBuilder.new(config)
3333

3434
time_now = Time.now
3535
allow(Time).to receive(:now).and_return(time_now)

‎spec/project_config_spec.rb‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
require 'optimizely/exceptions'
1919

2020
describe Optimizely::ProjectConfig do
21-
let(:config_body) { OptimizelySpec::V2_CONFIG_BODY }
22-
let(:config_body_JSON) { OptimizelySpec::V2_CONFIG_BODY_JSON }
21+
let(:config_body) { OptimizelySpec::VALID_CONFIG_BODY }
22+
let(:config_body_JSON) { OptimizelySpec::VALID_CONFIG_BODY_JSON }
2323
let(:error_handler) { Optimizely::NoOpErrorHandler.new }
2424
let(:logger) { Optimizely::NoOpLogger.new }
2525
let(:config) { Optimizely::ProjectConfig.new(config_body_JSON, logger, error_handler)}
@@ -237,21 +237,13 @@
237237
end
238238

239239
describe 'parsing_succeeded?' do
240-
let(:config_body_v1) { OptimizelySpec::V1_CONFIG_BODY }
241-
let(:config_body_v1_JSON) { OptimizelySpec::V1_CONFIG_BODY_JSON }
242-
let(:config_body_v2) { OptimizelySpec::V2_CONFIG_BODY }
243-
let(:config_body_v2_JSON) { OptimizelySpec::V2_CONFIG_BODY_JSON }
244-
240+
let(:config_body_v2) { OptimizelySpec::VALID_CONFIG_BODY }
241+
let(:config_body_v2_JSON) { OptimizelySpec::VALID_CONFIG_BODY_JSON }
245242

246243
it 'should be true for version 2' do
247244
project_config_v2 = Optimizely::ProjectConfig.new(config_body_v2_JSON, logger, error_handler)
248245
expect(project_config_v2.parsing_succeeded?).to be(true)
249246
end
250-
251-
it 'should be false for version 1' do
252-
project_config_v1 = Optimizely::ProjectConfig.new(config_body_v1_JSON, logger, error_handler)
253-
expect(project_config_v1.parsing_succeeded?).to be(false)
254-
end
255247
end
256248

257249
describe '@logger' do

‎spec/project_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
require 'optimizely/version'
2222

2323
describe 'OptimizelyV2' do
24-
let(:config_body) { OptimizelySpec::V2_CONFIG_BODY }
25-
let(:config_body_JSON) { OptimizelySpec::V2_CONFIG_BODY_JSON }
26-
let(:config_body_v1_JSON) { OptimizelySpec::V1_CONFIG_BODY_JSON }
24+
let(:config_body) { OptimizelySpec::VALID_CONFIG_BODY }
25+
let(:config_body_JSON) { OptimizelySpec::VALID_CONFIG_BODY_JSON }
26+
let(:config_body_invalid_JSON) { OptimizelySpec::INVALID_CONFIG_BODY_JSON }
2727
let(:error_handler) { Optimizely::RaiseErrorHandler.new }
2828
let(:spy_logger) { spy('logger') }
2929
let(:version) { Optimizely::VERSION }
@@ -109,7 +109,7 @@ class InvalidErrorHandler; end
109109
it 'should log an error when provided a datafile of unsupported version' do
110110
expect_any_instance_of(Optimizely::SimpleLogger).to receive(:log).once.with(Logger::ERROR, 'Provided datafile is an unsupported version. Please use SDK version 1.1.2 or earlier for datafile version 1.')
111111

112-
Optimizely::Project.new(config_body_v1_JSON, nil, nil, nil, true)
112+
Optimizely::Project.new(config_body_invalid_JSON, nil, nil, nil, true)
113113
end
114114
end
115115

0 commit comments

Comments
 (0)