rox-rollout 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c6afc3c1c54a584ecec20f9213d1bf3d90fa603e4d3f378fd4014fafe7fbbe
-  data.tar.gz: cc43890c658daf69fa6e3307ea00a78a6e6d16d94e7f1efc1f7aa8ede5466b2b
+  metadata.gz: ae34336f9f49d2ba7a2f77003d3f537eb53bbf4cde40fff04846a4c71d9fe177
+  data.tar.gz: d168174f3d6b72a482b89868d950e4bd8c30c908c0df6d0c11d276aceb8c229d
 SHA512:
-  metadata.gz: 715c0071fb927d9f8947e47135e1c60036a19ac88ead19d2d8c482821291e04acb4c0adc57027b5e7a6ec305718c68ef64ffe2a5238835045855daf48d1a3075
-  data.tar.gz: 2c56942cdf66b5a809970fa9ebabaa20b09e0fedf4a42f824234af9618eab0dd41be7b3c557fe3c597fa3175b35b29440cd74a4f8261d0ef0ffa91d1af651aee
+  metadata.gz: be4f8985f0289f5becb88a46f13578d83982ad0b5d471c3241dd8127493cdca9d1479eae63bc87e6c13c81092a37ae63e48bedaa40b806020a497a091e0996f2
+  data.tar.gz: f5c134a9692176e0495bbb3805799a439c14a08b5c160a61148c4affdb7e39f2699d1586e7f853e6bdd7fc43103bd9a66d17fc61b93a9b228627a92a7a6217ba

data/.github/workflows/e2e_tests.yaml

@@ -0,0 +1,52 @@
+name: E2E tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: rox-ruby
+      - name: Checkout e2e tests
+        uses: actions/checkout@v3
+        with:
+          repository: rollout/sdk-end-2-end-tests
+          ref: master
+          token: ${{ secrets.E2E_PAT }}
+          path: sdk-end-2-end-tests
+      - name: link driver
+        working-directory: ./sdk-end-2-end-tests/drivers
+        run: ln -s $GITHUB_WORKSPACE/rox-ruby/e2e-server ruby
+      - name: build e2e node driver
+        working-directory: ./sdk-end-2-end-tests/drivers/nodejs
+        run: |
+          yarn install --frozen-lockfile
+      - name: build and run e2e
+        working-directory: ./sdk-end-2-end-tests
+        run: |
+          yarn install --frozen-lockfile
+          QA_E2E_BEARER=$QA_E2E_BEARER API_HOST=https://api.test.rollout.io CD_API_ENDPOINT=https://api.test.rollout.io/device/get_configuration CD_S3_ENDPOINT=https://rox-conf.test.rollout.io/ SS_API_ENDPOINT=https://api.test.rollout.io/device/update_state_store/ SS_S3_ENDPOINT=https://rox-state.test.rollout.io/ CLIENT_DATA_CACHE_KEY=client_data ANALYTICS_ENDPOINT=https://analytic.test.rollout.io/ NOTIFICATIONS_ENDPOINT=https://push.test.rollout.io/sse SDK_LANG=ruby NODE_ENV=container yarn test:env
+        env:
+          QA_E2E_BEARER: ${{ secrets.QA_E2E_BEARER }}
+      - name: Show e2e server driver logs
+        if: ${{ always() }}
+        run: cat ./sdk-end-2-end-tests/drivers/ruby/log_1234.out || echo "no log file"
+      - name: Show e2e server sync driver logs
+        if: ${{ always() }}
+        run: cat ./sdk-end-2-end-tests/drivers/nodejs/log_1233.out || echo "no log file"
+      - name: Show e2e server init ClientData driver logs
+        if: ${{ always() }}
+        run: cat ./sdk-end-2-end-tests/drivers/ruby/log_2234.out || echo "no log file"
+      - name: Show e2e server init ClientData sync driver logs
+        if: ${{ always() }}
+        run: cat ./sdk-end-2-end-tests/drivers/nodejs/log_2233.out || echo "no log file"

data/.github/workflows/{ruby.yml → unit_tests.yaml}

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

data/Rakefile

@@ -8,12 +8,6 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-Rake::TestTask.new(:e2e) do |t|
-  t.libs << 'lib'
-  t.libs << 'e2e'
-  t.test_files = FileList['e2e/**/*_test.rb']
-end
-
 RuboCop::RakeTask.new(:lint)
 
 task default: :test

data/e2e-server/run_server.sh

@@ -2,9 +2,13 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd -P "$DIR"
 DIR=`pwd`
-gem install sinatra
-gem install sinatra-contrib
-gem install json
+
+# --conservative will save us some time (hopefully gem install just once)
+gem install sinatra --conservative
+gem install sinatra-contrib --conservative
+gem install json --conservative
+gem install em-eventsource --conservative
+
 nohup ruby ./server.rb $1 1>"$DIR"/log_"$1".out 2>&1 &
 while true ; do
   curl -p http://127.0.0.1:$1/status-check && exit 

data/e2e-server/server.rb

