connect-sdk-ruby 1.36.0 → 2.0.0

data/spec/lib/logging/header_obfuscator_spec.rb

@@ -30,7 +30,7 @@ describe HeaderObfuscator do
       }.to raise_error(ArgumentError)
 
       expect {
-        b.with_fixed_length(123)
+        b.with_fixed_length(123, 123)
       }.to raise_error(ArgumentError)
     end
 

data/spec/lib/logging/logging_util_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 LoggingUtil = Ingenico::Connect::SDK::Logging::LoggingUtil
 
-def test_obfuscate_body_with_matches(originalResource, obfuscatedResource)
+def test_obfuscate_body_with_matches(original_resource, obfuscated_resource)
   prefix = 'spec/fixtures/resources/logging/'
-  body = IO.read(prefix + originalResource)
-  expected = IO.read(prefix + obfuscatedResource)
+  body = IO.read(prefix + original_resource)
+  expected = IO.read(prefix + obfuscated_resource)
   expected == LoggingUtil.obfuscate_body(body)
 end
 
@@ -15,12 +15,12 @@ def test_obfuscate_body_with_no_matches(resource)
   body == LoggingUtil.obfuscate_body(body)
 end
 
-def test_obfuscate_header_with_match(name, originalValue, expectedValue)
-  expectedValue == LoggingUtil.obfuscate_header(name, originalValue)
+def test_obfuscate_header_with_match(name, original_value, expected_value)
+  expected_value == LoggingUtil.obfuscate_header(name, original_value)
 end
 
-def test_obfuscate_header_with_no_match(name, originalValue)
-  originalValue == LoggingUtil.obfuscate_header(name, originalValue)
+def test_obfuscate_header_with_no_match(name, original_value)
+  original_value == LoggingUtil.obfuscate_header(name, original_value)
 end
 
 describe LoggingUtil do

data/spec/lib/logging/obfuscator_spec.rb

@@ -4,13 +4,13 @@ Obfuscator ||= Ingenico::Connect::SDK::Logging::Obfuscator
 ValueObfuscator ||= Ingenico::Connect::SDK::Logging::ValueObfuscator
 
 describe Obfuscator do
-  subject(:sample) { Obfuscator.new(obsfs, caseInsensitive) }
+  subject(:sample) { Obfuscator.new(obsfs, case_insensitive) }
   context 'initialize' do
     let(:obsfs) { { 'k1' => ValueObfuscator.fixed_length(5),
                     'k2' => ValueObfuscator.keep_start_count(2) } }
 
     context 'case sensitive' do
-      let(:caseInsensitive) { false }
+      let(:case_insensitive) { false }
       it 'deep-copies obfuscators' do
         obsfs_copy = sample.instance_variable_get(:@obfuscators)
         obsfs['k2'] = nil
@@ -19,7 +19,7 @@ describe Obfuscator do
     end
 
     context 'case insensitive' do
-      let(:caseInsensitive) { true }
+      let(:case_insensitive) { true }
       it 'deep-copies obfuscators' do
         obsfs_copy = sample.instance_variable_get(:@obfuscators)
         expect(obsfs_copy['K2']).to equal(obsfs_copy['k2'])
@@ -32,7 +32,7 @@ describe Obfuscator do
   context '.obfuscate_value' do
     let(:obsfs) { { 'k1' => ValueObfuscator.fixed_length(10),
                     'k2' => ValueObfuscator.keep_start_count(1) } }
-    let(:caseInsensitive) { false }
+    let(:case_insensitive) { false }
     it 'uses the correct obfuscator' do
       str = 'str'
 

data/spec/lib/logging/ruby_communicator_logger_spec.rb

@@ -10,11 +10,11 @@ describe RubyCommunicatorLogger do
   let(:filename) { "testing-#{(0...8).map { (65 + rand(26)).chr }.join}.log" }
   let(:logger) { Logger.new(RubyCommunicatorLogger.create_logfile(filename)) }
   let(:regex) { Regexp.new("#{tag}, .* -- : (.*)#{$RS}", Regexp::MULTILINE) }
-  subject(:sample) { RubyCommunicatorLogger.new(logger, logLevel, errorLevel) }
+  subject(:sample) { RubyCommunicatorLogger.new(logger, log_level, error_level) }
 
   def expected_msg(msg, thrown=false)
     return msg unless thrown
-    msg + $RS + thrown.backtrace.join($RS)
+    msg + $RS + thrown.to_s + $RS + thrown.backtrace.join($RS)
   end
 
   after do
@@ -26,11 +26,11 @@ describe RubyCommunicatorLogger do
 
   context 'logging without error' do
 
