rox-rollout 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acfdbd9f2a75d947284c96ac406567af69f9eb61623d079664c0de6b0d26d338
-  data.tar.gz: db992ff6df1b786b96ba6fdd2625e4037e32e75b272fc7ad8ddf8ef9c170dacf
+  metadata.gz: 2d30a63b44e459ce5e10a2b64ce89e3ee59b59ceea67969fda6a1f5b962e43e4
+  data.tar.gz: 2bc7318f4e7476830c09fc4c9cf3fbcb9b8e21c0ad6bfdc34ed4e74d321eb8a6
 SHA512:
-  metadata.gz: 0aba475fed416f669ba8286b7c1144e04e9171471c1bcf35022a3451d4f6869648a85d80f831f1e363d23a09971d045ada0e3c6579a0aab30169000299f35cba
-  data.tar.gz: 6366f4efca140a0f5695accd0918ac1ece1d94ba7fea64ff28d45de870f93d7141ba3009eb1379c5986067840e0af1a282a56c6b9274a5b34468a4cd040395d5
+  metadata.gz: 2323d41086d92479bdafae351c9aabce8ad99ec4b870b30fb72ada7a8783bf211dbe6380fe80590d79fdd90d077e935d8961dea30436f3211c37cf2a52bb8da6
+  data.tar.gz: e3c8ff2bb1018d0d2db497fdbd307a4cac69edee35823f8b35adf47168bfa3339f3ef03401f864f4b918ee83c823e423aa472b44da67ca918f78fcdee02eca53

data/.github/workflows/ruby.yml

@@ -8,13 +8,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: [2.4, 2.5, 2.6, 2.7, 3.0]
+        ruby: [2.4, 2.5, 2.6, 2.7, '3.0', 3.1]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler: 2.3.3
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - run: bundle exec rake test
     - run: bundle exec rake e2e

data/lib/rox/core/configuration/configuration_fetched_invoker.rb

@@ -1,4 +1,5 @@
 require 'rox/core/configuration/configuration_fetched_args'
+require 'rox/core/error_handling/exception_trigger'
 
 module Rox
   module Core
@@ -6,6 +7,7 @@ module Rox
       def initialize(user_unhandled_error_invoker)
         @fetched_handlers = []
         @mutex = Mutex.new
+        @internal_handler = nil
         @user_unhandled_error_invoker = user_unhandled_error_invoker
       end
 
@@ -17,6 +19,10 @@ module Rox
         raise_fetched_event(Rox::Core::ConfigurationFetchedArgs.error(error_details))
       end
 
+      def register_start_stop_push(block)
+        @internal_handler = block
+      end
+
       def register_fetched_handler(&block)
         @mutex.synchronize do
           @fetched_handlers << block
@@ -24,6 +30,9 @@ module Rox
       end
 
       def raise_fetched_event(args)
+        unless @internal_handler.nil?
+          @internal_handler.call(args)
+        end
         handlers = []
         @mutex.synchronize do
           handlers = @fetched_handlers.clone
@@ -33,7 +42,7 @@ module Rox
           begin
             handler.call(args)
           rescue StandardError => e
-            user_unhandled_error_invoker.invoke(handler, Rox::Core::CONFIGURATION_FETCHED_HANDLER, e)
+            @user_unhandled_error_invoker.invoke(handler, ExceptionTrigger::CONFIGURATION_FETCHED_HANDLER, e)
           end
         end
       end

data/lib/rox/core/core.rb

@@ -24,7 +24,6 @@ require 'rox/core/security/signature_verifier'
 require 'rox/core/security/signature_verifier_mock'
 require 'rox/core/utils/periodic_task'
 require 'rox/core/client/dynamic_api'
-require 'rox/core/analytics'
 require 'rox/core/error_handling/userspace_unhandled_error_invoker'
 
 module Rox
@@ -72,10 +71,9 @@ module Rox
         # TODO: Analytics.Analytics.Initialize(deviceProperties.RolloutKey, deviceProperties)
         @internal_flags = InternalFlags.new(@experiment_repository, @parser, @rox_options)
 