@@ -1,18 +1,20 @@
+# comment the following line and install a rox-ruby gem to test a released version
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+
 require 'sinatra'
 require 'sinatra/namespace'
 require 'json'
 require 'rox/server/flags/rox_flag'
 require 'rox/server/rox_server'
 require 'rox/server/rox_options'
+require 'rox/server/network_configurations_options'
 
 class Container
-  attr_accessor :first_flag
-  attr_reader :bool_default_false, :bool_default_true
+  attr_reader :boolDefaultFalse, :boolDefaultTrue
 
   def initialize
-    @bool_default_false = Rox::Server::RoxFlag.new(false)
-    @bool_default_true = Rox::Server::RoxFlag.new(true)
-    @first_flag = Rox::Server::RoxFlag.new(true)
+    @boolDefaultFalse = Rox::Server::RoxFlag.new(false)
+    @boolDefaultTrue = Rox::Server::RoxFlag.new(true)
   end
 end
 
@@ -58,95 +60,63 @@ namespace '/' do
     [200, '']
   end
 
-  get 'api/values/:id' do |id|
-    if container.first_flag.enabled?
-      [200, JSON.generate({ value: id })]
-    else
-      [200, 'Eladddddd']
-    end
-  end
-
-  put 'api/values/:id' do
-    [200, '']
-  end
-
-  delete 'api/values/:id' do
-    [200, '']
-  end
-
   post '' do
     data = JSON.parse(request.body.read)
     action = data['action']
     payload = data['payload']
-    puts data
-
+    puts "data => #{data}"
     case action
     when 'staticFlagIsEnabled'
       flag = payload['flag']
       result = container.send(flag.to_sym).enabled?(payload['context'])
       [200, JSON.generate({ result: result })]
     when 'registerStaticContainers'
-      Rox::Server::RoxServer.register(container)
+      Rox::Server::RoxServer.register_with_namespace('namespace', container)
       [200, JSON.generate({ result: 'done' })]
     when 'setCustomPropertyToThrow'
       def raise_(ex)
         raise ex
       end
-      Rox::Server::RoxServer.set_custom_string_property(payload['key'], raise_(Exception('error')))
+      Rox::Server::RoxServer.set_custom_string_property(payload['key']) do |_context|
+        raise_(StandardError.new "custom property generator error")
+      end
       [200, JSON.generate({ result: 'done' })]
     when 'setCustomStringProperty'
       Rox::Server::RoxServer.set_custom_string_property(payload['key'], payload['value'])
       [200, JSON.generate({ result: 'done' })]
     when 'dynamicFlagValue'
-      if payload['context']
-        puts "There is a payload[context] => #{payload['context']}"
-        payload['context'].each do |context|
-          key = context[0]
-          value = context[1]
-          Rox::Server::RoxServer.set_custom_string_property(key, value) if value.instance_of? String
-          if value.instance_of? TrueClass
-            Rox::Server::RoxServer.set_custom_boolean_property(key, value)
-          elsif value.instance_of? FalseClass
-            Rox::Server::RoxServer.set_custom_boolean_property(key, value)
-          end
-          Rox::Server::RoxServer.set_custom_int_property(key, value) if value.instance_of? Integer
-          Rox::Server::RoxServer.set_custom_float_property(key, value) if value.instance_of? Float
-        end
-      end
-      result = Rox::Server::RoxServer.dynamic_api.value(payload['flag'], payload['defaultValue'], payload['context'],
-                                                        [])
+      result = Rox::Server::RoxServer.dynamic_api.value(payload['flag'], payload['defaultValue'], payload['context'], [])
       [200, JSON.generate({ result: result })]
     when 'dynamicFlagIsEnabled'
-      payload['context']&.each do |context|
-        key = context[0]
-        value = context[1]
-        Rox::Server::RoxServer.set_custom_string_property(key, value) if value.instance_of? String
-        if value.instance_of? TrueClass
-          Rox::Server::RoxServer.set_custom_boolean_property(key, value)
-        elsif value.instance_of? FalseClass
-          Rox::Server::RoxServer.set_custom_boolean_property(key, value)
-        end
-        Rox::Server::RoxServer.set_custom_int_property(key, value) if value.instance_of? Integer
-        Rox::Server::RoxServer.set_custom_float_property(key, value) if value.instance_of? Float
-      end
       result = Rox::Server::RoxServer.dynamic_api.enabled?(payload['flag'], payload['defaultValue'], payload['context'])
       [200, JSON.generate({ result: result })]
     when 'setupAndAwait'
       env = 'stam'
+      fetch_interval = nil
       if payload['options']
         options = payload['options']
+        env = options['env']
+        fetch_interval = options['fetchInterval']
         if options['configuration']
           configuration = options['configuration']
-          env = configuration['env']
         end
       end
+      network_config = nil
       case env
