conekta 6.0.3 → 6.0.4

data/lib/conekta/models/charge_request_payment_method.rb

@@ -14,257 +14,92 @@ require 'date'
 require 'time'
 
 module Conekta
-  # Payment method used in the charge. Go to the [payment methods](https://developers.conekta.com/reference/m%C3%A9todos-de-pago) section for more details 
-  class ChargeRequestPaymentMethod
-    # Method expiration date as unix timestamp
-    attr_accessor :expires_at
-
-    # How many months without interest to apply, it can be 3, 6, 9, 12 or 18
-    attr_accessor :monthly_installments
-
-    attr_accessor :type
-
-    attr_accessor :token_id
-
-    attr_accessor :payment_source_id
-
-    # Optional id sent to indicate the bank contract for recurrent card charges.
-    attr_accessor :contract_id
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    def self.attribute_map
-      {
-        :'expires_at' => :'expires_at',
-        :'monthly_installments' => :'monthly_installments',
-        :'type' => :'type',
-        :'token_id' => :'token_id',
-        :'payment_source_id' => :'payment_source_id',
-        :'contract_id' => :'contract_id'
-      }
-    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
-      {
-        :'expires_at' => :'Integer',
-        :'monthly_installments' => :'Integer',
-        :'type' => :'String',
-        :'token_id' => :'String',
-        :'payment_source_id' => :'String',
-        :'contract_id' => :'String'
-      }
-    end
-
-    # List of attributes with nullable: true
-    def self.openapi_nullable
-      Set.new([
-      ])
-    end
-
-    # Initializes the object
-    # @param [Hash] attributes Model attributes in the form of hash
-    def initialize(attributes = {})
-      if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `Conekta::ChargeRequestPaymentMethod` initialize method"
+  module ChargeRequestPaymentMethod
+    class << self
+      # List of class defined in oneOf (OpenAPI v3)
+      def openapi_one_of
+        [
+          :'PaymentMethodCardRequest',
+          :'PaymentMethodGeneralRequest'
+        ]
       end
 
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `Conekta::ChargeRequestPaymentMethod`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      # Builds the object
+      # @param [Mixed] Data to be matched against the list of oneOf items
+      # @return [Object] Returns the model or the data itself
+      def build(data)
+        # Go through the list of oneOf items and attempt to identify the appropriate one.
+        # Note:
+        # - We do not attempt to check whether exactly one item matches.
+        # - No advanced validation of types in some cases (e.g. "x: { type: string }" will happily match { x: 123 })
+        #   due to the way the deserialization is made in the base_object template (it just casts without verifying).
+        # - TODO: scalar values are de facto behaving as if they were nullable.
+        # - TODO: logging when debugging is set.
+        openapi_one_of.each do |klass|
+          begin
+            next if klass == :AnyType # "nullable: true"
+            typed_data = find_and_cast_into_type(klass, data)
+            return typed_data if typed_data
+          rescue # rescue all errors so we keep iterating even if the current item lookup raises
+          end
         end
-        h[k.to_sym] = v
-      }
 
-      if attributes.key?(:'expires_at')
-        self.expires_at = attributes[:'expires_at']
+        openapi_one_of.include?(:AnyType) ? data : nil
       end
 
