eway_rapid 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf2d582f80ab78226432c88df7781cfabe891278
-  data.tar.gz: 775898c5b1a9f42a5b69ca3527197685265c0750
+SHA256:
+  metadata.gz: b0a31499dfd48ef4a8c5e59971a038d9cf339562f961311b8659bf5ce391ee13
+  data.tar.gz: 8cea9af55a5db07c8af0604b03faa51c3fd7bc2015a95546552888d8991191e4
 SHA512:
-  metadata.gz: 9b19a982240640157c65e2b4139d2012de21eabc41a204a23c7263b33cbe2e3ac8ae482c2baa16727af117ab601ced81506fbc423b5d01864eeaa8f10c4ea703
-  data.tar.gz: 5ce639e7c8a1f166d9ed52565d28125570e87328a2c1b03944f3ed6b8b1b57fe63b05f8e99a01451796743c470628da7c92179079ceaec4ab7d7d904309f2609
+  metadata.gz: 533243b5a864cdfcaf701001602979c730beeb0aba0c9388fb4b73d8dc1210e54107a045c9469fc637895c192f0ac1b656247998dfa0e7b4e5e3a53350a6981a
+  data.tar.gz: 98c4e44e73e7a5854ada587463c2ee79d10715c511d4dc221874d7e2755c2fb889e87f3c75f6ea74a066aff1b5a539e8be60d0dd1e00f7f402570d794f0c91d8

data/.travis.yml

@@ -1,12 +1,16 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
-  - 2.3.0
-  - jruby-19mode
+  - 2.3
+  - 2.4
+  - 2.5
 
-before_install: gem install bundler -v 1.10.6
+env:
+ - EWAY_API_VERSION=31
+ - EWAY_API_VERSION=40
+
+before_install: gem install bundler -v 1.17.2
 
 sudo: false

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes will be documented in this file
 
+## 2.0.0
+
+ - Dropped support for Ruby 1.9
+ - Added support for save customer (thanks @brocktimus)
+ - Added support for Secure Fields (thanks @dNitza)
+ - Add support for setting a Rapid version
+ - Force use of TLS 1.2 for connections
+
 ## 1.2.0
 
  - Add support for Secure Fields and wallets with `secured_card_data field`

data/README.md

@@ -9,16 +9,12 @@ A Ruby Gem to integrate with eWAY's Rapid Payment API.
 Sign up with eWAY at:
  - Australia:    https://www.eway.com.au/
  - New Zealand:  https://eway.io/nz/
- - UK:           https://eway.io/uk/
- - Hong Kong:    https://eway.io/hk/
- - Malaysia:     https://eway.io/my/
- - Singapore:    https://eway.io/sg/
 
 For testing, get a free eWAY Partner account: https://www.eway.com.au/developers
 
 ## Installation
 
-The eWAY Ruby Gem requires Ruby 1.9.3 or better, it also requires the rest-client and json gems.
+The eWAY Ruby Gem requires Ruby 2.0.0 or better, it also requires the rest-client and json gems.
 
 Add this line to your application's Gemfile:
 

data/eway_rapid.gemspec

@@ -6,7 +6,7 @@ require 'eway_rapid/version'
 Gem::Specification.new do |spec|
   spec.name          = 'eway_rapid'
   spec.version       = EwayRapid::VERSION
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.0.0'
   spec.author        = ['eWAY']
   spec.summary       = 'Ruby gem for eWAY\'s Rapid API'
   spec.description   = 'Easy online payments with eWAY and the eWAY Rapid Ruby gem.'
@@ -16,17 +16,12 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'json', '~> 1.8.3'
+  spec.add_dependency 'json', '~> 2.1.0'
+  spec.add_dependency 'rest-client', '~> 2.0'
 
-  # prevent dependency issues for Ruby 1.9
-  if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-    spec.add_dependency 'rest-client', '~> 1.8.0'
-  else
-    spec.add_dependency 'rest-client', ['>= 1.8.0', '< 3.0']
-  end
-
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'test-unit'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/eway_rapid/constants.rb

@@ -75,6 +75,7 @@ module EwayRapid
     CHECKOUT_PAYMENT = 'CheckoutPayment'
     CHECKOUT_URL = 'CheckoutUrl'
     TRANSACTION_TYPE = 'TransactionType'
