onlinepayments-sdk-ruby 7.1.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e7cb9ac92f598fdb1b46de7835bc571cc1ea6ae6dbc8280e0b8d4bd11d66789
-  data.tar.gz: 68a5f622d5e0f09218c4011d9221e13cb6a04040e72edbc125796e0d67c3739d
+  metadata.gz: 886740826e219e0289ead1278dda67d3d119b1cbf149d7c00325619558de6570
+  data.tar.gz: e1d8f9cf63268d0300b447966f725f46cdebb6de3555176b45f9adf418789179
 SHA512:
-  metadata.gz: 71a201da39a7eaea4df36a890264e6d1b24f698cbf9b182ae3b456baea515cba83ced63744b224b905d1e2a7a5476de5e32ace889b2ba749983a4ac489139b21
-  data.tar.gz: a3147cade391aa8a68aa2dc64a116de320a91d29e7ada868144a6f03d91db9d9a82105edabb995fc945a141c9c13a4b92a85bed99080f3dad1c27917fe62a562
+  metadata.gz: 3d79d6219337df03eb700ed3ad99f338d47dac3ec91ab0d52acc5667e892523155c36cac6b8dff28953c302cc890b1bbe0812781d4bc095cc40c098a074e9a7a
+  data.tar.gz: 75f803d0195e128c0de97d7753c459319884dd194ca195cb5b5255960120be71f39c3dbc8bc3556fae4847e2446578badb74babb9a9dad8e163d91bccc817ee2

data/lib/onlinepayments/sdk/call_context.rb

@@ -30,6 +30,7 @@ module OnlinePayments
       attr_reader :idempotence_key
       attr_accessor :idempotence_request_timestamp
       attr_accessor :idempotence_response_date_time
+      attr_accessor :gzip
     end
   end
 end

data/lib/onlinepayments/sdk/client.rb

@@ -38,7 +38,7 @@ module OnlinePayments
           return Client.new(@communicator, nil)
         else
           # Checking to see if this is valid JSON (no JSON parse exceptions)
-          @communicator.marshaller.unmarshal(client_meta_info, DataObject)
+          @communicator.marshaller.unmarshal(client_meta_info, OnlinePayments::SDK::Domain::DataObject)
           client_meta_info = Base64.strict_encode64(client_meta_info)
           if @client_meta_info == client_meta_info
             self

data/lib/onlinepayments/sdk/communication/default_connection.rb

@@ -1,6 +1,8 @@
 require 'httpclient'
 require 'securerandom'
 require 'uri'
+require 'zlib'
+require 'stringio'
 require 'onlinepayments/sdk/communication/communication_exception'
 require 'onlinepayments/sdk/communication/multipart_form_data_object'
 require 'onlinepayments/sdk/communication/pooled_connection'
@@ -31,6 +33,7 @@ module OnlinePayments
 
         CONTENT_TYPE = 'Content-Type'.freeze
         JSON_CONTENT_TYPE = 'application/json'.freeze
+        CONTENT_ENCODING = 'Content-Encoding'.freeze
 
         public
 
@@ -104,7 +107,7 @@ module OnlinePayments
 
         # HTTPClient automatically closes expired connections so _close_expired_connections_ is a no-operation.
         def close_expired_connections
-          # By default the keep alive timeout is 15 sec, which is the HTTP 1.1
+          # By default, the keep alive timeout is 15 sec, which is the HTTP 1.1
           # standard. To change the value, use keep_alive_timeout= method
           # do nothing, handled by HTTPClient
         end
@@ -165,8 +168,22 @@ module OnlinePayments
           request_id = SecureRandom.uuid
           content_type = request_headers[CONTENT_TYPE]
 
-          info = { headers: request_headers, content_type: content_type }
-          info[:body] = body unless body.nil?
+          original_body_for_logging = body
+
+          encoding_present = request_headers.keys.any? { |k| k.casecmp(CONTENT_ENCODING).zero? }
+
+          if body.is_a?(String) &&
+             content_type && content_type.downcase.start_with?(JSON_CONTENT_TYPE) &&
+             encoding_present
+
+            gzip_buffer  = StringIO.new
+            gzip = Zlib::GzipWriter.new(gzip_buffer)
+            gzip.write(body)
+            gzip.close
+            body = gzip_buffer.string
+          end
+
+          info = { headers: request_headers, content_type: content_type, body: original_body_for_logging }
 
           log_request(request_id, method.upcase, uri, info)
 