-      if attributes.key?(:'monthly_installments')
-        self.monthly_installments = attributes[:'monthly_installments']
-      end
-
-      if attributes.key?(:'type')
-        self.type = attributes[:'type']
-      else
-        self.type = nil
-      end
-
-      if attributes.key?(:'token_id')
-        self.token_id = attributes[:'token_id']
-      end
-
-      if attributes.key?(:'payment_source_id')
-        self.payment_source_id = attributes[:'payment_source_id']
-      end
-
-      if attributes.key?(:'contract_id')
-        self.contract_id = attributes[:'contract_id']
-      end
-    end
-
-    # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properties with the reasons
-    def list_invalid_properties
-      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
-      invalid_properties = Array.new
-      if @type.nil?
-        invalid_properties.push('invalid value for "type", type cannot be nil.')
-      end
-
-      invalid_properties
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    def valid?
-      warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @type.nil?
-      true
-    end
-
-    # Checks equality by comparing each attribute.
-    # @param [Object] Object to be compared
-    def ==(o)
-      return true if self.equal?(o)
-      self.class == o.class &&
-          expires_at == o.expires_at &&
-          monthly_installments == o.monthly_installments &&
-          type == o.type &&
-          token_id == o.token_id &&
-          payment_source_id == o.payment_source_id &&
-          contract_id == o.contract_id
-    end
-
-    # @see the `==` method
-    # @param [Object] Object to be compared
-    def eql?(o)
-      self == o
-    end
-
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    def hash
-      [expires_at, monthly_installments, type, token_id, payment_source_id, contract_id].hash
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def self.build_from_hash(attributes)
-      return nil unless attributes.is_a?(Hash)
-      attributes = attributes.transform_keys(&:to_sym)
-      transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
-          transformed_hash["#{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[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+      private
+
+      SchemaMismatchError = Class.new(StandardError)
+
+      # Note: 'File' is missing here because in the regular case we get the data _after_ a call to JSON.parse.
+      def find_and_cast_into_type(klass, data)
+        return if data.nil?
+
+        case klass.to_s
+        when 'Boolean'
+          return data if data.instance_of?(TrueClass) || data.instance_of?(FalseClass)
+        when 'Float'
+          return data if data.instance_of?(Float)
+        when 'Integer'
+          return data if data.instance_of?(Integer)
+        when 'Time'
+          return Time.parse(data)
+        when 'Date'
+          return Date.parse(data)
+        when 'String'
+          return data if data.instance_of?(String)
+        when 'Object' # "type: object"
+          return data if data.instance_of?(Hash)
+        when /\AArray<(?<sub_type>.+)>\z/ # "type: array"
+          if data.instance_of?(Array)
+            sub_type = Regexp.last_match[:sub_type]
+            return data.map { |item| find_and_cast_into_type(sub_type, item) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
-        end
-      end
-      new(transformed_hash)
-    end
-
-    # Deserializes the data based on type
-    # @param string type Data type
-    # @param string value Value to be deserialized
-    # @return [Object] Deserialized data
-    def self._deserialize(type, value)
-      case type.to_sym
-      when :Time
-        Time.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :Boolean
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+        when /\AHash<String, (?<sub_type>.+)>\z/ # "type: object" with "additionalProperties: { ... }"
+          if data.instance_of?(Hash) && data.keys.all? { |k| k.instance_of?(Symbol) || k.instance_of?(String) }
+            sub_type = Regexp.last_match[:sub_type]
+            return data.each_with_object({}) { |(k, v), hsh| hsh[k] = find_and_cast_into_type(sub_type, v) }
+          end
+        else # model
+          const = Conekta.const_get(klass)
+          if const
+            if const.respond_to?(:openapi_one_of) # nested oneOf model
+              model = const.build(data)
+              return model if model
+            else
+              # raise if data contains keys that are not known to the model
+              raise if const.respond_to?(:acceptable_attributes) && !(data.keys - const.acceptable_attributes).empty?
+              model = const.build_from_hash(data)
+              return model if model
+            end
           end
-        end
-      else # model
-        # models (e.g. Pet) or oneOf
-        klass = Conekta.const_get(type)
-        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
-      end
-    end
-
-    # Returns the string representation of the object
-    # @return [String] String presentation of the object
-    def to_s
-      to_hash.to_s
-    end
-
-    # to_body is an alias to to_hash (backward compatibility)
-    # @return [Hash] Returns the object in the form of hash
-    def to_body
-      to_hash
-    end
-
-    # Returns the object in the form of hash
-    # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 
-        hash[param] = _to_hash(value)
+        raise # if no match by now, raise
+      rescue
+        raise SchemaMismatchError, "#{data} doesn't match the #{klass} type"
       end
-      hash
     end
-
-    # Outputs non-array value in the form of hash
-    # For object, use to_hash. Otherwise, just return the value
-    # @param [Object] value Any valid value
-    # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
-      if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
-      elsif value.is_a?(Hash)
-        {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
-        end
-      elsif value.respond_to? :to_hash
-        value.to_hash
-      else
-        value
-      end
-    end
-
   end
 
 end

data/lib/conekta/models/charge_response.rb

@@ -33,14 +33,18 @@ module Conekta
 
     attr_accessor :failure_message
 
+    # Charge ID
     attr_accessor :id
 
+    # Whether the charge was made in live mode or not
     attr_accessor :livemode
 
     attr_accessor :object
 
+    # Order ID
     attr_accessor :order_id
 
+    # Payment date
     attr_accessor :paid_at
 
     attr_accessor :payment_method

data/lib/conekta/models/charges_data_response.rb

@@ -33,14 +33,18 @@ module Conekta
 
     attr_accessor :failure_message
 
+    # Charge ID
     attr_accessor :id
 
+    # Whether the charge was made in live mode or not
     attr_accessor :livemode
 
     attr_accessor :object
 
+    # Order ID
     attr_accessor :order_id
 
+    # Payment date
     attr_accessor :paid_at
 
     attr_accessor :payment_method

data/lib/conekta/models/checkout.rb

@@ -28,6 +28,9 @@ module Conekta
     # This field allows you to specify the number of months without interest.
     attr_accessor :monthly_installments_options
 
+    # Indicates the 3DS2 mode for the order, either smart or strict.
+    attr_accessor :three_ds_mode
+
     # Reason for charge
     attr_accessor :name
 
@@ -55,6 +58,7 @@ module Conekta
         :'expires_at' => :'expires_at',
         :'monthly_installments_enabled' => :'monthly_installments_enabled',
         :'monthly_installments_options' => :'monthly_installments_options',
+        :'three_ds_mode' => :'three_ds_mode',
         :'name' => :'name',
         :'needs_shipping_contact' => :'needs_shipping_contact',
         :'on_demand_enabled' => :'on_demand_enabled',
@@ -77,6 +81,7 @@ module Conekta
         :'expires_at' => :'Integer',
         :'monthly_installments_enabled' => :'Boolean',
         :'monthly_installments_options' => :'Array<Integer>',
+        :'three_ds_mode' => :'String',
         :'name' => :'String',
         :'needs_shipping_contact' => :'Boolean',
         :'on_demand_enabled' => :'Boolean',
@@ -133,6 +138,10 @@ module Conekta
         end
       end
 
+      if attributes.key?(:'three_ds_mode')
+        self.three_ds_mode = attributes[:'three_ds_mode']
+      end
+
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       else
@@ -224,6 +233,7 @@ module Conekta
           expires_at == o.expires_at &&
           monthly_installments_enabled == o.monthly_installments_enabled &&
           monthly_installments_options == o.monthly_installments_options &&
+          three_ds_mode == o.three_ds_mode &&
           name == o.name &&
           needs_shipping_contact == o.needs_shipping_contact &&
           on_demand_enabled == o.on_demand_enabled &&
@@ -242,7 +252,7 @@ module Conekta
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [allowed_payment_methods, expires_at, monthly_installments_enabled, monthly_installments_options, name, needs_shipping_contact, on_demand_enabled, order_template, payments_limit_count, recurrent, type].hash
+      [allowed_payment_methods, expires_at, monthly_installments_enabled, monthly_installments_options, three_ds_mode, name, needs_shipping_contact, on_demand_enabled, order_template, payments_limit_count, recurrent, type].hash
     end
 
     # Builds the object from hash

data/lib/conekta/models/create_customer_payment_methods_request.rb

@@ -20,9 +20,9 @@ module Conekta
       # List of class defined in oneOf (OpenAPI v3)
       def openapi_one_of
         [
-          :'PaymentMethodCardRequest',
           :'PaymentMethodCashRequest',
-          :'PaymentMethodSpeiRequest'
+          :'PaymentMethodSpeiRequest',
+          :'PaymentMethodTokenRequest'
         ]
       end
 

data/lib/conekta/models/customer_payment_methods_request.rb

@@ -19,9 +19,9 @@ module Conekta
       # List of class defined in oneOf (OpenAPI v3)
       def openapi_one_of
         [
-          :'PaymentMethodCardRequest',
           :'PaymentMethodCashRequest',
-          :'PaymentMethodSpeiRequest'
+          :'PaymentMethodSpeiRequest',
+          :'PaymentMethodTokenRequest'
         ]
       end
 

data/lib/conekta/models/order_refund_request.rb

@@ -15,10 +15,12 @@ require 'time'
 
 module Conekta
   class OrderRefundRequest
+    # Amount to be refunded in cents
     attr_accessor :amount
 
     attr_accessor :expires_at
 
+    # Reason for the refund
     attr_accessor :reason
 
     # Attribute mapping from ruby-style variable name to JSON key.

data/lib/conekta/models/order_request.rb

@@ -46,7 +46,7 @@ module Conekta
     # Indicates the processing mode for the order, either ecommerce, recurrent or validation.
     attr_accessor :processing_mode
 
-    # Indicates the redirection callback upon completion of the 3DS2 flow.
+    # Indicates the redirection callback upon completion of the 3DS2 flow. Do not use this parameter if your order has a checkout parameter
     attr_accessor :return_url
 
     attr_accessor :shipping_contact

data/lib/conekta/models/payment_method_bank_transfer.rb

@@ -51,6 +51,8 @@ module Conekta
 
     attr_accessor :tracking_code
 
+    attr_accessor :customer_ip_address
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -71,7 +73,8 @@ module Conekta
         :'receiving_account_bank' => :'receiving_account_bank',
         :'receiving_account_tax_id' => :'receiving_account_tax_id',
         :'reference_number' => :'reference_number',
-        :'tracking_code' => :'tracking_code'
+        :'tracking_code' => :'tracking_code',
+        :'customer_ip_address' => :'customer_ip_address'
       }
     end
 
@@ -100,7 +103,8 @@ module Conekta
         :'receiving_account_bank' => :'String',
         :'receiving_account_tax_id' => :'String',
         :'reference_number' => :'String',
-        :'tracking_code' => :'String'
+        :'tracking_code' => :'String',
+        :'customer_ip_address' => :'String'
       }
     end
 
@@ -116,7 +120,7 @@ module Conekta
         :'receiving_account_holder_name',
         :'receiving_account_tax_id',
         :'reference_number',
-        :'tracking_code'
+        :'tracking_code',
       ])
     end
 
