datatrans 2.4.0 → 3.0.0

data/lib/datatrans/web/view_helper.rb

@@ -0,0 +1,25 @@
+module Datatrans::Web
+  module ViewHelper
+    def datatrans_notification_request_hidden_fields(datatrans, transaction)
+      fields = [
+        hidden_field_tag(:merchantId, datatrans.merchant_id),
+        hidden_field_tag(:hiddenMode, transaction.params[:hiddenMode]),
+        hidden_field_tag(:reqtype, transaction.params[:reqtype]),
+        hidden_field_tag(:amount, transaction.params[:amount]),
+        hidden_field_tag(:currency, transaction.params[:currency]),
+        hidden_field_tag(:useAlias, transaction.params[:useAlias]),
+        hidden_field_tag(:sign, transaction.signature),
+        hidden_field_tag(:refno, transaction.params[:refno]),
+        hidden_field_tag(:uppCustomerDetails, transaction.params[:uppCustomerDetails]),
+      ]
+
+      [:uppCustomerName, :uppCustomerEmail].each do |field_name|
+        if transaction.params[field_name].present?
+          fields << hidden_field_tag(field_name, transaction.params[field_name])
+        end
+      end
+
+      fields.join.html_safe
+    end
+  end
+end

data/lib/datatrans/xml/transaction.rb

@@ -3,33 +3,34 @@ require 'active_support/core_ext/hash'
 module Datatrans::XML
   class Transaction
     attr_accessor :request
-    attr_reader :response, :params
+    attr_reader :response, :params, :datatrans
 
-    def initialize(params)
+    def initialize(datatrans, params)
+      @datatrans = datatrans
       @params = params.symbolize_keys
     end
 
     def authorize
-      self.request = AuthorizeRequest.new(params)
-      @response = AuthorizeResponse.new(request.process)
+      self.request = AuthorizeRequest.new(self.datatrans, params)
+      @response = AuthorizeResponse.new(self.datatrans, request.process)
       @response.successful?
     end
 
     def void
-      self.request = VoidRequest.new(params)
-      @response = VoidResponse.new(request.process)
+      self.request = VoidRequest.new(self.datatrans, params)
+      @response = VoidResponse.new(self.datatrans, request.process)
       @response.successful?
     end
 
     def capture
-      self.request = CaptureRequest.new(params)
-      @response = CaptureResponse.new(request.process)
+      self.request = CaptureRequest.new(self.datatrans, params)
+      @response = CaptureResponse.new(self.datatrans, request.process)
       @response.successful?
     end
 
     def status
-      self.request = StatusRequest.new(params)
-      @response = StatusResponse.new(request.process)
+      self.request = StatusRequest.new(self.datatrans, params)
+      @response = StatusResponse.new(self.datatrans, request.process)
       @response.successful?
     end
 

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

@@ -4,7 +4,7 @@ require 'datatrans/xml/transaction/response'
 class Datatrans::XML::Transaction
   class AuthorizeRequest < Request
     def process
