rox-rollout 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83830a53d34aa5c51ae4d620b3e21789f5eb2cbd
-  data.tar.gz: 419c4a400b030dc5e539003bee949b3776a31bbe
+  metadata.gz: f4ad60820f71ef8569f15f07fcb1ced8b05e99be
+  data.tar.gz: 327115ab21d5889e4783fcef71d33e1cbc72e7ab
 SHA512:
-  metadata.gz: a1e076439bc9fb0ffccc6d8f9b3a096b9bc4baa3d22994a9b24c762922ee018105ce4ee3a4f096e111e2bc4a535b661f71559fa7dbe192669c9d7b2f4fb77ecf
-  data.tar.gz: 4f65eb77eed230bab5fe58fe6f14fb56e9c319650d60d892596a845461bea00dbedfd3bb3a36114edb15488325e3e24589a110d70c26dbae93de980a7134f64f
+  metadata.gz: '0368035eb4d7f508749be64e32e89001af56475e57a9018d45654e854c3ac9e9bae322f800525b70ea606240efc35cb1b7c9d140537114e145d92390416b706b'
+  data.tar.gz: 75afe906a4eb22195d5020fdb546952bea785a80f49df4eb6cb85bd8cdd9cec7c47e25f702d013525a8e4474b4ef8bd24f4e6acfb33553fde4a48a859dbcd6da

data/e2e/rox_e2e_test.rb

@@ -12,7 +12,7 @@ module E2E
     end
 
     def error(message, ex = nil)
-      puts 'Before Rox.Setup', message
+      puts 'Before Rox.Setup', message, ex
     end
 
     def warn(message, ex = nil)

data/lib/rox/core/client/dynamic_api.rb

@@ -0,0 +1,36 @@
+require 'rox/core/entities/flag'
+
+module Rox
+  module Core
+    class DynamicApi
+      def initialize(flag_repository, entities_provider)
+        @flag_repository = flag_repository
+        @entities_provider = entities_provider
+      end
+
+      def enabled?(name, default_value, context = nil)
+        variant = @flag_repository.flag(name)
+        if variant.nil?
+          variant = @entities_provider.create_flag(default_value)
+          @flag_repository.add_flag(variant, name)
+        end
+
+        return default_value unless variant.is_a?(Flag)
+
+        is_enabled = variant.internal_enabled?(context, nil_instead_of_default: true)
+        is_enabled.nil? ? default_value : is_enabled
+      end
+
+      def value(name, default_value, context = nil, options = [])
+        variant = @flag_repository.flag(name)
+        if variant.nil?
+          variant = @entities_provider.create_variant(default_value, options)
+          @flag_repository.add_flag(variant, name)
+        end
+
+        value = variant.internal_value(context, nil_instead_of_default: true)
+        value.nil? ? default_value : value
+      end
+    end
+  end
+end

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

@@ -37,6 +37,17 @@ module Rox
           'https://analytic.rollout.io'
         end
       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
+      end
     end
   end
 end

data/lib/rox/core/core.rb

@@ -11,6 +11,7 @@ require 'rox/core/network/request_configuration_builder'
 require 'rox/core/network/request'
 require 'rox/core/network/configuration_fetcher'
 require 'rox/core/network/configuration_fetcher_roxy'
+require 'rox/core/notifications/notification_listener'
 require 'rox/core/register/registerer'
 require 'rox/core/client/internal_flags'
 require 'rox/core/client/buid'
@@ -19,6 +20,7 @@ require 'rox/core/impression/impression_invoker'
 require 'rox/core/reporting/error_reporter'
 require 'rox/core/security/signature_verifier'
 require 'rox/core/utils/periodic_task'
+require 'rox/core/client/dynamic_api'
 
 module Rox
   module Core
@@ -44,6 +46,8 @@ module Rox
         @error_reporter = nil
         @configuration_fetcher = nil
         @last_configurations = nil
+        @internal_flags = nil
+        @push_updates_listener = nil
       end
 
       def setup(sdk_settings, device_properties, rox_options)
@@ -52,10 +56,10 @@ module Rox
         roxy_path = rox_options.nil? || rox_options.roxy_url.nil? ? nil : rox_options.roxy_url
 
         # TODO: Analytics.Analytics.Initialize(deviceProperties.RolloutKey, deviceProperties)
-        internal_flags = InternalFlags.new(@experiment_repository, @parser)
+        @internal_flags = InternalFlags.new(@experiment_repository, @parser)
 
         # TODO: impressionInvoker = new ImpressionInvoker(internalFlags, customPropertyRepository, deviceProperties, Analytics.Analytics.Client, roxyPath != null);
