adzerk_decision_sdk 1.0.0.pre.beta.3 → 1.0.0.pre.beta.8

data/lib/adzerk_decision_sdk/api_error.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.0.1
 
 =end
 

data/lib/adzerk_decision_sdk/client.rb

@@ -25,8 +25,9 @@ module AdzerkDecisionSdk
       configuration = Configuration.new
       configuration.scheme = protocol
       configuration.host = host
-      configuration.api_key['X-Adzerk-ApiKey'] = api_key
+      configuration.api_key['ApiKeyAuth'] = api_key
       configuration.debugging = is_debug
+      configuration.server_index = nil
 
       unless logger.nil?
         configuration.logger = logger
@@ -36,8 +37,8 @@ module AdzerkDecisionSdk
       api_client.default_headers['X-Adzerk-Sdk-Version'] = "adzerk-decision-sdk-ruby:#{version}"
 
       @decisions = DecisionClient.new(network_id, site_id, api_client, configuration.logger)
-      @user_db = UserDbClient.new(network_id, api_client)
-      @pixels = PixelClient.new(api_client)
+      @user_db = UserDbClient.new(network_id, api_client, configuration.logger)
+      @pixels = PixelClient.new(api_client, configuration.logger)
     end
   end
 end

data/lib/adzerk_decision_sdk/configuration.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.0.1
 
 =end
 
@@ -21,6 +21,18 @@ module AdzerkDecisionSdk
     # Defines url base path
     attr_accessor :base_path
 
+    # Define server configuration index
+    attr_accessor :server_index
+
+    # Define server operation configuration index
+    attr_accessor :server_operation_index
+
+    # Default server variables
+    attr_accessor :server_variables
+
+    # Default server operation variables
+    attr_accessor :server_operation_variables
+
     # Defines API keys used with API Key authentications.
     #
     # @return [Hash] key: parameter name, value: parameter value (API key)
@@ -129,6 +141,10 @@ module AdzerkDecisionSdk
       @scheme = 'https'
       @host = 'e-23.adzerk.net'
       @base_path = ''
+      @server_index = 0
+      @server_operation_index = {}
+      @server_variables = {}
+      @server_operation_variables = {}
       @api_key = {}
       @api_key_prefix = {}
       @timeout = 0
@@ -171,17 +187,23 @@ module AdzerkDecisionSdk
       @base_path = '' if @base_path == '/'
     end
 
-    def base_url
-      "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
+    # Returns base URL for specified operation based on server settings
+    def base_url(operation = nil)
+      index = server_operation_index.fetch(operation, server_index)
+      return "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '') if index == nil
+
+      server_url(index, server_operation_variables.fetch(operation, server_variables), operation_server_settings[operation])
     end
 
     # Gets API key (with prefix if set).
     # @param [String] param_name the parameter name of API key auth
-    def api_key_with_prefix(param_name)
+    def api_key_with_prefix(param_name, param_alias = nil)
+      key = @api_key[param_name]
+      key = @api_key.fetch(param_alias, key) unless param_alias.nil?
       if @api_key_prefix[param_name]
-        "#{@api_key_prefix[param_name]} #{@api_key[param_name]}"
+        "#{@api_key_prefix[param_name]} #{key}"
       else
-        @api_key[param_name]
+        key
       end
     end
 
@@ -198,7 +220,7 @@ module AdzerkDecisionSdk
             type: 'api_key',
             in: 'header',
             key: 'X-Adzerk-ApiKey',
-            value: api_key_with_prefix('X-Adzerk-ApiKey')
+            value: api_key_with_prefix('ApiKeyAuth')
           },
       }
     end
@@ -227,12 +249,17 @@ module AdzerkDecisionSdk
       ]
     end
 
+    def operation_server_settings
+      {
+      }
+    end
+
     # Returns URL based on server settings
     #
     # @param index array index of the server settings
     # @param variables hash of variable and the corresponding value
-    def server_url(index, variables = {})
-      servers = server_settings
+    def server_url(index, variables = {}, servers = nil)
+      servers = server_settings if servers == nil
 
       # check array index out of bound
       if (index < 0 || index >= servers.size)