+    SECURED_CARD_DATA = 'SecuredCardData'
     PARTNER_ID = 'PartnerID'
     TRANSACTIONS = 'Transactions'
     ERRORS_CAPITALIZED = 'Errors'
@@ -112,6 +113,10 @@ module EwayRapid
     AMOUNT = 'Amount'
     TRANSACTION_DATE = 'TransactionDateTime'
     SETTLEMENT_DATE = 'SettlementDateTime'
+    SOURCE = 'Source'
+    MAX_REFUND = 'MaxRefund'
+    ORIGINAL_TRANSACTION = 'OriginalTransactionId'
+    AMEX_EC_DATA = 'AmexECEncryptedData'
     JSON_SUFFIX = '.json'
     LIBRARY_NOT_HAVE_ENDPOINT_ERROR_CODE = 'S9990'
     API_KEY_INVALID_ERROR_CODE = 'S9991'

data/lib/eway_rapid/entities/create_access_code_response.rb

@@ -37,6 +37,7 @@ module EwayRapid
     attr_accessor :card_start_month
     attr_accessor :card_start_year
     attr_accessor :card_issue_number
+    attr_accessor :amex_ec_data
 
     def to_json(options={})
       {Constants::CUSTOMER               => customer,
@@ -75,7 +76,8 @@ module EwayRapid
        Constants::CARD_EXPIRY_YEAR       => card_expiry_year,
        Constants::CARD_START_MONTH       => card_start_month,
        Constants::CARD_START_YEAR        => card_start_year,
-       Constants::CARD_ISSUE_NUMBER      => card_issue_number}.to_json
+       Constants::CARD_ISSUE_NUMBER      => card_issue_number,
+       Constants::AMEX_EC_DATA           => amex_ec_data}.to_json
     end
 
     def self.from_json(json)
@@ -122,6 +124,7 @@ module EwayRapid
       create_access_code_response.card_start_month = hash[Constants::CARD_START_MONTH]
       create_access_code_response.card_start_year = hash[Constants::CARD_START_YEAR]
       create_access_code_response.card_issue_number = hash[Constants::CARD_ISSUE_NUMBER]
+      create_access_code_response.amex_ec_data = hash[Constants::AMEX_EC_DATA]
       create_access_code_response
     end
   end

data/lib/eway_rapid/entities/direct_payment_request.rb

@@ -7,6 +7,7 @@ module EwayRapid
     attr_accessor :payment
     attr_accessor :method
     attr_accessor :transaction_type
+    attr_accessor :secured_card_data
     attr_accessor :customer_ip
     attr_accessor :device_id
     attr_accessor :partner_id
@@ -20,6 +21,7 @@ module EwayRapid
        Constants::PAYMENT            => InternalModels::Payment.to_hash(payment),
        Constants::METHOD             => method,
        Constants::TRANSACTION_TYPE   => transaction_type,
+       Constants::SECURED_CARD_DATA  => secured_card_data,
        Constants::CUSTOMER_DEVICE_IP => customer_ip,
        Constants::DEVICE_ID          => device_id,
        Constants::PARTNER_ID         => partner_id,

data/lib/eway_rapid/message/convert/internal_trans_to_trans.rb

@@ -10,6 +10,7 @@ module EwayRapid
           transaction.customer = get_eway_customer(i_transaction)
           transaction.payment_details = get_payment_details(i_transaction)
           transaction.shipping_details = get_shipping_details(i_transaction)
+          transaction.token_customer_id = i_transaction.token_customer_id
           transaction.options = i_transaction.options
           transaction
         end

data/lib/eway_rapid/message/convert/internal_transaction_to_status.rb

@@ -12,6 +12,14 @@ module EwayRapid
           transaction_status.total = transaction.total_amount
           transaction_status.processing_details = get_processing_details(transaction)
           transaction_status.verification_result = get_verification_result(transaction)
+          transaction_status.transaction_date_time = transaction.transaction_date_time
+          transaction_status.transaction_captured = transaction.transaction_captured
+          transaction_status.source = transaction.source
+          transaction_status.max_refund = transaction.max_refund
+          transaction_status.original_transaction_id = transaction.original_transaction_id
+          transaction_status.fraud_action = transaction.fraud_action
+          transaction_status.currency_code = transaction.currency_code
+
           begin
             transaction_status.transaction_id = Integer(transaction.transaction_id) if transaction.transaction_id
           rescue