+      when 'container'
+        network_config = Rox::Server::NetworkConfigurationsOptions.new(
+          get_config_api_endpoint:    configuration['CD_API_ENDPOINT']&.chomp('/'),
+          get_config_cloud_endpoint:  configuration['CD_S3_ENDPOINT']&.chomp('/'),
+          send_state_api_endpoint:    configuration['SS_API_ENDPOINT']&.chomp('/'),
+          send_state_cloud_endpoint:  configuration['SS_S3_ENDPOINT']&.chomp('/'),
+          analytics_endpoint:         configuration['ANALYTICS_ENDPOINT']&.chomp('/'),
+          push_notification_endpoint: configuration['NOTIFICATIONS_ENDPOINT']&.chomp('/'))
       when 'qa'
         ENV['ROLLOUT_MODE'] = 'QA'
       when 'localhost'
         ENV['ROLLOUT_MODE'] = 'LOCAL'
       end
-      options = Rox::Server::RoxOptions.new(logger: ServerLogger.new)
+      options = Rox::Server::RoxOptions.new(fetch_interval: fetch_interval,logger: ServerLogger.new, network_configurations_options: network_config)
       puts "options => #{options}"
       Rox::Server::RoxServer.setup(payload['key'], options).value
       [200, JSON.generate({ result: 'done' })]

data/lib/rox/core/analytics/transport.rb

@@ -18,6 +18,7 @@ module Rox
         def initialize(device_properties)
           @device_properties = device_properties
           uri = URI.parse(Rox::Core::Environment.analytics_path)
+          logger.debug("Using Analytics url #{uri}")
           @headers = {
             'Accept' => 'application/json',
             'Content-Type' => 'application/json',

data/lib/rox/core/consts/environment.rb

@@ -1,77 +1,85 @@
 module Rox
   module Core
     module Environment
+      def self.reset(rox_options = nil)
+        @roxy_internal_path = 'device/request_configuration'
+        if !rox_options&.network_configurations_options.nil?
+            @cdn_path = rox_options&.network_configurations_options&.get_config_cloud_endpoint
+            @api_path = rox_options&.network_configurations_options&.get_config_api_endpoint
+            @state_cdn_path = rox_options&.network_configurations_options&.send_state_cloud_endpoint
+            @state_api_path = rox_options&.network_configurations_options&.send_state_api_endpoint
+            @analytics_path = rox_options&.network_configurations_options&.analytics_endpoint
+            @notifications_path = rox_options&.network_configurations_options&.push_notification_endpoint
+        else
+          case ENV['ROLLOUT_MODE']
+          when 'QA'
+            setQA
+          when 'LOCAL'
+            setLOCAL
+          else
+            setDefault(rox_options)
+          end
+        end
+      end
+
       def self.roxy_internal_path
-        'device/request_configuration'
+        @roxy_internal_path
       end
 
       def self.cdn_path
-        case ENV['ROLLOUT_MODE']
-        when 'QA'
-          'https://qa-conf.rollout.io'
-        when 'LOCAL'
-          'https://development-conf.rollout.io'
-        else
-          'https://conf.rollout.io'
-        end
+        @cdn_path
       end
 
-      def self.api_path(api_url = nil)
-        case ENV['ROLLOUT_MODE']
-        when 'QA'
-          'https://qa-api.rollout.io/device/get_configuration'
-        when 'LOCAL'
-          'http://127.0.0.1:8557/device/get_configuration'
-        else
-          api_url ||= 'https://x-api.rollout.io'
-          "#{api_url}/device/get_configuration"
-        end
+      def self.api_path
+        @api_path
       end
 
       def self.state_cdn_path
-        case ENV['ROLLOUT_MODE']
-        when 'QA'
-          'https://qa-statestore.rollout.io'
-        when 'LOCAL'
-          'https://development-statestore.rollout.io'
-        else
-          'https://statestore.rollout.io'
-        end
+        @state_cdn_path
       end
 
-      def self.state_api_path(api_url = nil)
-        case ENV['ROLLOUT_MODE']
-        when 'QA'
-          'https://qa-api.rollout.io/device/update_state_store'
-        when 'LOCAL'
-          'http://127.0.0.1:8557/device/update_state_store'
-        else
-          api_url ||= 'https://x-api.rollout.io'
-          "#{api_url}/device/update_state_store"
-        end
+      def self.state_api_path
+        @state_api_path
       end
 
-      def self.analytics_path(analytics_url = 'https://analytic.rollout.io')
-        case ENV['ROLLOUT_MODE']
-        when 'QA'
-          'https://qaanalytic.rollout.io'
-        when 'LOCAL'
-          'http://127.0.0.1:8787'
-        else
-          analytics_url
-        end
+      def self.analytics_path
+        @analytics_path
       end
 
       def self.notifications_path
-        case ENV['ROLLOUT_MODE']
-        when 'QA'
-          'https://qax-push.rollout.io/sse'
-        when 'LOCAL'
-          'http://127.0.0.1:8887/sse'
-        else
-          'https://push.rollout.io/sse'
-        end
+        @notifications_path
+      end
+
+      private
+      def self.setQA()
+        @cdn_path = 'https://qa-conf.rollout.io'
+        @api_path = 'https://qa-api.rollout.io/device/get_configuration'
+        @state_cdn_path = 'https://qa-statestore.rollout.io'
+        @state_api_path = 'https://qa-api.rollout.io/device/update_state_store'
+        @analytics_path = 'https://qaanalytic.rollout.io'
+        @notifications_path = 'https://qax-push.rollout.io/sse'
+      end
+
+      def self.setLOCAL()
+        @cdn_path = 'https://development-conf.rollout.io'
+        @api_path = 'http://127.0.0.1:8557/device/get_configuration'
+        @state_cdn_path = 'https://development-statestore.rollout.io'
+        @state_api_path = 'http://127.0.0.1:8557/device/update_state_store'
+        @analytics_path = 'http://127.0.0.1:8787'
+        @notifications_path = 'http://127.0.0.1:8887/sse'
+      end
+
+      def self.setDefault(rox_options)
+        @cdn_path = 'https://conf.rollout.io'
+        @state_cdn_path = 'https://statestore.rollout.io'
+        alternative_api_url = rox_options&.self_managed_options&.server_url || 'https://x-api.rollout.io'
+        @api_path = "#{alternative_api_url}/device/get_configuration"
+        @state_api_path = "#{alternative_api_url}/device/update_state_store"
+        @analytics_path = rox_options&.self_managed_options&.analytics_url ||'https://analytic.rollout.io'
+        @notifications_path = 'https://push.rollout.io/sse'
       end
     end
   end
 end
+
+Rox::Core::Environment.reset

data/lib/rox/core/core.rb

@@ -59,6 +59,7 @@ module Rox
       def setup(sdk_settings, device_properties)
         @sdk_settings = sdk_settings
         @rox_options = device_properties.rox_options
+        Rox::Core::Environment.reset(@rox_options)
 
         experiments_extensions = ExperimentsExtensions.new(@parser, @target_group_repository, @flag_repository,
                                                            @experiment_repository)
@@ -70,14 +71,12 @@ module Rox
 
         validate_api_key(sdk_settings&.api_key) if roxy_path.nil?
 
-        # TODO: Analytics.Analytics.Initialize(deviceProperties.RolloutKey, deviceProperties)
         @internal_flags = InternalFlags.new(@experiment_repository, @parser, @rox_options)
 
-        if !@rox_options.self_managed? && roxy_path.nil?
+        if roxy_path.nil?
           @analytics_client = create_analytics_client(device_properties)
         end
 
-        # 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)
         @flag_setter = FlagSetter.new(@flag_repository, @parser, @experiment_repository, @impression_invoker)
@@ -109,14 +108,13 @@ module Rox
                                                                 @configuration_fetched_invoker)
         end
 
