unleash 5.1.1 → 6.0.5.pre

data/lib/unleash/context.rb

@@ -7,20 +7,36 @@ module Unleash
     def initialize(params = {})
       raise ArgumentError, "Unleash::Context must be initialized with a hash." unless params.is_a?(Hash)
 
-      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)&.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)
-
-      properties = value_for('properties', params)
+      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)&.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)
+
+      properties = value_for("properties", params)
       self.properties = properties.is_a?(Hash) ? properties.transform_keys(&:to_sym) : {}
     end
 
     def to_s
       "<Context: user_id=#{@user_id},session_id=#{@session_id},remote_address=#{@remote_address},properties=#{@properties}" \
-        ",app_name=#{@app_name},environment=#{@environment},current_time=#{@current_time}>"
+      ",app_name=#{@app_name},environment=#{@environment},current_time=#{@current_time}>"
+    end
+
+    def as_json
+      {
+        appName: to_safe_value(self.app_name),
+        environment: to_safe_value(self.environment),
+        userId: to_safe_value(self.user_id),
+        sessionId: to_safe_value(self.session_id),
+        remoteAddress: to_safe_value(self.remote_address),
+        currentTime: to_safe_value(self.current_time),
+        properties: self.properties.transform_values{ |value| to_safe_value(value) }
+      }
+    end
+
+    def to_json(*options)
+      as_json(*options).to_json(*options)
     end
 
     def to_h
@@ -52,6 +68,16 @@ module Unleash
       params.values_at(key, key.to_sym, underscore(key), underscore(key).to_sym).compact.first || default_value
     end
 
+    def to_safe_value(value)
+      return nil if value.nil?
+
+      if value.is_a?(Time)
+        value.utc.iso8601
+      else
+        value.to_s
+      end
+    end
+
     # converts CamelCase to snake_case
     def underscore(camel_cased_word)
       camel_cased_word.to_s.gsub(/(.)([A-Z])/, '\1_\2').downcase

data/lib/unleash/metrics_reporter.rb

@@ -1,5 +1,4 @@
 require 'unleash/configuration'
-require 'unleash/metrics'
 require 'net/http'
 require 'json'
 require 'time'
@@ -15,52 +14,39 @@ module Unleash
     end
 
     def generate_report
-      now = Time.now
+      metrics = Unleash&.engine&.get_metrics()
+      return nil if metrics.nil? || metrics.empty?
 
