splitclient-rb 4.1.0 → 4.2.0

data/lib/{engine/parser/split_treatment.rb → splitclient-rb/engine/parser/evaluator.rb}

@@ -1,21 +1,37 @@
 module SplitIoClient
   module Engine
     module Parser
-      class SplitTreatment
-        def initialize(segments_repository)
+      class Evaluator
+        def initialize(segments_repository, splits_repository, multiple = false)
+          @splits_repository = splits_repository
           @segments_repository = segments_repository
+          @multiple = multiple
+          @cache = {}
         end
 
         def call(keys, split, attributes = nil)
-          @default_treatment = split[:defaultTreatment]
+          # DependencyMatcher here, split is actually a split_name in this case
+          cache_result = split.is_a? String
+          split = @splits_repository.get_split(split) if cache_result
+          digest = Digest::MD5.hexdigest("#{{matching_key: keys[:matching_key]}}#{split}#{attributes}")
 
-          return treatment(Models::Label::ARCHIVED, Treatments::CONTROL, split[:changeNumber]) if Models::Split.archived?(split)
+          if Models::Split.archived?(split)
+            return treatment_hash(Models::Label::ARCHIVED, Models::Treatment::CONTROL, split[:changeNumber])
+          end
 
-          if Models::Split.matchable?(split)
-            match(split, keys, attributes)
+          treatment = if Models::Split.matchable?(split)
+            if @multiple && @cache[digest]
+              @cache[digest]
+            else
+              match(split, keys, attributes)
+            end
           else
-            treatment(Models::Label::KILLED, @default_treatment, split[:changeNumber])
+            treatment_hash(Models::Label::KILLED, split[:defaultTreatment], split[:changeNumber])
           end
+
+          @cache[digest] = treatment if cache_result
+
+          treatment
         end
 
         private
@@ -35,26 +51,26 @@ module SplitIoClient
                 bucket = Splitter.bucket(Splitter.count_hash(key, split[:trafficAllocationSeed].to_i, legacy_algo))
 
                 if bucket >= split[:trafficAllocation]
-                  return treatment(Models::Label::NOT_IN_SPLIT, @default_treatment, split[:changeNumber])
+                  return treatment_hash(Models::Label::NOT_IN_SPLIT, split[:defaultTreatment], split[:changeNumber])
                 end
               end
 
               in_rollout = true
             end
 
-            if matcher_type(condition).match?(keys[:matching_key], attributes)
+            if matcher_type(condition).match?(keys[:matching_key], keys[:bucketing_key], self, attributes)
               key = keys[:bucketing_key] ? keys[:bucketing_key] : keys[:matching_key]
               result = Splitter.get_treatment(key, split[:seed], condition.partitions, split[:algo])
 
               if result.nil?
-                return treatment(Models::Label::NO_RULE_MATCHED, @default_treatment, split[:changeNumber])
+                return treatment_hash(Models::Label::NO_RULE_MATCHED, split[:defaultTreatment], split[:changeNumber])
               else
-                return treatment(c[:label], result, split[:changeNumber])
+                return treatment_hash(c[:label], result, split[:changeNumber])
               end
             end
           end
 
-          treatment(Models::Label::NO_RULE_MATCHED, @default_treatment, split[:changeNumber])
+          treatment_hash(Models::Label::NO_RULE_MATCHED, split[:defaultTreatment], split[:changeNumber])
         end
 
         def matcher_type(condition)
@@ -79,7 +95,7 @@ module SplitIoClient
           end
         end
 
-        def treatment(label, treatment, change_number = nil)
+        def treatment_hash(label, treatment, change_number = nil)
           { label: label, treatment: treatment, change_number: change_number }
         end
 

data/lib/splitclient-rb/localhost_utils.rb

@@ -18,7 +18,7 @@ module SplitIoClient
           @localhost_mode_features = []
           store_features(splits_file)
 