-        configuration_fetched_handler = nil
-        configuration_fetched_handler = @rox_options.configuration_fetched_handler unless @rox_options.nil?
-
         @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)
+        if !@rox_options.nil? && !@rox_options.configuration_fetched_handler.nil?
+          @configuration_fetched_invoker.register_fetched_handler(&@rox_options.configuration_fetched_handler)
+        end
 
         @thread = Thread.new do
           Thread.current.report_on_exception = false if Thread.current.respond_to?(:report_on_exception)

data/lib/rox/core/entities/rox_double.rb

@@ -4,7 +4,7 @@ module Rox
   module Core
     class RoxDouble < RoxString
       def value(context = nil)
-        return_value = internal_value(context, false, Float)
+        return_value = Rox::Server::NormalizeFlagType.normalize_float(internal_value(context, false, Float))
         send_impressions(return_value, context)
         return_value
       end

data/lib/rox/core/entities/rox_int.rb

@@ -4,7 +4,7 @@ module Rox
   module Core
     class RoxInt < RoxString
       def value(context = nil)
-        return_value = internal_value(context, false, Integer)
+        return_value = Rox::Server::NormalizeFlagType.normalize_int(internal_value(context, false, Integer))
         send_impressions(return_value, context)
         return_value
       end

data/lib/rox/core/network/request_configuration_builder.rb

@@ -23,7 +23,7 @@ module Rox
       end
 
       def build_for_api
-        build_request_with_full_params("#{Rox::Core::Environment.api_path(@rox_options.self_managed_options&.server_url)}/#{relative_path}")
+        build_request_with_full_params("#{Rox::Core::Environment.api_path}/#{relative_path}")
       end
 
       def relative_path

data/lib/rox/core/network/response.rb

@@ -21,8 +21,8 @@ module Rox
       end
 
       def missing_via_response_body?
-        @status_code == 200 && @content_type == 'application/json' &&
-          [404, '404'].include?(JSON.parse(text)['result'])
+        # api send state respons returns 200 'OK', application/json filters it
+        @status_code == 200 && @content_type == 'application/json' && @text && [404, '404'].include?(JSON.parse(text)['result'])
       rescue JSON::ParserError
         Logging.logger.error("Failed to parse JSON response: #{text}")
         false

data/lib/rox/core/network/state_sender.rb