@@ -274,8 +291,8 @@ module OnlinePayments
           body = args[:body]
           content_type = args[:content_type]
           log_msg_builder = OnlinePayments::SDK::Logging::RequestLogMessageBuilder.new(request_id, method, uri,
-                                                                                           @body_obfuscator,
-                                                                                           @header_obfuscator)
+                                                                                       @body_obfuscator,
+                                                                                       @header_obfuscator)
           headers.each { |k, v| log_msg_builder.add_headers(k, v) } if headers
 
           if binary?(headers)
@@ -335,12 +352,11 @@ module OnlinePayments
 
         # @param headers [Hash]
         def binary?(headers)
-          unless headers.nil?
-            content_type = nil
-            headers.each { |k, v| content_type = v if k.casecmp(CONTENT_TYPE).zero? }
+          return false if headers.nil?
 
-            binary_content_type?(content_type)
-          end
+          content_type = nil
+          headers.each { |k, v| content_type = v if k.casecmp(CONTENT_TYPE).zero? }
+          binary_content_type?(content_type)
         end
 
         # @param content_type [String, nil]
@@ -348,8 +364,8 @@ module OnlinePayments
           unless content_type.nil?
             content_type = content_type.downcase
             return !content_type.start_with?('text/') &&
-              !content_type.include?('json') &&
-              !content_type.include?('xml')
+                   !content_type.include?('json') &&
+                   !content_type.include?('xml')
           end
           false
         end

data/lib/onlinepayments/sdk/communication/metadata_provider.rb

@@ -13,7 +13,7 @@ module OnlinePayments
       class MetadataProvider
         private
 
-        SDK_VERSION = '7.1.0'.freeze
+        SDK_VERSION = '7.2.1'.freeze
         SERVER_META_INFO_HEADER = 'X-GCS-ServerMetaInfo'.freeze
         PROHIBITED_HEADERS = [SERVER_META_INFO_HEADER, 'X-GCS-Idempotence-Key', 'Date', 'Content-Type', 'Authorization'].sort!.freeze
         CHARSET = 'utf-8'.freeze

data/lib/onlinepayments/sdk/communicator.rb

@@ -1,5 +1,6 @@
 require 'date'
 require 'uri'
+require 'onlinepayments/sdk/domain/data_object'
 require 'onlinepayments/sdk/communication/communication_exception'
 require 'onlinepayments/sdk/communication/multipart_form_data_object'
 require 'onlinepayments/sdk/communication/multipart_form_data_request'
@@ -202,6 +203,11 @@ module OnlinePayments
         elsif !request_body.nil?
           request_headers.push(Communication::RequestHeader.new('Content-Type', 'application/json'))
           body = @marshaller.marshal(request_body)
+
+          if context&.gzip
+            request_headers.push(Communication::RequestHeader.new('Content-Encoding', 'gzip'))
+          end
+
         else
           # Set the content-type, even though there is no body, to prevent the httpClient from
           # adding a content-type header after authentication has been generated.
@@ -249,6 +255,11 @@ module OnlinePayments
         elsif !request_body.nil?
           request_headers.push(Communication::RequestHeader.new('Content-Type', 'application/json'))
           body = @marshaller.marshal(request_body)
+
+          if context&.gzip
+            request_headers.push(Communication::RequestHeader.new('Content-Encoding', 'gzip'))
+          end
+
         else
           # Set the content-type, even though there is no body, to prevent the httpClient from
           # adding a content-type header after authentication has been generated.
@@ -461,7 +472,7 @@ module OnlinePayments
       end
 
       def process_binary_response(status, body, headers, context)
-        update_context(response.headers, context) unless context.nil?
+        update_context(headers, context) unless context.nil?
 
         if status < 400
           yield headers, body
