splitclient-rb 3.2.2 → 3.2.3.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd02348730c0013aee593b672a772897bab28b9
-  data.tar.gz: a150c8b06d3d8314141b25b8abafc6aa12840b00
+  metadata.gz: 638a1c1d4cfc959913f5b8abbad11479484f9288
+  data.tar.gz: dc6156ca70f74b44a63a8d6b964f79494dd37441
 SHA512:
-  metadata.gz: e8da041cf30878f72bda67ce8dc2a00f12621545f01b7a014c3b0d07d828987fa6b20f641768e6610d0ec0799830b9ea64e3f1dfccc2e935a919c052d1551ccd
-  data.tar.gz: 14e0567c0e7f9015fda71aeed77f6a65f506cffa4c0e5ab520c4bf51ffa91f6e7cf1ae91b940f0e4b99343450e903866050a4ea91af2ab9502cc7b4068703071
+  metadata.gz: fb45bded324cb23480d25c139270a80b96afe48f443e8b1b314a1a014977a4a22c0b0f4d17c2f174be796315071efe71d9d31ff1f5913bda3b92ce8785d61eff
+  data.tar.gz: 24e0ff8793c58994ebf863f4cc88de6f6d807623320f03bd9720d10678cc2e0c5afcd5364628cb6614efd79c56a4219fa42d56996913bed5692cb83752e9b0f4

data/CHANGES.txt

@@ -1,3 +1,7 @@
+3.2.3
+- Fix Redis namespace issue to align with the spec
+- Allocate less memory by not creating Split model to check if Split is archived
+
 3.2.2
 - Fix issue when segment_store was never invoked
 

data/lib/cache/repositories/impressions/redis_repository.rb

@@ -13,7 +13,7 @@ module SplitIoClient
           # Store impression data in Redis
           def add(split_name, data)
             @adapter.add_to_set(
-              namespace_key("impressions.#{split_name}"),
+              namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/impressions.#{split_name}"),
               data.merge(split_name: split_name).to_json
             )
           end

data/lib/cache/repositories/metrics/redis_repository.rb

@@ -9,14 +9,14 @@ module SplitIoClient
           end
 
           def add_count(counter, delta)
-            prefixed_name = namespace_key("count.#{counter}")
+            prefixed_name = namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/count.#{counter}")
             counts = @adapter.find_strings_by_prefix(prefixed_name)
 
             @adapter.inc(prefixed_name, delta)
           end
 
           def add_latency(operation, time_in_ms, binary_search)
-            prefixed_name = namespace_key("latency.#{operation}")
+            prefixed_name = namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/latency.#{operation}")
             latencies = @adapter.find_strings_by_prefix(prefixed_name)
 
             if operation == 'sdk.get_treatment'
@@ -32,24 +32,24 @@ module SplitIoClient
           end
 
           def counts