@@ -242,10 +269,12 @@ module AdzerkDecisionSdk
       server = servers[index]
       url = server[:url]
 
+      return url unless server.key? :variables
+
       # go through variable and assign a value
       server[:variables].each do |name, variable|
         if variables.key?(name)
-          if (server[:variables][name][:enum_values].include? variables[name])
+          if (!server[:variables][name].key?(:enum_values) || server[:variables][name][:enum_values].include?(variables[name]))
             url.gsub! "{" + name.to_s + "}", variables[name]
           else
             fail ArgumentError, "The variable `#{name}` in the server URL has invalid value #{variables[name]}. Must be #{server[:variables][name][:enum_values]}."

data/lib/adzerk_decision_sdk/decision_client.rb

@@ -2,30 +2,40 @@ require 'adzerk_decision_sdk/api/decision_api'
 
 module AdzerkDecisionSdk
   class DecisionClient
+
     def initialize(network_id, site_id, api_client, logger)
       @network_id = network_id
       @site_id = site_id
       @api = DecisionApi.new(api_client)
       @logger = logger
+      @deprecated_placement_fields = [[:ecpm_partition, 'ecpm_partitions']]
     end
 
     def get(request, opts = {})
       opts ||= {}
       header_params = opts[:header_params] || {}
-      opts[:body] ||= request.respond_to?('to_hash') ? request.to_hash() : request
+      opts[:debug_body] ||= request.respond_to?('to_hash') ? request.to_hash() : request
 
-      @logger.info("Processing request: #{opts[:body]}")
+      @logger.info("Processing request: #{opts[:debug_body]}")
 
-      opts[:body][:enableBotFiltering] = false if not opts[:body].has_key?(:enableBotFiltering)
+      opts[:debug_body][:enableBotFiltering] = false if not opts[:debug_body].has_key?(:enableBotFiltering)
 
-      if !opts[:body].has_key?(:placements) or !opts[:body][:placements] or opts[:body][:placements].length() == 0
+      if !opts[:debug_body].has_key?(:placements) or !opts[:debug_body][:placements] or opts[:debug_body][:placements].length() == 0
         fail ArgumentError, "Each request requires at least one placement"
       end
 
-      opts[:body][:placements].each_with_index do |placement, idx|
+      opts[:debug_body][:placements].each_with_index do |placement, idx|
         if !placement.has_key?(:adTypes) or !placement[:adTypes] or placement[:adTypes].length() == 0
           fail ArgumentError, "Each placement needs at least one ad type"
         end
+
+        @deprecated_placement_fields.each do |pair|
+          deprecated_field, replacement = pair
+          if placement.has_key?(deprecated_field) and !placement[deprecated_field].nil?
+            @logger.warn("DEPRECATION WARNING: #{deprecated_field} has been deprecated. Please use #{replacement} instead.")
+          end
+        end
+
         placement[:networkId] = @network_id if not placement.has_key?(:networkId)
         placement[:siteId] = @site_id if not placement.has_key?(:siteId)
         placement[:divName] = "div#{idx}" if not placement.has_key?(:divName)
@@ -46,13 +56,14 @@ module AdzerkDecisionSdk
 
       opts[:header_params] = header_params
 
-      @logger.info("Processed request: #{opts[:body]}")
+      @logger.info("Processed request: #{opts[:debug_body]}")
       @logger.info("Requesting with headers: #{opts[:header_params]}")
 
       response = @api.get_decisions(opts)
+      @logger.info("Received response: #{response}")
 
       parsed_response = parse_response(response)
-      @logger.info("Received response: #{parsed_response}")
+      @logger.info("Parsed response: #{parsed_response}")
 
       return parsed_response
     end

data/lib/adzerk_decision_sdk/models/consent_request.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: 1.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.0.1
 
 =end
 
 require 'date'
+require 'time'
 
 module AdzerkDecisionSdk
   class ConsentRequest