-          sleep(::Utilities.randomize_interval(reload_rate))
+          sleep(SplitIoClient::Utilities.randomize_interval(reload_rate))
         end
       end
     end

data/lib/splitclient-rb/split_config.rb

@@ -260,7 +260,7 @@ module SplitIoClient
     #
     # @return [object]
     def self.default_logger
-      Logger.new($stdout)
+      (defined?(Rails) && Rails.logger) ? Rails.logger : Logger.new($stdout)
     end
 
     #
@@ -334,9 +334,12 @@ module SplitIoClient
     #
     # @return [string]
     def self.get_ip
-      Socket.ip_address_list.detect { |intf| intf.ipv4_private? }.ip_address
-    rescue StandardError
-      'unknown'
+      loopback_ip = Socket.ip_address_list.find { |ip| ip.ipv4_loopback? }
+      private_ip = Socket.ip_address_list.find { |ip| ip.ipv4_private? }
+
+      addr_info = private_ip || loopback_ip
+
+      addr_info.ip_address
     end
   end
 end

data/lib/splitclient-rb/utilitites.rb

@@ -0,0 +1,41 @@
+module SplitIoClient
+  module Utilities
+    extend self
+
+    # Convert String with Time info to its epoch FixNum previously setting to zero the seconds
+    def to_epoch(value)
+      parsed = Time.parse(value)
+      zeroed = Time.new(parsed.year, parsed.month, parsed.day, parsed.hour, parsed.min, 0, 0)
+
+      zeroed.to_i
+    end
+
+    def to_epoch_milis(value)
+      to_epoch(value) * 1000
+    end
+
+    def to_milis_zero_out_from_seconds(value)
+      parsed_value = Time.strptime(value.to_s, '%s').utc
+      zeroed = Time.new(parsed_value.year, parsed_value.month, parsed_value.day, parsed_value.hour, parsed_value.min, 0, 0)
+
+      zeroed.to_i * 1000
+    rescue StandardError
+      return :non_valid_date_info
+    end
+
+    def to_milis_zero_out_from_hour(value)
+      parsed_value = Time.strptime(value.to_s, '%s').utc
+      zeroed = Time.new(parsed_value.year, parsed_value.month, parsed_value.day, 0, 0, 0, 0)
+
+      zeroed.to_i * 1000
+    rescue StandardError
+      return :non_valid_date_info
+    end
+
+    def randomize_interval(interval)
+      random_factor = Random.new.rand(50..100) / 100.0
+
+      interval * random_factor
+    end
+  end  
+end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '4.1.0'
+  VERSION = '4.2.0'
 end

data/splitclient-rb.gemspec

@@ -29,13 +29,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "allocation_stats"
 
-  spec.add_runtime_dependency "json", "~> 1.8"
-  spec.add_runtime_dependency "thread_safe"
+  spec.add_runtime_dependency "json", ">= 1.8"
+  spec.add_runtime_dependency "thread_safe", ">= 0.3"
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "faraday"
-  spec.add_runtime_dependency "faraday-http-cache"
-  spec.add_runtime_dependency "faraday_middleware"
-  spec.add_runtime_dependency "net-http-persistent", "<= 2.9.4"
-  spec.add_runtime_dependency "redis"
-  spec.add_runtime_dependency "digest-murmurhash"
+  spec.add_runtime_dependency "faraday", ">= 0.8"
+  spec.add_runtime_dependency "net-http-persistent", "~> 2.9"
+  spec.add_runtime_dependency "redis", "~> 3.2"
+  spec.add_runtime_dependency "digest-murmurhash", ">= 1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Split Software
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,14 +140,14 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -184,84 +184,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday-http-cache
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.4
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.4
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: digest-murmurhash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 description: Ruby client for using split SDK.
 email:
 - pato@split.io
@@ -280,62 +252,66 @@ files:
 - Rakefile
 - console
 - exe/splitio