@@ -69,7 +69,7 @@ module Rox
 
       def send_state_to_API(rollout_key, md5_signature, state_payload)
         @request.send_post(
-          "#{Rox::Core::Environment.state_api_path(@device_properties.rox_options.self_managed_options&.server_url)}/#{rollout_key}/#{md5_signature}", state_payload
+          "#{Rox::Core::Environment.state_api_path}/#{rollout_key}/#{md5_signature}", state_payload
         )
       end
 

data/lib/rox/server/network_configurations_options.rb

@@ -0,0 +1,20 @@
+module Rox
+    module Server
+        class NetworkConfigurationsOptions
+            attr_reader :get_config_api_endpoint, :get_config_cloud_endpoint,
+                        :send_state_api_endpoint, :send_state_cloud_endpoint,
+                        :analytics_endpoint, :push_notification_endpoint
+
+            def initialize(get_config_api_endpoint:, get_config_cloud_endpoint:,
+                            send_state_api_endpoint:, send_state_cloud_endpoint:,
+                            analytics_endpoint:, push_notification_endpoint:)
+                @get_config_api_endpoint = get_config_api_endpoint
+                @get_config_cloud_endpoint = get_config_cloud_endpoint
+                @send_state_api_endpoint = send_state_api_endpoint
+                @send_state_cloud_endpoint = send_state_cloud_endpoint
+                @analytics_endpoint = analytics_endpoint
+                @push_notification_endpoint = push_notification_endpoint
+            end
+        end
+    end
+end

data/lib/rox/server/rox_options.rb

@@ -3,20 +3,12 @@ require 'rox/server/logging/server_logger'
 
 module Rox
   module Server
-    class SelfManagedOptions
-      attr_reader :server_url, :analytics_url
-
-      def initialize(server_url:, analytics_url:)
-        @server_url = server_url
-        @analytics_url = analytics_url
-      end
-    end
-
     class RoxOptions
       attr_reader :dev_mode_key, :version, :fetch_interval,
                   :logger, :impression_handler,
                   :configuration_fetched_handler,
                   :roxy_url, :self_managed_options,
+                  :network_configurations_options,
                   :dynamic_property_rule_handler
 
       def initialize(
@@ -28,6 +20,7 @@ module Rox
         configuration_fetched_handler: nil,
         roxy_url: nil,
         self_managed_options: nil,
+        network_configurations_options: nil,
         dynamic_property_rule_handler: nil
       )
         @dev_mode_key = dev_mode_key || 'stam'
@@ -45,6 +38,7 @@ module Rox
         @configuration_fetched_handler = configuration_fetched_handler
         @roxy_url = roxy_url
         @self_managed_options = self_managed_options
+        @network_configurations_options = network_configurations_options
         @dynamic_property_rule_handler = dynamic_property_rule_handler || proc do |prop_name, context|
           context ? context[prop_name] : nil
         end

data/lib/rox/server/self_managed_options.rb

@@ -0,0 +1,12 @@
+module Rox
+    module Server
+        class SelfManagedOptions
+            attr_reader :server_url, :analytics_url
+
+            def initialize(server_url:, analytics_url:)
+                @server_url = server_url
+                @analytics_url = analytics_url
+            end
+        end
+    end
+end

data/lib/rox/version.rb

@@ -1,3 +1,3 @@
 module Rox
-  VERSION = '5.1.0'.freeze
+  VERSION = '5.1.1'.freeze
 end

data/rox.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.5'
 
   spec.add_runtime_dependency 'em-eventsource', '~> 0.3.2'
 
-  spec.add_development_dependency 'bundler', '~> 2.3.3'
+  spec.add_development_dependency 'bundler', '~> 2.4.6'
   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.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - CloudBees
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-eventsource
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: 2.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: 2.4.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -108,16 +108,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.7.5
-description: 
+description:
 email:
 - support@rollout.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".editorconfig"
-- ".github/workflows/ruby.yml"
+- ".github/workflows/e2e_tests.yaml"
+- ".github/workflows/unit_tests.yaml"
 - ".gitignore"
 - ".rubocop.yml"
 - Gemfile
@@ -129,10 +129,6 @@ files:
 - e2e-server/.gitignore
 - e2e-server/run_server.sh
 - e2e-server/server.rb
-- e2e/container.rb
-- e2e/custom_props.rb
-- e2e/rox_e2e_test.rb
-- e2e/test_vars.rb
 - example/local.rb
 - lib/rox.rb
 - lib/rox/core/analytics/backoff_policy.rb
@@ -226,15 +222,17 @@ files:
 - lib/rox/server/flags/rox_string.rb
 - lib/rox/server/flags/server_entities_provider.rb
 - lib/rox/server/logging/server_logger.rb
+- lib/rox/server/network_configurations_options.rb
 - lib/rox/server/rox_options.rb
 - lib/rox/server/rox_server.rb
+- lib/rox/server/self_managed_options.rb
 - lib/rox/version.rb
 - rox.gemspec
 homepage: https://github.com/rollout/rox-ruby
 licenses:
 - Nonstandard
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -242,15 +240,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.4.7
+signing_key:
 specification_version: 4
 summary: Feature Management ROX Ruby SDK
 test_files: []

data/.circleci/config.yml

