splitclient-rb 7.0.1.pre.rc3 → 7.0.1.pre.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22f596ae2c858d642bbd57bf6fdfbfbf11be01ef39a54e2e9e9c69142d2f745
-  data.tar.gz: 221e861adf092444cc790537c7469185f8bfc2c306e5f5d681d2876f23816d9e
+  metadata.gz: e594bbd6140417bdce0b99925f46e3db09af26b945280c5e34917eac89edac19
+  data.tar.gz: 8ce2b999204052796d33ee1416a2ffb7637616eaaf6becf14b46520f5e542e8d
 SHA512:
-  metadata.gz: fc2b364e35389b85447a12adc3bfb0f947cf61057531777093fe69bf5400104ed5eb56e92a74666626f7f410151c4e6faded6cc574fa5d7dd8bc249607577bbd
-  data.tar.gz: 14348f14b7df6b3f07ef6c7392d1774a2cf67294dbc0c76dc13c76927cb9f4c4ef8ddb3a23cfe9584ef26379df7e91fb5db7fa9dfca00ff8c21df384ecefb7d2
+  metadata.gz: 8e96d61588f39684609ca7d1252e91b389c64f0c91d532987c7123e2eeb86ab1e769dfdaa4cf104eff2d94803fa75e5e908548e544142a961290c7d856e5f548
+  data.tar.gz: ec1a1fa45062c25caf15236a8d703df730c030239826cbf766b4c8722b6f0e455e94012af5856564d7a33ba767a52b6749e60274939bac3ccdce9fa62d379abb

data/CHANGES.txt

@@ -1,7 +1,10 @@
-7.0.1 (Sep 13, 2019)
+7.0.1 (Oct 25, 2019)
  - Updated localhost mode so that parsing of test files results in JSON data for splits analogous to that returned by the Split backend.
  - Resulting localhost data is now used indifferently from actual backend data by the SDK code.
  - Removed specific spare code dealing with localhost operations.
+ - Removed the disable_impressions configuration param.
+ - Fixed an issue about Event properties were not sent to be.
+ - Added ip_addresses_enabled to enable/disable sending MachineName and MachineIP headers when data is posted to Split Servers.
 
 7.0.0 (Aug 23, 2019)
  - BREAKING CHANGE: block_until_ready is now a method in both split_client and split_manager that needs to be explicitly called. The block_until_ready parameter is now ignored if passed in the configuration, and defaults to 15s unless passed as a parameter of the block_until_ready method.

data/lib/splitclient-rb/engine/api/client.rb

@@ -30,6 +30,9 @@ module SplitIoClient
           req.headers = common_headers(api_key)
                         .merge('Content-Type' => 'application/json')
                         .merge(headers)
+                        
+          req.headers = req.headers.merge('SplitSDKMachineIP' => @config.machine_ip) unless @config.machine_ip.empty?
+          req.headers = req.headers.merge('SplitSDKMachineName' => @config.machine_name) unless @config.machine_name.empty?
 
           req.body = data.to_json
 
@@ -78,19 +81,8 @@ module SplitIoClient
         {
           'Authorization' => "Bearer #{api_key}",
           'SplitSDKVersion' => "#{@config.language}-#{@config.version}",
-          'SplitSDKMachineName' => @config.machine_name,
-          'SplitSDKMachineIP' => @config.machine_ip,
-          'Referer' => referer
         }
       end
-
-      def referer
-        result = "#{@config.language}-#{@config.version}"
-
-        result = "#{result}::#{SplitIoClient::SplitConfig.machine_hostname}" unless SplitIoClient::SplitConfig.machine_hostname == 'localhost'
-
-        result
-      end
     end
   end
 end

data/lib/splitclient-rb/engine/api/events.rb

@@ -18,10 +18,7 @@ module SplitIoClient
           response = post_api(
             "#{@config.events_uri}/events/bulk",
             @api_key,
-            events_slice.map { |event| formatted_event(event[:e]) },
-            'SplitSDKMachineIP' => events_slice[0][:m][:i],
-            'SplitSDKMachineName' => events_slice[0][:m][:n],
-            'SplitSDKVersion' => events_slice[0][:m][:s]
+            events_slice.map { |event| formatted_event(event[:e]) }
           )
 
           if response.success?

