unleash 4.3.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f05a01bdf6013184b6948fb5c38f6b1da1cde9d18f9a0eeecd69b54cbed8ff18
-  data.tar.gz: 6343830fd945d00decd331acade205d605e0d496ed1d4afd4736affcb2f538ca
+  metadata.gz: e7e1d111b5560a8236c52c1b1744f32724fdd0b26d02af16da707efe2869be3e
+  data.tar.gz: 402580857880d3508ad7b46afbc47b74c696bb6ad5360a48e4254f35ecd48f05
 SHA512:
-  metadata.gz: 1ac4a4b89f787b5ae27acda02865def0eb68f261da10b83c01a6b34f6706b1b29443375eb82418b9834db555fbe54c1a1dfe49e9bf4c761556145edce88f76c9
-  data.tar.gz: c7a2332c7e6ab54872b08432af4c5c2cf092b7586664eb0267e45e416fb9a72c46246dd6cdedf68b4a9421678e4cb9f9507365e40fc5c2113b9fba8e703a19dd
+  metadata.gz: ed380682c17c90cea0d8b79ba7b05f20b053eb20fd3d293f93e3b2356a264ab386fcee3b91b6ec6507965fb23e922f1e9d50cae2bd880973d9111413abda0572
+  data.tar.gz: 0ba69ee86b9dc60e65aac73023e9e39c1a93d56579fee7c3f990d4e944259a879ba66058e8614cc41c9dc22a41cc4ab5bf8824e7db24d3e8a5cbc8b5c4fcb4cb

data/.github/stale.yml

@@ -0,0 +1 @@
+_extends: .github

data/.github/workflows/pull_request.yml

@@ -28,8 +28,9 @@ jobs:
           - ubuntu
           - macos
         ruby-version:
-          - jruby-9.2
+          - jruby-9.4
           - jruby-9.3
+          - jruby-9.2
           - 3.1
           - '3.0'
           - 2.7
@@ -37,7 +38,7 @@ jobs:
           - 2.5
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
@@ -46,7 +47,7 @@ jobs:
       - name: Install dependencies
         run: bundle install
       - name: Download test cases
-        run: git clone --depth 5 --branch v4.1.0 https://github.com/Unleash/client-specification.git client-specification
+        run: git clone --depth 5 --branch v4.2.2 https://github.com/Unleash/client-specification.git client-specification
       - name: Run tests
         run: bundle exec rake
         env:

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--require 'spec_helper'

data/.rubocop.yml

@@ -9,7 +9,7 @@ Naming/PredicateName:
 
 
 Metrics/ClassLength:
-  Max: 125
+  Max: 135
 Layout/LineLength:
   Max: 140
 Metrics/MethodLength:
@@ -22,7 +22,7 @@ Metrics/BlockLength:
 Metrics/AbcSize:
   Max: 30
 Metrics/CyclomaticComplexity:
-  Max: 9
+  Max: 10
 Metrics/PerceivedComplexity:
   Max: 10
 
@@ -34,6 +34,9 @@ Style/StringLiterals:
 Style/RedundantSelf:
   Enabled: false
 
+Style/OptionalBooleanParameter:
+  Enabled: false
+
 Style/SymbolArray:
   EnforcedStyle: brackets
 Style/WordArray:

data/README.md