@@ -26,6 +27,11 @@ module AdzerkDecisionSdk
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -111,7 +117,9 @@ module AdzerkDecisionSdk
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -119,7 +127,7 @@ module AdzerkDecisionSdk
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -131,8 +139,8 @@ module AdzerkDecisionSdk
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -162,7 +170,9 @@ module AdzerkDecisionSdk
           end
         end
       else # model
-        AdzerkDecisionSdk.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = AdzerkDecisionSdk.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -188,7 +198,7 @@ module AdzerkDecisionSdk
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -211,5 +221,7 @@ module AdzerkDecisionSdk
         value
       end
     end
+
   end
+
 end

data/lib/adzerk_decision_sdk/models/content.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: 1.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.0.1
 
 =end
 
 require 'date'
+require 'time'
 
 module AdzerkDecisionSdk
   class Content
@@ -35,13 +36,18 @@ module AdzerkDecisionSdk
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
         :'type' => :'String',
         :'template' => :'String',
         :'custom_template' => :'String',
-        :'data' => :'DecisionData',
+        :'data' => :'Object',
         :'body' => :'String'
       }
     end
@@ -138,7 +144,9 @@ module AdzerkDecisionSdk
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -146,7 +154,7 @@ module AdzerkDecisionSdk
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -158,8 +166,8 @@ module AdzerkDecisionSdk
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -189,7 +197,9 @@ module AdzerkDecisionSdk
           end
         end
       else # model
-        AdzerkDecisionSdk.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = AdzerkDecisionSdk.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -215,7 +225,7 @@ module AdzerkDecisionSdk
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -238,5 +248,7 @@ module AdzerkDecisionSdk
         value
       end
     end
+
   end
+
 end

data/lib/adzerk_decision_sdk/models/decision.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: 1.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.0.1
 
 =end
 
 require 'date'
+require 'time'
 
 module AdzerkDecisionSdk
   class Decision
@@ -32,6 +33,8 @@ module AdzerkDecisionSdk
 
     attr_accessor :events
 
+    attr_accessor :matched_points
+
     attr_accessor :pricing
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -46,10 +49,16 @@ module AdzerkDecisionSdk
         :'contents' => :'contents',
         :'impression_url' => :'impressionUrl',
         :'events' => :'events',
+        :'matched_points' => :'matchedPoints',
         :'pricing' => :'pricing'
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -62,6 +71,7 @@ module AdzerkDecisionSdk
         :'contents' => :'Array<Content>',
         :'impression_url' => :'String',
         :'events' => :'Array<Event>',
+        :'matched_points' => :'Array<MatchedPoint>',
         :'pricing' => :'PricingData'
       }
     end
@@ -127,6 +137,12 @@ module AdzerkDecisionSdk
         end
       end
 
+      if attributes.key?(:'matched_points')
+        if (value = attributes[:'matched_points']).is_a?(Array)
+          self.matched_points = value
+        end
+      end
+
       if attributes.key?(:'pricing')
         self.pricing = attributes[:'pricing']
       end
@@ -159,6 +175,7 @@ module AdzerkDecisionSdk
           contents == o.contents &&
           impression_url == o.impression_url &&
           events == o.events &&
+          matched_points == o.matched_points &&
           pricing == o.pricing
     end
 
@@ -171,7 +188,7 @@ module AdzerkDecisionSdk
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [ad_id, creative_id, flight_id, campaign_id, priority_id, click_url, contents, impression_url, events, pricing].hash
+      [ad_id, creative_id, flight_id, campaign_id, priority_id, click_url, contents, impression_url, events, matched_points, pricing].hash
     end
 
     # Builds the object from hash
@@ -187,7 +204,9 @@ module AdzerkDecisionSdk
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -195,7 +214,7 @@ module AdzerkDecisionSdk
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -207,8 +226,8 @@ module AdzerkDecisionSdk
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -238,7 +257,9 @@ module AdzerkDecisionSdk
           end
         end
       else # model
-        AdzerkDecisionSdk.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = AdzerkDecisionSdk.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -264,7 +285,7 @@ module AdzerkDecisionSdk
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -287,5 +308,7 @@ module AdzerkDecisionSdk
         value
       end
     end
+
   end
+
 end