promoted-ruby-client 1.0.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d69f1cdf504a586671a915d42a1b65c71aeb97f783ddf42dc17693a6450244c6
-  data.tar.gz: 52b544d8e6919363728646bca71603636856b548cf0c139e5028ece5834c90cb
+  metadata.gz: 05e28ca6fd30469a610359aa335a16e57f936855fc2db54b8a134fa14a5b8119
+  data.tar.gz: 1a9761eef161f0fb6ff6fe34be49490e99b814bc977530ef1586cdcc52c33a48
 SHA512:
-  metadata.gz: 39b89adc216fc01fd13b7be8e11d241460fae6f0217c944bace0d59b67c587c83c86504d43ed2b01b85404db56d3209f5809900a2fd803d1252953b5b3523411
-  data.tar.gz: ef7f09600fbc73fab498b290957a3ddbfc32bb2b1ecdb7750194c526e48679cf9e1b7b504edc0c20f733929e64721db71c23bcdd743c61f3c6549c8a8882d0d3
+  metadata.gz: 171e24016958cd1319d0dce62de4a4f46e9571c40db7085745f0f7d967930947f3b1c6eda31793a98c827cc08837eb19f4a3e26f32a3bde9bb1a31a18d052f6b
+  data.tar.gz: 92589062b4f45c5e93589edd0ff8402027520b0d95c65e86138ec671e04f9d6604d7c3de3d8c58e1ecbf6e2c2f93ec9fe66f4e9208cda47fffee4c7c41514bc8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    promoted-ruby-client (1.0.1)
+    promoted-ruby-client (2.0.1)
       concurrent-ruby (~> 1)
       faraday (>= 0.9.0)
       faraday_middleware (>= 0.9.0)

data/README.md

@@ -205,7 +205,7 @@ Field Name | Type | Optional? | Description
 Output of ```deliver```, includes the insertions as well as a suitable ```LogRequest``` for forwarding to Metrics API.
 Field Name | Type | Optional? | Description
 ---------- | ---- | --------- | -----------
-```:insertion``` | [] of Insertion | No | The insertions, which are from Delivery API (when ```deliver``` was called, i.e. we weren't either only-log or part of an experiment) or the input insertions (when the other conditions don't hold).
+```:insertion``` | [] of Insertion | No | The paged insertions, which are from Delivery API (when ```deliver``` was called, i.e. we weren't either only-log or part of an experiment) or the input insertions (when the other conditions don't hold).
 ```:log_request``` | LogRequest | Yes | A message suitable for logging to Metrics API via ```send_log_request```. If the call to ```deliver``` was made (i.e. the request was not part of the CONTROL arm of an experiment or marked to only log), ```:log_request``` will not be set, as you can assume logging was performed on the server-side by Promoted.
 ```:client_request_id``` | String | Yes | Client-generated request id sent to Delivery API and may be useful for logging and debugging.
 ```:execution_server``` | one of 'API' or 'SDK' | Yes | Indicates if response insertions on a delivery request came from the API or the SDK.

data/dev.md

@@ -1,8 +1,14 @@
+# Run tests
+
+```
+bundle exec rspec
+```
+
 # Deploy
 
 1. Update version number.
 2. Get credentials for deployment from 1password.
 3. Modify `promoted-ruby-client.gemspec`'s push block.
 4. Run `gem build promoted-ruby-client.gemspec` to generate `gem`.
-5. Run (using new output) `gem push promoted-ruby-client-1.0.1.gem`
+5. Run (using new output) `gem push promoted-ruby-client-2.0.1.gem`
 6. Update README with new version.

data/lib/promoted/ruby/client/log_request_builder.rb

@@ -0,0 +1,61 @@
+module Promoted
+  module Ruby
+    module Client
+      class LogRequestBuilder
+        attr_reader :request, :response_insertions, :experiment
+        attr_accessor :request, :response_insertions, :experiment
+
+        def initialize args = {}
+          if args[:id_generator]
+            @id_generator = args[:id_generator]
+          else
+            @id_generator = IdGenerator.new
+          end
+        end
+
+        def log_request(include_delivery_log:, exec_server:)
+          log_req = {
+            platform_id: @request[:platform_id],
+            user_info: @request[:user_info],
+            # For now, we'll just use the request timestamp.
+            timing: @request[:timing],
+            client_info: @request[:client_info],
+            device: @request[:device],
+          }
+
+          if @experiment
+            log_req[:cohort_membership] = [@experiment]
+          end
+
+          # Log request allows for multiple requests but here we only send one.
+          if include_delivery_log
+            request[:request_id] = request[:request_id] || @id_generator.newID
+            # Remove redundant fields from `request` since they're already on the LogRequest.
+            stripped_request = @request.clone
+            stripped_request.delete(:platform_id)
+            stripped_request.delete(:user_info)
+            stripped_request.delete(:timing)
+            stripped_request.delete(:device)
+            stripped_request.delete(:client_info)
+
+            log_req[:delivery_log] = [{
+              execution: {
+                execution_server: exec_server,
+                server_version: Promoted::Ruby::Client::SERVER_VERSION
+              },
+              request: stripped_request,
+              response: {
+                insertion: @response_insertions
+              }
+            }]
+          end
+          log_req.clean!
+        end
+      end
+    end
+  end
+end
+
+require "promoted/ruby/client/constants"
+require "promoted/ruby/client/extensions"
+require "promoted/ruby/client/id_generator"