-    let(:errorLevel) { Logger::WARN }
+    let(:error_level) { Logger::WARN }
     let(:msg) { 'Hello World' }
 
     context "with level 'INFO'" do
-      let(:logLevel) { Logger::INFO }
+      let(:log_level) { Logger::INFO }
       let(:tag) { 'I' }
 
       it 'should not throw an exception when logging unicode strings' do
@@ -38,7 +38,7 @@ describe RubyCommunicatorLogger do
         body = "Schröder"
         content = "JSON"
         message.set_body(body, content)
-        sample.log(message.get_message())
+        sample.log(message.get_message)
       end
       it 'logs with the correct logLevel and message' do
         sample.log(msg)
@@ -52,7 +52,7 @@ describe RubyCommunicatorLogger do
     end
 
     context "with level 'WARN'" do
-      let(:logLevel) { Logger::WARN }
+      let(:log_level) { Logger::WARN }
       let(:tag) { 'W' }
 
       it 'logs with the correct logLevel and message' do
@@ -68,8 +68,8 @@ describe RubyCommunicatorLogger do
   end
 
   context 'logging with error' do
-    let(:errorLevel) { Logger::WARN }
-    let(:logLevel) { Logger::INFO }
+    let(:error_level) { Logger::WARN }
+    let(:log_level) { Logger::INFO }
     let(:msg) { 'Some error message' }
     let(:tag) { 'W' }
 

data/spec/lib/logging/stdout_communicator_logger_spec.rb

@@ -21,7 +21,7 @@ describe StdoutCommunicatorLogger do
 
   def expected_msg(msg, thrown=false)
     return msg unless thrown
-    msg + $RS + thrown.backtrace.join($RS)
+    msg + $RS + thrown.to_s + $RS + thrown.backtrace.join($RS)
   end
 
   context 'test log' do

data/spec/lib/logging/value_obfuscator_spec.rb

@@ -72,7 +72,7 @@ describe ValueObfuscator do
     end
 
     it 'returns empty string if value has length 0' do
-      expect(sample.obfuscate_value('')).to eq ('')
+      expect(sample.obfuscate_value('')).to eq('')
     end
 
     it 'calls repeak_mask(@fixed_length) if @fixed_length is not 0' do

data/spec/lib/payments_client_spec.rb

@@ -9,7 +9,6 @@ require 'ingenico/connect/sdk/merchant/payments/payments_client'
 PaymentsClient ||= Ingenico::Connect::SDK::Merchant::Payments::PaymentsClient
 Payment ||= Ingenico::Connect::SDK::Domain::Payment
 Definitions ||= Ingenico::Connect::SDK::Domain::Definitions
-Response ||= Ingenico::Connect::SDK::Response
 ResponseHeader ||= Ingenico::Connect::SDK::ResponseHeader
 
 ResponseException ||= Ingenico::Connect::SDK::ResponseException
@@ -29,7 +28,7 @@ describe PaymentsClient do
     connection = double(Ingenico::Connect::SDK::Connection)
     client = init_client(connection)
     response_body = IO.read(resource_prefix + 'pending_approval.json')
-    allow(connection).to receive(:post).and_return(Response.new(201, response_body, nil))
+    allow(connection).to receive(:post).and_yield(201, {}, StringIO.new(response_body))
 
     response = client.merchant('merchantId').payments.create(request_body)
 
@@ -41,7 +40,7 @@ describe PaymentsClient do
     connection = double(Ingenico::Connect::SDK::Connection)
     client = init_client(connection)
     response_body = IO.read(resource_prefix + 'rejected.json')