@@ -1,73 +0,0 @@
-version: 2.1
-jobs:
-  test_2-6: &test-template
-    docker:
-    - image: circleci/ruby:2.6.4
-
-    working_directory: ~/repo
-
-    steps:
-    - checkout
-
-    - run:
-        name: install ssh
-        command: |
-          sudo apt-get update
-          sudo apt-get install libssl-dev
-
-    - run:
-        name: install dependencies
-        command: |
-          bundle install --jobs=4 --retry=3 --path vendor/bundle
-
-    - run:
-        name: run tests
-        command: |
-          bundle exec rake test
-
-    - run:
-        name: run tests
-        command: |
-          bundle exec rake e2e
-
-  test_2-5:
-    <<: *test-template
-    docker:
-    - image: circleci/ruby:2.5.6
-  test_2-4:
-    <<: *test-template
-    docker:
-    - image: circleci/ruby:2.4.7
-  test_2-3:
-    <<: *test-template
-    docker:
-    - image: circleci/ruby:2.3.8
-
-  sdk-integration-test:
-      <<: *test-template
-      steps:
-      - run:
-          name: trigger sdk integration test workflow
-          command: >-
-            curl -X POST https://circleci.com/api/v2/project/gh/rollout/sdk-integration-tests/pipeline
-            --header 'Content-Type: application/json'
-            --header 'Accept: application/json'
-            --header 'x-attribution-login: rox-ruby'
-            --header 'x-attribution-actor-id: rox-ruby'
-            --header 'Circle-Token: '$CircleApiToken
-            --data '{"parameters": {"sdk_triggered_run": true, "repo_name": "'$CIRCLE_PROJECT_REPONAME'", "repo_owner": "'$CIRCLE_PROJECT_USERNAME'", "sha": "'$CIRCLE_SHA1'"  }}'
-
-workflows:
-  version: 2
-  test:
-    jobs:
-    - test_2-6
-    - test_2-5
-    - test_2-4
-    - test_2-3
-    - sdk-integration-test:
-        requires:
-          - test_2-6
-          - test_2-5
-          - test_2-4
-          - test_2-3

data/e2e/container.rb

@@ -1,35 +0,0 @@
-require 'rox/server/flags/rox_flag'
-require 'rox/server/flags/rox_string'
-
-module E2E
-  class Container
-    attr_accessor :simple_flag, :simple_flag_overwritten, :flag_for_impression,
-                  :flag_for_impression_with_experiment_and_context, :flag_custom_properties,
-                  :flag_target_groups_all, :flag_target_groups_any, :flag_target_groups_none,
-                  :variant_with_context, :variant, :variant_overwritten, :flag_for_dependency,
-                  :flag_dependent, :flag_color_dependent_with_context
-
-    def initialize
-      @simple_flag = Rox::Server::RoxFlag.new(true)
-      @simple_flag_overwritten = Rox::Server::RoxFlag.new(true)
-
-      @flag_for_impression = Rox::Server::RoxFlag.new(false)
-      @flag_for_impression_with_experiment_and_context = Rox::Server::RoxFlag.new(false)
-
-      @flag_custom_properties = Rox::Server::RoxFlag.new
-
-      @flag_target_groups_all = Rox::Server::RoxFlag.new
-      @flag_target_groups_any = Rox::Server::RoxFlag.new
-      @flag_target_groups_none = Rox::Server::RoxFlag.new
-
-      @variant_with_context = Rox::Server::RoxString.new('red', %w[red blue green])
-
-      @variant = Rox::Server::RoxString.new('red', %w[red blue green])
-      @variant_overwritten = Rox::Server::RoxString.new('red', %w[red blue green])
-
-      @flag_for_dependency = Rox::Server::RoxFlag.new(false)
-      @flag_dependent = Rox::Server::RoxFlag.new(false)
-      @flag_color_dependent_with_context = Rox::Server::RoxString.new('White', %w[White Blue Green Yellow])
-    end
-  end
-end

data/e2e/custom_props.rb