-- lib/cache/adapters/memory_adapter.rb
-- lib/cache/adapters/memory_adapters/map_adapter.rb
-- lib/cache/adapters/memory_adapters/queue_adapter.rb
-- lib/cache/adapters/redis_adapter.rb
-- lib/cache/repositories/impressions/memory_repository.rb
-- lib/cache/repositories/impressions/redis_repository.rb
-- lib/cache/repositories/impressions_repository.rb
-- lib/cache/repositories/metrics/memory_repository.rb
-- lib/cache/repositories/metrics/redis_repository.rb
-- lib/cache/repositories/metrics_repository.rb
-- lib/cache/repositories/repository.rb
-- lib/cache/repositories/segments_repository.rb
-- lib/cache/repositories/splits_repository.rb
-- lib/cache/senders/impressions_formatter.rb
-- lib/cache/senders/impressions_sender.rb
-- lib/cache/senders/metrics_sender.rb
-- lib/cache/stores/sdk_blocker.rb
-- lib/cache/stores/segment_store.rb
-- lib/cache/stores/split_store.rb
-- lib/engine/api/client.rb
-- lib/engine/api/impressions.rb
-- lib/engine/api/metrics.rb
-- lib/engine/api/segments.rb
-- lib/engine/api/splits.rb
-- lib/engine/evaluator/splitter.rb
-- lib/engine/matchers/all_keys_matcher.rb
-- lib/engine/matchers/between_matcher.rb
-- lib/engine/matchers/combiners.rb
-- lib/engine/matchers/combining_matcher.rb
-- lib/engine/matchers/contains_all_matcher.rb
-- lib/engine/matchers/contains_any_matcher.rb
-- lib/engine/matchers/contains_matcher.rb
-- lib/engine/matchers/ends_with_matcher.rb
-- lib/engine/matchers/equal_to_matcher.rb
-- lib/engine/matchers/equal_to_set_matcher.rb
-- lib/engine/matchers/greater_than_or_equal_to_matcher.rb
-- lib/engine/matchers/less_than_or_equal_to_matcher.rb
-- lib/engine/matchers/negation_matcher.rb
-- lib/engine/matchers/part_of_set_matcher.rb
-- lib/engine/matchers/set_matcher.rb
-- lib/engine/matchers/starts_with_matcher.rb
-- lib/engine/matchers/user_defined_segment_matcher.rb
-- lib/engine/matchers/whitelist_matcher.rb
-- lib/engine/metrics/binary_search_latency_tracker.rb
-- lib/engine/metrics/metrics.rb
-- lib/engine/models/label.rb
-- lib/engine/models/split.rb
-- lib/engine/parser/condition.rb
-- lib/engine/parser/partition.rb
-- lib/engine/parser/split_adapter.rb
-- lib/engine/parser/split_treatment.rb
-- lib/engine/partitions/treatments.rb
-- lib/exceptions/sdk_blocker_timeout_expired_exception.rb
 - lib/splitclient-rb.rb
+- lib/splitclient-rb/cache/adapters/memory_adapter.rb
+- lib/splitclient-rb/cache/adapters/memory_adapters/map_adapter.rb
+- lib/splitclient-rb/cache/adapters/memory_adapters/queue_adapter.rb
+- lib/splitclient-rb/cache/adapters/redis_adapter.rb
+- lib/splitclient-rb/cache/repositories/impressions/memory_repository.rb
+- lib/splitclient-rb/cache/repositories/impressions/redis_repository.rb
+- lib/splitclient-rb/cache/repositories/impressions_repository.rb
+- lib/splitclient-rb/cache/repositories/metrics/memory_repository.rb
+- lib/splitclient-rb/cache/repositories/metrics/redis_repository.rb
+- lib/splitclient-rb/cache/repositories/metrics_repository.rb
+- lib/splitclient-rb/cache/repositories/repository.rb
+- lib/splitclient-rb/cache/repositories/segments_repository.rb
+- lib/splitclient-rb/cache/repositories/splits_repository.rb
+- lib/splitclient-rb/cache/senders/impressions_formatter.rb
+- lib/splitclient-rb/cache/senders/impressions_sender.rb
+- lib/splitclient-rb/cache/senders/metrics_sender.rb
+- lib/splitclient-rb/cache/stores/sdk_blocker.rb
+- lib/splitclient-rb/cache/stores/segment_store.rb
+- lib/splitclient-rb/cache/stores/split_store.rb
 - lib/splitclient-rb/clients/localhost_split_client.rb
 - lib/splitclient-rb/clients/split_client.rb