-            keys = @adapter.find_strings_by_prefix(namespace_key('count'))
+            keys = @adapter.find_strings_by_prefix(namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/count"))
 
             return [] if keys.empty?
 
             @adapter.multiple_strings(keys).map do |name, data|
-              [name.gsub(namespace_key('count.'), ''), data]
+              [name.gsub(namespace_key("ruby-#{VERSION}/#{@config.machine_ip}/count."), ''), data]
             end.to_h
           end
 
           def latencies
             collected_latencies = {}
             latencies_array = Array.new(BinarySearchLatencyTracker::BUCKETS.length, 0)
-            keys = @adapter.find_strings_by_prefix(namespace_key('latency'))
+            keys = @adapter.find_strings_by_prefix(namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/latency"))
 
             return [] if keys.empty?
 
             found_latencies = @adapter.multiple_strings(keys).map do |name, data|
-              [name.gsub(namespace_key('latency.'), ''), data]
+              [name.gsub(namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/latency."), ''), data]
             end.to_h
 
             found_latencies.each do |key, value|
@@ -73,12 +73,12 @@ module SplitIoClient
           end
 
           def clear_counts
-            keys = @adapter.find_strings_by_prefix(namespace_key('count'))
+            keys = @adapter.find_strings_by_prefix(namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/count"))
             @adapter.delete(keys)
           end
 
           def clear_latencies
-            keys = @adapter.find_strings_by_prefix(namespace_key('latency'))
+            keys = @adapter.find_strings_by_prefix(namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/latency"))
             @adapter.delete(keys)
           end
 

data/lib/cache/repositories/repository.rb

@@ -12,7 +12,7 @@ module SplitIoClient
       protected
 
       def namespace_key(key)
-        "#{@config.redis_namespace}/#{@config.machine_ip}/#{key}"
+        "#{@config.redis_namespace}#{key}"
       end
     end
   end

data/lib/cache/repositories/segments_repository.rb

@@ -10,7 +10,7 @@ module SplitIoClient
           @adapter = adapter
           @config = config
 
-          @adapter.set_bool(namespace_key('ready'), false)
+          @adapter.set_bool(namespace_key('.ready'), false)
         end
 
         # Receives segment data, adds and removes segements from the store
@@ -32,33 +32,33 @@ module SplitIoClient
         end
 
         def used_segment_names
-          @adapter.get_set(namespace_key('segments.registered'))
+          @adapter.get_set(namespace_key('.segments.registered'))
         end
 
         def set_change_number(name, last_change)
-          @adapter.set_string(namespace_key("segment.#{name}.till"), last_change)
+          @adapter.set_string(namespace_key(".segment.#{name}.till"), last_change)
         end
 
         def get_change_number(name)
-          @adapter.string(namespace_key("segment.#{name}.till")) || -1
+          @adapter.string(namespace_key(".segment.#{name}.till")) || -1
         end
 
         def ready?
-          @adapter.string(namespace_key('cache.ready.segments')).to_i != -1
+          @adapter.string(namespace_key('.segments.ready')).to_i != -1
         end
 
         def not_ready!
-          @adapter.set_string(namespace_key('cache.ready.segments'), -1)
+          @adapter.set_string(namespace_key('.segments.ready'), -1)
         end
 
         def ready!
-          @adapter.set_string(namespace_key('cache.ready.segments'), Time.now.utc.to_i)
+          @adapter.set_string(namespace_key('.segments.ready'), Time.now.utc.to_i)
         end
 
         private
 
         def segment_data(name)
-          namespace_key("segmentData.#{name}")
+          namespace_key(".segment.#{name}")
         end
 
         def add_keys(name, keys)

data/lib/cache/repositories/splits_repository.rb

@@ -12,18 +12,18 @@ module SplitIoClient
           @adapter = adapter
           @config = config
 
-          @adapter.set_string(namespace_key('splits.till'), '-1')
-          @adapter.initialize_map(namespace_key('segments.registered'))
+          @adapter.set_string(namespace_key('.splits.till'), '-1')
+          @adapter.initialize_map(namespace_key('.segments.registered'))
         end
 
         def add_split(split)
           return unless split[:name]
 
-          @adapter.set_string(namespace_key("split.#{split[:name]}"), split.to_json)
+          @adapter.set_string(namespace_key(".split.#{split[:name]}"), split.to_json)
         end
 
         def remove_split(name)
-          @adapter.delete(namespace_key("split.#{name}"))
+          @adapter.delete(namespace_key(".split.#{name}"))
         end
 
         def get_splits(names, slice = SPLITS_SLICE)
@@ -32,8 +32,8 @@ module SplitIoClient
           names.each_slice(slice) do |splits_slice|
             splits.merge!(
               @adapter
-                .multiple_strings(splits_slice.map { |name| namespace_key("split.#{name}") })
-                .map { |name, data| [name.gsub(namespace_key('split.'), ''), data] }.to_h
+                .multiple_strings(splits_slice.map { |name| namespace_key(".split.#{name}") })
+                .map { |name, data| [name.gsub(namespace_key('.split.'), ''), data] }.to_h
             )
           end
 
@@ -44,7 +44,7 @@ module SplitIoClient
         end
 
         def get_split(name)
-          split = @adapter.string(namespace_key("split.#{name}"))
+          split = @adapter.string(namespace_key(".split.#{name}"))
 
           JSON.parse(split, symbolize_names: true) if split
         end
@@ -61,40 +61,40 @@ module SplitIoClient
 
         # Return an array of Split Names excluding control keys like splits.till
         def split_names
-          @adapter.find_strings_by_prefix(namespace_key('split.'))
-            .map { |split| split.gsub(namespace_key('split.'), '') }
+          @adapter.find_strings_by_prefix(namespace_key('.split.'))
+            .map { |split| split.gsub(namespace_key('.split.'), '') }
         end
 
         def set_change_number(since)
-          @adapter.set_string(namespace_key('splits.till'), since)
+          @adapter.set_string(namespace_key('.splits.till'), since)
         end
 
         def get_change_number
-          @adapter.string(namespace_key('splits.till'))
+          @adapter.string(namespace_key('.splits.till'))
         end
 
         def set_segment_names(names)
           return if names.nil? || names.empty?
 
           names.each do |name|
-            @adapter.add_to_set(namespace_key('segments.registered'), name)
+            @adapter.add_to_set(namespace_key('.segments.registered'), name)
           end
         end
 
         def exists?(name)
-          @adapter.exists?(namespace_key("split.#{name}"))
+          @adapter.exists?(namespace_key(".split.#{name}"))
         end
 
         def ready?
-          @adapter.string(namespace_key('cache.ready.splits')).to_i != -1
+          @adapter.string(namespace_key('.splits.ready')).to_i != -1
         end
 
         def not_ready!
-          @adapter.set_string(namespace_key('cache.ready.splits'), -1)
+          @adapter.set_string(namespace_key('.splits.ready'), -1)
         end
 
         def ready!
-          @adapter.set_string(namespace_key('cache.ready.splits'), Time.now.utc.to_i)
+          @adapter.set_string(namespace_key('.splits.ready'), Time.now.utc.to_i)
         end
       end
     end

data/lib/cache/stores/split_store.rb

@@ -70,7 +70,7 @@ module SplitIoClient
         end
 
         def add_split_unless_archived(split)
-          if split_model(split).archived?
+          if Engine::Models::Split.archived?(split)
             @config.logger.debug("Seeing archived split #{split[:name]}") if @config.debug_enabled
 
             remove_archived_split(split)
@@ -90,10 +90,6 @@ module SplitIoClient
 
           @splits_repository.add_split(split)
         end
-
-        def split_model(split)
-          Engine::Models::Split.new(split)
-        end
       end
     end
   end

data/lib/engine/models/split.rb

@@ -2,16 +2,14 @@ module SplitIoClient
   module Engine
     module Models
       class Split
-        def initialize(data)
-          @data = data
-        end
-
-        def matchable?
-          @data && @data[:status] == 'ACTIVE' && @data[:killed] == false
-        end
+        class << self
+          def matchable?(data)
+            data && data[:status] == 'ACTIVE' && data[:killed] == false
+          end
 
-        def archived?
-          @data && @data[:status] == 'ARCHIVED'
+          def archived?(data)
+            data && data[:status] == 'ARCHIVED'
+          end
         end
       end
     end

data/lib/engine/parser/split_treatment.rb

@@ -7,12 +7,11 @@ module SplitIoClient
         end
 
         def call(keys, split, attributes = nil)
-          split_model = Models::Split.new(split)
           @default_treatment = split[:defaultTreatment]
 
-          return treatment(Models::Label::ARCHIVED, Treatments::CONTROL, split[:changeNumber]) if split_model.archived?
+          return treatment(Models::Label::ARCHIVED, Treatments::CONTROL, split[:changeNumber]) if Models::Split.archived?(split)
 
-          if split_model.matchable?
+          if Models::Split.matchable?(split)
             match(split, keys, attributes)
           else
             treatment(Models::Label::KILLED, @default_treatment, split[:changeNumber])

data/lib/splitclient-rb/managers/split_manager.rb

@@ -21,12 +21,11 @@ module SplitIoClient
       return if @splits_repository.nil?
 
       @splits_repository.splits.each_with_object([]) do |(name, split), memo|
-        split_model = Engine::Models::Split.new(split)
         split_view = build_split_view(name, split)
 
         next if split_view[:name] == nil
 
-        memo << split_view unless split_model.archived?
+        memo << split_view unless Engine::Models::Split.archived?(split)
       end
     end
 
@@ -45,11 +44,13 @@ module SplitIoClient
     #
     # @returns a split view
     def split(split_name)
-      if @splits_repository
-        split = @splits_repository.get_split(split_name)
+      return unless @splits_repository
+      
+      split = @splits_repository.get_split(split_name)
 
-        build_split_view(split_name, split) unless split.nil? or split_model(split).archived?
-      end
+      return if split.nil? || Engine::Models::Split.archived?(split)
+
+      build_split_view(split_name, split)
     end
 
     def build_split_view(name, split)
@@ -70,11 +71,5 @@ module SplitIoClient
           change_number: split[:changeNumber]
         }
     end
-
-    private
-
-    def split_model(split)
-      split_model = Engine::Models::Split.new(split)
-    end
   end
 end

data/lib/splitclient-rb/split_config.rb

@@ -282,7 +282,7 @@ module SplitIoClient
     end
 
     def self.default_redis_namespace
-      "SPLITIO/ruby-#{VERSION}"
+      'SPLITIO'
     end
 
     #

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '3.2.2'
+  VERSION = '3.2.3-rc1'
 end

data/splitclient-rb.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "redis"
 
   spec.add_runtime_dependency "json", "~> 1.8"
   spec.add_runtime_dependency "thread_safe"
@@ -36,4 +35,5 @@ Gem::Specification.new do |spec|
   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"
 end

data/splitio.yml.example

@@ -1,7 +1,11 @@
 ---
-:api_key: api_key 
+:api_key: r2tdmvojm6rp6vugmd9svhoedv43e71ejolk
+#:base_uri: 'https://sdk-aws-staging.split.io/api'
+#:events_uri: 'https://events-aws-staging.split.io/api'
 :mode: :producer
 :cache_adapter: :redis
 :debug_enabled: true
 :transport_debug_enabled: true
 :impressions_refresh_rate: 30
+:block_until_ready: 10
+:redis_namespace: "PATO"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3.pre.rc1
 platform: ruby
 authors:
 - Split Software
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +220,20 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 2.9.4
+- !ruby/object:Gem::Dependency
+  name: redis
+  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'
 description: Ruby client for using split SDK.
 email:
 - pato@split.io
@@ -331,9 +331,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2