datatrans 5.0.0 → 5.2.0

data/lib/datatrans/xml/transaction/authorize.rb

@@ -1,12 +1,12 @@
-require 'datatrans/xml/transaction/request'
-require 'datatrans/xml/transaction/response'
+require "datatrans/xml/transaction/request"
+require "datatrans/xml/transaction/response"
 
 class Datatrans::XML::Transaction
   class AuthorizeRequest < Request
     def process
-      post(self.datatrans.url(:xml_authorize_url),
-        :headers => { 'Content-Type' => 'text/xml' },
-        :body => build_authorize_request.to_s).parsed_response
+      post(datatrans.url(:xml_authorize_url),
+        headers: {"Content-Type" => "text/xml"},
+        body: build_authorize_request.to_s).parsed_response
     end
 
     private
@@ -18,60 +18,80 @@ class Datatrans::XML::Transaction
         xml.aliasCC params[:aliasCC]
         xml.expm params[:expm]
         xml.expy params[:expy]
-        xml.sign sign(self.datatrans.merchant_id, params[:amount], params[:currency], params[:refno])
+        xml.sign sign(datatrans.merchant_id, params[:amount], params[:currency], params[:refno])
       end
     end
   end
 
   class AuthorizeResponse < Response
     def successful?
-      response_code == '01' && response_message == 'Authorized'
+      response_code == "01" && response_message == "Authorized"
     end
 
     def response_code
-      params_root_node['response']['responseCode'] rescue nil
+      params_root_node["response"]["responseCode"]
+    rescue
+      nil
     end
 
     def response_message
-      params_root_node['response']['responseMessage'] rescue nil
+      params_root_node["response"]["responseMessage"]
+    rescue
+      nil
     end
 
     def transaction_id
-      params_root_node['response']['uppTransactionId'] rescue nil
+      params_root_node["response"]["uppTransactionId"]
+    rescue
+      nil
     end
 
     def reference_number
-      params_root_node['refno'] rescue nil
+      params_root_node["refno"]
+    rescue
+      nil
     end
 
     def authorization_code
-      params_root_node['response']['authorizationCode'] rescue nil
+      params_root_node["response"]["authorizationCode"]
+    rescue
+      nil
     end
 
     def masked_cc
-      params_root_node['response']['maskedCC'] rescue nil
+      params_root_node["response"]["maskedCC"]
+    rescue
+      nil
     end
 
     def creditcard_alias
-      params_root_node['request']['aliasCC'] rescue nil
+      params_root_node["request"]["aliasCC"]
+    rescue
+      nil
     end
 
     def error_code
-      params_root_node['error']['errorCode'] rescue nil
+      params_root_node["error"]["errorCode"]
+    rescue
+      nil
     end
 
     def error_message
-      params_root_node['error']['errorMessage'] rescue nil
+      params_root_node["error"]["errorMessage"]
+    rescue
+      nil
     end
 
     def error_detail
-      params_root_node['error']['errorDetail'] rescue nil
+      params_root_node["error"]["errorDetail"]
+    rescue
+      nil
     end
 
     private
 
     def params_root_node
-      params['authorizationService']['body']['transaction']
+      params["authorizationService"]["body"]["transaction"]
     end
   end
-end
+end

data/lib/datatrans/xml/transaction/capture.rb

@@ -1,12 +1,12 @@
-require 'datatrans/xml/transaction/request'
-require 'datatrans/xml/transaction/response'
+require "datatrans/xml/transaction/request"
+require "datatrans/xml/transaction/response"
 
 class Datatrans::XML::Transaction
   class CaptureRequest < Request
     def process
-      post(self.datatrans.url(:xml_settlement_url),
-        :headers => { 'Content-Type' => 'text/xml' },
-        :body => build_capture_request.to_s).parsed_response
+      post(datatrans.url(:xml_settlement_url),
+        headers: {"Content-Type" => "text/xml"},
+        body: build_capture_request.to_s).parsed_response
     end
 
     private
@@ -22,41 +22,55 @@ class Datatrans::XML::Transaction
 
   class CaptureResponse < Response
     def successful?
-      response_code == '01' && response_message == 'settlement succeeded'
+      response_code == "01" && response_message == "settlement succeeded"
     end
 
     def response_code
-      params_root_node['response']['responseCode'] rescue nil
+      params_root_node["response"]["responseCode"]
+    rescue
+      nil
     end
 
     def response_message
-      params_root_node['response']['responseMessage'] rescue nil
+      params_root_node["response"]["responseMessage"]
+    rescue
+      nil
     end
 
     def transaction_id