-      self.class.post(Datatrans.xml_authorize_url,
+      post(self.datatrans.url(:xml_authorize_url),
         :headers => { 'Content-Type' => 'text/xml' },
         :body => build_authorize_request.to_s).parsed_response
     end
@@ -18,7 +18,7 @@ class Datatrans::XML::Transaction
         xml.aliasCC params[:aliasCC]
         xml.expm params[:expm]
         xml.expy params[:expy]
-        xml.sign sign(Datatrans.merchant_id, params[:amount], params[:currency], params[:refno])
+        xml.sign sign(self.datatrans.merchant_id, params[:amount], params[:currency], params[:refno])
       end
     end
   end

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

@@ -4,7 +4,7 @@ require 'datatrans/xml/transaction/response'
 class Datatrans::XML::Transaction
   class CaptureRequest < Request
     def process
-      self.class.post(Datatrans.xml_settlement_url,
+      post(self.datatrans.url(:xml_settlement_url),
         :headers => { 'Content-Type' => 'text/xml' },
         :body => build_capture_request.to_s).parsed_response
     end

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

@@ -3,25 +3,16 @@ require 'builder'
 
 class Datatrans::XML::Transaction
   class Request
-    include HTTParty
 
-    attr_accessor :params
+    attr_accessor :params, :datatrans
 
-    def self.set_default_options
-      if Datatrans.proxy
-        proxy = Datatrans.proxy.symbolize_keys
-        http_proxy(proxy[:host], proxy[:port], proxy[:user], proxy[:password])
-      else
-        http_proxy(nil, nil, nil, nil)
-      end
-    end
-
-    def self.perform_request(*args, &block)
-      set_default_options
-      super
+    def post(url, options = {})
+      options = options.merge(self.datatrans.proxy)
+      HTTParty.post(url, options)
     end
 
-    def initialize(params)
+    def initialize(datatrans, params)
+      @datatrans = datatrans
       @params = params
     end
 
@@ -37,7 +28,7 @@ class Datatrans::XML::Transaction
       xml = Builder::XmlMarkup.new
       xml.instruct!
       xml.tag! "#{service}Service", :version => 1 do
-        xml.body :merchantId => Datatrans.merchant_id do |body|
+        xml.body :merchantId => self.datatrans.merchant_id do |body|
           xml.transaction :refno => params[:refno] do
             xml.request do
               yield body

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

@@ -1,8 +1,9 @@
 class Datatrans::XML::Transaction
   class Response
-    attr_reader :params
+    attr_reader :params, :datatrans
 
-    def initialize(params)
+    def initialize(datatrans, params)
+      @datatrans = datatrans
       @params = params
     end
 

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

@@ -4,8 +4,8 @@ require 'datatrans/xml/transaction/response'
 class Datatrans::XML::Transaction
   class StatusRequest < Request
     def process
-      self.class.post(
-        Datatrans.xml_status_url,
+      post(
+        self.datatrans.url(:xml_status_url),
         :headers => {
           'Content-Type' => 'text/xml'
         },

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

@@ -4,7 +4,7 @@ require 'datatrans/xml/transaction/response'
 class Datatrans::XML::Transaction
   class VoidRequest < Request
     def process
-      self.class.post(Datatrans.xml_settlement_url,
+      post(self.datatrans.url(:xml_settlement_url),
         :headers => { 'Content-Type' => 'text/xml' },
         :body => build_void_request.to_s).parsed_response
     end

data/spec/common_spec.rb

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe Datatrans::Common do
   context "sign" do
     before do
-      class Request; include Datatrans::Common; end
-      @request = Request.new
+      #class Request
+      # include Datatrans::Common
+      #end
+      @request = Datatrans::XML::Transaction::Request.new(@datatrans, {})
     end
 
     it "generates the correct sign" do
@@ -12,7 +14,7 @@ describe Datatrans::Common do
       currency = 'CHF'
       reference_number = 'ABCEDF'
 
-      @request.sign(Datatrans.merchant_id, amount, currency, reference_number).should == '4e7d4d5bbde548c586f3b7f109635ffc'
+      @request.sign(@datatrans.merchant_id, amount, currency, reference_number).should == '4e7d4d5bbde548c586f3b7f109635ffc'
     end
   end
 end

data/spec/config_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Datatrans::Config do
+  describe "Instance Methods" do
+    before do
+      @datatrans = Datatrans::Config.new(:merchant_id => "xxx")
+    end
+
+    describe "web_transaction" do
+      it "builds a new web transaction object" do
+        @datatrans.web_transaction({}).class.should eq(Datatrans::Web::Transaction)
+      end
+    end
+
+    describe "xml_transaction" do
+      it "builds a new xml transaction object" do
+        @datatrans.xml_transaction({}).class.should eq(Datatrans::XML::Transaction)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -10,10 +10,10 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
 
   config.before(:each) do
-    Datatrans.configure do |config|
-      config.merchant_id = '1100000000'
-      config.sign_key = 'd777c17ba2010282c2d2350a68b441ca07a799d294bfaa630b7c8442207c0b69703cc55775b0ca5a4e455b818a9bb10a43669c0c20ce31f4a43f10e0cabb9525'
-      config.environment = :development
-    end
+    @datatrans = Datatrans::Config.new(
+      :merchant_id => '1100000000',
+      :sign_key => 'd777c17ba2010282c2d2350a68b441ca07a799d294bfaa630b7c8442207c0b69703cc55775b0ca5a4e455b818a9bb10a43669c0c20ce31f4a43f10e0cabb9525',
+      :environment => :development
+    )
   end
 end

data/spec/web/authorize_spec.rb

@@ -69,12 +69,12 @@ describe Datatrans::Web::Transaction do
 
   context "rails form helper" do
     before do
-      @transaction = Datatrans::Web::Transaction.new(@valid_params)
+      @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
       @view = ActionView::Base.new
     end
 
     it "should generate valid form field string" do
-      @view.datatrans_notification_request_hidden_fields(@transaction).should == "<input id=\"merchantId\" name=\"merchantId\" type=\"hidden\" value=\"1100000000\" /><input id=\"hiddenMode\" name=\"hiddenMode\" type=\"hidden\" value=\"yes\" /><input id=\"reqtype\" name=\"reqtype\" type=\"hidden\" value=\"NOA\" /><input id=\"amount\" name=\"amount\" type=\"hidden\" value=\"1000\" /><input id=\"currency\" name=\"currency\" type=\"hidden\" value=\"CHF\" /><input id=\"useAlias\" name=\"useAlias\" type=\"hidden\" value=\"yes\" /><input id=\"sign\" name=\"sign\" type=\"hidden\" value=\"0402fb3fba8c6fcb40df9b7756e7e637\" /><input id=\"refno\" name=\"refno\" type=\"hidden\" value=\"ABCDEF\" /><input id=\"uppCustomerDetails\" name=\"uppCustomerDetails\" type=\"hidden\" /><input id=\"uppCustomerEmail\" name=\"uppCustomerEmail\" type=\"hidden\" value=\"customer@email.com\" />"
+      @view.datatrans_notification_request_hidden_fields(@datatrans, @transaction).should == "<input id=\"merchantId\" name=\"merchantId\" type=\"hidden\" value=\"1100000000\" /><input id=\"hiddenMode\" name=\"hiddenMode\" type=\"hidden\" value=\"yes\" /><input id=\"reqtype\" name=\"reqtype\" type=\"hidden\" value=\"NOA\" /><input id=\"amount\" name=\"amount\" type=\"hidden\" value=\"1000\" /><input id=\"currency\" name=\"currency\" type=\"hidden\" value=\"CHF\" /><input id=\"useAlias\" name=\"useAlias\" type=\"hidden\" value=\"yes\" /><input id=\"sign\" name=\"sign\" type=\"hidden\" value=\"0402fb3fba8c6fcb40df9b7756e7e637\" /><input id=\"refno\" name=\"refno\" type=\"hidden\" value=\"ABCDEF\" /><input id=\"uppCustomerDetails\" name=\"uppCustomerDetails\" type=\"hidden\" /><input id=\"uppCustomerEmail\" name=\"uppCustomerEmail\" type=\"hidden\" value=\"customer@email.com\" />"
     end
   end
 
@@ -85,7 +85,7 @@ describe Datatrans::Web::Transaction do
 
     context "process" do
       it "handles a valid datatrans authorize response" do
-        @transaction = Datatrans::Web::Transaction.new(@valid_params)
+        @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
         @transaction.authorize.should be_true
       end
     end
@@ -96,7 +96,7 @@ describe Datatrans::Web::Transaction do
       fake_response = @successful_response
       fake_response[:sign2] = 'invalid'
       Datatrans::Web::Transaction::AuthorizeResponse.any_instance.stub(:params).and_return(fake_response)
-      @transaction = Datatrans::Web::Transaction.new(@valid_params)
+      @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
     end
 
     it "raises an exception if sign2 is invalid" do
@@ -109,7 +109,7 @@ describe Datatrans::Web::Transaction do
   context "failed response" do
     before do
       Datatrans::Web::Transaction::AuthorizeResponse.any_instance.stub(:params).and_return(@failed_response)
-      @transaction = Datatrans::Web::Transaction.new(@valid_params)
+      @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
     end
 
     context "process" do

data/spec/xml/authorize_spec.rb

@@ -7,61 +7,61 @@ describe Datatrans::XML::Transaction::AuthorizeRequest do
         "body" => {
           "transaction" => {
             "request" => {
-              "amount" => "1000", 
-              "currency" => "CHF", 
-              "aliasCC" => "70323122544311173", 
-              "expm" => "12", 
-              "expy" => "15", 
-              "sign" => "1d236349b97fac15b267becb0792d185", 
+              "amount" => "1000",
+              "currency" => "CHF",
+              "aliasCC" => "70323122544311173",
+              "expm" => "12",
+              "expy" => "15",
+              "sign" => "1d236349b97fac15b267becb0792d185",
               "reqtype" => "NOA"
-            }, 
+            },
             "response" => {
-              "responseCode" => "01", 
-              "responseMessage" => "Authorized", 
-              "uppTransactionId" => "110808142256858007", 
-              "authorizationCode" => "257128012", 
-              "acqAuthorizationCode" => "142257", 
-              "maskedCC" => "520000xxxxxx0007", 
+              "responseCode" => "01",
+              "responseMessage" => "Authorized",
+              "uppTransactionId" => "110808142256858007",
+              "authorizationCode" => "257128012",
+              "acqAuthorizationCode" => "142257",
+              "maskedCC" => "520000xxxxxx0007",
               "returnCustomerCountry" => "CHE"
-            }, 
-            "refno" => "ABCDEF", 
+            },
+            "refno" => "ABCDEF",
             "trxStatus" => "response"
-          }, 
-          "merchantId" => "1100001872", 
+          },
+          "merchantId" => "1100001872",
           "status" => "accepted"
-        }, 
+        },
         "version" => "1"
       }
     }