@@ -217,6 +221,10 @@ module Conekta
       if attributes.key?(:'tracking_code')
         self.tracking_code = attributes[:'tracking_code']
       end
+
+      if attributes.key?(:'customer_ip_address')
+        self.customer_ip_address = attributes[:'customer_ip_address']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -261,7 +269,8 @@ module Conekta
           receiving_account_bank == o.receiving_account_bank &&
           receiving_account_tax_id == o.receiving_account_tax_id &&
           reference_number == o.reference_number &&
-          tracking_code == o.tracking_code
+          tracking_code == o.tracking_code &&
+          customer_ip_address == o.customer_ip_address
     end
 
     # @see the `==` method
@@ -273,7 +282,7 @@ module Conekta
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [type, object, bank, clabe, description, executed_at, expires_at, issuing_account_bank, issuing_account_number, issuing_account_holder_name, issuing_account_tax_id, payment_attempts, receiving_account_holder_name, receiving_account_number, receiving_account_bank, receiving_account_tax_id, reference_number, tracking_code].hash
+      [type, object, bank, clabe, description, executed_at, expires_at, issuing_account_bank, issuing_account_number, issuing_account_holder_name, issuing_account_tax_id, payment_attempts, receiving_account_holder_name, receiving_account_number, receiving_account_bank, receiving_account_tax_id, reference_number, tracking_code, customer_ip_address].hash
     end
 
     # Builds the object from hash