@@ -492,7 +503,7 @@ module OnlinePayments
             cause = Communication::ResponseException.new(status_code, headers, body)
             if status_code == 404
               raise Communication::NotFoundException.new(cause, 'The requested resource was not found; invalid path: ' +
-                request_path)
+                                                                request_path)
             else
               raise Communication::CommunicationException, cause
             end

data/lib/onlinepayments/sdk/domain/acceptance.rb

@@ -0,0 +1,39 @@
+#
+# This file was automatically generated.
+#
+require 'date'
+
+require 'onlinepayments/sdk/domain/data_object'
+
+module OnlinePayments
+  module SDK
+    module Domain
+      # @attr [String] acceptance_system_application_id
+      # @attr [DateTime] authorization_date
+      class Acceptance < OnlinePayments::SDK::Domain::DataObject
+
+        attr_accessor :acceptance_system_application_id
+
+        attr_accessor :authorization_date
+
+        # @return (Hash)
+        def to_h
+          hash = super
+          hash['acceptanceSystemApplicationId'] = @acceptance_system_application_id unless @acceptance_system_application_id.nil?
+          hash['authorizationDate'] = @authorization_date.iso8601(3) unless @authorization_date.nil?
+          hash
+        end
+
+        def from_hash(hash)
+          super
+          if hash.has_key? 'acceptanceSystemApplicationId'
+            @acceptance_system_application_id = hash['acceptanceSystemApplicationId']
+          end
+          if hash.has_key? 'authorizationDate'
+            @authorization_date = DateTime.parse(hash['authorizationDate'])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/onlinepayments/sdk/domain/batch_metadata.rb

@@ -0,0 +1,44 @@
+#
+# This file was automatically generated.
+#
+require 'onlinepayments/sdk/domain/data_object'
+
+module OnlinePayments
+  module SDK
+    module Domain
+      # @attr [Integer] item_count
+      # @attr [String] merchant_batch_reference
+      # @attr [String] operation_type
+      class BatchMetadata < OnlinePayments::SDK::Domain::DataObject
+
+        attr_accessor :item_count
+
+        attr_accessor :merchant_batch_reference
+
+        attr_accessor :operation_type
+
+        # @return (Hash)
+        def to_h
+          hash = super
+          hash['itemCount'] = @item_count unless @item_count.nil?
+          hash['merchantBatchReference'] = @merchant_batch_reference unless @merchant_batch_reference.nil?
+          hash['operationType'] = @operation_type unless @operation_type.nil?
+          hash
+        end
+
+        def from_hash(hash)
+          super
+          if hash.has_key? 'itemCount'
+            @item_count = hash['itemCount']
+          end
+          if hash.has_key? 'merchantBatchReference'
+            @merchant_batch_reference = hash['merchantBatchReference']
+          end
+          if hash.has_key? 'operationType'
+            @operation_type = hash['operationType']
+          end
+        end
+      end
+    end
+  end
+end

data/lib/onlinepayments/sdk/domain/cancel_payment_batch_request.rb

@@ -0,0 +1,39 @@
+#
+# This file was automatically generated.
+#
+require 'onlinepayments/sdk/domain/cancel_payment_request'
+require 'onlinepayments/sdk/domain/data_object'
+
+module OnlinePayments
+  module SDK
+    module Domain
+      # @attr [OnlinePayments::SDK::Domain::CancelPaymentRequest] cancel
+      # @attr [String] payment_id
+      class CancelPaymentBatchRequest < OnlinePayments::SDK::Domain::DataObject
+
+        attr_accessor :cancel
+
+        attr_accessor :payment_id
+
+        # @return (Hash)
+        def to_h
+          hash = super
+          hash['cancel'] = @cancel.to_h unless @cancel.nil?
+          hash['paymentId'] = @payment_id unless @payment_id.nil?
+          hash
+        end
+
+        def from_hash(hash)
+          super
+          if hash.has_key? 'cancel'
+            raise TypeError, "value '%s' is not a Hash" % [hash['cancel']] unless hash['cancel'].is_a? Hash
+            @cancel = OnlinePayments::SDK::Domain::CancelPaymentRequest.new_from_hash(hash['cancel'])
+          end
+          if hash.has_key? 'paymentId'
+            @payment_id = hash['paymentId']
+          end
+        end
+      end
+    end
+  end
+end