-        @impression_invoker = ImpressionInvoker.new(internal_flags, @custom_property_repository, device_properties, nil, !roxy_path.nil?)
+        @impression_invoker = ImpressionInvoker.new(@internal_flags, @custom_property_repository, device_properties, nil, !roxy_path.nil?)
         @flag_setter = FlagSetter.new(@flag_repository, @parser, @experiment_repository, @impression_invoker)
         buid = BUID.new(sdk_settings, device_properties, @flag_repository, @custom_property_repository)
 
@@ -72,10 +76,13 @@ module Rox
           @configuration_fetcher = ConfigurationFetcherRoxy.new(request_config_builder, client_request, @configuration_fetched_invoker)
         end
 
-        if !rox_options.nil? && !rox_options.configuration_fetched_handler.nil?
-          @configuration_fetched_invoker.register_fetched_handler(&rox_options.configuration_fetched_handler)
+        configuration_fetched_handler = nil
+        unless rox_options.nil?
+          configuration_fetched_handler = rox_options.configuration_fetched_handler
         end
 
+        @configuration_fetched_invoker.register_fetched_handler(&wrap_configuration_fetched_handler(&configuration_fetched_handler))
+
         Thread.new do
           Thread.current.report_on_exception = false if Thread.current.respond_to?(:report_on_exception)
           fetch
@@ -126,6 +133,34 @@ module Rox
       def add_custom_property_if_not_exists(property)
         @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) unless handler.nil?
+        end
+      end
+
+      def start_or_stop_push_updated_listener
+        if @internal_flags.enabled?('rox.internal.pushUpdates')
+          if @push_updates_listener.nil?
+            @push_updates_listener = NotificationListener.new(Environment.notifications_path, @sdk_settings.api_key)
+            @push_updates_listener.on 'changed' do |data|
+              fetch
+            end
+            @push_updates_listener.start
+          end
+        else
+          unless @push_updates_listener.nil?
+            @push_updates_listener.stop
+            @push_updates_listener = nil
+          end
+        end
+      end
+
+      def dynamic_api(entities_provider)
+        Rox::Core::DynamicApi.new(@flag_repository, entities_provider)
+      end
     end
   end
 end

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

@@ -14,6 +14,11 @@ module Rox
         value(context) == Flag::FLAG_TRUE_VALUE
       end
 
+      def internal_enabled?(context, nil_instead_of_default)
+        val = internal_value(context, nil_instead_of_default)
+        nil_instead_of_default && val.nil? ? nil : (val == Flag::FLAG_TRUE_VALUE)
+      end
+
       def enabled(context)
         yield if enabled?(context)
       end

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

@@ -7,7 +7,7 @@ module Rox
     class Variant
       attr_accessor :default_value, :options, :name, :context, :condition, :parser, :impression_invoker, :client_experiment
 
-      def initialize(default_value, options)
+      def initialize(default_value, options = [])
         @default_value = default_value
         @options = options.clone
         @options << default_value unless options.include?(default_value)
@@ -34,7 +34,11 @@ module Rox
       end
 
       def value(context = nil)
-        return_value = @default_value
+        internal_value(context, false)
+      end
+
+      def internal_value(context, nil_instead_of_default)
+        return_value = nil_instead_of_default ? nil : @default_value
         merged_context = MergedContext.new(@context, context)
 
         if !@parser.nil? && !@condition.nil? && !@condition.empty?
@@ -42,7 +46,7 @@ module Rox
           unless evaluation_result.nil?
             value = evaluation_result.string_value
             if !value.nil? && !value.empty?
-              return_value = value if @options.include?(value)
+              return_value = value
             end
           end
         end

data/lib/rox/core/notifications/notification_listener.rb

@@ -0,0 +1,45 @@
+require "em-eventsource"
+
+module Rox
+  module Core
+    class NotificationListener
+      def initialize(listen_url, app_key)
+        @listen_url = listen_url
+        @app_key = app_key
+        @handlers = {}
+      end
+
+      def on(event_name, &handler)
+        @handlers[event_name] ||= []
+        @handlers[event_name] << handler
+      end
+
+      def start
+        sse_url = @listen_url.chomp('/') + '/' + @app_key
+        @thread = Thread.new do
+          EM.run do
+            source = EventMachine::EventSource.new(sse_url)
+            @handlers.each do |event_name, event_handlers|
+              event_handlers.each do |handler|
+                source.on event_name do |data|
+                  # Start new thread to allow the handler to stop the Listener (terminate the current thread)
+                  # and continue handler code execution without interruption
+                  handler_thread = Thread.new do
+                    handler.call(data)
+                  end
+                  handler_thread.join
+                end
+              end
+            end
+            source.start
+          end
+        end
+      end
+
+      def stop
+        @thread.terminate unless @thread.nil?
+        @thread = nil
+      end
+    end
+  end
+end

