absmartly-sdk 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a43518b761dda2ac2d8c0297e39c9b0ce83c48c7f8a173206148d4e28f7db3d
-  data.tar.gz: f770928ce488617ce4381e67a5d12df3bfdfd07fa05bb04e5144dcd186bdfd0d
+  metadata.gz: 7cc6b910c683119e99ad8800165f98b47b280ccd5f9e44a915d1043e1256888c
+  data.tar.gz: 8d8d61b7f4f8ed27280a4c3aa4ea7cf9bf8519b5b6743a809c3a799bd38e6c5f
 SHA512:
-  metadata.gz: a5d3b4c6d70f2893a291192e85a2bccd8a9be25381d2a4d7c870d77a8c46853b4249dcbc80c04688204384024be6f505c3e946b75ca54998812ed232a7783f15
-  data.tar.gz: ec9681200650e472a496c36930a2332224d305a5304d2bea53398d12563071762afc9efdfce763b5412a5a10eac20e98d0bfafdac70eae3821464790043fc18e
+  metadata.gz: c6a4e6f5e52ffeb1f29a60d0a9a08474c460c28355dfd6c1471c3c756254248cac33c2c7fe0760e8b415e1b699cbee882217177f32a9aeffdbfe5fa2e65a0b45
+  data.tar.gz: 1d714b5d6288e2a87982fec2e45f76ff2ef3aaeb2d227e43c3dbaaeafb419f9a33bff7acdd615326454067bee3dcce7682caf11e7ba3a921229d065eb4d51ee0

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.0.6

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    absmartly-sdk (1.1.2)
+    absmartly-sdk (1.2.1)
+      base64 (~> 0.2)
       faraday (~> 2.0)
       faraday-retry (~> 2.0)
       murmurhash3 (~> 0.1.7)
@@ -10,13 +11,14 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    base64 (0.3.0)
     byebug (11.1.3)
     diff-lcs (1.5.0)
     faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    faraday-retry (2.1.0)
+    faraday-retry (2.4.0)
       faraday (~> 2.0)
     io-console (0.5.6)
     irb (1.2.6)
@@ -31,8 +33,7 @@ GEM
     regexp_parser (2.5.0)
     reline (0.1.5)
       io-console (~> 0.5)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.4.4)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -60,7 +61,6 @@ GEM
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    strscan (3.1.0)
     unicode-display_width (2.2.0)
 
 PLATFORMS

data/example/example.rb

@@ -82,4 +82,4 @@ properties = {
 }
 ctx2.track("payment", properties)
 
-ctx2.close
+ctx2.close

data/lib/a_b_smartly.rb

@@ -1,92 +1,51 @@
 # frozen_string_literal: true
 
 require "time"
+require "singleton"
+require "forwardable"
 require_relative "context"
 require_relative "audience_matcher"
-require_relative "default_context_data_provider"
-require_relative "default_context_event_handler"
-require_relative "default_variable_parser"
-require_relative "default_audience_deserializer"
-require_relative "scheduled_thread_pool_executor"
+require_relative "a_b_smartly_config"
+require_relative "absmartly/version"
 
 class ABSmartly
-  attr_accessor :context_data_provider, :context_event_handler,
-                :variable_parser, :scheduler, :context_event_logger,
-                :audience_deserializer, :client
+  extend Forwardable
 
-  def self.configure_client(&block)
-    @@init_http = block
-  end
+  attr_reader :config
+
+  def_delegators :@config, :context_data_provider, :context_event_handler, :variable_parser, :context_event_logger,
+                 :audience_deserializer, :client
+
+  def_delegators :@config, :endpoint, :api_key, :application, :environment
 
   def self.create(config)
-    ABSmartly.new(config)
+    new(config)
   end
 
   def initialize(config)
-    @@init_http = nil
-    @context_data_provider = config.context_data_provider
-    @context_event_handler = config.context_event_handler
-    @context_event_logger = config.context_event_logger
-    @variable_parser = config.variable_parser
-    @audience_deserializer = config.audience_deserializer
-    @scheduler = config.scheduler
-
-    if @context_data_provider.nil? || @context_event_handler.nil?
-      @client = config.client
-      raise ArgumentError.new("Missing Client instance configuration") if @client.nil?
-
-      if @context_data_provider.nil?
-        @context_data_provider = DefaultContextDataProvider.new(@client)
-      end
-
-      if @context_event_handler.nil?
-        @context_event_handler = DefaultContextEventHandler.new(@client)
-      end
-    end
+    config.validate!
 