data/lib/splitclient-rb/engine/api/impressions.rb

@@ -15,7 +15,7 @@ module SplitIoClient
         end
 
         impressions_by_ip(impressions).each do |ip, impressions_ip|
-          response = post_api("#{@config.events_uri}/testImpressions/bulk", @api_key, impressions_ip, 'SplitSDKMachineIP' => ip)
+          response = post_api("#{@config.events_uri}/testImpressions/bulk", @api_key, impressions_ip)
 
           if response.success?
             @config.split_logger.log_if_debug("Impressions reported: #{total_impressions(impressions)}")

data/lib/splitclient-rb/split_config.rb

@@ -69,8 +69,10 @@ module SplitIoClient
       @transport_debug_enabled = opts[:transport_debug_enabled] || SplitConfig.default_debug
       @block_until_ready = SplitConfig.default_block_until_ready
 
-      @machine_name = opts[:machine_name] || SplitConfig.machine_hostname
-      @machine_ip = opts[:machine_ip] || SplitConfig.machine_ip
+      @ip_addresses_enabled = opts[:ip_addresses_enabled].nil? ? SplitConfig.default_ip_addresses_enabled : opts[:ip_addresses_enabled]
+
+      @machine_name = SplitConfig.machine_hostname(@ip_addresses_enabled, opts[:machine_name], opts[:cache_adapter] || SplitConfig.default_cache_adapter)
+      @machine_ip = SplitConfig.machine_ip(@ip_addresses_enabled, opts[:machine_ip], opts[:cache_adapter] || SplitConfig.default_cache_adapter)
 
       @cache_ttl = opts[:cache_ttl] || SplitConfig.cache_ttl
       @max_cache_size = opts[:max_cache_size] || SplitConfig.max_cache_size
@@ -251,6 +253,8 @@ module SplitIoClient
 
     attr_accessor :localhost_mode
 
+    attr_accessor :ip_addresses_enabled
+
     #
     # The default split client configuration
     #
@@ -412,6 +416,14 @@ module SplitIoClient
       15
     end
 
+    #
+    # The default ip addresses enabled value
+    #
+    # @return [boolean]
+    def self.default_ip_addresses_enabled
+      true
+    end
+
     #
     # The default transport_debug_enabled value
     #
@@ -478,23 +490,49 @@ module SplitIoClient
     # gets the hostname where the sdk gem is running
     #
     # @return [string]
-    def self.machine_hostname
-      Socket.gethostname
-    rescue
-      'localhost'.freeze
+    def self.machine_hostname(ip_addresses_enabled, machine_name, adapter)
+      if ip_addresses_enabled
+        begin
+          return machine_name || Socket.gethostname
+        rescue
+          return 'unknown'.freeze
+        end
+      else
+        case adapter
+        when :redis
+          return 'NA'.freeze
+        end
+      end
+      
+      return ''.freeze
     end
 
     #
     # gets the ip where the sdk gem is running
     #
     # @return [string]
-    def self.machine_ip
-      loopback_ip = Socket.ip_address_list.find { |ip| ip.ipv4_loopback? }
-      private_ip = Socket.ip_address_list.find { |ip| ip.ipv4_private? }
+    def self.machine_ip(ip_addresses_enabled, machine_ip, adapter)
+      if ip_addresses_enabled
+        begin
+          return machine_ip unless machine_ip.blank?
+
+          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 = private_ip || loopback_ip
+
+          return addr_info.ip_address
+        rescue
+          return 'unknown'.freeze
+        end
+      else
+        case adapter
+        when :redis
+          return 'NA'.freeze
+        end
+      end
 
-      addr_info.ip_address
+      return ''.freeze
     end
   end
 end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.0.1.pre.rc3'
+  VERSION = '7.0.1.pre.rc4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.0.1.pre.rc3
+  version: 7.0.1.pre.rc4
 platform: ruby
 authors:
 - Split Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allocation_stats
@@ -409,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby client for split SDK.