-      start = self.last_time
-      stop  = now
-      self.last_time = now
-
-      report = {
-        'appName': Unleash.configuration.app_name,
-        'instanceId': Unleash.configuration.instance_id,
+      {
         'platformName': RUBY_ENGINE,
         'platformVersion': RUBY_VERSION,
-        'yggdrasilVersion': nil,
+        'yggdrasilVersion': "0.13.2",
         'specVersion': Unleash::CLIENT_SPECIFICATION_VERSION,
-        'bucket': {
-          'start': start.iso8601(Unleash::TIME_RESOLUTION),
-          'stop': stop.iso8601(Unleash::TIME_RESOLUTION),
-          'toggles': Unleash.toggle_metrics.features
-        }
+        'appName': Unleash.configuration.app_name,
+        'instanceId': Unleash.configuration.instance_id,
+        'bucket': metrics
       }
-      Unleash.toggle_metrics.reset
-
-      report
     end
 
     def post
       Unleash.logger.debug "post() Report"
 
-      if bucket_empty? && (Time.now - self.last_time < LONGEST_WITHOUT_A_REPORT) # and last time is less then 10 minutes...
+      bucket = self.generate_report
+      if bucket.nil? && (Time.now - self.last_time < LONGEST_WITHOUT_A_REPORT) # and last time is less then 10 minutes...
         Unleash.logger.debug "Report not posted to server, as it would have been empty. (and has been empty for up to 10 min)"
 
         return
       end
 
-      response = Unleash::Util::Http.post(Unleash.configuration.client_metrics_uri, self.generate_report.to_json)
+      response = Unleash::Util::Http.post(Unleash.configuration.client_metrics_uri, bucket.to_json)
 
       if ['200', '202'].include? response.code
         Unleash.logger.debug "Report sent to unleash server successfully. Server responded with http code #{response.code}"
       else
+        # :nocov:
         Unleash.logger.error "Error when sending report to unleash server. Server responded with http code #{response.code}."
+        # :nocov:
       end
     end
-
-    private
-
-    def bucket_empty?
-      Unleash.toggle_metrics.features.empty?
-    end
   end
 end

data/lib/unleash/strategies.rb

@@ -1,92 +1,33 @@
-require 'unleash/strategy/base'
-Gem.find_files('unleash/strategy/**/*.rb').each{ |path| require path }
-
 module Unleash
+  class DefaultOverrideError < RuntimeError
+  end
+
   class Strategies
+    attr_accessor :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
+      @strategies.has_key?(name.to_s) || DEFAULT_STRATEGIES.include?(name.to_s)
     end
 
     def add(strategy)
-      if default_strategy_names.include?(strategy.name)
-        Unleash.logger.error "WARNING: Overriding built in strategy '#{strategy.name}'. OVERIDING BUILT IN STRATEGIES IS \
-DEPRECATED AND WILL BE REMOVED IN A FUTURE RELEASE."
-      end
-      self.internal_add(strategy)
-    end
-
-    def []=(key, strategy)
-      warn_deprecated_registration(strategy, 'modifying Unleash::STRATEGIES')
-      @strategies[key.to_s] = strategy
-    end
+      raise DefaultOverrideError, "Cannot override a default strategy" if DEFAULT_STRATEGIES.include?(strategy.name)
 
-    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.internal_add(strategy)
-      end
-    end
-
-    def register_base_strategies
-      DEFAULT_STRATEGIES.each{ |c| self.internal_add(c.new) }
-    end
-
-    def internal_add(strategy)
       @strategies[strategy.name] = strategy
     end
 
-    def default_strategy_names
-      DEFAULT_STRATEGIES.map{ |strategy_class| strategy_class.new.name }
+    def custom_strategies
+      @strategies.values
     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) }`"
+    def known_strategies
+      @strategies.keys.map{ |key| { name: key } }
     end
+
+    DEFAULT_STRATEGIES = ['applicationHostname', 'default', 'flexibleRollout', 'gradualRolloutRandom', 'gradualRolloutSessionId',
+                          'gradualRolloutUserId', 'remoteAddress', 'userWithId'].freeze
   end
 end

data/lib/unleash/toggle_fetcher.rb

@@ -2,15 +2,15 @@ require 'unleash/configuration'
 require 'unleash/bootstrap/handler'
 require 'net/http'
 require 'json'
+require 'yggdrasil_engine'
 
 module Unleash
   class ToggleFetcher
-    attr_accessor :toggle_cache, :toggle_lock, :toggle_resource, :etag, :retry_count, :segment_cache
+    attr_accessor :toggle_engine, :toggle_lock, :toggle_resource, :etag, :retry_count
 
-    def initialize
+    def initialize(engine)
+      self.toggle_engine = engine
       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
@@ -32,14 +32,6 @@ module Unleash
       # once initialized, somewhere else you will want to start a loop with fetch()
     end
 
-    def toggles
-      self.toggle_lock.synchronize do
-        # wait for resource, only if it is null
-        self.toggle_resource.wait(self.toggle_lock) if self.toggle_cache.nil?
-        return self.toggle_cache
-      end
-    end
-
     # rename to refresh_from_server!  ??
     def fetch
       Unleash.logger.debug "fetch()"
@@ -55,16 +47,14 @@ module Unleash
       end
 
       self.etag = response['ETag']
-      features = get_features(response.body)
 
       # always synchronize with the local cache when fetching:
-      synchronize_with_local_cache!(features)
+      update_engine_state!(response.body)
 
-      update_running_client!
-      save!
+      save! response.body
     end
 
-    def save!
+    def save!(toggle_data)
       Unleash.logger.debug "Will save toggles to disk now"
 
       backup_file = Unleash.configuration.backup_file
@@ -72,7 +62,7 @@ module Unleash
 
       self.toggle_lock.synchronize do
         File.open(backup_file_tmp, "w") do |file|
-          file.write(self.toggle_cache.to_json)
+          file.write(toggle_data)
         end
         File.rename(backup_file_tmp, backup_file)
       end
@@ -84,23 +74,13 @@ module Unleash
 
     private
 
-    def synchronize_with_local_cache!(features)
-      if self.toggle_cache != features
-        self.toggle_lock.synchronize do
-          self.toggle_cache = features
-        end
-
-        # notify all threads waiting for this resource to no longer wait
-        self.toggle_resource.broadcast
+    def update_engine_state!(toggle_data)
+      self.toggle_lock.synchronize do
+        self.toggle_engine.take_state(toggle_data)
       end
-    end
 
-    def update_running_client!
-      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["features"]
-        Unleash.segment_cache = self.toggles["segments"]
-      end
+      # notify all threads waiting for this resource to no longer wait
+      self.toggle_resource.broadcast
     end
 
     def read!
@@ -108,42 +88,28 @@ module Unleash
       backup_file = Unleash.configuration.backup_file
       return nil unless File.exist?(backup_file)
 
-      backup_as_hash = JSON.parse(File.read(backup_file))
-      synchronize_with_local_cache!(backup_as_hash)
-      update_running_client!
+      backup_data = File.read(backup_file)
+      update_engine_state!(backup_data)
     rescue IOError => e
+      # :nocov:
       Unleash.logger.error "Unable to read the backup_file: #{e}"
+      # :nocov:
     rescue JSON::ParserError => e
+      # :nocov:
       Unleash.logger.error "Unable to parse JSON from existing backup_file: #{e}"
+      # :nocov:
     rescue StandardError => e
+      # :nocov:
       Unleash.logger.error "Unable to extract valid data from backup_file. Exception thrown: #{e}"
+      # :nocov:
     end
 
     def bootstrap
       bootstrap_payload = Unleash::Bootstrap::Handler.new(Unleash.configuration.bootstrap_config).retrieve_toggles
-      synchronize_with_local_cache! get_features bootstrap_payload
-      update_running_client!
+      update_engine_state! bootstrap_payload
 
       # reset Unleash.configuration.bootstrap_data to free up memory, as we will never use it again
       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)
-
-      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."
-    end
   end
 end

data/lib/unleash/variant.rb

@@ -14,12 +14,18 @@ module Unleash
     end
 
     def to_s
+      # :nocov:
       "<Variant: name=#{self.name},enabled=#{self.enabled},payload=#{self.payload},feature_enabled=#{self.feature_enabled}>"
+      # :nocov:
     end
 
     def ==(other)
       self.name == other.name && self.enabled == other.enabled && self.payload == other.payload \
         && self.feature_enabled == other.feature_enabled
     end
+
+    def self.disabled_variant
+      Variant.new(name: 'disabled', enabled: false, feature_enabled: false)
+    end
   end
 end

data/lib/unleash/version.rb

@@ -1,3 +1,3 @@
 module Unleash
-  VERSION = "5.1.1".freeze
+  VERSION = "6.0.5.pre".freeze
 end

data/lib/unleash.rb

@@ -10,7 +10,7 @@ module Unleash
   TIME_RESOLUTION = 3
 
   class << self
-    attr_accessor :configuration, :toggle_fetcher, :toggles, :toggle_metrics, :reporter, :segment_cache, :logger
+    attr_accessor :configuration, :toggle_fetcher, :reporter, :logger, :engine
   end
 
   self.configuration = Unleash::Configuration.new

data/unleash-client.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.6"
 
   spec.add_dependency "murmurhash3", "~> 0.1.7"
+  spec.add_dependency "yggdrasil-engine", "~> 0.0.6"
 
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 12.3"

data/v6_MIGRATION_GUIDE.md

@@ -0,0 +1,21 @@
+# Migrating to Unleash-Client-Ruby 6.0.0
+
+This guide highlights the key changes you should be aware of when upgrading to v6.0.0 of the Unleash client.
+
+## Custom strategy changes
+
+In version 6+, custom strategies cannot override the built-in strategies. Specifically, strategies `applicationHostname`, `default`, `flexibleRollout`, `gradualRolloutRandom`, `gradualRolloutSessionId`, `gradualRolloutUserId`, `remoteAddress` or `userWithId` throw an error on startup. Previously, creating a custom strategy would only generate a warning in the logs.
+
+The deprecated `register_custom_strategies` method has been removed. You can continue to [register custom strategies](./README.md#custom-strategies) using configuration.
+
+## Direct access to strategy objects
+
+**Note:** If you're not using the method `known_strategies` this section doesn't affect you
+
+The objects for base strategies are no longer directly accessible via the SDK. The `known_strategies` method only returns custom strategies registered by the user. To check if a custom strategy will override either a built-in or custom strategy, use the `includes?` method (returns false if the name is available).
+
+It is strongly discouraged to access or modify any properties of the built-in strategies other than the name. In version 6+, this is a hard requirement.
+
+## ARM requirements
+
+Version 6.0.0 introduces a new dependency on a native binary. Currently, only ARM binaries for macOS are distributed. If you require ARM support for Linux or Windows, please open a GitHub issue.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unleash
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 6.0.5.pre
 platform: ruby
 authors:
 - Renato Arruda
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2024-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: murmurhash3
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.7
+- !ruby/object:Gem::Dependency
+  name: yggdrasil-engine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +180,6 @@ files:
 - examples/extending_unleash_with_opentelemetry.rb
 - examples/simple.rb
 - lib/unleash.rb
-- lib/unleash/activation_strategy.rb
 - lib/unleash/bootstrap/configuration.rb
 - lib/unleash/bootstrap/handler.rb
 - lib/unleash/bootstrap/provider/base.rb
@@ -174,36 +187,22 @@ files:
 - lib/unleash/bootstrap/provider/from_url.rb
 - lib/unleash/client.rb
 - lib/unleash/configuration.rb
-- lib/unleash/constraint.rb
 - lib/unleash/context.rb
-- lib/unleash/feature_toggle.rb
-- lib/unleash/metrics.rb
 - lib/unleash/metrics_reporter.rb
 - lib/unleash/scheduled_executor.rb
 - lib/unleash/spec_version.rb
 - lib/unleash/strategies.rb
-- lib/unleash/strategy/application_hostname.rb
-- lib/unleash/strategy/base.rb
-- lib/unleash/strategy/default.rb
-- lib/unleash/strategy/flexible_rollout.rb
-- lib/unleash/strategy/gradual_rollout_random.rb
-- lib/unleash/strategy/gradual_rollout_sessionid.rb
-- lib/unleash/strategy/gradual_rollout_userid.rb
-- lib/unleash/strategy/remote_address.rb
-- lib/unleash/strategy/user_with_id.rb
-- lib/unleash/strategy/util.rb
 - lib/unleash/toggle_fetcher.rb
 - lib/unleash/util/http.rb
 - lib/unleash/variant.rb
-- lib/unleash/variant_definition.rb
-- lib/unleash/variant_override.rb
 - lib/unleash/version.rb
 - unleash-client.gemspec
+- v6_MIGRATION_GUIDE.md
 homepage: https://github.com/unleash/unleash-client-ruby
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -218,8 +217,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.5.6
+signing_key: 
 specification_version: 4
 summary: Unleash feature toggle client.
 test_files: []

data/lib/unleash/activation_strategy.rb

@@ -1,44 +0,0 @@
-module Unleash
-  class ActivationStrategy
-    attr_accessor :name, :params, :constraints, :disabled, :variant_definitions
-
-    def initialize(name, params, constraints = [], variant_definitions = [])
-      self.name = name
-      self.disabled = false
-
-      if params.is_a?(Hash)
-        self.params = params
-      elsif params.nil?
-        self.params = {}
-      else
-        Unleash.logger.warn "Invalid params provided for ActivationStrategy (params:#{params})"
-        self.params = {}
-      end
-
-      if constraints.is_a?(Array) && constraints.all?{ |c| c.is_a?(Constraint) }
-        self.constraints = constraints
-      else
-        Unleash.logger.warn "Invalid constraints provided for ActivationStrategy (constraints: #{constraints})"
-        self.disabled = true
-        self.constraints = []
-      end
-
-      self.variant_definitions = valid_variant_definitions(variant_definitions)
-    end
-
-    def matches_context?(context)
-      self.constraints.any?{ |c| c.matches_context? context }
-    end
-
-    private
-
-    def valid_variant_definitions(variant_definitions)
-      if variant_definitions.is_a?(Array) && variant_definitions.all?{ |variant_definition| variant_definition.is_a?(VariantDefinition) }
-        variant_definitions
-      else
-        Unleash.logger.warn "Invalid variant_definitions provided for ActivationStrategy (variant_definitions: #{variant_definitions})"
-        []
-      end
-    end
-  end
-end