data/lib/promoted/ruby/client/pager.rb

@@ -50,11 +50,14 @@ module Promoted
               final_insertion_size = [size, insertions.length - index].min
               insertion_page = Array.new(final_insertion_size)
               0.upto(final_insertion_size - 1) {|i|
-                insertion = insertions[index]
-                if insertion[:position] == nil
-                  insertion[:position] = offset
-                end
-                insertion_page[i] = insertion
+                request_insertion = insertions[index]
+                # Pager returns response insertions.  Create a copy and fill in some of the fields.
+                response_insertion = Hash[]
+                response_insertion[:content_id] = request_insertion[:content_id]
+                response_insertion[:insertion_id] = request_insertion[:insertion_id]
+                # TODO - implement retrieval_start.
+                response_insertion[:position] = offset
+                insertion_page[i] = response_insertion
                 index = index + 1
                 offset = offset + 1
               }

data/lib/promoted/ruby/client/request_builder.rb

@@ -49,7 +49,6 @@ module Promoted
           return @experiment
         end
 
-        # Only used in delivery
         def delivery_request_params
           params = {
             user_info: user_info,
@@ -70,93 +69,12 @@ module Promoted
           params.clean!
         end
 
-        # Only used in delivery
-        # Maps the response insertions to the full insertions and re-insert the properties bag
-        # to the responses.
-        def fill_details_from_response response_insertions
-          if !response_insertions then
-            response_insertions = []
-          end
-
-          props = @insertion.each_with_object({}) do |insertion, hash|
-            if insertion.has_key?(:properties)
-              # Don't add nil properties to response insertions.
-              hash[insertion[:content_id]] = insertion[:properties]
-            end
-          end
-
-          filled_in_copy = []
-          response_insertions.each do |resp_insertion|
-            copied_insertion = resp_insertion.clone
-            if copied_insertion.has_key?(:content_id) && props.has_key?(copied_insertion[:content_id])
-              copied_insertion[:properties] = props[resp_insertion[:content_id]]
-            end
-            filled_in_copy << copied_insertion
-          end
-
-          filled_in_copy
-        end
-
-        def log_request_params(include_delivery_log:, exec_server:)
-          params = {
-            user_info: user_info,
-            timing: timing,
-            client_info: merge_client_info_defaults,
-            device: @device,
-          }
-
-          if @experiment
-            params[:cohort_membership] = [@experiment]
-          end
-
-          # Log request allows for multiple requests but here we only send one.
-          if include_delivery_log
-            request[:request_id] = request[:request_id] || @id_generator.newID
-
-            params[:delivery_log] = [{
-              execution: {
-                execution_server: exec_server,
-                server_version: Promoted::Ruby::Client::SERVER_VERSION
-              },
-              request: request,
-              response: {
-                insertion: response_insertion
-              }
-            }]
-
-            add_missing_insertion_ids! params[:delivery_log][0][:response][:insertion]            
-          end
-          
-          params.clean!
-        end
-
         def ensure_client_timestamp
           if timing[:client_log_timestamp].nil?
             timing[:client_log_timestamp] = (Time.now.to_f * 1000).to_i
           end
         end
 
-        def response_insertion
-          @response_insertions  = []
-          paging                = request[:paging] || {}
-          size                  = paging[:size] ? paging[:size].to_i : 0
-          if size <= 0
-            size = insertion.length()
-          end
-          offset                = paging[:offset] ? paging[:offset].to_i : 0
-
-          insertion.each_with_index do |insertion_obj, index|
-            # TODO - this does not look performant.
-            break if @response_insertions.length() >= size
-            response_insertion = Hash[]
-            response_insertion[:content_id]   = insertion_obj[:content_id]
-            response_insertion[:position]     = offset + index
-            response_insertion[:insertion_id] = insertion_obj[:insertion_id]
-            @response_insertions << response_insertion.clean!
-          end
-          @response_insertions
-        end
-
         def add_missing_insertion_ids! insertions
           insertions.each do |insertion|
             insertion[:insertion_id] = @id_generator.newID if not insertion[:insertion_id]

data/lib/promoted/ruby/client/util.rb

@@ -31,10 +31,10 @@ module Promoted
                 end
               end
               sym_hash
-              rescue => e
+              rescue
                 raise 'Unable to parse args. Please pass correct arguments. Must be JSON'
-              end      
             end
+        end
       end
-  end
+    end
 end

data/lib/promoted/ruby/client/version.rb

@@ -1,7 +1,7 @@
 module Promoted
   module Ruby
     module Client
-      VERSION = "1.0.1"
+      VERSION = "2.0.1"
       SERVER_VERSION = "rb." + VERSION
     end
   end

data/lib/promoted/ruby/client.rb

@@ -135,10 +135,10 @@ module Promoted
           if @perform_checks
             perform_common_checks!(args)
             if !only_log && args[:insertion_page_type] == Promoted::Ruby::Client::INSERTION_PAGING_TYPE['PRE_PAGED'] then
-                err = DeliveryInsertionPageType.new
-                @logger.error(err) if @logger
-                raise err
-              end
+              err = DeliveryInsertionPageType.new
+              @logger.error(err) if @logger
+              raise err
+            end
 
             if should_send_shadow_traffic && args[:insertion_page_type] != Promoted::Ruby::Client::INSERTION_PAGING_TYPE['UNPAGED'] then
               should_send_shadow_traffic = false
@@ -177,23 +177,23 @@ module Promoted
             if should_apply_treatment(cohort_membership_to_log)
               # Call Delivery API to get insertions to use
               delivery_request_params = delivery_request_builder.delivery_request_params  
+              # Don't send shadow traffic if we've already tried normal traffic.
+              should_send_shadow_traffic = false
               begin
                 response = send_request(delivery_request_params, @delivery_endpoint, @delivery_timeout_millis, @delivery_api_key, headers)
                 @validator.validate_response!(response)
+                raise ValidationError.new("Response shoul be a Hash") if !response.is_a?(Hash)
+                response_insertions = response && response[:insertion] || []
+                insertions_from_delivery = (response != nil && !deliver_err);
               rescue  StandardError => err
                 # Currently we don't propagate errors to the SDK caller, but rather default to returning
                 # the request insertions.
                 deliver_err = true
                 @logger.error("Error calling delivery: " + err.message) if @logger
               end
-              should_send_shadow_traffic = false
             else
               should_send_shadow_traffic &&= @send_shadow_traffic_for_control
             end
-
-            insertions_from_delivery = (response != nil && !deliver_err);
-            response_insertions = delivery_request_builder.fill_details_from_response(
-              response && response[:insertion] || [])
           end
 
           should_send_shadow_traffic &&= should_send_as_shadow_traffic?
@@ -202,33 +202,24 @@ module Promoted
               deliver_shadow_traffic args, headers
           end
 
-          request_to_log = nil
           if !insertions_from_delivery then
-            request_to_log = delivery_request_builder.request
             response_insertions = build_sdk_response_insertions(delivery_request_builder)
           end
 
           log_req = nil
           exec_server = (insertions_from_delivery ? Promoted::Ruby::Client::EXECUTION_SERVER['API'] : Promoted::Ruby::Client::EXECUTION_SERVER['SDK'])
-          
-          # We only return a log request if there's a request or cohort to log.
-          if request_to_log || cohort_membership_to_log
-            log_request_builder = RequestBuilder.new
-            log_request = {
-              :insertion => response_insertions,
-              :experiment => cohort_membership_to_log,
-              :request => request_to_log
-            }
-            log_request_builder.set_request_params(log_request)
 
-            # We can't count on these being set already since request_to_log may be nil.
-            log_request_builder.platform_id = delivery_request_builder.platform_id
-            log_request_builder.timing      = delivery_request_builder.timing
-            log_request_builder.user_info   = delivery_request_builder.user_info
+          # We only return a log request if there's a request or cohort to log.
+          if !insertions_from_delivery || cohort_membership_to_log
+            log_request_builder = LogRequestBuilder.new
+            # TODO - make this more efficient.
+            log_request_builder.request = delivery_request_builder.delivery_request_params
+            log_request_builder.response_insertions = response_insertions
+            log_request_builder.experiment = cohort_membership_to_log
 
             # On a successful delivery request, we don't log the insertions
             # or the request since they are logged on the server-side.
-            log_req = log_request_builder.log_request_params(
+            log_req = log_request_builder.log_request(
               include_delivery_log: !insertions_from_delivery, 
               exec_server: exec_server)
           end
@@ -386,6 +377,7 @@ module Promoted
 end
 
 # dependent /libs
+require "promoted/ruby/client/log_request_builder"
 require "promoted/ruby/client/request_builder"
 require "promoted/ruby/client/pager"
 require "promoted/ruby/client/sampler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: promoted-ruby-client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.1
 platform: ruby
 authors:
 - scottmcmaster
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-18 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -139,6 +139,7 @@ files:
 - lib/promoted/ruby/client/extensions.rb
 - lib/promoted/ruby/client/faraday_http_client.rb
 - lib/promoted/ruby/client/id_generator.rb
+- lib/promoted/ruby/client/log_request_builder.rb
 - lib/promoted/ruby/client/pager.rb
 - lib/promoted/ruby/client/request_builder.rb
 - lib/promoted/ruby/client/sampler.rb
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.9
 signing_key:
 specification_version: 4
 summary: A Ruby Client to contact Promoted APIs.