-      params_root_node['request']['uppTransactionId'] rescue nil
+      params_root_node["request"]["uppTransactionId"]
+    rescue
+      nil
     end
 
     def reference_number
-      params_root_node['refno'] rescue nil
+      params_root_node["refno"]
+    rescue
+      nil
     end
 
     def error_code
-      params_root_node['error']['errorCode'] rescue nil
+      params_root_node["error"]["errorCode"]
+    rescue
+      nil
     end
 
     def error_message
-      params_root_node['error']['errorMessage'] rescue nil
+      params_root_node["error"]["errorMessage"]
+    rescue
+      nil
     end
 
     def error_detail
-      params_root_node['error']['errorDetail'] rescue nil
+      params_root_node["error"]["errorDetail"]
+    rescue
+      nil
     end
 
     private
 
     def params_root_node
-      params['paymentService']['body']['transaction']
+      params["paymentService"]["body"]["transaction"]
     end
   end
-end
+end

data/lib/datatrans/xml/transaction/request.rb

@@ -1,25 +1,26 @@
-require 'httparty'
-require 'builder'
+require "httparty"
+require "builder"
 
 class Datatrans::XML::Transaction
   class Request
-
     attr_accessor :params, :datatrans
 
     def post(url, options = {})
       options = options
-        .merge(self.datatrans.proxy)
-        .merge(:basic_auth => { :username => self.datatrans.merchant_id, :password => self.datatrans.password })
+        .merge(datatrans.proxy)
+        .merge(basic_auth: {username: datatrans.merchant_id, password: datatrans.password})
       HTTParty.post(url, **options)
     end
 
     def initialize(datatrans, params)
+      warn "DEPRECATION WARNING: Support for the XML API is deprecated and will be removed in the next major version. Please use the JSON API instead."
+
       @datatrans = datatrans
       @params = params
     end
 
     def process
-      raise 'overwrite in subclass!'
+      raise "overwrite in subclass!"
     end
 
     private
@@ -29,9 +30,9 @@ class Datatrans::XML::Transaction
     def build_xml_request(service)
       xml = Builder::XmlMarkup.new
       xml.instruct!
-      xml.tag! "#{service}Service", :version => 1 do
-        xml.body :merchantId => self.datatrans.merchant_id do |body|
-          xml.transaction :refno => params[:refno] do
+      xml.tag! "#{service}Service", version: 1 do
+        xml.body merchantId: datatrans.merchant_id do |body|
+          xml.transaction refno: params[:refno] do
             xml.request do
               yield body
             end

data/lib/datatrans/xml/transaction/response.rb

@@ -3,12 +3,14 @@ class Datatrans::XML::Transaction
     attr_reader :params, :datatrans
 
     def initialize(datatrans, params)
+      warn "DEPRECATION WARNING: Support for the XML API is deprecated and will be removed in the next major version. Please use the JSON API instead."
+
       @datatrans = datatrans
       @params = params
     end
 
     def successful?
-      raise 'overwrite in subclass!'
+      raise "overwrite in subclass!"
     end
   end
-end
+end

data/lib/datatrans/xml/transaction/status.rb