-    
+
     @failed_response = {
       "authorizationService" => {
         "body" => {
           "transaction" => {
             "request" => {
-              "amount" => "1000", 
-              "currency" => "CHF", 
-              "aliasCC" => "70323122544311173", 
-              "expm" => "12", 
-              "expy" => "15", 
-              "sign" => "1d236349b97fac15b267becb0792d185", 
+              "amount" => "1000",
+              "currency" => "CHF",
+              "aliasCC" => "70323122544311173",
+              "expm" => "12",
+              "expy" => "15",
+              "sign" => "1d236349b97fac15b267becb0792d185",
               "reqtype" => "NOA"
-            }, 
+            },
             "error" => {
-              "errorCode" => "2021", 
-              "errorMessage" => "missing value", 
+              "errorCode" => "2021",
+              "errorMessage" => "missing value",
               "errorDetail" => "CC-alias"
-            }, 
-            "refno" => "ABCDEF", 
+            },
+            "refno" => "ABCDEF",
             "trxStatus" => "response"
-          }, 
-          "merchantId" => "1100001872", 
+          },
+          "merchantId" => "1100001872",
           "status" => "accepted"
-        }, 
+        },
         "version" => "1"
       }
     }
-    
+
     @valid_params = {
       :refno => 'ABCDEF',
       :amount => 1000,
@@ -71,38 +71,38 @@ describe Datatrans::XML::Transaction::AuthorizeRequest do
       :expy => 15
     }
   end