data/lib/eway_rapid/message/convert/request/transaction_to_create_access_code_request.rb

@@ -44,7 +44,11 @@ module EwayRapid
               end
 
               request.method = if transaction.capture
-                                 Enums::RequestMethod::PROCESS_PAYMENT
+                                 if transaction.customer && (transaction.customer.token_customer_id || transaction.save_customer)
+                                   Enums::RequestMethod::TOKEN_PAYMENT
+                                 else
+                                   Enums::RequestMethod::PROCESS_PAYMENT
+                                 end
                                else
                                  Enums::RequestMethod::AUTHORISE
                                end

data/lib/eway_rapid/message/convert/request/transaction_to_create_access_code_shared_request.rb

@@ -40,7 +40,11 @@ module EwayRapid
               request.options = option_converter.do_convert(input)
 
               request.method = if input.capture
-                                 Enums::RequestMethod::PROCESS_PAYMENT
+                                 if input.customer && (input.customer.token_customer_id || input.save_customer)
+                                   Enums::RequestMethod::TOKEN_PAYMENT
+                                 else
+                                   Enums::RequestMethod::PROCESS_PAYMENT
+                                 end
                                else
                                  Enums::RequestMethod::AUTHORISE
                                end

data/lib/eway_rapid/message/convert/request/transaction_to_direct_payment.rb

@@ -30,6 +30,7 @@ module EwayRapid
             request.device_id = input.device_id
             request.partner_id = input.partner_id
             request.transaction_type = input.transaction_type || ''
+            request.secured_card_data = input.secured_card_data
             request.method = if input.capture
                                Enums::RequestMethod::PROCESS_PAYMENT
                              else

data/lib/eway_rapid/message/convert/response/access_code_to_create_trans.rb

@@ -18,6 +18,7 @@ module EwayRapid
             transaction_response.errors = response.errors.split(/\s*,\s*/) if response.errors
             transaction_response.access_code = response.access_code
             transaction_response.form_action_url = response.form_action_url
+            transaction_response.amex_ec_data = response.amex_ec_data
             transaction_response
           end
         end

data/lib/eway_rapid/message/process/customer_process.rb

@@ -15,6 +15,7 @@ module EwayRapid
           request.customer_ip = input.customer_device_ip
           request.method = Constants::CREATE_TOKEN_CUSTOMER_METHOD
           request.transaction_type = Enums::TransactionType::MOTO
+          request.secured_card_data = input.secured_card_data
           request
         end
 
@@ -23,9 +24,9 @@ module EwayRapid
         # @param [String] password
         # @param [DirectPaymentRequest] request
         # @return [String]