@@ -1,55 +0,0 @@
-module E2E
-  class CustomProps
-    def self.create_custom_props
-      Rox::Server::RoxServer.set_custom_string_property('string_prop1', 'Hello')
-      Rox::Server::RoxServer.set_custom_string_property('string_prop2') do |_context|
-        TestVars.is_computed_string_prop_called = true
-        'World'
-      end
-
-      Rox::Server::RoxServer.set_custom_boolean_property('bool_prop1', true)
-      Rox::Server::RoxServer.set_custom_boolean_property('bool_prop2') do |_context|
-        TestVars.is_computed_boolean_prop_called = true
-        false
-      end
-
-      Rox::Server::RoxServer.set_custom_int_property('int_prop1', 6)
-      Rox::Server::RoxServer.set_custom_int_property('int_prop2') do |_context|
-        TestVars.is_computed_int_prop_called = true
-        28
-      end
-
-      Rox::Server::RoxServer.set_custom_float_property('float_prop1', 3.14)
-      Rox::Server::RoxServer.set_custom_float_property('float_prop2') do |_context|
-        TestVars.is_computed_float_prop_called = true
-        1.618
-      end
-
-      Rox::Server::RoxServer.set_custom_semver_property('smvr_prop1', '9.11.2001')
-      Rox::Server::RoxServer.set_custom_semver_property('smvr_prop2') do |_context|
-        TestVars.is_computed_semver_prop_called = true
-        '20.7.1969'
-      end
-
-      Rox::Server::RoxServer.set_custom_boolean_property('bool_prop_target_group_for_variant') do |context|
-        context['isDuckAndCover']
-      end
-
-      Rox::Server::RoxServer.set_custom_boolean_property('bool_prop_target_group_operand1') do |_context|
-        TestVars.target_group1
-      end
-
-      Rox::Server::RoxServer.set_custom_boolean_property('bool_prop_target_group_operand2') do |_context|
-        TestVars.target_group2
-      end
-
-      Rox::Server::RoxServer.set_custom_boolean_property('bool_prop_target_group_for_dependency') do |_context|
-        TestVars.is_prop_for_target_group_for_dependency
-      end
-
-      Rox::Server::RoxServer.set_custom_boolean_property('bool_prop_target_group_for_variant_dependency') do |context|
-        context['isDuckAndCover']
-      end
-    end
-  end
-end

data/e2e/rox_e2e_test.rb