-    if @variable_parser.nil?
-      @variable_parser = DefaultVariableParser.new
-    end
-
-    if @audience_deserializer.nil?
-      @audience_deserializer = DefaultAudienceDeserializer.new
-    end
-    if @scheduler.nil?
-      @scheduler = ScheduledThreadPoolExecutor.new(1)
-    end
+    @config = config
   end
 
-  def create_context(config)
-    validate_params(config)
-    Context.create(get_utc_format, config, @context_data_provider.context_data,
-                   @context_data_provider, @context_event_handler, @context_event_logger, @variable_parser,
-                   AudienceMatcher.new(@audience_deserializer))
+  def create_context(context_config)
+    Context.create(get_utc_format, context_config, context_data,
+                   context_data_provider, context_event_handler, context_event_logger, variable_parser,
+                   AudienceMatcher.new(audience_deserializer))
   end
 
-  def create_context_with(config, data)
-    Context.create(get_utc_format, config, data,
-                   @context_data_provider, @context_event_handler, @context_event_logger, @variable_parser,
-                   AudienceMatcher.new(@audience_deserializer))
+  def create_context_with(context_config, data)
+    Context.create(get_utc_format, context_config, data,
+                   context_data_provider, context_event_handler, context_event_logger, variable_parser,
+                   AudienceMatcher.new(audience_deserializer))
   end
 
   def context_data
-    @context_data_provider.context_data
+    context_data_provider.context_data
   end
 
   private
     def get_utc_format
       Time.now.utc.iso8601(3)
     end
-
-    def validate_params(params)
-      params.units.each do |key, value|
-        unless value.is_a?(String) || value.is_a?(Numeric)
-          raise ArgumentError.new("Unit '#{key}' UID is of unsupported type '#{value.class}'. UID must be one of ['string', 'number']")
-        end
-
-        if value.to_s.size.zero?
-          raise ArgumentError.new("Unit '#{key}' UID length must be >= 1")
-        end
-      end
-    end
 end

data/lib/a_b_smartly_config.rb

@@ -1,49 +1,65 @@
 # frozen_string_literal: true
 
+require "forwardable"
+
+require_relative "client"
+require_relative "client_config"
+require_relative "default_context_data_provider"
+require_relative "default_context_event_handler"
+require_relative "default_variable_parser"
+require_relative "default_audience_deserializer"
+
 class ABSmartlyConfig
-  attr_accessor :context_data_provider, :context_event_handler,
-                :variable_parser, :scheduler, :context_event_logger,
-                :client, :audience_deserializer
+  extend Forwardable
+
+  attr_accessor :scheduler
+
+  attr_writer :context_data_provider, :context_event_handler, :audience_deserializer, :variable_parser, :client
+
+  attr_reader :client_config, :context_event_logger
+
+  def_delegators :@client_config, :endpoint, :api_key, :application, :environment
+  def_delegators :@client_config, :connect_timeout, :connection_request_timeout, :retry_interval, :max_retries
+
   def self.create
-    ABSmartlyConfig.new
+    new
   end
 
-  def context_data_provider=(context_data_provider)
-    @context_data_provider = context_data_provider
-    self
+  def initialize
+    @client_config = ClientConfig.new
   end
 
-  def context_event_handler=(context_event_handler)
-    @context_event_handler = context_event_handler
-    self
+  def validate!
+    raise ArgumentError.new("event logger not configured") if context_event_logger.nil?
+    raise ArgumentError.new("failed to initialize client") if client.nil?
+    raise ArgumentError.new("failed to initialize context_data_provider") if context_data_provider.nil?
   end
 
-  def context_data_provide
-    @context_event_handler
+  def context_event_logger=(context_event_logger)
+    if context_event_logger.is_a?(Proc)
+      @context_event_logger = ContextEventLoggerCallback.new(context_event_logger)
+    else
+      @context_event_logger = context_event_logger
+    end
   end
 