+- lib/splitclient-rb/engine/api/client.rb
+- lib/splitclient-rb/engine/api/faraday_middleware/gzip.rb
+- lib/splitclient-rb/engine/api/impressions.rb
+- lib/splitclient-rb/engine/api/metrics.rb
+- lib/splitclient-rb/engine/api/segments.rb
+- lib/splitclient-rb/engine/api/splits.rb
+- lib/splitclient-rb/engine/evaluator/splitter.rb
+- lib/splitclient-rb/engine/matchers/all_keys_matcher.rb
+- lib/splitclient-rb/engine/matchers/between_matcher.rb
+- lib/splitclient-rb/engine/matchers/combiners.rb
+- lib/splitclient-rb/engine/matchers/combining_matcher.rb
+- lib/splitclient-rb/engine/matchers/contains_all_matcher.rb
+- lib/splitclient-rb/engine/matchers/contains_any_matcher.rb
+- lib/splitclient-rb/engine/matchers/contains_matcher.rb
+- lib/splitclient-rb/engine/matchers/dependency_matcher.rb
+- lib/splitclient-rb/engine/matchers/ends_with_matcher.rb
+- lib/splitclient-rb/engine/matchers/equal_to_boolean_matcher.rb
+- lib/splitclient-rb/engine/matchers/equal_to_matcher.rb
+- lib/splitclient-rb/engine/matchers/equal_to_set_matcher.rb
+- lib/splitclient-rb/engine/matchers/greater_than_or_equal_to_matcher.rb
+- lib/splitclient-rb/engine/matchers/less_than_or_equal_to_matcher.rb
+- lib/splitclient-rb/engine/matchers/matches_string_matcher.rb
+- lib/splitclient-rb/engine/matchers/negation_matcher.rb
+- lib/splitclient-rb/engine/matchers/part_of_set_matcher.rb
+- lib/splitclient-rb/engine/matchers/set_matcher.rb
+- lib/splitclient-rb/engine/matchers/starts_with_matcher.rb
+- lib/splitclient-rb/engine/matchers/user_defined_segment_matcher.rb
+- lib/splitclient-rb/engine/matchers/whitelist_matcher.rb
+- lib/splitclient-rb/engine/metrics/binary_search_latency_tracker.rb
+- lib/splitclient-rb/engine/metrics/metrics.rb
+- lib/splitclient-rb/engine/models/label.rb
+- lib/splitclient-rb/engine/models/split.rb
+- lib/splitclient-rb/engine/models/treatment.rb
+- lib/splitclient-rb/engine/parser/condition.rb
+- lib/splitclient-rb/engine/parser/evaluator.rb
+- lib/splitclient-rb/engine/parser/partition.rb
+- lib/splitclient-rb/engine/parser/split_adapter.rb
+- lib/splitclient-rb/exceptions/sdk_blocker_timeout_expired_exception.rb
 - lib/splitclient-rb/localhost_split_factory.rb
 - lib/splitclient-rb/localhost_utils.rb
 - lib/splitclient-rb/managers/localhost_split_manager.rb
@@ -343,8 +319,8 @@ files:
 - lib/splitclient-rb/split_config.rb
 - lib/splitclient-rb/split_factory.rb
 - lib/splitclient-rb/split_factory_builder.rb
+- lib/splitclient-rb/utilitites.rb
 - lib/splitclient-rb/version.rb
-- lib/splitclient-rb_utilitites.rb
 - runTests
 - splitclient-rb.gemspec
 - splitio.yml.example