-    allow(connection).to receive(:post).and_return(Response.new(400, response_body, nil))
+    allow(connection).to receive(:post).and_yield(400, {}, StringIO.new(response_body))
 
     expect{client.merchant('merchantId').payments.create(request_body)}.to raise_error(DeclinedPaymentException){|error|
       expect(error.message).to include("payment '000002000020142544360000100001'")
@@ -57,7 +56,7 @@ describe PaymentsClient do
     connection = double(Ingenico::Connect::SDK::Connection)
     client = init_client(connection)
     response_body = IO.read(resource_prefix + 'invalid_request.json')
-    allow(connection).to receive(:post).and_return(Response.new(400, response_body, nil))
+    allow(connection).to receive(:post).and_yield(400, {}, StringIO.new(response_body))
 
     expect{client.merchant('merchantId').payments.create(request_body)}.to raise_error(ValidationException){|error|
       expect(error.message).to include(response_body)
@@ -68,7 +67,7 @@ describe PaymentsClient do
     connection = double(Ingenico::Connect::SDK::Connection)
     client = init_client(connection)
     response_body = IO.read(resource_prefix + 'invalid_authorization.json')
-    allow(connection).to receive(:post).and_return(Response.new(401, response_body, nil))
+    allow(connection).to receive(:post).and_yield(401, {}, StringIO.new(response_body))
 
     expect{client.merchant('merchantId').payments.create(request_body)}.to raise_error(ApiException){|error|
 
@@ -80,7 +79,7 @@ describe PaymentsClient do
     connection = double(Ingenico::Connect::SDK::Connection)
     client = init_client(connection)
     response_body = IO.read(resource_prefix + 'duplicate_request.json')
-    allow(connection).to receive(:post).and_return(Response.new(409, response_body, nil))
+    allow(connection).to receive(:post).and_yield(409, {}, StringIO.new(response_body))
 
     expect{client.merchant('merchantId').payments.create(request_body)}.to raise_error(ReferenceException){|error|
       expect(error.message).to include(response_body)
@@ -92,7 +91,7 @@ describe PaymentsClient do
     client = init_client(connection)
     response_body = IO.read(resource_prefix + 'duplicate_request.json')
     context = Ingenico::Connect::SDK::CallContext.new('key')
-    allow(connection).to receive(:post).and_return(Response.new(409, response_body, nil))
+    allow(connection).to receive(:post).and_yield(409, {}, StringIO.new(response_body))
 
     expect{client.merchant('merchantId').payments.create(request_body, context)}
         .to raise_error(IdempotenceException){|error|
@@ -105,7 +104,7 @@ describe PaymentsClient do
     connection = double(Ingenico::Connect::SDK::Connection)
     client = init_client(connection)
     response_body = IO.read(resource_prefix + 'not_found.html')
-    allow(connection).to receive(:post).and_return(Response.new(404, response_body, [ResponseHeader.new('content-type', 'text/html')]))
+    allow(connection).to receive(:post).and_yield(404, [ResponseHeader.new('content-type', 'text/html')], StringIO.new(response_body))
 
     expect{client.merchant('merchantId').payments.create(request_body)}.to raise_error(Ingenico::Connect::SDK::NotFoundException){|error|
       expect(error.cause).to be_a(ResponseException)
@@ -117,7 +116,7 @@ describe PaymentsClient do
     connection = double(Ingenico::Connect::SDK::Connection)
     client = init_client(connection)
     response_body = IO.read(resource_prefix + 'method_not_allowed.html')
-    allow(connection).to receive(:post).and_return(Response.new(405, response_body, [ResponseHeader.new('content-type', 'text/html')]))
+    allow(connection).to receive(:post).and_yield(405, [ResponseHeader.new('content-type', 'text/html')], StringIO.new(response_body))
 
     expect{client.merchant('merchantId').payments.create(request_body)}.to raise_error(CommunicationException){|error|
       expect(error.cause).to be_a(ResponseException)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: connect-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 1.36.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ingenico ePayments
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -125,7 +125,9 @@ files:
 - examples/merchant/disputes/cancel_dispute_example.rb
 - examples/merchant/disputes/get_dispute_example.rb
 - examples/merchant/disputes/submit_dispute_example.rb
+- examples/merchant/disputes/upload_dispute_file_example.rb
 - examples/merchant/example_configuration.yml
+- examples/merchant/files/get_file_example.rb
 - examples/merchant/hostedcheckouts/create_hosted_checkout_example.rb
 - examples/merchant/hostedcheckouts/get_hosted_checkout_example.rb
 - examples/merchant/hostedmandatemanagements/create_hosted_mandate_management_example.rb
@@ -166,7 +168,6 @@ files:
 - examples/merchant/products/get_directory_example.rb
 - examples/merchant/products/get_networks_example.rb
 - examples/merchant/products/get_payment_product_example.rb
-- examples/merchant/products/get_payment_product_public_key_example.rb
 - examples/merchant/products/get_payment_products_example.rb
 - examples/merchant/refunds/approve_refund_example.rb
 - examples/merchant/refunds/cancel_approval_refund_example.rb
@@ -252,6 +253,7 @@ files:
 - lib/ingenico/connect/sdk/domain/dispute/dispute_response.rb
 - lib/ingenico/connect/sdk/domain/dispute/dispute_status_output.rb
 - lib/ingenico/connect/sdk/domain/dispute/disputes_response.rb
+- lib/ingenico/connect/sdk/domain/dispute/upload_dispute_file_response.rb
 - lib/ingenico/connect/sdk/domain/errors/api_error.rb
 - lib/ingenico/connect/sdk/domain/errors/error_response.rb
 - lib/ingenico/connect/sdk/domain/file/hosted_file.rb
@@ -479,7 +481,6 @@ files:
 - lib/ingenico/connect/sdk/domain/product/range_validator.rb
 - lib/ingenico/connect/sdk/domain/product/regular_expression_validator.rb
 - lib/ingenico/connect/sdk/domain/product/value_mapping_element.rb
-- lib/ingenico/connect/sdk/domain/publickey/public_key.rb
 - lib/ingenico/connect/sdk/domain/refund/approve_refund_request.rb
 - lib/ingenico/connect/sdk/domain/refund/bank_account_bban_refund.rb
 - lib/ingenico/connect/sdk/domain/refund/bank_refund_method_specific_input.rb
@@ -564,6 +565,8 @@ files:
 - lib/ingenico/connect/sdk/marshaller_syntax_exception.rb
 - lib/ingenico/connect/sdk/merchant/captures/captures_client.rb
 - lib/ingenico/connect/sdk/merchant/disputes/disputes_client.rb
+- lib/ingenico/connect/sdk/merchant/disputes/upload_file_request.rb
+- lib/ingenico/connect/sdk/merchant/files/files_client.rb
 - lib/ingenico/connect/sdk/merchant/hostedcheckouts/hostedcheckouts_client.rb
 - lib/ingenico/connect/sdk/merchant/hostedmandatemanagements/hostedmandatemanagements_client.rb
 - lib/ingenico/connect/sdk/merchant/mandates/mandates_client.rb
@@ -591,6 +594,8 @@ files:
 - lib/ingenico/connect/sdk/merchant/tokens/tokens_client.rb
 - lib/ingenico/connect/sdk/meta_data_provider.rb
 - lib/ingenico/connect/sdk/modules.rb
+- lib/ingenico/connect/sdk/multipart_form_data_object.rb
+- lib/ingenico/connect/sdk/multipart_form_data_request.rb
 - lib/ingenico/connect/sdk/not_found_exception.rb
 - lib/ingenico/connect/sdk/param_request.rb
 - lib/ingenico/connect/sdk/pooled_connection.rb
@@ -598,10 +603,10 @@ files:
 - lib/ingenico/connect/sdk/reference_exception.rb
 - lib/ingenico/connect/sdk/request_header.rb
 - lib/ingenico/connect/sdk/request_param.rb
-- lib/ingenico/connect/sdk/response.rb
 - lib/ingenico/connect/sdk/response_exception.rb
 - lib/ingenico/connect/sdk/response_header.rb
 - lib/ingenico/connect/sdk/session.rb
+- lib/ingenico/connect/sdk/uploadable_file.rb
 - lib/ingenico/connect/sdk/validation_exception.rb
 - lib/ingenico/connect/sdk/webhooks.rb
 - lib/ingenico/connect/sdk/webhooks/api_version_mismatch_exception.rb
@@ -647,6 +652,7 @@ files:
 - spec/integration/convert_amount_spec.rb
 - spec/integration/idempotence_spec.rb
 - spec/integration/multiline_header_spec.rb
+- spec/integration/multipart_form_data_spec.rb
 - spec/integration/payment_product_groups_spec.rb
 - spec/integration/payment_products_spec.rb
 - spec/integration/risk_assessments_spec.rb
@@ -674,7 +680,6 @@ files:
 - spec/lib/requestparams/directory_params_spec.rb
 - spec/lib/requestparams/find_params_spec.rb
 - spec/lib/requestparams/get_params_spec.rb
-- spec/lib/requestparams/param_request_spec.rb
 - spec/lib/webhooks/webhooks_helper_spec.rb
 - spec/lib/webhooks/webhooks_spec.rb
 - spec/spec_helper.rb
@@ -738,6 +743,7 @@ test_files:
 - spec/integration/convert_amount_spec.rb
 - spec/integration/idempotence_spec.rb
 - spec/integration/multiline_header_spec.rb
+- spec/integration/multipart_form_data_spec.rb
 - spec/integration/payment_product_groups_spec.rb
 - spec/integration/payment_products_spec.rb
 - spec/integration/risk_assessments_spec.rb
@@ -765,7 +771,6 @@ test_files:
 - spec/lib/requestparams/directory_params_spec.rb
 - spec/lib/requestparams/find_params_spec.rb
 - spec/lib/requestparams/get_params_spec.rb
-- spec/lib/requestparams/param_request_spec.rb
 - spec/lib/webhooks/webhooks_helper_spec.rb
 - spec/lib/webhooks/webhooks_spec.rb
 - spec/spec_helper.rb

data/lib/ingenico/connect/sdk/domain/publickey/public_key.rb

@@ -1,38 +0,0 @@
-#
-# This class was auto-generated from the API references found at
-# https://epayments-api.developer-ingenico.com/s2sapi/v1/
-#
-require 'ingenico/connect/sdk/data_object'
-
-module Ingenico::Connect::SDK
-  module Domain
-    module Publickey
-
-      class PublicKey < Ingenico::Connect::SDK::DataObject
-
-        # String
-        attr_accessor :key_id
-
-        # String
-        attr_accessor :public_key
-
-        def to_h
-          hash = super
-          add_to_hash(hash, 'keyId', @key_id)
-          add_to_hash(hash, 'publicKey', @public_key)
-          hash
-        end
-
-        def from_hash(hash)
-          super
-          if hash.has_key?('keyId')
-            @key_id = hash['keyId']
-          end
-          if hash.has_key?('publicKey')
-            @public_key = hash['publicKey']
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ingenico/connect/sdk/response.rb

@@ -1,59 +0,0 @@
-module Ingenico::Connect::SDK
-
-  # Base class for HTTP responses. It provides access to the response headers, status code and response message body
-  class Response
-
-    # Create a new response object that stores the following:
-    # status_code:: HTTP status code
-    # body::        response message body, given as a string
-    # headers::     response headers as a {Ingenico::Connect::SDK::ResponseHeader} list
-    def initialize(status_code, body, headers)
-      @status_code = status_code
-      @body = body
-      @headers = if headers.nil? or headers.empty?
-                   {}
-                  else
-                    headers.inject({}) do |hash, header|
-                      hash[header.name.downcase.to_sym] = header.dup.freeze
-                      hash
-                    end
-                  end.freeze
-    end
-
-    # HTTP status code
-    attr_reader :status_code
-
-    # Response message body
-    attr_reader :body
-
-    # Response headers as a {Ingenico::Connect::SDK::ResponseHeader} list
-    def headers
-      @headers.values
-    end
-
-    # Returns the {Ingenico::Connect::SDK::ResponseHeader} that goes by the given _header_name_,
-    # or _nil_ if this Response does not contain a header with the given name.
-    def get_header(header_name)
-      @headers[header_name.downcase.to_sym]
-    end
-
-    # Returns the header value of the header that goes by the given _header_name_,
-    # or _nil_ if this Response does not contain a header with the given name.
-    def get_header_value(header_name)
-      header = get_header(header_name)
-      unless header.nil?
-        header.value
-      else
-        nil
-      end
-    end
-
-    def to_s
-      str = self.class.name
-      str << "[status_code=#{@status_code}"
-      str << ",body='#{@body}'" unless @body.nil? or @body.empty?
-      str << ",headers=#{headers}" unless headers.nil? or headers.empty?
-      str << ']'
-    end
-  end
-end

data/spec/lib/requestparams/param_request_spec.rb

@@ -1,57 +0,0 @@
-require 'spec_helper'
-
-ParamRequest ||= Ingenico::Connect::SDK::ParamRequest
-RequestParam ||= Ingenico::Connect::SDK::RequestParam
-
-describe ParamRequest do
-
-  it 'accepts strings' do
-    validate_add_parameter('foo', 'false')
-  end
-
-  it 'accepts Fixnums' do
-    validate_add_parameter('foo', 1234567890)
-  end
-
-  it 'accepts Bignums' do
-    validate_add_parameter('foo', 2**33-2)
-  end
-
-  it 'accepts booleans' do
-    validate_add_parameter('foo', false)
-  end
-
-  it 'accepts a list of strings' do
-    validate_add_parameter('foo', ['bar'])
-  end
-
-  it 'accepts a list of Fixnums' do
-    validate_add_parameter('foo', [1337])
-  end
-
-  it 'accepts a list of booleans' do
-    validate_add_parameter('foo', [true, false])
-  end
-
-  it 'does not accept a float' do
-    expect{validate_add_parameter('bar', 3.14)}.to raise_error(ArgumentError)
-  end
-
-  it 'does not accept a list of a list' do
-    expect{validate_add_parameter('bar', [['foo']])}.to raise_error(ArgumentError)
-  end
-
-
-  # Checks if the parameter pair _name_ _value_ can be added to a ParamRequest
-  def validate_add_parameter(name, value)
-    list = []
-    ParamRequest.new.send(:add_parameter, list, name, value)
-
-    if value.instance_of?(Array)
-      expected = value.collect{|val| RequestParam.new(name, val)}
-    else
-      expected = [RequestParam.new(name, value)]
-    end
-    expect(list).to match_array(expected)
-  end
-end