@@ -1,15 +1,15 @@
-require 'datatrans/xml/transaction/request'
-require 'datatrans/xml/transaction/response'
+require "datatrans/xml/transaction/request"
+require "datatrans/xml/transaction/response"
 
 class Datatrans::XML::Transaction
   class StatusRequest < Request
     def process
       post(
-        self.datatrans.url(:xml_status_url),
-        :headers => {
-          'Content-Type' => 'text/xml'
+        datatrans.url(:xml_status_url),
+        headers: {
+          "Content-Type" => "text/xml"
         },
-        :body => build_status_request.to_s
+        body: build_status_request.to_s
       ).parsed_response
     end
 
@@ -25,60 +25,76 @@ class Datatrans::XML::Transaction
   class StatusResponse < Response
     def successful?
       [
-        '1', # Transaction ready for settlement (trx authorized)
-        '2', # Transaction debit waiting for daily settlement process
-        '3', # Transaction credit waiting for daily settlement process
+        "1", # Transaction ready for settlement (trx authorized)
+        "2", # Transaction debit waiting for daily settlement process
+        "3" # Transaction credit waiting for daily settlement process
       ].include?(response_code)
     end
 
     def response_code
-      params_root_node['response']['responseCode'] rescue nil
+      params_root_node["response"]["responseCode"]
+    rescue
+      nil
     end
 
     def response_message
-      params_root_node['response']['responseMessage'] rescue nil
+      params_root_node["response"]["responseMessage"]
+    rescue
+      nil
     end
 
     def error_code
-      params_root_node['error']['errorCode'] rescue nil
+      params_root_node["error"]["errorCode"]
+    rescue
+      nil
     end
 
     def error_message
-      params_root_node['error']['errorMessage'] rescue nil
+      params_root_node["error"]["errorMessage"]
+    rescue
+      nil
     end
 
     def error_detail
-      params_root_node['error']['errorDetail'] rescue nil
+      params_root_node["error"]["errorDetail"]
+    rescue
+      nil
     end
 
     def reference_number
-      params_root_node['response']['refno'] rescue nil
+      params_root_node["response"]["refno"]
+    rescue
+      nil
     end
 
     def amount
-      params_root_node['response']['amount'] rescue nil
+      params_root_node["response"]["amount"]
+    rescue
+      nil
     end
 
     def currency
-      params_root_node['response']['currency'] rescue nil
+      params_root_node["response"]["currency"]
+    rescue
+      nil
     end
 
     def authorization_code
-      params_root_node['response']['authorizationCode'] rescue nil
-    end
-
-    def authorization_code
-      params_root_node['response']['authorizationCode'] rescue nil
+      params_root_node["response"]["authorizationCode"]
+    rescue
+      nil
     end
 
     def payment_method
-      params_root_node['response']['pmethod'] rescue nil
+      params_root_node["response"]["pmethod"]
+    rescue
+      nil
     end
 
     private
 
     def params_root_node
-      params['statusService']['body']['transaction']
+      params["statusService"]["body"]["transaction"]
     end
   end
-end
+end

data/lib/datatrans/xml/transaction/void.rb

@@ -1,12 +1,12 @@
-require 'datatrans/xml/transaction/request'
-require 'datatrans/xml/transaction/response'
+require "datatrans/xml/transaction/request"
+require "datatrans/xml/transaction/response"
 
 class Datatrans::XML::Transaction
   class VoidRequest < Request
     def process
-      post(self.datatrans.url(:xml_settlement_url),
-        :headers => { 'Content-Type' => 'text/xml' },
-        :body => build_void_request.to_s).parsed_response
+      post(datatrans.url(:xml_settlement_url),
+        headers: {"Content-Type" => "text/xml"},
+        body: build_void_request.to_s).parsed_response
     end
 
     private
@@ -16,48 +16,62 @@ class Datatrans::XML::Transaction
         xml.amount params[:amount]
         xml.currency params[:currency]
         xml.uppTransactionId params[:transaction_id]
-        xml.reqtype 'DOA'
+        xml.reqtype "DOA"
       end
     end
   end
 
   class VoidResponse < Response
     def successful?
-      response_code == '01' && response_message == 'cancellation succeeded'
+      response_code == "01" && response_message == "cancellation succeeded"
     end
 
     def response_code
-      params_root_node['response']['responseCode'] rescue nil
+      params_root_node["response"]["responseCode"]
+    rescue
+      nil
     end
 
     def response_message
-      params_root_node['response']['responseMessage'] rescue nil
+      params_root_node["response"]["responseMessage"]
+    rescue
+      nil
     end
 
     def transaction_id
-      params_root_node['request']['uppTransactionId'] rescue nil
+      params_root_node["request"]["uppTransactionId"]
+    rescue
+      nil
     end
 
     def reference_number
-      params_root_node['refno'] rescue nil
+      params_root_node["refno"]
+    rescue
+      nil
     end
 
     def error_code
-      params_root_node['error']['errorCode'] rescue nil
+      params_root_node["error"]["errorCode"]
+    rescue
+      nil
     end
 
     def error_message
-      params_root_node['error']['errorMessage'] rescue nil
+      params_root_node["error"]["errorMessage"]
+    rescue
+      nil
     end
 
     def error_detail
-      params_root_node['error']['errorDetail'] rescue nil
+      params_root_node["error"]["errorDetail"]
+    rescue
+      nil
     end
 
     private
 
     def params_root_node
-      params['paymentService']['body']['transaction']
+      params["paymentService"]["body"]["transaction"]
     end
   end
-end
+end

data/lib/datatrans/xml/transaction.rb

@@ -1,4 +1,4 @@
-require 'active_support/core_ext/hash'
+require "active_support/core_ext/hash"
 
 module Datatrans::XML
   class Transaction
@@ -6,36 +6,41 @@ module Datatrans::XML
     attr_reader :response, :params, :datatrans
 
     def initialize(datatrans, params)
+      warn "DEPRECATION WARNING: Support for the XML API is deprecated and will be removed in the next major version. Please use the JSON API instead."
+
       @datatrans = datatrans
       @params = params.symbolize_keys
     end
 
     def authorize
-      self.request = AuthorizeRequest.new(self.datatrans, params)
-      @response = AuthorizeResponse.new(self.datatrans, request.process)
+      self.request = AuthorizeRequest.new(datatrans, params)
+      @response = AuthorizeResponse.new(datatrans, request.process)
       @response.successful?
     end
 
     def void
-      self.request = VoidRequest.new(self.datatrans, params)
-      @response = VoidResponse.new(self.datatrans, request.process)
+      self.request = VoidRequest.new(datatrans, params)
+      @response = VoidResponse.new(datatrans, request.process)
       @response.successful?
     end
 
     def capture
-      self.request = CaptureRequest.new(self.datatrans, params)
-      @response = CaptureResponse.new(self.datatrans, request.process)
+      self.request = CaptureRequest.new(datatrans, params)
+      @response = CaptureResponse.new(datatrans, request.process)
       @response.successful?
     end
 
     def status
-      self.request = StatusRequest.new(self.datatrans, params)
-      @response = StatusResponse.new(self.datatrans, request.process)
+      self.request = StatusRequest.new(datatrans, params)
+      @response = StatusResponse.new(datatrans, request.process)
       @response.successful?
     end
 
     # TODO: purchase, credit methods
 
+    def respond_to_missing?(method, *)
+      response.respond_to?(method.to_sym) || request.respond_to?(method.to_sym) || super
+    end
 
     def method_missing(method, *args, &block)
       if response.respond_to? method.to_sym
@@ -49,8 +54,7 @@ module Datatrans::XML
   end
 end
 
-require 'datatrans/xml/transaction/authorize'
-require 'datatrans/xml/transaction/void'
-require 'datatrans/xml/transaction/capture'
-require 'datatrans/xml/transaction/status'
-
+require "datatrans/xml/transaction/authorize"
+require "datatrans/xml/transaction/void"
+require "datatrans/xml/transaction/capture"
+require "datatrans/xml/transaction/status"

data/lib/datatrans.rb

@@ -1,18 +1,19 @@
-require 'active_support/core_ext/module'
+require "active_support/core_ext/module"
 
 module Datatrans
   InvalidSignatureError = Class.new(StandardError)
 end
 
-require 'datatrans/version'
-require 'datatrans/common'
-require 'datatrans/config'
-require 'datatrans/xml/transaction'
-require 'datatrans/web/transaction'
+require "datatrans/version"
+require "datatrans/common"
+require "datatrans/config"
+require "datatrans/xml/transaction"
+require "datatrans/web/transaction"
+require "datatrans/json/transaction"
 
 begin
-  require 'action_view'
-  require 'datatrans/web/view_helper'
+  require "action_view"
+  require "datatrans/web/view_helper"
   ActionView::Base.send(:include, Datatrans::Web::ViewHelper)
 rescue LoadError
 end

data/renovate.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "github>simplificator/renovate-preset"
+  ],
+  "packageRules": [
+    {
+      "matchPackagePatterns": [
+        "ruby"
+      ],
+      "enabled": false
+    }
+  ]
+}