data/lib/rox/core/register/registerer.rb

@@ -16,14 +16,16 @@ module Rox
 
         @namespaces << ns
 
-        container.methods.each do |method_name|
-          method = container.method(method_name)
-          next unless method.arity.zero?
-
+        container.instance_variables().each do |attribute_name|
           begin
-            value = method.call
-            if value.is_a?(Variant)
-              @flag_repository.add_flag(value, ns == '' ? method_name.to_s : "#{ns}.#{method_name}")
+            value = container.instance_variable_get(attribute_name)
+            if value != nil && value.is_a?(Variant)
+              var_name = attribute_name.to_s();
+              # removing the attribute starting @ (if [always] exists)
+              if (var_name[0] == '@')
+                var_name[0] = '';
+              end
+              @flag_repository.add_flag(value, ns == '' ? var_name : "#{ns}.#{var_name}")
             end
           rescue StandardError
             next
@@ -32,4 +34,4 @@ module Rox
       end
     end
   end
-end
+end

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

@@ -127,15 +127,21 @@ module Rox
 
         add_operator('md5') do |parser, stack, context|
           op1 = stack.pop
-          raise ArgumentError, 'should be string' unless op1.is_a?(String)
-          stack.push(Digest::MD5.hexdigest(op1))
+          if op1.is_a?(String)
+            stack.push(Digest::MD5.hexdigest(op1))
+          else
+            stack.push(TokenType::UNDEFINED)
+          end
         end
 
         add_operator('concat') do |parser, stack, context|
           op1 = stack.pop
           op2 = stack.pop
-          raise ArgumentError, 'should be string' unless op1.is_a?(String) && op2.is_a?(String)
-          stack.push("#{op1}#{op2}")
+          if op1.is_a?(String) && op2.is_a?(String)
+            stack.push("#{op1}#{op2}")
+          else
+            stack.push(TokenType::UNDEFINED)
+          end
         end
       end
     end

data/lib/rox/server/flags/server_entities_provider.rb

@@ -0,0 +1,16 @@
+require 'rox/server/flags/rox_flag'
+require 'rox/server/flags/rox_variant'
+
+module Rox
+  module Server
+    class ServerEntitiesProvider
+      def create_flag(default_value)
+        Rox::Server::RoxFlag.new(default_value)
+      end
+
+      def create_variant(default_value, options)
+        Rox::Server::RoxVariant.new(default_value, options)
+      end
+    end
+  end
+end

data/lib/rox/server/rox_server.rb

@@ -8,6 +8,8 @@ require 'rox/core/properties/device_property'
 require 'rox/core/properties/custom_property'
 require 'rox/core/properties/custom_property_type'
 require 'rox/core/consts/property_type'
+require 'rox/server/flags/server_entities_provider'
+
 
 module Rox
   module Server
@@ -78,6 +80,10 @@ module Rox
       def self.set_custom_semver_property(name, value = nil, &block)
         @core.add_custom_property(Rox::Core::CustomProperty.new(name, Rox::Core::CustomPropertyType::SEMVER, value, &block))
       end
+
+      def self.dynamic_api
+        @core.dynamic_api(Rox::Server::ServerEntitiesProvider.new)
+      end
     end
   end
 end

data/lib/rox/version.rb

@@ -1,3 +1,3 @@
 module Rox
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

data/rox.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
+  spec.add_runtime_dependency 'em-eventsource', '~> 0.3.0'
+
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 12.3'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rox-rollout
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Rollout.io
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-07 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: em-eventsource
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +105,7 @@ files:
 - lib/rox.rb
 - lib/rox/core/client/buid.rb
 - lib/rox/core/client/device_properties.rb
+- lib/rox/core/client/dynamic_api.rb
 - lib/rox/core/client/internal_flags.rb
 - lib/rox/core/client/sdk_settings.rb
 - lib/rox/core/configuration/configuration.rb
@@ -124,6 +139,7 @@ files:
 - lib/rox/core/network/request_configuration_builder.rb
 - lib/rox/core/network/request_data.rb
 - lib/rox/core/network/response.rb
+- lib/rox/core/notifications/notification_listener.rb
 - lib/rox/core/properties/custom_property.rb
 - lib/rox/core/properties/custom_property_type.rb
 - lib/rox/core/properties/device_property.rb
@@ -152,6 +168,7 @@ files:
 - lib/rox/server/client/server_properties.rb
 - lib/rox/server/flags/rox_flag.rb
 - lib/rox/server/flags/rox_variant.rb
+- lib/rox/server/flags/server_entities_provider.rb
 - lib/rox/server/logging/server_logger.rb
 - lib/rox/server/rox_options.rb
 - lib/rox/server/rox_server.rb