-        @analytics_client = Analytics.new(sdk_settings.api_key).client
         # TODO: impressionInvoker = new ImpressionInvoker(internalFlags, customPropertyRepository, deviceProperties, Analytics.Analytics.Client, roxyPath != null);
         @impression_invoker = ImpressionInvoker.new(@internal_flags, @custom_property_repository, device_properties,
-                                                    @analytics_client, !roxy_path.nil?, @user_unhandled_error_invoker)
+                                                    nil, !roxy_path.nil?, @user_unhandled_error_invoker)
         @flag_setter = FlagSetter.new(@flag_repository, @parser, @experiment_repository, @impression_invoker)
         buid = BUID.new(sdk_settings, device_properties, @flag_repository, @custom_property_repository)
 
@@ -108,7 +106,11 @@ module Rox
         configuration_fetched_handler = nil
         configuration_fetched_handler = @rox_options.configuration_fetched_handler unless @rox_options.nil?
 
-        @configuration_fetched_invoker.register_fetched_handler(&wrap_configuration_fetched_handler(&configuration_fetched_handler))
+        @configuration_fetched_invoker.register_start_stop_push(proc do |args|
+          start_or_stop_push_updated_listener unless args.fetcher_status == FetcherStatus::ERROR_FETCHED_FAILED
+        end)
+
+        @configuration_fetched_invoker.register_fetched_handler(&configuration_fetched_handler)
 
         @thread = Thread.new do
           Thread.current.report_on_exception = false if Thread.current.respond_to?(:report_on_exception)
@@ -136,9 +138,9 @@ module Rox
           @push_updates_listener = nil
         end
 
-        return if @analytics_client.nil?
+        #return if @analytics_client.nil?
 
-        @analytics_client.flush
+        #@analytics_client.flush
       end
 
       def fetch
@@ -189,13 +191,6 @@ module Rox
         @custom_property_repository.add_custom_property_if_not_exists(property)
       end
 
-      def wrap_configuration_fetched_handler(&handler)
-        lambda do |args|
-          start_or_stop_push_updated_listener unless args.fetcher_status == FetcherStatus::ERROR_FETCHED_FAILED
-          handler&.call(args)
-        end
-      end
-
       def start_or_stop_push_updated_listener
         if @internal_flags.enabled?('rox.internal.pushUpdates')
           if @push_updates_listener.nil?

data/lib/rox/core/error_handling/userspace_handler_exception.rb

@@ -1,10 +1,11 @@
 module Rox
   module Core
     class UserspaceHandlerException < StandardError
-      def initialize(exception_source, exception_trigger, exception)
+      attr_accessor :exception_source, :exception_trigger, :original_exception
+      def initialize(exception_source, exception_trigger, original_exception)
         @exception_source = exception_source
         @exception_trigger = exception_trigger
-        @exception = exception
+        @original_exception = original_exception
         super('user unhandled exception in roxx expression')
       end
     end

data/lib/rox/core/impression/impression_invoker.rb

@@ -18,7 +18,8 @@ module Rox
         @mutex = Mutex.new
       end
 
-      def invoke(reporting_value, stickiness_property, context)
+      # TODO: write analytics client and initiate it before using it
+      def call_analytics_gateway(reporting_value, stickiness_property, context)
         begin
           analytics_enabled = @internal_flags.enabled?('rox.internal.analytics')
           if analytics_enabled && !@is_roxy
@@ -47,7 +48,10 @@ module Rox
         rescue StandardError => ex
           Logging.logger.error('Failed to send analytics', ex)
         end
-
+      end
+      
+      def invoke(reporting_value, stickiness_property, context)
+        #call_analytics_gateway
         raise_impression_event(ImpressionArgs.new(reporting_value, context))
       end
 
@@ -63,11 +67,13 @@ module Rox
           handlers = @impression_handlers.clone
         end
 