-        def self.send_request(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
           begin
-            CustDirectPaymentMsgProcess.new.do_post(url, api_key, password, request)
+            CustDirectPaymentMsgProcess.new.do_post(url, api_key, password, version, request)
           rescue SocketError => e
             raise Exceptions::CommunicationFailureException.new(e.message)
           rescue RestClient::Exception => e
@@ -68,8 +69,8 @@ module EwayRapid
         # @param [String] password
         # @param [CreateAccessCodeSharedRequest] request
         # @return [String]
-        def self.send_request(url, api_key, password, request)
-          CustResponsiveSharedMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          CustResponsiveSharedMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response
@@ -102,8 +103,8 @@ module EwayRapid
         # @param [String] password
         # @param [CreateAccessCodeRequest] request
         # @return [String]
-        def self.send_request(url, api_key, password, request)
-          CustTransparentRedirectMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          CustTransparentRedirectMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response
@@ -129,8 +130,8 @@ module EwayRapid
 
         # @param [DirectCustomerSearchRequest] request
         # @return [String]
-        def self.send_request(url, api_key, password, request)
-          QueryCustomerMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          QueryCustomerMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response
@@ -165,8 +166,8 @@ module EwayRapid
         # @param [String] api_key
         # @param [String] password
         # @param [DirectPaymentRequest] request
-        def self.send_request(url, api_key, password, request)
-          CustDirectUpdateMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          CustDirectUpdateMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response
@@ -202,8 +203,8 @@ module EwayRapid
         # @param [String] api_key
         # @param [String] password
         # @param [CreateAccessCodeSharedRequest] request
-        def self.send_request(url, api_key, password, request)
-          CustResponsiveUpdateMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          CustResponsiveUpdateMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response
@@ -238,8 +239,8 @@ module EwayRapid
         # @param [String] api_key
         # @param [String] password
         # @param [CreateAccessCodeRequest] request
-        def self.send_request(url, api_key, password, request)
-          CustTransparentUpdateMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          CustTransparentUpdateMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response

data/lib/eway_rapid/message/process/refund_process.rb

@@ -15,10 +15,10 @@ module EwayRapid
 
         # @param [DirectRefundRequest] request
         # @return [String]
-        def self.send_request(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
           url = url + '/' + request.refund.original_transaction_id.to_s + '/' + Constants::REFUND_SUB_PATH_METHOD
           url = URI.encode(url)
-          RefundMsgProcess.new.do_post(url, api_key, password, request)
+          RefundMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response
@@ -49,8 +49,8 @@ module EwayRapid
           request
         end
 
-        def self.send_request(url, api_key, password, request)
-          CancelAuthorisationMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          CancelAuthorisationMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response

data/lib/eway_rapid/message/process/rest_process.rb

@@ -8,7 +8,7 @@ module EwayRapid
       # @param [String] api_key rapid api key
       # @param [String] password rapid password
       # @param [String] request object to post
-      def do_post(url, api_key, password, request)
+      def do_post(url, api_key, password, version, request)
         begin
           RestClient::Request.execute(
             :method => :post,
@@ -17,10 +17,12 @@ module EwayRapid
             :password => password,
             :payload => request.to_json,
             :timeout => 9000000,
+            :ssl_version => 'TLSv1_2',
             :headers => {
                 :accept => :json,
                 :content_type => :json,
-                :user_agent => get_user_agent
+                :user_agent => get_user_agent,
+                :'X-EWAY-APIVERSION' => version
             }
           )
         rescue SocketError => e
@@ -39,17 +41,19 @@ module EwayRapid
       # @param [String] url rapid endpoint url
       # @param [String] api_key rapid api key
       # @param [String] password rapid password
-      def do_get(url, api_key, password)
+      def do_get(url, api_key, password, version)
         begin
           RestClient::Request.new(
               :method => :get,
               :url => url,
               :user => api_key,
               :password => password,
+              :ssl_version => 'TLSv1_2',
               :headers => {
                   :accept => :json,
                   :content_type => :json,
-                  :user_agent => get_user_agent
+                  :user_agent => get_user_agent,
+                  :'X-EWAY-APIVERSION' => version
               }
           ).execute
         rescue SocketError => e

data/lib/eway_rapid/message/process/transaction_process.rb

@@ -18,8 +18,8 @@ module EwayRapid
         # @param [String] password
         # @param [DirectPaymentRequest] request
         # @return [String]
-        def self.send_request(url, api_key, password, request)
-          TransDirectPaymentMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          TransDirectPaymentMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response
@@ -47,8 +47,8 @@ module EwayRapid
         # @param [String] password
         # @param [CreateAccessCodeSharedRequest] request
         # @return [String]
-        def self.send_request(url, api_key, password, request)
-          TransResponsiveSharedMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          TransResponsiveSharedMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response
@@ -76,8 +76,8 @@ module EwayRapid
         # @param [String] password
         # @param [CreateAccessCodeRequest] request
         # @return [String]
-        def self.send_request(url, api_key, password, request)
-          TransTransparentRedirectMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          TransTransparentRedirectMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response
@@ -105,8 +105,8 @@ module EwayRapid
         # @param [String] password
         # @param [CapturePaymentRequest] request
         # @return [String]
-        def self.send_request(url, api_key, password, request)
-          CapturePaymentMsgProcess.new.do_post(url, api_key, password, request)
+        def self.send_request(url, api_key, password, version, request)
+          CapturePaymentMsgProcess.new.do_post(url, api_key, password, version, request)
         end
 
         # @param [String] response
@@ -122,8 +122,8 @@ module EwayRapid
       class TransQueryMsgProcess
         include RestProcess
 
-        def self.process_post_msg(url, api_key, password)
-          TransQueryMsgProcess.new.do_get(url, api_key, password)
+        def self.process_post_msg(url, api_key, password, version)
+          TransQueryMsgProcess.new.do_get(url, api_key, password, version)
         end
 
         # @param [String] response
@@ -148,8 +148,8 @@ module EwayRapid
           URI.encode_www_form(hash)
         end
 
-        def self.send_request(url, api_key, password)
-          SettlementSearchMsgProcess.new.do_get(url, api_key, password)
+        def self.send_request(url, api_key, password, version)
+          SettlementSearchMsgProcess.new.do_get(url, api_key, password, version)
         end
 
         def self.make_result(response)

data/lib/eway_rapid/models/internal_models.rb

@@ -334,6 +334,13 @@ module EwayRapid
       attr_accessor :customer
       attr_accessor :shipping_address
       attr_accessor :beagle_verification
+      attr_accessor :transaction_date_time
+      attr_accessor :transaction_captured
+      attr_accessor :source
+      attr_accessor :max_refund
+      attr_accessor :original_transaction_id
+      attr_accessor :fraud_action
+      attr_accessor :currency_code
       attr_accessor :errors
 
       def to_json(opts={})
@@ -353,7 +360,13 @@ module EwayRapid
         hash[Constants::VERIFICATION] = verification if verification
         hash[Constants::CUSTOMER] = customer if customer
         hash[Constants::SHIPPING_ADDRESS] = shipping_address if shipping_address
-        hash[Constants::BEAGLE_VERIFICATION] = beagle_verification if beagle_verification
+        hash[Constants::TRANSACTION_DATE] = transaction_date_time if transaction_date_time
+        hash[Constants::TRANSACTION_CAPTURED] = transaction_captured if transaction_captured
+        hash[Constants::SOURCE] = source if source
+        hash[Constants::MAX_REFUND] = max_refund if max_refund
+        hash[Constants::ORIGINAL_TRANSACTION] = original_transaction_id if original_transaction_id
+        hash[Constants::FRAUD_ACTION] = fraud_action if fraud_action
+        hash[Constants::CURRENCY_CODE] = currency_code if currency_code
         hash[Constants::ERRORS] = errors if errors
         hash.to_json
       end
@@ -381,6 +394,13 @@ module EwayRapid
         transaction.customer = Customer.from_hash(hash[Constants::CUSTOMER])
         transaction.shipping_address = ShippingAddress.from_hash(hash[Constants::SHIPPING_ADDRESS])
         transaction.beagle_verification = BeagleVerification.from_hash(hash[Constants::BEAGLE_VERIFICATION])
+        transaction.transaction_date_time = hash[Constants::TRANSACTION_DATE]
+        transaction.transaction_captured = hash[Constants::TRANSACTION_CAPTURED]
+        transaction.source = hash[Constants::SOURCE]
+        transaction.max_refund = hash[Constants::MAX_REFUND]
+        transaction.original_transaction_id = hash[Constants::ORIGINAL_TRANSACTION]
+        transaction.fraud_action = hash[Constants::FRAUD_ACTION]
+        transaction.currency_code = hash[Constants::CURRENCY_CODE]
         transaction.errors = hash[Constants::ERRORS]
         transaction
       end

data/lib/eway_rapid/models/models.rb

@@ -82,6 +82,7 @@ module EwayRapid
       attr_accessor :redirect_url
       attr_accessor :cancel_url
       attr_accessor :customer_device_ip
+      attr_accessor :secured_card_data
     end
 
     # Item information
@@ -290,6 +291,36 @@ module EwayRapid
       # The URL of the merchant's logo to display on the Responsive Shared Page
       attr_accessor :logo_url
 
+      # (v40+ only) A token used to configure AMEX Express Checkout
+      attr_accessor :amex_ec_data
+
+      # (v40+ query response only) The date and time the transaction took place
+      attr_accessor :transaction_date_time
+
+      # (v40+ query response only) True if funds were captured in the transaction
+      attr_accessor :transaction_captured
+
+      # (v40+ query response only) Reserved for future use
+      attr_accessor :source
+
+      # (v40+ query response only) The maximum amount that could be refunded from this transaction
+      attr_accessor :max_refund
+
+      # (v40+ query response only) Contains the original transaction ID if the queried transaction is a refund
+      attr_accessor :original_transaction_id
+
+      # (v40+ query response only) The fraud action that occurred if any. One of NotChallenged, Allow, Review, PreAuth, Processed, Approved, Block
+      attr_accessor :fraud_action
+
+      #(v40+ query response only) The ISO 4217 numeric currency code (e.g. AUD = 036)
+      attr_accessor :currency_code
+
+      # Set to true to create a token customer when the transaction is complete
+      attr_accessor :save_customer
+
+      # An eWAY-issued ID that represents the Token customer that was loaded or created for this transaction (if applicable)
+      attr_accessor :token_customer_id
+
       alias_method :customer_read_only?, :customer_read_only
       alias_method :checkout_payment?, :checkout_payment
       alias_method :verify_customer_phone?, :verify_customer_phone
@@ -311,6 +342,15 @@ module EwayRapid
       attr_accessor :verification_result
       attr_accessor :processing_details
 
+      # (v40+ query response only)
+      attr_accessor :transaction_date_time
+      attr_accessor :transaction_captured
+      attr_accessor :source
+      attr_accessor :max_refund
+      attr_accessor :original_transaction_id
+      attr_accessor :fraud_action
+      attr_accessor :currency_code
+
       alias_method :status?, :status
     end
 

data/lib/eway_rapid/output/create_transaction_response.rb

@@ -20,5 +20,8 @@ module EwayRapid
     # and Responsive Shared)
     attr_accessor :access_code
 
+    # (v40+ only) A token used to configure AMEX Express Checkout
+    attr_accessor :amex_ec_data
+
   end
 end

data/lib/eway_rapid/rapid_client.rb

@@ -16,6 +16,7 @@ module EwayRapid
       @api_key = api_key
       @password = password
       @rapid_endpoint = rapid_endpoint
+      @version = 31
 
       validate_api_param
     end
@@ -31,6 +32,13 @@ module EwayRapid
       validate_api_param
     end
 
+    # Sets the Rapid API version to use (e.g. 40)
+    #
+    # @param [Integer] version eWAY Rapid API version
+    def set_version(version)
+      @version = version
+    end
+
     # Creates a transaction either using an authorisation, the responsive shared
     # page, transparent redirect, or direct as the source of funds
     #
@@ -47,39 +55,39 @@ module EwayRapid
           url = @web_url + Constants::DIRECT_PAYMENT_METHOD_NAME + Constants::JSON_SUFFIX
 
           request = Message::TransactionProcess::TransDirectPaymentMsgProcess.create_request(transaction)
-          response = Message::TransactionProcess::TransDirectPaymentMsgProcess.send_request(url, @api_key, @password, request)
+          response = Message::TransactionProcess::TransDirectPaymentMsgProcess.send_request(url, @api_key, @password, @version, request)
           Message::TransactionProcess::TransDirectPaymentMsgProcess.make_result(response)
         when Enums::PaymentMethod::RESPONSIVE_SHARED
           url = @web_url + Constants::RESPONSIVE_SHARED_METHOD_NAME + Constants::JSON_SUFFIX
 
           request = Message::TransactionProcess::TransResponsiveSharedMsgProcess.create_request(transaction)
-          response = Message::TransactionProcess::TransResponsiveSharedMsgProcess.send_request(url, @api_key, @password, request)
+          response = Message::TransactionProcess::TransResponsiveSharedMsgProcess.send_request(url, @api_key, @password, @version, request)
           Message::TransactionProcess::TransResponsiveSharedMsgProcess.make_result(response)
         when Enums::PaymentMethod::TRANSPARENT_REDIRECT
           url = @web_url + Constants::TRANSPARENT_REDIRECT_METHOD_NAME + Constants::JSON_SUFFIX
 
           request = Message::TransactionProcess::TransTransparentRedirectMsgProcess.create_request(transaction)
-          response = Message::TransactionProcess::TransTransparentRedirectMsgProcess.send_request(url, @api_key, @password, request)
+          response = Message::TransactionProcess::TransTransparentRedirectMsgProcess.send_request(url, @api_key, @password, @version, request)
           Message::TransactionProcess::TransTransparentRedirectMsgProcess.make_result(response)
         when Enums::PaymentMethod::WALLET
           if transaction.capture
             url = @web_url + Constants::DIRECT_PAYMENT_METHOD_NAME + Constants::JSON_SUFFIX
 
             request = Message::TransactionProcess::TransDirectPaymentMsgProcess.create_request(transaction)
-            response = Message::TransactionProcess::TransDirectPaymentMsgProcess.send_request(url, @api_key, @password, request)
+            response = Message::TransactionProcess::TransDirectPaymentMsgProcess.send_request(url, @api_key, @password, @version, request)
             Message::TransactionProcess::TransDirectPaymentMsgProcess.make_result(response)
           else
             url = @web_url + Constants::CAPTURE_PAYMENT_METHOD
 
             request = Message::TransactionProcess::CapturePaymentMsgProcess.create_request(transaction)
-            response = Message::TransactionProcess::CapturePaymentMsgProcess.send_request(url, @api_key, @password, request)
+            response = Message::TransactionProcess::CapturePaymentMsgProcess.send_request(url, @api_key, @password, @version, request)
             Message::TransactionProcess::CapturePaymentMsgProcess.make_result(response)
           end
         when Enums::PaymentMethod::AUTHORISATION
           url = @web_url + Constants::CAPTURE_PAYMENT_METHOD
 
           request = Message::TransactionProcess::CapturePaymentMsgProcess.create_request(transaction)
-          response = Message::TransactionProcess::CapturePaymentMsgProcess.send_request(url, @api_key, @password, request)
+          response = Message::TransactionProcess::CapturePaymentMsgProcess.send_request(url, @api_key, @password, @version, request)
           Message::TransactionProcess::CapturePaymentMsgProcess.make_result(response)
         else
           make_response_with_exception(Exceptions::ParameterInvalidException.new('Unsupported payment type'), CreateTransactionResponse)
@@ -144,7 +152,7 @@ module EwayRapid
         url = @web_url + Constants::TRANSACTION_METHOD
 
         request = Message::RefundProcess::RefundMsgProcess.create_request(refund)
-        response = Message::RefundProcess::RefundMsgProcess.send_request(url, @api_key, @password, request)
+        response = Message::RefundProcess::RefundMsgProcess.send_request(url, @api_key, @password, @version, request)
         Message::RefundProcess::RefundMsgProcess.make_result(response)
       rescue => e
         @logger.error(e.to_s) if @logger
@@ -164,7 +172,7 @@ module EwayRapid
         url = @web_url + Constants::CANCEL_AUTHORISATION_METHOD
 
         request = Message::RefundProcess::CancelAuthorisationMsgProcess.create_request(refund)
-        response = Message::RefundProcess::CancelAuthorisationMsgProcess.send_request(url, @api_key, @password, request)
+        response = Message::RefundProcess::CancelAuthorisationMsgProcess.send_request(url, @api_key, @password, @version, request)
         Message::RefundProcess::CancelAuthorisationMsgProcess.make_result(response)
       rescue => e
         @logger.error(e.to_s) if @logger
@@ -188,19 +196,19 @@ module EwayRapid
           url = @web_url + Constants::DIRECT_PAYMENT_METHOD_NAME + Constants::JSON_SUFFIX
 
           request = Message::CustomerProcess::CustDirectPaymentMsgProcess.create_request(customer)
-          response = Message::CustomerProcess::CustDirectPaymentMsgProcess.send_request(url, @api_key, @password, request)
+          response = Message::CustomerProcess::CustDirectPaymentMsgProcess.send_request(url, @api_key, @password, @version, request)
           Message::CustomerProcess::CustDirectPaymentMsgProcess.make_result(response)
         when Enums::PaymentMethod::RESPONSIVE_SHARED
           url = @web_url + Constants::RESPONSIVE_SHARED_METHOD_NAME + Constants::JSON_SUFFIX
 
           request = Message::CustomerProcess::CustResponsiveSharedMsgProcess.create_request(customer)
-          response = Message::CustomerProcess::CustResponsiveSharedMsgProcess.send_request(url, @api_key, @password, request)
+          response = Message::CustomerProcess::CustResponsiveSharedMsgProcess.send_request(url, @api_key, @password, @version, request)
           Message::CustomerProcess::CustResponsiveSharedMsgProcess.make_result(response)
         when Enums::PaymentMethod::TRANSPARENT_REDIRECT
           url = @web_url + Constants::TRANSPARENT_REDIRECT_METHOD_NAME + Constants::JSON_SUFFIX
 
           request = Message::CustomerProcess::CustTransparentRedirectMsgProcess.create_request(customer)
-          response = Message::CustomerProcess::CustTransparentRedirectMsgProcess.send_request(url, @api_key, @password, request)
+          response = Message::CustomerProcess::CustTransparentRedirectMsgProcess.send_request(url, @api_key, @password, @version, request)
           Message::CustomerProcess::CustTransparentRedirectMsgProcess.make_result(response)
         else
           make_response_with_exception(Exceptions::ParameterInvalidException.new('Unsupported payment type'), CreateCustomerResponse)
@@ -225,19 +233,19 @@ module EwayRapid
         when Enums::PaymentMethod::DIRECT
           url = @web_url + Constants::DIRECT_PAYMENT_METHOD_NAME + Constants::JSON_SUFFIX
           request = Message::CustomerProcess::CustDirectUpdateMsgProcess.create_request(customer)
-          response = Message::CustomerProcess::CustDirectUpdateMsgProcess.send_request(url, @api_key, @password, request)
+          response = Message::CustomerProcess::CustDirectUpdateMsgProcess.send_request(url, @api_key, @password, @version, request)
           Message::CustomerProcess::CustDirectUpdateMsgProcess.make_result(response)
         when Enums::PaymentMethod::RESPONSIVE_SHARED
           url = @web_url + Constants::RESPONSIVE_SHARED_METHOD_NAME + Constants::JSON_SUFFIX
 
           request = Message::CustomerProcess::CustResponsiveUpdateMsgProcess.create_request(customer)
-          response = Message::CustomerProcess::CustResponsiveUpdateMsgProcess.send_request(url, @api_key, @password, request)
+          response = Message::CustomerProcess::CustResponsiveUpdateMsgProcess.send_request(url, @api_key, @password, @version, request)
           Message::CustomerProcess::CustResponsiveUpdateMsgProcess.make_result(response)
         when Enums::PaymentMethod::TRANSPARENT_REDIRECT
           url = @web_url + Constants::TRANSPARENT_REDIRECT_METHOD_NAME + Constants::JSON_SUFFIX
 
           request = Message::CustomerProcess::CustTransparentUpdateMsgProcess.create_request(customer)
-          response = Message::CustomerProcess::CustTransparentUpdateMsgProcess.send_request(url, @api_key, @password, request)
+          response = Message::CustomerProcess::CustTransparentUpdateMsgProcess.send_request(url, @api_key, @password, @version, request)
           Message::CustomerProcess::CustTransparentUpdateMsgProcess.make_result(response)
         else
           return make_response_with_exception(Exceptions::ParameterInvalidException.new('Unsupported payment type'), CreateCustomerResponse)
@@ -263,7 +271,7 @@ module EwayRapid
         url = URI.encode(url)
 
         request = Message::CustomerProcess::QueryCustomerMsgProcess.create_request(token_customer_id.to_s)
-        response = Message::CustomerProcess::QueryCustomerMsgProcess.send_request(url, @api_key, @password, request)
+        response = Message::CustomerProcess::QueryCustomerMsgProcess.send_request(url, @api_key, @password, @version, request)
         Message::CustomerProcess::QueryCustomerMsgProcess.make_result(response)
       rescue => e
         @logger.error(e.to_s) if @logger
@@ -284,7 +292,7 @@ module EwayRapid
         request = Message::TransactionProcess::SettlementSearchMsgProcess.create_request(search_request)
         url = @web_url + Constants::SETTLEMENT_SEARCH_METHOD +  request
 
-        response = Message::TransactionProcess::SettlementSearchMsgProcess.send_request(url, @api_key, @password)
+        response = Message::TransactionProcess::SettlementSearchMsgProcess.send_request(url, @api_key, @password, @version)
         Message::TransactionProcess::SettlementSearchMsgProcess.make_result(response)
 
       rescue => e
@@ -335,7 +343,7 @@ module EwayRapid
         end
         url = URI.encode(url)
 
-        response = Message::TransactionProcess::TransQueryMsgProcess.process_post_msg(url, @api_key, @password)
+        response = Message::TransactionProcess::TransQueryMsgProcess.process_post_msg(url, @api_key, @password, @version)
         Message::TransactionProcess::TransQueryMsgProcess.make_result(response)
       rescue => e
         @logger.error(e.to_s) if @logger

data/lib/eway_rapid/version.rb

@@ -1,3 +1,3 @@
 module EwayRapid
-  VERSION = '1.2.1'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eway_rapid
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - eWAY
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,62 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easy online payments with eWAY and the eWAY Rapid Ruby gem.
 email: 
 executables: []
@@ -197,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -205,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby gem for eWAY's Rapid API