data/spec/common_spec.rb

@@ -1,20 +1,20 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Datatrans::Common do
   context "sign" do
     before do
-      #class Request
+      # class Request
       # include Datatrans::Common
-      #end
+      # end
       @request = Datatrans::XML::Transaction::Request.new(@datatrans, {})
     end
 
     it "generates the correct sign" do
       amount = 1000
-      currency = 'CHF'
-      reference_number = 'ABCEDF'
+      currency = "CHF"
+      reference_number = "ABCEDF"
 
-      expect(@request.sign(@datatrans.merchant_id, amount, currency, reference_number)).to eq '4e7d4d5bbde548c586f3b7f109635ffc'
+      expect(@request.sign(@datatrans.merchant_id, amount, currency, reference_number)).to eq "4e7d4d5bbde548c586f3b7f109635ffc"
     end
   end
 end

data/spec/config_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Datatrans::Config do
   describe "Instance Methods" do
     before do
-      @datatrans = Datatrans::Config.new(:merchant_id => "xxx", :password => "yyy")
+      @datatrans = Datatrans::Config.new(merchant_id: "xxx", password: "yyy")
     end
 
     describe "web_transaction" do
@@ -17,5 +17,11 @@ describe Datatrans::Config do
         expect(@datatrans.xml_transaction({}).class).to eq(Datatrans::XML::Transaction)
       end
     end
+
+    describe "json_transaction" do
+      it "builds a new json transaction object" do
+        expect(@datatrans.json_transaction({}).class).to eq(Datatrans::JSON::Transaction)
+      end
+    end
   end
 end