-        begin
-          handlers.each { |handler| handler.call(args) }
-        rescue StandardError => e
-          user_unhandled_error_invoker.invoke(handler, ExceptionTrigger::IMPRESSION_HANDLER, e)
-          Logging.logger.error('Impresssion handler exception', ex)
+        handlers.each do |handler|
+          begin
+            handler.call(args)
+          rescue StandardError => e
+            @user_unhandled_error_invoker.invoke(handler, ExceptionTrigger::IMPRESSION_HANDLER, e)
+            Logging.logger.error('Impresssion handler exception', e)
+          end
         end
       end
     end

data/lib/rox/core/properties/custom_property.rb

@@ -1,7 +1,7 @@
 module Rox
   module Core
     class CustomProperty
-      attr_accessor :name, :type
+      attr_accessor :name, :type, :block
 
       def initialize(name, type, value = nil, &block)
         @name = name

data/lib/rox/core/repositories/roxx/properties_extensions.rb

@@ -38,13 +38,13 @@ module Rox
       def get_value_from_dynamic_property_rule_handler(prop_name, context)
         @dynamic_property_rule_handler.call(prop_name, context)
       rescue StandardError => e
-        raise Rox::Core::UserspaceHandlerException, handler, ExceptionTrigger::DYNAMIC_PROPERTIES_RULE, e
+        raise Rox::Core::UserspaceHandlerException.new(@dynamic_property_rule_handler, ExceptionTrigger::DYNAMIC_PROPERTIES_RULE, e)
       end
 
       def get_value_from_property(property, context)
         property.value(context)
       rescue StandardError => e
-        raise Rox::Core::UserspaceHandlerException, handler, ExceptionTrigger::CUSTOM_PROPERTY_GENERATOR, e
+        raise Rox::Core::UserspaceHandlerException.new(property.block, ExceptionTrigger::CUSTOM_PROPERTY_GENERATOR, e)
       end
     end
   end

data/lib/rox/core/roxx/parser.rb

@@ -50,7 +50,7 @@ module Rox
 
           EvaluationResult.new(result)
         rescue Rox::Core::UserspaceHandlerException => e
-          @user_unhandled_error_invoker.invoke(e.exception_source, e.exception_trigger, e.exception)
+          @user_unhandled_error_invoker.invoke(e.exception_source, e.exception_trigger, e.original_exception)
           Logging.logger.warn("Roxx Exception: Failed evaluate expression, user unhandled expression: #{e}")
           EvaluationResult.new(nil)
         rescue StandardError => e

data/lib/rox/version.rb

@@ -1,3 +1,3 @@
 module Rox
-  VERSION = '5.0.2'.freeze
+  VERSION = '5.0.3'.freeze
 end

data/rox.gemspec

@@ -23,10 +23,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3'
 
   spec.add_runtime_dependency 'em-eventsource', '~> 0.3.2'
-  spec.add_runtime_dependency 'analytics-ruby', '~> 2.0.0'
 
-
-  spec.add_development_dependency 'bundler', '~> 2.2.3'
+  spec.add_development_dependency 'bundler', '~> 2.3.3'
   spec.add_development_dependency 'minitest', '~> 5.11'
   spec.add_development_dependency 'pry-byebug', '~> 3.7.0'
   spec.add_development_dependency 'rake', '~> 12.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rox-rollout
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - CloudBees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-eventsource
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
-- !ruby/object:Gem::Dependency
-  name: analytics-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +134,6 @@ files:
 - e2e/test_vars.rb
 - example/local.rb
 - lib/rox.rb
-- lib/rox/core/analytics.rb
 - lib/rox/core/client/buid.rb
 - lib/rox/core/client/device_properties.rb
 - lib/rox/core/client/dynamic_api.rb

data/lib/rox/core/analytics.rb

@@ -1,18 +0,0 @@
-require 'segment/analytics'
-
-module Rox
-  module Core
-    # Analytics based on segment client
-    # https://segment.com/docs/connections/sources/catalog/libraries/server/ruby/
-    class Analytics
-      attr_reader :client
-
-      def initialize(key)
-        @client = Segment::Analytics.new({
-                                           write_key: key,
-                                           on_error: proc { |_status, msg| print msg }
-                                         })
-      end
-    end
-  end
-end