data/lib/conekta/models/payment_method_card.rb

@@ -19,29 +19,40 @@ module Conekta
 
     attr_accessor :object
 
+    # Account type of the card
     attr_accessor :account_type
 
     attr_accessor :auth_code
 
+    # Brand of the card
     attr_accessor :brand
 
     # Id sent for recurrent charges.
     attr_accessor :contract_id
 
+    # Country of the card
     attr_accessor :country
 
+    # Expiration month of the card
     attr_accessor :exp_month
 
+    # Expiration year of the card
     attr_accessor :exp_year
 
     attr_accessor :fraud_indicators
 
+    # Issuer of the card
     attr_accessor :issuer
 
+    # Last 4 digits of the card
     attr_accessor :last4
 
+    # Name of the cardholder
     attr_accessor :name
 
+    # Optional field used to capture the customer's IP address for fraud prevention and security monitoring purposes
+    attr_accessor :customer_ip_address
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -57,7 +68,8 @@ module Conekta
         :'fraud_indicators' => :'fraud_indicators',
         :'issuer' => :'issuer',
         :'last4' => :'last4',
-        :'name' => :'name'
+        :'name' => :'name',
+        :'customer_ip_address' => :'customer_ip_address'
       }
     end
 
@@ -81,7 +93,8 @@ module Conekta
         :'fraud_indicators' => :'Array<Object>',
         :'issuer' => :'String',
         :'last4' => :'String',
-        :'name' => :'String'
+        :'name' => :'String',
+        :'customer_ip_address' => :'String'
       }
     end
 
@@ -168,6 +181,10 @@ module Conekta
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
+
+      if attributes.key?(:'customer_ip_address')
+        self.customer_ip_address = attributes[:'customer_ip_address']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -207,7 +224,8 @@ module Conekta
           fraud_indicators == o.fraud_indicators &&
           issuer == o.issuer &&
           last4 == o.last4 &&
-          name == o.name
+          name == o.name &&
+          customer_ip_address == o.customer_ip_address
     end
 
     # @see the `==` method
@@ -219,7 +237,7 @@ module Conekta
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [type, object, account_type, auth_code, brand, contract_id, country, exp_month, exp_year, fraud_indicators, issuer, last4, name].hash
+      [type, object, account_type, auth_code, brand, contract_id, country, exp_month, exp_year, fraud_indicators, issuer, last4, name, customer_ip_address].hash
     end
 
     # Builds the object from hash