@@ -15,6 +15,7 @@ Leverage the [Unleash Server](https://github.com/Unleash/unleash) for powerful f
   * MRI 2.7
   * MRI 2.6
   * MRI 2.5
+  * jruby 9.4
   * jruby 9.3
   * jruby 9.2
 
@@ -23,7 +24,7 @@ Leverage the [Unleash Server](https://github.com/Unleash/unleash) for powerful f
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'unleash', '~> 4.0.0'
+gem 'unleash', '~> 4.4.0'
 ```
 
 And then execute:
@@ -97,6 +98,7 @@ Argument | Description | Required? |  Type |  Default Value|
 `logger` | Specify a custom `Logger` class to handle logs for the Unleash client. | N | Class | `Logger.new(STDOUT)` |
 `log_level` | Change the log level for the `Logger` class. Constant from `Logger::Severity`. | N | Constant | `Logger::WARN` |
 `bootstrap_config` | Bootstrap config on how to loaded data on start-up. This is useful for loading large states on startup without (or before) hitting the network. | N | Unleash::Bootstrap::Configuration | `nil` |
+`strategies` | Strategies manager that holds all strategies and allows to add custom strategies | N | Unleash::Strategies | `Unleash::Strategies.new` |
 
 For a more in-depth look, please see `lib/unleash/configuration.rb`.
 
@@ -472,10 +474,37 @@ This client comes with the all the required strategies out of the box:
  * UnknownStrategy
  * UserWithIdStrategy
 
+## Custom Strategies
+
+Client allows to add [custom activation strategies](https://docs.getunleash.io/advanced/custom_activation_strategy) using configuration.
+In order for strategy to work correctly it should support two methods `name` and `is_enabled?`
+
+```ruby
+class MyCustomStrategy
+  def name
+    'muCustomStrategy'
+  end
+
+  def is_enabled?(params = {}, context = nil)
+    true
+  end
+end
+
+Unleash.configure do |config|
+  config.strategies.add(MyCustomStrategy.new)
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
+This SDK is also built against the Unleash Client Specification tests. To run the Ruby SDK against this test suite, you'll need to have a copy on your machine, you can clone the repository directly using:
+
+`git clone --depth 5 --branch v4.2.2 https://github.com/Unleash/client-specification.git client-specification`
+
+After doing this, `rake spec` will also run the client specification tests.
+
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 

data/lib/unleash/activation_strategy.rb

@@ -1,9 +1,10 @@
 module Unleash
   class ActivationStrategy
-    attr_accessor :name, :params, :constraints
+    attr_accessor :name, :params, :constraints, :disabled
 
     def initialize(name, params, constraints = [])
       self.name = name
+      self.disabled = false
 
       if params.is_a?(Hash)
         self.params = params
@@ -18,6 +19,7 @@ module Unleash
         self.constraints = constraints
       else
         Unleash.logger.warn "Invalid constraints provided for ActivationStrategy (contraints: #{constraints})"
+        self.disabled = true
         self.constraints = []
       end
     end

data/lib/unleash/client.rb

@@ -12,7 +12,7 @@ module Unleash
     attr_accessor :fetcher_scheduled_executor, :metrics_scheduled_executor
 
     def initialize(*opts)
-      Unleash.configuration ||= Unleash::Configuration.new(*opts)
+      Unleash.configuration = Unleash::Configuration.new(*opts) unless opts.empty?
       Unleash.configuration.validate!
 
       Unleash.logger = Unleash.configuration.logger.clone
@@ -45,7 +45,7 @@ module Unleash
         return default_value
       end
 
-      toggle = Unleash::FeatureToggle.new(toggle_as_hash)
+      toggle = Unleash::FeatureToggle.new(toggle_as_hash, Unleash&.segment_cache)
 
       toggle.is_enabled?(context)
     end
@@ -110,7 +110,7 @@ module Unleash
         'appName': Unleash.configuration.app_name,
         'instanceId': Unleash.configuration.instance_id,
         'sdkVersion': "unleash-client-ruby:" + Unleash::VERSION,
-        'strategies': Unleash::STRATEGIES.keys,
+        'strategies': Unleash.strategies.keys,
         'started': Time.now.iso8601(Unleash::TIME_RESOLUTION),
         'interval': Unleash.configuration.metrics_interval_in_millis
       }

data/lib/unleash/configuration.rb

@@ -20,7 +20,8 @@ module Unleash
       :backup_file,
       :logger,
       :log_level,
-      :bootstrap_config
+      :bootstrap_config,
+      :strategies
 
     def initialize(opts = {})
       validate_custom_http_headers!(opts[:custom_http_headers]) if opts.has_key?(:custom_http_headers)
@@ -51,7 +52,8 @@ module Unleash
     def http_headers
       {
         'UNLEASH-INSTANCEID' => self.instance_id,
-        'UNLEASH-APPNAME' => self.app_name
+        'UNLEASH-APPNAME' => self.app_name,
+        'Unleash-Client-Spec' => '4.2.2'
       }.merge!(generate_custom_http_headers)
     end
 
@@ -94,12 +96,13 @@ module Unleash
       self.backup_file      = nil
       self.log_level        = Logger::WARN
       self.bootstrap_config = nil
+      self.strategies       = Unleash::Strategies.new
 
       self.custom_http_headers = {}
     end
 
     def initialize_default_logger
-      self.logger = Logger.new(STDOUT)
+      self.logger = Logger.new($stdout)
 
       # on default logger, use custom formatter that includes thread_name:
       self.logger.formatter = proc do |severity, datetime, _progname, msg|

data/lib/unleash/constraint.rb

@@ -1,12 +1,11 @@
 require 'date'
-
 module Unleash
   class Constraint
     attr_accessor :context_name, :operator, :value, :inverted, :case_insensitive
 
     OPERATORS = {
-      IN: ->(context_v, constraint_v){ constraint_v.include? context_v },
-      NOT_IN: ->(context_v, constraint_v){ !constraint_v.include? context_v },
+      IN: ->(context_v, constraint_v){ constraint_v.include? context_v.to_s },
+      NOT_IN: ->(context_v, constraint_v){ !constraint_v.include? context_v.to_s },
       STR_STARTS_WITH: ->(context_v, constraint_v){ constraint_v.any?{ |v| context_v.start_with? v } },
       STR_ENDS_WITH: ->(context_v, constraint_v){ constraint_v.any?{ |v| context_v.end_with? v } },
       STR_CONTAINS: ->(context_v, constraint_v){ constraint_v.any?{ |v| context_v.include? v } },
@@ -19,16 +18,21 @@ module Unleash
       DATE_BEFORE: ->(context_v, constraint_v){ on_valid_date(constraint_v, context_v){ |x, y| (x > y) } },
       SEMVER_EQ: ->(context_v, constraint_v){ on_valid_version(constraint_v, context_v){ |x, y| (x == y) } },
       SEMVER_GT: ->(context_v, constraint_v){ on_valid_version(constraint_v, context_v){ |x, y| (x < y) } },
-      SEMVER_LT: ->(context_v, constraint_v){ on_valid_version(constraint_v, context_v){ |x, y| (x > y) } }
+      SEMVER_LT: ->(context_v, constraint_v){ on_valid_version(constraint_v, context_v){ |x, y| (x > y) } },
+      FALLBACK_VALIDATOR: ->(_context_v, _constraint_v){ false }
     }.freeze
 
     LIST_OPERATORS = [:IN, :NOT_IN, :STR_STARTS_WITH, :STR_ENDS_WITH, :STR_CONTAINS].freeze
 
     def initialize(context_name, operator, value = [], inverted: false, case_insensitive: false)
       raise ArgumentError, "context_name is not a String" unless context_name.is_a?(String)
-      raise ArgumentError, "operator does not hold a valid value:" + OPERATORS.keys unless OPERATORS.include? operator.to_sym
 
-      self.validate_constraint_value_type(operator.to_sym, value)
+      unless OPERATORS.include? operator.to_sym
+        Unleash.logger.warn "Operator #{operator} is not a supported operator, " \
+          "falling back to FALLBACK_VALIDATOR which skips this constraint."
+        operator = "FALLBACK_VALIDATOR"
+      end
+      self.log_inconsistent_constraint_configuration(operator.to_sym, value)
 
       self.context_name = context_name
       self.operator = operator.to_sym
@@ -38,8 +42,9 @@ module Unleash
     end
 
     def matches_context?(context)
-      Unleash.logger.debug "Unleash::Constraint matches_context? value: #{self.value} context.get_by_name(#{self.context_name})" \
-        " #{context.get_by_name(self.context_name)} "
+      Unleash.logger.debug "Unleash::Constraint matches_context? value: #{self.value} context.get_by_name(#{self.context_name})"
+      return false if context.nil?
+
       match = matches_constraint?(context)
       self.inverted ? !match : match
     rescue KeyError
@@ -79,19 +84,25 @@ module Unleash
     end
 
     # This should be a private method but for some reason this fails on Ruby 2.5
-    def validate_constraint_value_type(operator, value)
-      raise ArgumentError, "context_name is not an Array" if LIST_OPERATORS.include?(operator) && value.is_a?(String)
-      raise ArgumentError, "context_name is not a String" if !LIST_OPERATORS.include?(operator) && value.is_a?(Array)
+    def log_inconsistent_constraint_configuration(operator, value)
+      Unleash.logger.warn "value is a String, operator is expecting an Array" if LIST_OPERATORS.include?(operator) && value.is_a?(String)
+      Unleash.logger.warn "value is an Array, operator is expecting a String" if !LIST_OPERATORS.include?(operator) && value.is_a?(Array)
     end
 
     private
 
     def matches_constraint?(context)
+      Unleash.logger.debug "Unleash::Constraint matches_constraint? value: #{self.value} operator: #{self.operator} " \
+        " context.get_by_name(#{self.context_name})"
+
       unless OPERATORS.include?(self.operator)
         Unleash.logger.warn "Invalid constraint operator: #{self.operator}, this should be unreachable. Always returning false."
         false
       end
 
+      # when the operator is NOT_IN and there is no data, return true. In all other cases the operator doesn't match.
+      return self.operator == :NOT_IN unless context.include?(self.context_name)
+
       v = self.value.dup
       context_value = context.get_by_name(self.context_name)
 

data/lib/unleash/context.rb

@@ -9,7 +9,7 @@ module Unleash
 
       self.app_name    = value_for('appName', params, Unleash&.configuration&.app_name)
       self.environment = value_for('environment', params, Unleash&.configuration&.environment || 'default')
-      self.user_id     = value_for('userId', params)
+      self.user_id     = value_for('userId', params)&.to_s
       self.session_id  = value_for('sessionId', params)
       self.remote_address = value_for('remoteAddress', params)
       self.current_time = value_for('currentTime', params, Time.now.utc.iso8601.to_s)
@@ -33,6 +33,13 @@ module Unleash
       end
     end
 
+    def include?(name)
+      normalized_name = underscore(name)
+      return self.instance_variable_defined? "@#{normalized_name}" if ATTRS.include? normalized_name.to_sym
+
+      self.properties.include?(normalized_name.to_sym) || self.properties.include?(name.to_sym)
+    end
+
     private
 
     # Method to fetch values from hash for two types of keys: string in camelCase and symbol in snake_case

data/lib/unleash/feature_toggle.rb

@@ -9,13 +9,13 @@ module Unleash
   class FeatureToggle
     attr_accessor :name, :enabled, :strategies, :variant_definitions
 
-    def initialize(params = {})
+    def initialize(params = {}, segment_map = {})
       params = {} if params.nil?
 
       self.name       = params.fetch('name', nil)
       self.enabled    = params.fetch('enabled', false)
 
-      self.strategies = initialize_strategies(params)
+      self.strategies = initialize_strategies(params, segment_map)
       self.variant_definitions = initialize_variant_definitions(params)
     end
 
@@ -37,12 +37,11 @@ module Unleash
 
       context = ensure_valid_context(context)
 
-      return Unleash::FeatureToggle.disabled_variant unless self.enabled && am_enabled?(context)
-      return Unleash::FeatureToggle.disabled_variant if sum_variant_defs_weights <= 0
-
-      variant = variant_from_override_match(context) || variant_from_weights(context, resolve_stickiness)
+      toggle_enabled = am_enabled?(context)
+      variant = resolve_variant(context, toggle_enabled)
 
-      Unleash.toggle_metrics.increment_variant(self.name, variant.name) unless Unleash.configuration.disable_metrics
+      choice = toggle_enabled ? :yes : :no
+      Unleash.toggle_metrics.increment_variant(self.name, choice, variant.name) unless Unleash.configuration.disable_metrics
       variant
     end
 
@@ -52,6 +51,13 @@ module Unleash
 
     private
 
+    def resolve_variant(context, toggle_enabled)
+      return Unleash::FeatureToggle.disabled_variant unless toggle_enabled
+      return Unleash::FeatureToggle.disabled_variant if sum_variant_defs_weights <= 0
+
+      variant_from_override_match(context) || variant_from_weights(context, resolve_stickiness)
+    end
+
     def resolve_stickiness
       self.variant_definitions&.map(&:stickiness)&.compact&.first || "default"
     end
@@ -75,12 +81,14 @@ module Unleash
     end
 
     def strategy_enabled?(strategy, context)
-      r = Unleash::STRATEGIES.fetch(strategy.name.to_sym, :unknown).is_enabled?(strategy.params, context)
+      r = Unleash.strategies.fetch(strategy.name).is_enabled?(strategy.params, context)
       Unleash.logger.debug "Unleash::FeatureToggle.strategy_enabled? Strategy #{strategy.name} returned #{r} with context: #{context}"
       r
     end
 
     def strategy_constraint_matches?(strategy, context)
+      return false if strategy.disabled
+
       strategy.constraints.empty? || strategy.constraints.all?{ |c| c.matches_context?(context) }
     end
 
@@ -128,26 +136,35 @@ module Unleash
       context
     end
 
-    def initialize_strategies(params)
+    def initialize_strategies(params, segment_map)
       params.fetch('strategies', [])
-        .select{ |s| s.has_key?('name') && Unleash::STRATEGIES.has_key?(s['name'].to_sym) }
+        .select{ |s| s.has_key?('name') && Unleash.strategies.includes?(s['name']) }
         .map do |s|
           ActivationStrategy.new(
             s['name'],
             s['parameters'],
-            (s['constraints'] || []).map do |c|
-              Constraint.new(
-                c.fetch('contextName'),
-                c.fetch('operator'),
-                c.fetch('values', nil) || c.fetch('value', nil),
-                inverted: c.fetch('inverted', false),
-                case_insensitive: c.fetch('caseInsensitive', false)
-              )
-            end
+            resolve_constraints(s, segment_map)
           )
         end || []
     end
 
+    def resolve_constraints(strategy, segment_map)
+      segment_constraints = (strategy["segments"] || []).map do |segment_id|
+        segment_map[segment_id]&.fetch("constraints")
+      end
+      (strategy.fetch("constraints", []) + segment_constraints).flatten.map do |constraint|
+        return nil if constraint.nil?
+
+        Constraint.new(
+          constraint.fetch('contextName'),
+          constraint.fetch('operator'),
+          constraint.fetch('value', nil) || constraint.fetch('values', nil),
+          inverted: constraint.fetch('inverted', false),
+          case_insensitive: constraint.fetch('caseInsensitive', false)
+        )
+      end
+    end
+
     def initialize_variant_definitions(params)
       (params.fetch('variants', []) || [])
         .select{ |v| v.is_a?(Hash) && v.has_key?('name') }

data/lib/unleash/metrics.rb

@@ -1,33 +1,41 @@
 module Unleash
   class Metrics
-    attr_accessor :features
-
-    # NOTE: no mutexes for features
+    attr_accessor :features, :features_lock
 
     def initialize
       self.features = {}
+      self.features_lock = Mutex.new
     end
 
     def to_s
-      self.features.to_json
+      self.features_lock.synchronize do
+        return self.features.to_json
+      end
     end
 
     def increment(feature, choice)
       raise "InvalidArgument choice must be :yes or :no" unless [:yes, :no].include? choice
 
-      self.features[feature] = { yes: 0, no: 0 } unless self.features.include? feature
-      self.features[feature][choice] += 1
+      self.features_lock.synchronize do
+        self.features[feature] = { yes: 0, no: 0 } unless self.features.include? feature
+        self.features[feature][choice] += 1
+      end
     end
 
-    def increment_variant(feature, variant)
-      self.features[feature] = { yes: 0, no: 0 } unless self.features.include? feature
-      self.features[feature]['variant'] = {}     unless self.features[feature].include? 'variant'
-      self.features[feature]['variant'][variant] = 0 unless self.features[feature]['variant'].include? variant
-      self.features[feature]['variant'][variant] += 1
+    def increment_variant(feature, choice, variant)
+      self.features_lock.synchronize do
+        self.features[feature] = { yes: 0, no: 0 } unless self.features.include? feature
+        self.features[feature][choice] += 1
+        self.features[feature]['variant'] = {}     unless self.features[feature].include? 'variant'
+        self.features[feature]['variant'][variant] = 0 unless self.features[feature]['variant'].include? variant
+        self.features[feature]['variant'][variant] += 1
+      end
     end
 
     def reset
-      self.features = {}
+      self.features_lock.synchronize do
+        self.features = {}
+      end
     end
   end
 end

data/lib/unleash/strategies.rb

@@ -0,0 +1,80 @@
+require 'unleash/strategy/base'
+Gem.find_files('unleash/strategy/**/*.rb').each{ |path| require path }
+
+module Unleash
+  class Strategies
+    def initialize
+      @strategies = {}
+      register_strategies
+    end
+
+    def keys
+      @strategies.keys
+    end
+
+    def includes?(name)
+      @strategies.has_key?(name.to_s)
+    end
+
+    def fetch(name)
+      raise Unleash::Strategy::NotImplemented, "Strategy is not implemented" unless (strategy = @strategies[name.to_s])
+
+      strategy
+    end
+
+    def add(strategy)
+      @strategies[strategy.name] = strategy
+    end
+
+    def []=(key, strategy)
+      warn_deprecated_registration(strategy, 'modifying Unleash::STRATEGIES')
+      @strategies[key.to_s] = strategy
+    end
+
+    def [](key)
+      @strategies[key.to_s]
+    end
+
+    def register_strategies
+      register_base_strategies
+      register_custom_strategies
+    end
+
+    protected
+
+    # Deprecated: Use Unleash.configuration to add custom strategies
+    def register_custom_strategies
+      Unleash::Strategy.constants
+        .select{ |c| Unleash::Strategy.const_get(c).is_a? Class }
+        .reject{ |c| ['NotImplemented', 'Base'].include?(c.to_s) } # Reject abstract classes
+        .map{ |c| Object.const_get("Unleash::Strategy::#{c}") }
+        .reject{ |c| DEFAULT_STRATEGIES.include?(c) } # Reject base classes
+        .each do |c|
+        strategy = c.new
+        warn_deprecated_registration(strategy, 'adding custom class into Unleash::Strategy namespace')
+        self.add(strategy)
+      end
+    end
+
+    def register_base_strategies
+      DEFAULT_STRATEGIES.each{ |c| self.add(c.new) }
+    end
+
+    DEFAULT_STRATEGIES = [
+      Unleash::Strategy::ApplicationHostname,
+      Unleash::Strategy::Default,
+      Unleash::Strategy::FlexibleRollout,
+      Unleash::Strategy::GradualRolloutRandom,
+      Unleash::Strategy::GradualRolloutSessionId,
+      Unleash::Strategy::GradualRolloutUserId,
+      Unleash::Strategy::RemoteAddress,
+      Unleash::Strategy::UserWithId
+    ].freeze
+
+    def warn_deprecated_registration(strategy, method)
+      warn "[DEPRECATED] Registering custom Unleash strategy by #{method} is deprecated.
+             Please use Unleash configuration to register custom strategy: " \
+           "`Unleash.configure {|c| c.strategies.add(#{strategy.class.name}.new) }`"
+    end
+  end
+end

data/lib/unleash/strategy/flexible_rollout.rb

@@ -10,7 +10,7 @@ module Unleash
       # need: params['percentage']
       def is_enabled?(params = {}, context = nil)
         return false unless params.is_a?(Hash)
-        return false unless context.class.name == 'Unleash::Context'
+        return false unless context.instance_of?(Unleash::Context)
 
         stickiness = params.fetch('stickiness', 'default')
         stickiness_id = resolve_stickiness(stickiness, context)

data/lib/unleash/strategy/gradual_rollout_sessionid.rb

@@ -10,7 +10,7 @@ module Unleash
       # need: params['percentage'], params['groupId'], context.user_id,
       def is_enabled?(params = {}, context = nil)
         return false unless params.is_a?(Hash) && params.has_key?('percentage')
-        return false unless context.class.name == 'Unleash::Context'
+        return false unless context.instance_of?(Unleash::Context)
         return false if context.session_id.nil? || context.session_id.empty?
 
         percentage = Integer(params['percentage'] || 0)

data/lib/unleash/strategy/gradual_rollout_userid.rb

@@ -10,7 +10,7 @@ module Unleash
       # need: params['percentage'], params['groupId'], context.user_id,
       def is_enabled?(params = {}, context = nil, _constraints = [])
         return false unless params.is_a?(Hash) && params.has_key?('percentage')
-        return false unless context.class.name == 'Unleash::Context'
+        return false unless context.instance_of?(Unleash::Context)
         return false if context.user_id.nil? || context.user_id.empty?
 
         percentage = Integer(params['percentage'] || 0)

data/lib/unleash/strategy/remote_address.rb

@@ -11,7 +11,7 @@ module Unleash
       def is_enabled?(params = {}, context = nil)
         return false unless params.is_a?(Hash) && params.has_key?(PARAM)
         return false unless params.fetch(PARAM, nil).is_a? String
-        return false unless context.class.name == 'Unleash::Context'
+        return false unless context.instance_of?(Unleash::Context)
 
         remote_address = ipaddr_or_nil_from_str(context.remote_address)
 

data/lib/unleash/strategy/user_with_id.rb

@@ -11,7 +11,7 @@ module Unleash
       def is_enabled?(params = {}, context = nil)
         return false unless params.is_a?(Hash) && params.has_key?(PARAM)
         return false unless params.fetch(PARAM, nil).is_a? String
-        return false unless context.class.name == 'Unleash::Context'
+        return false unless context.instance_of?(Unleash::Context)
 
         params[PARAM].split(",").map(&:strip).include?(context.user_id)
       end

data/lib/unleash/toggle_fetcher.rb

@@ -5,11 +5,12 @@ require 'json'
 
 module Unleash
   class ToggleFetcher
-    attr_accessor :toggle_cache, :toggle_lock, :toggle_resource, :etag, :retry_count
+    attr_accessor :toggle_cache, :toggle_lock, :toggle_resource, :etag, :retry_count, :segment_cache
 
     def initialize
       self.etag = nil
       self.toggle_cache = nil
+      self.segment_cache = nil
       self.toggle_lock = Mutex.new
       self.toggle_resource = ConditionVariable.new
       self.retry_count = 0
@@ -95,9 +96,10 @@ module Unleash
     end
 
     def update_running_client!
-      if Unleash.toggles != self.toggles
+      if Unleash.toggles != self.toggles["features"] || Unleash.segment_cache != self.toggles["segments"]
         Unleash.logger.info "Updating toggles to main client, there has been a change in the server."
-        Unleash.toggles = self.toggles
+        Unleash.toggles = self.toggles["features"]
+        Unleash.segment_cache = self.toggles["segments"]
       end
     end
 
@@ -126,10 +128,19 @@ module Unleash
       Unleash.configuration.bootstrap_config = nil
     end
 
+    def build_segment_map(segments_array)
+      return {} if segments_array.nil?
+
+      segments_array.map{ |segment| [segment["id"], segment] }.to_h
+    end
+
     # @param response_body [String]
     def get_features(response_body)
       response_hash = JSON.parse(response_body)
-      return response_hash['features'] if response_hash['version'] >= 1
+
+      if response_hash['version'] >= 1
+        return { "features" => response_hash["features"], "segments" => build_segment_map(response_hash["segments"]) }
+      end
 
       raise NotImplemented, "Version of features provided by unleash server" \
         " is unsupported by this client."

data/lib/unleash/variant_definition.rb

@@ -4,7 +4,7 @@ module Unleash
   class VariantDefinition
     attr_accessor :name, :weight, :payload, :overrides, :stickiness
 
-    def initialize(name, weight = 0, payload = nil, stickiness = nil, overrides = [])
+    def initialize(name, weight = 0, payload = nil, stickiness = nil, overrides = []) # rubocop:disable Metrics/ParameterLists
       self.name = name
       self.weight = weight
       self.payload = payload

data/lib/unleash/variant_override.rb

@@ -14,7 +14,7 @@ module Unleash
     end
 
     def matches_context?(context)
-      raise ArgumentError, 'context must be of class Unleash::Context' unless context.class.name == 'Unleash::Context'
+      raise ArgumentError, 'context must be of class Unleash::Context' unless context.instance_of?(Unleash::Context)
 
       context_value =
         case self.context_name

data/lib/unleash/version.rb

@@ -1,3 +1,3 @@
 module Unleash
-  VERSION = "4.3.0".freeze
+  VERSION = "4.4.1".freeze
 end

data/lib/unleash.rb

@@ -1,35 +1,31 @@
 require 'unleash/version'
 require 'unleash/configuration'
-require 'unleash/strategy/base'
+require 'unleash/strategies'
 require 'unleash/context'
 require 'unleash/client'
 require 'logger'
 
-Gem.find_files('unleash/strategy/**/*.rb').each{ |path| require path unless path.end_with? '_spec.rb' }
-
 module Unleash
   TIME_RESOLUTION = 3
 
-  STRATEGIES = Unleash::Strategy.constants
-    .select{ |c| Unleash::Strategy.const_get(c).is_a? Class }
-    .reject{ |c| ['NotImplemented', 'Base'].include?(c.to_s) }
-    .map do |c|
-      lowered_c = c.to_s
-      lowered_c[0] = lowered_c[0].downcase
-      [lowered_c.to_sym, Object.const_get("Unleash::Strategy::#{c}").new]
-    end
-    .to_h
-
   class << self
-    attr_accessor :configuration, :toggle_fetcher, :toggles, :toggle_metrics, :reporter, :logger
+    attr_accessor :configuration, :toggle_fetcher, :toggles, :toggle_metrics, :reporter, :segment_cache, :logger
   end
 
+  self.configuration = Unleash::Configuration.new
+
+  # Deprecated: Use Unleash.configure to add custom strategies
+  STRATEGIES = self.configuration.strategies
+
   # Support for configuration via yield:
   def self.configure
-    self.configuration ||= Unleash::Configuration.new
     yield(configuration)
 
     self.configuration.validate!
     self.configuration.refresh_backup_file!
   end
+
+  def self.strategies
+    self.configuration.strategies
+  end
 end

data/unleash-client.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-json_expectations", "~> 2.2"
   spec.add_development_dependency "webmock", "~> 3.8"
 
-  spec.add_development_dependency "rubocop", "< 1.0.0"
+  spec.add_development_dependency "rubocop", "~> 1.28.2"
   spec.add_development_dependency "simplecov", "~> 0.21.2"
   spec.add_development_dependency "simplecov-lcov", "~> 0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unleash
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Renato Arruda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: murmurhash3
@@ -98,16 +98,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.28.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/stale.yml"
 - ".github/workflows/add-to-project.yml"
 - ".github/workflows/pull_request.yml"
 - ".gitignore"
@@ -176,6 +177,7 @@ files:
 - lib/unleash/metrics.rb
 - lib/unleash/metrics_reporter.rb
 - lib/unleash/scheduled_executor.rb
+- lib/unleash/strategies.rb
 - lib/unleash/strategy/application_hostname.rb
 - lib/unleash/strategy/base.rb
 - lib/unleash/strategy/default.rb
@@ -212,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.6
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Unleash feature toggle client.