data/lib/onlinepayments/sdk/domain/capture_payment_batch_request.rb

@@ -0,0 +1,39 @@
+#
+# This file was automatically generated.
+#
+require 'onlinepayments/sdk/domain/capture_payment_request'
+require 'onlinepayments/sdk/domain/data_object'
+
+module OnlinePayments
+  module SDK
+    module Domain
+      # @attr [OnlinePayments::SDK::Domain::CapturePaymentRequest] capture
+      # @attr [String] payment_id
+      class CapturePaymentBatchRequest < OnlinePayments::SDK::Domain::DataObject
+
+        attr_accessor :capture
+
+        attr_accessor :payment_id
+
+        # @return (Hash)
+        def to_h
+          hash = super
+          hash['capture'] = @capture.to_h unless @capture.nil?
+          hash['paymentId'] = @payment_id unless @payment_id.nil?
+          hash
+        end
+
+        def from_hash(hash)
+          super
+          if hash.has_key? 'capture'
+            raise TypeError, "value '%s' is not a Hash" % [hash['capture']] unless hash['capture'].is_a? Hash
+            @capture = OnlinePayments::SDK::Domain::CapturePaymentRequest.new_from_hash(hash['capture'])
+          end
+          if hash.has_key? 'paymentId'
+            @payment_id = hash['paymentId']
+          end
+        end
+      end
+    end
+  end
+end

data/lib/onlinepayments/sdk/domain/card_payment_method_specific_output.rb

@@ -1,6 +1,7 @@
 #
 # This file was automatically generated.
 #
+require 'onlinepayments/sdk/domain/acceptance'
 require 'onlinepayments/sdk/domain/acquirer_information'
 require 'onlinepayments/sdk/domain/card_essentials'
 require 'onlinepayments/sdk/domain/card_fraud_results'
@@ -17,6 +18,7 @@ require 'onlinepayments/sdk/domain/three_d_secure_results'
 module OnlinePayments
   module SDK
     module Domain
+      # @attr [OnlinePayments::SDK::Domain::Acceptance] acceptance
       # @attr [OnlinePayments::SDK::Domain::AcquirerInformation] acquirer_information
       # @attr [Integer] authenticated_amount
       # @attr [String] authorisation_code
@@ -39,6 +41,8 @@ module OnlinePayments
       # @attr [String] token
       class CardPaymentMethodSpecificOutput < OnlinePayments::SDK::Domain::DataObject
 
+        attr_accessor :acceptance
+
         attr_accessor :acquirer_information
 
         attr_accessor :authenticated_amount
@@ -82,6 +86,7 @@ module OnlinePayments
         # @return (Hash)
         def to_h
           hash = super
+          hash['acceptance'] = @acceptance.to_h unless @acceptance.nil?
           hash['acquirerInformation'] = @acquirer_information.to_h unless @acquirer_information.nil?
           hash['authenticatedAmount'] = @authenticated_amount unless @authenticated_amount.nil?
           hash['authorisationCode'] = @authorisation_code unless @authorisation_code.nil?
@@ -107,6 +112,10 @@ module OnlinePayments
 
         def from_hash(hash)
           super
+          if hash.has_key? 'acceptance'
+            raise TypeError, "value '%s' is not a Hash" % [hash['acceptance']] unless hash['acceptance'].is_a? Hash
+            @acceptance = OnlinePayments::SDK::Domain::Acceptance.new_from_hash(hash['acceptance'])
+          end
           if hash.has_key? 'acquirerInformation'
             raise TypeError, "value '%s' is not a Hash" % [hash['acquirerInformation']] unless hash['acquirerInformation'].is_a? Hash
             @acquirer_information = OnlinePayments::SDK::Domain::AcquirerInformation.new_from_hash(hash['acquirerInformation'])