-  def variable_parser=(variable_parser)
-    @variable_parser = variable_parser
-    self
+  def variable_parser
+    @variable_parser ||= DefaultVariableParser.new
   end
 
-  def scheduler=(scheduler)
-    @scheduler = scheduler
-    self
+  def audience_deserializer
+    @audience_deserializer ||= DefaultAudienceDeserializer.new
   end
 
-  def context_event_logger=(context_event_logger)
-    @context_event_logger = context_event_logger
-    self
+  def context_data_provider
+    @context_data_provider ||= DefaultContextDataProvider.new(client)
   end
 
-  def audience_deserializer=(audience_deserializer)
-    @audience_deserializer = audience_deserializer
-    self
+  def context_event_handler
+    @context_event_handler ||= DefaultContextEventHandler.new(client)
   end
 
-  def client=(client)
-    @client = client
-    self
+  def client
+    @client ||= Client.new(client_config)
   end
 end

data/lib/absmartly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Absmartly
-  VERSION = "1.1.2"
+  VERSION = "1.2.1"
 end

data/lib/absmartly.rb

@@ -8,16 +8,16 @@ require_relative "client_config"
 require_relative "context_config"
 
 module Absmartly
-  @@init_config = nil
-
   class Error < StandardError
   end
 
   class << self
-    attr_accessor :endpoint, :api_key, :application, :environment
+    MUTEX = Thread::Mutex.new
 
     def configure_client
-      yield self
+      yield sdk_config
+
+      sdk_config.validate!
     end
 
     def create
@@ -40,24 +40,15 @@ module Absmartly
       sdk.context_data
     end
 
-    private
-      def client_config
-        @client_config = ClientConfig.create
-        @client_config.endpoint = @endpoint
-        @client_config.api_key = @api_key
-        @client_config.application = @application
-        @client_config.environment = @environment
-        @client_config
-      end
+    private_constant :MUTEX
 
+    private
       def sdk_config
-        @sdk_config = ABSmartlyConfig.create
-        @sdk_config.client = Client.create(client_config)
-        @sdk_config
+        MUTEX.synchronize { @sdk_config ||= ABSmartlyConfig.create }
       end
 
       def sdk
-        @sdk ||= create
+        MUTEX.synchronize { @sdk ||= create }
       end
   end
 end

data/lib/client.rb

@@ -1,80 +1,49 @@
 # frozen_string_literal: true
 
+require "forwardable"
 require_relative "default_http_client"
 require_relative "default_http_client_config"
 require_relative "default_context_data_deserializer"
 require_relative "default_context_event_serializer"
 
 class Client
-  attr_accessor :url, :query, :headers, :http_client, :executor, :deserializer, :serializer
-  attr_reader :data_future, :promise, :exception
+  extend Forwardable
 
-  def self.create(config, http_client = nil)
-    Client.new(config, http_client || DefaultHttpClient.create(DefaultHttpClientConfig.create))
-  end
-
-  def initialize(config = nil, http_client = nil)
-    endpoint = config.endpoint
-    raise ArgumentError.new("Missing Endpoint configuration") if endpoint.nil? || endpoint.empty?
-
-    api_key = config.api_key
-    raise ArgumentError.new("Missing APIKey configuration") if api_key.nil? || api_key.empty?
-
-    application = config.application
-    raise ArgumentError.new("Missing Application configuration") if application.nil? || application.empty?
-
-    environment = config.environment
-    raise ArgumentError.new("Missing Environment configuration") if environment.nil? || environment.empty?
+  attr_accessor :http_client
+  attr_reader :config, :data_future, :promise, :exception
 
-    @url = "#{endpoint}/context"
-    @http_client = http_client
-    @deserializer = config.context_data_deserializer
-    @serializer = config.context_event_serializer
-    @executor = config.executor
+  def_delegators :@config, :url, :query, :headers, :deserializer, :serializer
+  def_delegator :@http_client, :close
+  def_delegator :@promise, :success?
 
-    @deserializer = DefaultContextDataDeserializer.new if @deserializer.nil?
-    @serializer = DefaultContextEventSerializer.new if @serializer.nil?
+  def self.create(config = nil, http_client = nil)
+    new(config, http_client)
+  end
 