-  
+
   context "successful response" do
     before do
       Datatrans::XML::Transaction::AuthorizeRequest.any_instance.stub(:process).and_return(@successful_response)
     end
-    
+
     context "build_authorize_request" do
       it "generates a valid datatrans authorize xml" do
-        @request = Datatrans::XML::Transaction::AuthorizeRequest.new(@valid_params)
+        @request = Datatrans::XML::Transaction::AuthorizeRequest.new(@datatrans, @valid_params)
         @request.send(:build_authorize_request).should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><authorizationService version=\"1\"><body merchantId=\"1100000000\"><transaction refno=\"ABCDEF\"><request><amount>1000</amount><currency>CHF</currency><aliasCC>3784982984234</aliasCC><expm>12</expm><expy>15</expy><sign>0402fb3fba8c6fcb40df9b7756e7e637</sign></request></transaction></body></authorizationService>"
       end
     end
-    
+
     context "process" do
       it "handles a valid datatrans authorize response" do
-        @transaction = Datatrans::XML::Transaction.new(@valid_params)
+        @transaction = Datatrans::XML::Transaction.new(@datatrans, @valid_params)
         @transaction.authorize.should be_true
       end
     end
   end
-  
+
   context "failed response" do
     before do
       Datatrans::XML::Transaction::AuthorizeRequest.any_instance.stub(:process).and_return(@failed_response)
-      @transaction = Datatrans::XML::Transaction.new(@valid_params)
+      @transaction = Datatrans::XML::Transaction.new(@datatrans, @valid_params)
     end
-  
+
     context "process" do
       it "handles a failed datatrans authorize response" do
         @transaction.authorize.should be_false
       end
-  
+
       it "returns error details" do
         @transaction.authorize
         @transaction.error_code.length.should > 0

data/spec/xml/capture_spec.rb

@@ -68,14 +68,14 @@ describe Datatrans::XML::Transaction::CaptureRequest do
 
     context "build_capture_request" do
       it "generates a valid datatrans capture xml" do
-        @request = Datatrans::XML::Transaction::CaptureRequest.new(@valid_params)
+        @request = Datatrans::XML::Transaction::CaptureRequest.new(@datatrans, @valid_params)
         @request.send(:build_capture_request).should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><paymentService version=\"1\"><body merchantId=\"1100000000\"><transaction refno=\"ABCDEF\"><request><amount>1000</amount><currency>CHF</currency><uppTransactionId>110808142256858007</uppTransactionId></request></transaction></body></paymentService>"
       end
     end
 
     context "process" do
       it "handles a valid datatrans capture response" do
-        @transaction = Datatrans::XML::Transaction.new(@valid_params)
+        @transaction = Datatrans::XML::Transaction.new(@datatrans, @valid_params)
         @transaction.capture.should be_true
       end
     end
@@ -84,7 +84,7 @@ describe Datatrans::XML::Transaction::CaptureRequest do
   context "failed response" do
     before do
       Datatrans::XML::Transaction::CaptureRequest.any_instance.stub(:process).and_return(@failed_response)
-      @transaction = Datatrans::XML::Transaction.new(@valid_params)
+      @transaction = Datatrans::XML::Transaction.new(@datatrans, @valid_params)
     end
 
     context "process" do