@@ -1,202 +0,0 @@
-require 'minitest/autorun'
-require 'rox/server/rox_options'
-require 'rox/server/rox_server'
-require 'rox/server/logging/server_logger'
-require_relative 'container'
-require_relative 'custom_props'
-require_relative 'test_vars'
-
-module E2E
-  class Logger
-    def debug(message, _ex = nil)
-      puts 'Before Rox.Setup', message
-    end
-
-    def error(message, ex = nil)
-      puts 'Before Rox.Setup', message, ex
-    end
-
-    def warn(message, _ex = nil)
-      puts 'Before Rox.Setup', message
-    end
-  end
-
-  class RoxE2ETest < Minitest::Test
-    ENV['ROLLOUT_MODE'] = 'QA'
-
-    @@setupComplete = false
-    @@testsRun = 0
-
-    def setup
-      @@testsRun += 1
-      if !@@setupComplete
-
-        configuration_fetched_handler = proc do |e|
-          if !e.nil? && e.fetcher_status == Rox::Core::FetcherStatus::APPLIED_FROM_NETWORK
-            TestVars.configuration_fetched_count += 1
-          end
-        end
-
-        impression_handler = proc do |e|
-          puts "targeting: #{e.reporting_value.targeting}"
-          if e.reporting_value.targeting
-            puts "#{Time.now}: flag #{e.reporting_value.name} value is #{e.reporting_value.value}"
-          else
-            puts "#{Time.now}: flag #{e.reporting_value.name} has no conditions, or targeting is off. default value #{!!e.reporting_value.value == e.reporting_value.value ? (e.reporting_value.value ? 'true' : 'false') : e.reporting_value.value} was used"
-          end
-          if !e.nil? && !e.reporting_value.nil? && (e.reporting_value.name == 'flag_for_impression')
-            TestVars.is_impression_raised = true
-            TestVars.impression_raised_times += 1
-          end
-          TestVars.impression_returned_args = e
-        end
-
-        option = Rox::Server::RoxOptions.new(
-          configuration_fetched_handler: configuration_fetched_handler,
-          impression_handler: impression_handler,
-          dev_mode_key: '67e39e708444aa953414e444',
-          logger: Rox::Server::ServerLogger.new
-        )
-
-        @@container = Container.new
-        Rox::Server::RoxServer.register(@@container)
-        CustomProps.create_custom_props
-        Rox::Server::RoxServer.setup('5b82864ebc3aec37aff1fdd5', option).join
-        @@setupComplete = true
-      end
-    end
-
-    def teardown
-      if @@testsRun == RoxE2ETest.runnable_methods.length
-        Rox::Server::RoxServer.shutdown
-      end
-    end
-
-    def before_setup
-      TestVars.is_impression_raised = false
-      TestVars.impression_raised_times = 0
-    end
-
-    def test_simple_flag
-      assert_equal true, @@container.simple_flag.enabled?
-    end
-
-    def test_simple_flag_overwritten
-      assert_equal false, @@container.simple_flag_overwritten.enabled?
-    end
-
-    def test_string
-      assert_equal 'red', @@container.variant.value
-    end
-
-    def test_variant_overwritten
-      assert_equal 'green', @@container.variant_overwritten.value
-    end
-
-    def test_all_custom_properties
-      assert_equal true, @@container.flag_custom_properties.enabled?
-
-      assert_equal true, TestVars.is_computed_boolean_prop_called
-      assert_equal true, TestVars.is_computed_float_prop_called
-      assert_equal true, TestVars.is_computed_int_prop_called
-      assert_equal true, TestVars.is_computed_semver_prop_called
-      assert_equal true, TestVars.is_computed_string_prop_called
-    end
-
-    def test_fetch_within_timeout
-      number_of_config_fetches = TestVars.configuration_fetched_count
-      timeout = 5
-      thread = Rox::Server::RoxServer.fetch
-      res = thread.join(timeout)
-
-      if res.nil?
-        flunk('timeout')
-      else
-        assert number_of_config_fetches < TestVars.configuration_fetched_count
-      end
-    end
-
-    def test_string_with_context
-      some_positive_context = { 'isDuckAndCover' => true }
-      some_negative_context = { 'isDuckAndCover' => false }
-
-      assert_equal 'red', @@container.variant_with_context.value
-
-      assert_equal 'blue', @@container.variant_with_context.value(some_positive_context)
-      assert_equal 'red', @@container.variant_with_context.value(some_negative_context)
-    end
-
-    def test_target_groups_all_any_none
-      TestVars.target_group1 = true
-      TestVars.target_group2 = true
-
-      assert_equal true, @@container.flag_target_groups_all.enabled?
-      assert_equal true, @@container.flag_target_groups_any.enabled?
-      assert_equal false, @@container.flag_target_groups_none.enabled?
-
-      TestVars.target_group1 = false
-      assert_equal false, @@container.flag_target_groups_all.enabled?
-      assert_equal true, @@container.flag_target_groups_any.enabled?
-      assert_equal false, @@container.flag_target_groups_none.enabled?
-
-      TestVars.target_group2 = false
-      assert_equal false, @@container.flag_target_groups_all.enabled?
-      assert_equal false, @@container.flag_target_groups_any.enabled?
-      assert_equal true, @@container.flag_target_groups_none.enabled?
-    end
-
-    def test_impression_handler
-      @@container.flag_for_impression.enabled?
-      assert_equal true, TestVars.is_impression_raised
-      TestVars.is_impression_raised = false
-
-      context = { 'var' => 'val' }
-      flag_impression_value = @@container.flag_for_impression_with_experiment_and_context.enabled?(context)
-      refute_nil TestVars.impression_returned_args
-      refute_nil TestVars.impression_returned_args.reporting_value
-      assert_equal true, TestVars.impression_returned_args.reporting_value.value
-      assert_equal true, flag_impression_value
-      assert_equal 'flag_for_impression_with_experiment_and_context',
-                   TestVars.impression_returned_args.reporting_value.name
-
-      refute_nil TestVars.impression_returned_args
-
-      assert_equal 'val', TestVars.impression_returned_args.context['var']
-    end
-
-    def test_static_flag_impression_raised_once
-      assert_equal false, TestVars.is_impression_raised
-      assert_equal 0, TestVars.impression_raised_times
-      @@container.flag_for_impression.enabled?
-      assert_equal true, TestVars.is_impression_raised
-      assert_equal 1, TestVars.impression_raised_times
-    end
-
-    def test_dynamic_flag_impression_raised_once
-      assert_equal false, TestVars.is_impression_raised
-      assert_equal 0, TestVars.impression_raised_times
-      Rox::Server::RoxServer::dynamic_api.enabled?('flag_for_impression', true)
-      assert_equal true, TestVars.is_impression_raised
-      assert_equal 1, TestVars.impression_raised_times
-    end
-
-    def test_flag_dependency
-      TestVars.is_prop_for_target_group_for_dependency = true
-      assert_equal true, @@container.flag_for_dependency.enabled?
-      assert_equal false, @@container.flag_dependent.enabled?
-
-      TestVars.is_prop_for_target_group_for_dependency = false
-      assert_equal true, @@container.flag_dependent.enabled?
-      assert_equal false, @@container.flag_for_dependency.enabled?
-    end
-
-    def test_string_dependency_with_context
-      some_positive_context = { 'isDuckAndCover' => true }
-      some_negative_context = { 'isDuckAndCover' => false }
-
-      assert_equal 'White', @@container.flag_color_dependent_with_context.value
-      assert_equal 'White', @@container.flag_color_dependent_with_context.value(some_negative_context)
-      assert_equal 'Yellow', @@container.flag_color_dependent_with_context.value(some_positive_context)
-    end
-  end
-end

data/e2e/test_vars.rb

@@ -1,22 +0,0 @@
-module E2E
-  module TestVars
-    class << self
-      attr_accessor :is_computed_boolean_prop_called, :is_computed_string_prop_called, :is_computed_int_prop_called,
-                    :is_computed_float_prop_called, :is_computed_semver_prop_called, :target_group1, :target_group2, :is_impression_raised, :impression_raised_times, :is_prop_for_target_group_for_dependency, :configuration_fetched_count, :impression_returned_args
-    end
-
-    @is_computed_boolean_prop_called = false
-    @is_computed_string_prop_called = false
-    @is_computed_int_prop_called = false
-    @is_computed_float_prop_called = false
-    @is_computed_semver_prop_called = false
-    @target_group1 = false
-    @target_group2 = false
-    @is_impression_raised = false
-    @impression_raised_times = 0
-    @is_prop_for_target_group_for_dependency = false
-
-    @configuration_fetched_count = 0
-    @impression_returned_args = nil
-  end
-end