-    @headers = {
-      "Content-Type": "application/json",
-      "X-API-Key": api_key,
-      "X-Application": application,
-      "X-Environment": environment,
-      "X-Application-Version": "0",
-      "X-Agent": "absmartly-ruby-sdk"
-    }
+  def initialize(config = nil, http_client = nil)
+    @config = config || ClientConfig.new
+    @config.validate!
 
-    @query = {
-      "application": application,
-      "environment": environment
-    }
+    @http_client = http_client || DefaultHttpClient.create(@config.http_client_config)
   end
 
   def context_data
-    @promise = @http_client.get(@url, @query, @headers)
+    @promise = http_client.get(config.url, config.query, config.headers)
     unless @promise.success?
       @exception = Exception.new(@promise.body)
       return self
     end
 
     content = (@promise.body || {}).to_s
-    @data_future = @deserializer.deserialize(content, 0, content.size)
+    @data_future = deserializer.deserialize(content, 0, content.size)
     self
   end
 
   def publish(event)
-    content = @serializer.serialize(event)
-    response = @http_client.put(@url, nil, @headers, content)
+    content = serializer.serialize(event)
+    response = http_client.put(config.url, nil, config.headers, content)
     return Exception.new(response.body) unless response.success?
 
     response
   end
-
-  def close
-    @http_client.close
-  end
-
-  def success?
-    @promise.success?
-  end
 end

data/lib/client_config.rb

@@ -1,21 +1,33 @@
 # frozen_string_literal: true
 
+require "forwardable"
+require_relative "default_context_data_deserializer"
+require_relative "default_context_event_serializer"
+require_relative "default_http_client_config"
+
 class ClientConfig
-  attr_accessor :endpoint, :api_key, :environment, :application, :deserializer,
-                :serializer, :executor
+  extend Forwardable
+
+  attr_accessor :endpoint, :api_key, :environment, :application
+
+  attr_reader :http_client_config
+
+  attr_writer :context_data_deserializer, :context_event_serializer
+
+  def_delegators :@http_client_config, :connect_timeout, :connection_request_timeout, :retry_interval, :max_retries
 
-  def self.create
-    ClientConfig.new
+  def self.create(endpoint: nil, environment: nil, application: nil, api_key: nil)
+    new(endpoint: endpoint, environment: environment, application: application, api_key: api_key)
   end
 
   def self.create_from_properties(properties, prefix)
     properties = properties.transform_keys(&:to_sym)
-    client_config = create
-    client_config.endpoint = properties["#{prefix}endpoint".to_sym]
-    client_config.environment = properties["#{prefix}environment".to_sym]
-    client_config.application = properties["#{prefix}application".to_sym]
-    client_config.api_key = properties["#{prefix}apikey".to_sym]
-    client_config
+    create(
+      endpoint: properties["#{prefix}endpoint".to_sym],
+      environment: properties["#{prefix}environment".to_sym],
+      application: properties["#{prefix}application".to_sym],
+      api_key: properties["#{prefix}apikey".to_sym]
+    )
   end
 
   def initialize(endpoint: nil, environment: nil, application: nil, api_key: nil)
@@ -23,21 +35,60 @@ class ClientConfig
     @environment = environment
     @application = application
     @api_key = api_key
+
+    @http_client_config = DefaultHttpClientConfig.new
   end
 
   def context_data_deserializer
-    @deserializer
+    @context_data_deserializer ||= DefaultContextDataDeserializer.new
   end
 
-  def context_data_deserializer=(deserializer)
-    @deserializer = deserializer
+  def context_event_serializer
+    @context_event_serializer ||= DefaultContextEventSerializer.new
   end
 
-  def context_event_serializer
-    @serializer
+  def deserializer=(deserializer)
+    @context_data_deserializer = deserializer
+  end
+
+  def serializer=(serializer)
+    @context_event_serializer = serializer
+  end
+
+  def deserializer
+    context_data_deserializer
+  end
+
+  def serializer
+    context_event_serializer
+  end
+
+  def url
+    @url ||= "#{endpoint}/context"
+  end
+
+  def headers
+    @headers ||= {
+      "Content-Type": "application/json",
+      "X-API-Key": api_key,
+      "X-Application": application,
+      "X-Environment": environment,
+      "X-Application-Version": "0",
+      "X-Agent": "absmartly-ruby-sdk"
+    }
+  end
+
+  def query
+    @query ||= {
+      "application": application,
+      "environment": environment
+    }
   end
 
