Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some small misc improvements #72

Merged
merged 4 commits into from Dec 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -9,6 +9,9 @@
/tmp/
/vendor

# IntelliJ
.idea/

# rspec failure tracking
.rspec_status

Expand Down
2 changes: 1 addition & 1 deletion lib/unleash/client.rb
Expand Up @@ -159,7 +159,7 @@ def register
end

def disabled_variant
@disabled_variant ||= Unleash::FeatureToggle.new.disabled_variant
@disabled_variant ||= Unleash::FeatureToggle.disabled_variant
end
end
end
10 changes: 5 additions & 5 deletions lib/unleash/feature_toggle.rb
Expand Up @@ -32,13 +32,13 @@ def is_enabled?(context, default_result)
result
end

def get_variant(context, fallback_variant = disabled_variant)
def get_variant(context, fallback_variant = Unleash::FeatureToggle.disabled_variant)
raise ArgumentError, "Provided fallback_variant is not of type Unleash::Variant" if fallback_variant.class.name != 'Unleash::Variant'

context = ensure_valid_context(context)

return disabled_variant unless self.enabled && am_enabled?(context, true)
return disabled_variant if sum_variant_defs_weights <= 0
return Unleash::FeatureToggle.disabled_variant unless self.enabled && am_enabled?(context, true)
return Unleash::FeatureToggle.disabled_variant if sum_variant_defs_weights <= 0

variant = variant_from_override_match(context)
variant = variant_from_weights(context) if variant.nil?
Expand All @@ -47,7 +47,7 @@ def get_variant(context, fallback_variant = disabled_variant)
variant
end

def disabled_variant
def self.disabled_variant
Unleash::Variant.new(name: 'disabled', enabled: false)
end

Expand Down Expand Up @@ -110,7 +110,7 @@ def variant_from_weights(context)
prev_weights += v.weight
res
end
return disabled_variant if variant_definition.nil?
return self.disabled_variant if variant_definition.nil?

Unleash::Variant.new(name: variant_definition.name, enabled: true, payload: variant_definition.payload)
end
Expand Down
4 changes: 2 additions & 2 deletions spec/unleash/feature_toggle_spec.rb
Expand Up @@ -10,7 +10,7 @@
Unleash.configuration = Unleash::Configuration.new
Unleash.logger = Unleash.configuration.logger
Unleash.logger.level = Unleash.configuration.log_level
# Unleash.logger.level = Logger::DEBUG
Unleash.logger.level = Logger::ERROR
Unleash.toggles = []
Unleash.toggle_metrics = {}

Expand Down Expand Up @@ -523,7 +523,7 @@

describe 'disabled_variant' do
it 'returns disabled variant' do
ret = described_class.new.disabled_variant
ret = described_class.disabled_variant
expect(ret.enabled).to be false
expect(ret.name).to eq 'disabled'
end
Expand Down