Skip to content

Commit 34b786f

Browse files
kp-catkp-cat
committed
code cleanup
1 parent 98bd1b2 commit 34b786f

File tree

2 files changed

+37
-44
lines changed

2 files changed

+37
-44
lines changed

‎lib/configcat/configcatclient.rb

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -52,28 +52,24 @@ def initialize(sdk_key,
5252
if !@_override_data_source.equal?(nil) && @_override_data_source.get_behaviour() == OverrideBehaviour::LOCAL_ONLY
5353
@_config_fetcher = nil
5454
@_cache_policy = nil
55+
elsif poll_interval_seconds > 0
56+
@_config_fetcher = CacheControlConfigFetcher.new(sdk_key, "p", base_url: base_url,
57+
proxy_address: proxy_address, proxy_port: proxy_port, proxy_user: proxy_user, proxy_pass: proxy_pass,
58+
open_timeout: open_timeout, read_timeout: read_timeout,
59+
data_governance: data_governance)
60+
@_cache_policy = AutoPollingCachePolicy.new(@_config_fetcher, @_config_cache, _get_cache_key(), poll_interval_seconds, max_init_wait_time_seconds, on_configuration_changed_callback)
61+
elsif cache_time_to_live_seconds > 0
62+
@_config_fetcher = CacheControlConfigFetcher.new(sdk_key, "l", base_url: base_url,
63+
proxy_address: proxy_address, proxy_port: proxy_port, proxy_user: proxy_user, proxy_pass: proxy_pass,
64+
open_timeout: open_timeout, read_timeout: read_timeout,
65+
data_governance: data_governance)
66+
@_cache_policy = LazyLoadingCachePolicy.new(@_config_fetcher, @_config_cache, _get_cache_key(), cache_time_to_live_seconds)
5567
else
56-
if poll_interval_seconds > 0
57-
@_config_fetcher = CacheControlConfigFetcher.new(sdk_key, "p", base_url: base_url,
58-
proxy_address: proxy_address, proxy_port: proxy_port, proxy_user: proxy_user, proxy_pass: proxy_pass,
59-
open_timeout: open_timeout, read_timeout: read_timeout,
60-
data_governance: data_governance)
61-
@_cache_policy = AutoPollingCachePolicy.new(@_config_fetcher, @_config_cache, _get_cache_key(), poll_interval_seconds, max_init_wait_time_seconds, on_configuration_changed_callback)
62-
else
63-
if cache_time_to_live_seconds > 0
64-
@_config_fetcher = CacheControlConfigFetcher.new(sdk_key, "l", base_url: base_url,
65-
proxy_address: proxy_address, proxy_port: proxy_port, proxy_user: proxy_user, proxy_pass: proxy_pass,
66-
open_timeout: open_timeout, read_timeout: read_timeout,
67-
data_governance: data_governance)
68-
@_cache_policy = LazyLoadingCachePolicy.new(@_config_fetcher, @_config_cache, _get_cache_key(), cache_time_to_live_seconds)
69-
else
70-
@_config_fetcher = CacheControlConfigFetcher.new(sdk_key, "m", base_url: base_url,
71-
proxy_address: proxy_address, proxy_port: proxy_port, proxy_user: proxy_user, proxy_pass: proxy_pass,
72-
open_timeout: open_timeout, read_timeout: read_timeout,
73-
data_governance: data_governance)
74-
@_cache_policy = ManualPollingCachePolicy.new(@_config_fetcher, @_config_cache, _get_cache_key())
75-
end
76-
end
68+
@_config_fetcher = CacheControlConfigFetcher.new(sdk_key, "m", base_url: base_url,
69+
proxy_address: proxy_address, proxy_port: proxy_port, proxy_user: proxy_user, proxy_pass: proxy_pass,
70+
open_timeout: open_timeout, read_timeout: read_timeout,
71+
data_governance: data_governance)
72+
@_cache_policy = ManualPollingCachePolicy.new(@_config_fetcher, @_config_cache, _get_cache_key())
7773
end
7874
end
7975

@@ -187,26 +183,22 @@ def _get_settings()
187183
behaviour = @_override_data_source.get_behaviour()
188184
if behaviour == OverrideBehaviour::LOCAL_ONLY
189185
return @_override_data_source.get_overrides()
190-
else
191-
if behaviour == OverrideBehaviour::REMOTE_OVER_LOCAL
192-
remote_settings = @_cache_policy.get()
193-
local_settings = @_override_data_source.get_overrides()
194-
result = local_settings.clone()
195-
if remote_settings.key?(FEATURE_FLAGS) && local_settings.key?(FEATURE_FLAGS)
196-
result[FEATURE_FLAGS] = result[FEATURE_FLAGS].merge(remote_settings[FEATURE_FLAGS])
197-
end
198-
return result
199-
else
200-
if behaviour == OverrideBehaviour::LOCAL_OVER_REMOTE
201-
remote_settings = @_cache_policy.get()
202-
local_settings = @_override_data_source.get_overrides()
203-
result = remote_settings.clone()
204-
if remote_settings.key?(FEATURE_FLAGS) && local_settings.key?(FEATURE_FLAGS)
205-
result[FEATURE_FLAGS] = result[FEATURE_FLAGS].merge(local_settings[FEATURE_FLAGS])
206-
end
207-
return result
208-
end
186+
elsif behaviour == OverrideBehaviour::REMOTE_OVER_LOCAL
187+
remote_settings = @_cache_policy.get()
188+
local_settings = @_override_data_source.get_overrides()
189+
result = local_settings.clone()
190+
if remote_settings.key?(FEATURE_FLAGS) && local_settings.key?(FEATURE_FLAGS)
191+
result[FEATURE_FLAGS] = result[FEATURE_FLAGS].merge(remote_settings[FEATURE_FLAGS])
192+
end
193+
return result
194+
elsif behaviour == OverrideBehaviour::LOCAL_OVER_REMOTE
195+
remote_settings = @_cache_policy.get()
196+
local_settings = @_override_data_source.get_overrides()
197+
result = remote_settings.clone()
198+
if remote_settings.key?(FEATURE_FLAGS) && local_settings.key?(FEATURE_FLAGS)
199+
result[FEATURE_FLAGS] = result[FEATURE_FLAGS].merge(local_settings[FEATURE_FLAGS])
209200
end
201+
return result
210202
end
211203
end
212204
return @_cache_policy.get()

‎spec/datagovernance_spec.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
RSpec.describe 'Data governance tests', type: :feature do
66
BASE_URL_FORCED = "https://forced.configcat.com"
7+
BASE_URL_CUSTOM = "https://custom.configcat.com"
78
URI_GLOBAL = ConfigCat::BASE_URL_GLOBAL + "/" + ConfigCat::BASE_PATH + ConfigCat::BASE_EXTENSION
89
URI_EU_ONLY = ConfigCat::BASE_URL_EU_ONLY + "/" + ConfigCat::BASE_PATH + ConfigCat::BASE_EXTENSION
9-
URI_CUSTOM = "https://custom.configcat.com/" + ConfigCat::BASE_PATH + ConfigCat::BASE_EXTENSION
10+
URI_CUSTOM = BASE_URL_CUSTOM + "/" + ConfigCat::BASE_PATH + ConfigCat::BASE_EXTENSION
1011
URI_FORCED = BASE_URL_FORCED + "/" + ConfigCat::BASE_PATH + ConfigCat::BASE_EXTENSION
1112
TEST_JSON = '{"test": "json"}'
1213

@@ -142,7 +143,7 @@ def stub_request(request_uri, response_uri, redirect)
142143
custom_stub = stub_request(URI_CUSTOM, ConfigCat::BASE_URL_GLOBAL, 0)
143144

144145
fetcher = ConfigCat::CacheControlConfigFetcher.new("", "m",
145-
base_url: "https://custom.configcat.com",
146+
base_url: BASE_URL_CUSTOM,
146147
data_governance: ConfigCat::DataGovernance::GLOBAL)
147148

148149
# First fetch
@@ -173,7 +174,7 @@ def stub_request(request_uri, response_uri, redirect)
173174
custom_stub = stub_request(URI_CUSTOM, ConfigCat::BASE_URL_GLOBAL, 0)
174175

175176
fetcher = ConfigCat::CacheControlConfigFetcher.new("", "m",
176-
base_url: "https://custom.configcat.com",
177+
base_url: BASE_URL_CUSTOM,
177178
data_governance: ConfigCat::DataGovernance::EU_ONLY)
178179

179180
# First fetch
@@ -265,7 +266,7 @@ def stub_request(request_uri, response_uri, redirect)
265266
custom_to_forced_stub = stub_request(URI_CUSTOM, BASE_URL_FORCED, 2)
266267

267268
fetcher = ConfigCat::CacheControlConfigFetcher.new("", "m",
268-
base_url: "https://custom.configcat.com",
269+
base_url: BASE_URL_CUSTOM,
269270
data_governance: ConfigCat::DataGovernance::GLOBAL)
270271

271272
# First fetch

0 commit comments

Comments
 (0)