-  def context_event_serializer=(serializer)
-    @serializer = serializer
+  def validate!
+    raise ArgumentError.new("Missing Endpoint configuration") if endpoint.nil? || endpoint.empty?
+    raise ArgumentError.new("Missing APIKey configuration") if api_key.nil? || api_key.empty?
+    raise ArgumentError.new("Missing Application configuration") if application.nil? || application.empty?
+    raise ArgumentError.new("Missing Environment configuration") if environment.nil? || environment.empty?
   end
 end

data/lib/context.rb

@@ -10,7 +10,7 @@ require_relative "json/publish_event"
 require_relative "json/goal_achievement"
 
 class Context
-  attr_reader :data, :pending_count
+  attr_reader :pending_count
 
   def self.create(clock, config, data_future, data_provider,
                   event_handler, event_logger, variable_parser, audience_matcher)
@@ -114,6 +114,10 @@ class Context
   def set_unit(unit_type, uid)
     check_not_closed?
 
+    unless uid.is_a?(String) || uid.is_a?(Numeric)
+      raise IllegalStateException.new("Unit '#{unit_type}' UID is of unsupported type '#{uid.class}'. UID must be one of ['string', 'number']")
+    end
+
     previous = @units[unit_type.to_sym]
     if !previous.nil? && previous != uid
       raise IllegalStateException.new("Unit '#{unit_type}' already set.")
@@ -541,7 +545,6 @@ class Context
                 @experimentCustomFieldValues[custom_field_value.name] = value
 
               end
-
             end
           end
 

data/lib/context_config.rb

@@ -29,7 +29,8 @@ class ContextConfig
   end
 
   def set_attributes(attributes)
-    @attributes ||= attributes.transform_keys(&:to_sym)
+    @attributes.merge!(attributes.transform_keys(&:to_sym))
+    self
   end
 
   def set_attribute(name, value)
@@ -68,11 +69,8 @@ class ContextConfig
     @custom_assignments[experiment_name.to_sym]
   end
 
-
   def set_event_logger(event_logger)
     @event_logger = event_logger
     self
   end
-
-  attr_reader :event_logger
 end

data/lib/default_context_event_handler.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "context_data_provider"
+require_relative "context_event_handler"
 
-class DefaultContextEventHandler < ContextDataProvider
+class DefaultContextEventHandler < ContextEventHandler
   attr_accessor :client
 
   def initialize(client)

data/lib/default_http_client.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "faraday"
-require 'faraday/retry'
+require "faraday/retry"
 require "uri"
 require_relative "http_client"
 

data/lib/json_expr/expr_evaluator.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "bigdecimal"
 require_relative "../string"
 require_relative "./evaluator"
 EMPTY_MAP = {}

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: absmartly-sdk
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - absmartly
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +83,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- absmartly.gemspec
 - example/example.rb
 - lib/a_b_smartly.rb
 - lib/a_b_smartly_config.rb
@@ -141,7 +153,6 @@ metadata:
   homepage_uri: https://github.com/absmartly/ruby-sdk
   source_code_uri: https://github.com/absmartly/ruby-sdk
   changelog_uri: https://github.com/absmartly/ruby-sdk
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Absmartly gem
 test_files: []

data/absmartly.gemspec

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-# $:.push File.expand_path("../lib", __FILE__)
-require File.expand_path("lib/absmartly/version", __dir__)
-Gem::Specification.new do |spec|
-  spec.name = "absmartly-sdk"
-  spec.version = Absmartly::VERSION
-  spec.authors = ["absmartly"]
-  spec.email = ["sdks@absmartly.com"]
-
-  spec.summary = "Absmartly gem"
-  spec.description = "Absmartly gem"
-
-  spec.homepage = "https://github.com/absmartly/ruby-sdk"
-
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.0"
-  spec.extra_rdoc_files = ["README.md"]
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/absmartly/ruby-sdk"
-  spec.metadata["changelog_uri"] = "https://github.com/absmartly/ruby-sdk"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "faraday", "~> 2.0"
-  spec.add_dependency "faraday-retry", "~> 2.0"
-  spec.add_dependency "murmurhash3", "~> 0.1.7"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end