datatrans 5.0.0 → 5.2.0

data/spec/xml/request_spec.rb

@@ -1,42 +1,41 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Datatrans::XML::Transaction::Request do
   describe "Proxy" do
     describe "configured" do
       before(:each) do
         @datatrans = Datatrans::Config.new(
-          :merchant_id => '1100000000',
-          :sign_key => 'd777c17ba2010282c2d2350a68b441ca07a799d294bfaa630b7c8442207c0b69703cc55775b0ca5a4e455b818a9bb10a43669c0c20ce31f4a43f10e0cabb9525',
-          :password => 'basic_auth_password',
-          :key => "value",
-          :proxy => {
-            :http_proxyaddr => "proxy.com",
-            :http_proxyport => 80,
-            :http_proxyuser => "hans",
-            :http_proxpass => "xxx",
+          merchant_id: "1100000000",
+          sign_key: "d777c17ba2010282c2d2350a68b441ca07a799d294bfaa630b7c8442207c0b69703cc55775b0ca5a4e455b818a9bb10a43669c0c20ce31f4a43f10e0cabb9525",
+          password: "basic_auth_password",
+          key: "value",
+          proxy: {
+            http_proxyaddr: "proxy.com",
+            http_proxyport: 80,
+            http_proxyuser: "hans",
+            http_proxpass: "xxx"
           },
-          :environment => :development
+          environment: :development
         )
-
       end
       it "forward those options to HTTParty" do
         request = Datatrans::XML::Transaction::Request.new(@datatrans, {})
-        expect(HTTParty).to receive(:post).with('lirum',
-         :basic_auth => {:password => 'basic_auth_password', :username => '1100000000'},
-         :params => {:foo => :bar},
-           :http_proxpass => 'xxx',
-           :http_proxyuser => 'hans',
-           :http_proxyaddr => 'proxy.com',
-            :http_proxyport => 80)
-        request.post('lirum', :params => {:foo => :bar})
+        expect(HTTParty).to receive(:post).with("lirum",
+          basic_auth: {password: "basic_auth_password", username: "1100000000"},
+          params: {foo: :bar},
+          http_proxpass: "xxx",
+          http_proxyuser: "hans",
+          http_proxyaddr: "proxy.com",
+          http_proxyport: 80)
+        request.post("lirum", params: {foo: :bar})
       end
     end
 
     describe "not configured" do
       it "should not add any proxy settings" do
         request = Datatrans::XML::Transaction::Request.new(@datatrans, {})
-        expect(HTTParty).to receive(:post).with('lirum', :basic_auth => {:password => 'basic_auth_password', :username => '1100000000'}, :params => {:foo => :bar})
-        request.post('lirum', :params => {:foo => :bar})
+        expect(HTTParty).to receive(:post).with("lirum", basic_auth: {password: "basic_auth_password", username: "1100000000"}, params: {foo: :bar})
+        request.post("lirum", params: {foo: :bar})
       end
     end
   end

data/spec/xml/status_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Datatrans::XML::Transaction::StatusRequest do
   before do
@@ -17,7 +17,7 @@ describe Datatrans::XML::Transaction::StatusRequest do
               "amount" => "500",
               "currency" => "CHF",
               "authorizationCode" => "891104057",
-              "pmethod" => "ECA",
+              "pmethod" => "ECA"
             },
             "trxStatus" => "response"
           },
@@ -43,7 +43,7 @@ describe Datatrans::XML::Transaction::StatusRequest do
               "amount" => "",
               "currency" => "",
               "authorizationCode" => "",
-              "pmethod" => "",
+              "pmethod" => ""
             },
             "trxStatus" => "response"
           },
@@ -55,7 +55,7 @@ describe Datatrans::XML::Transaction::StatusRequest do
     }
 
     @valid_params = {
-      :transaction_id => '111013090000394044',
+      transaction_id: "111013090000394044"
     }
   end
 

data/spec/xml/void_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Datatrans::XML::Transaction::VoidRequest do
   before do
@@ -54,10 +54,10 @@ describe Datatrans::XML::Transaction::VoidRequest do
     }
 
     @valid_params = {
-      :refno => 'ABCDEF',
-      :amount => 1000,
-      :currency => 'CHF',
-      :transaction_id => '110808143302868124'
+      refno: "ABCDEF",
+      amount: 1000,
+      currency: "CHF",
+      transaction_id: "110808143302868124"
     }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datatrans
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Tobias Miesel
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -154,6 +154,7 @@ files:
 - Appraisals
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.markdown
 - Rakefile
@@ -162,9 +163,17 @@ files:
 - gemfiles/rails_6_0.gemfile
 - gemfiles/rails_6_1.gemfile
 - gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_1.gemfile
 - lib/datatrans.rb
 - lib/datatrans/common.rb
 - lib/datatrans/config.rb
+- lib/datatrans/json/transaction.rb
+- lib/datatrans/json/transaction/authorize.rb
+- lib/datatrans/json/transaction/init.rb
+- lib/datatrans/json/transaction/merchant_authorize.rb
+- lib/datatrans/json/transaction/response.rb
+- lib/datatrans/json/transaction/settle.rb
+- lib/datatrans/json/transaction/status.rb
 - lib/datatrans/version.rb
 - lib/datatrans/web/transaction.rb
 - lib/datatrans/web/transaction/authorize.rb
@@ -176,12 +185,19 @@ files:
 - lib/datatrans/xml/transaction/response.rb
 - lib/datatrans/xml/transaction/status.rb
 - lib/datatrans/xml/transaction/void.rb
+- renovate.json
 - spec/common_spec.rb
 - spec/config_spec.rb
+- spec/json/authorize_spec.rb
+- spec/json/init_spec.rb
+- spec/json/merchant_authorize_spec.rb
+- spec/json/settle_spec.rb
+- spec/json/status_spec.rb
+- spec/json/transaction_spec.rb
 - spec/spec_helper.rb
-- spec/web/authorize_spec.rb
-- spec/xml/authorize_spec.rb
+- spec/web/init_spec.rb
 - spec/xml/capture_spec.rb
+- spec/xml/init_spec.rb
 - spec/xml/request_spec.rb
 - spec/xml/status_spec.rb
 - spec/xml/void_spec.rb

data/spec/web/authorize_spec.rb

@@ -1,157 +0,0 @@
-require 'action_controller'
-require 'spec_helper'
-
-describe Datatrans::Web::Transaction do
-  before do
-    @successful_response = {
-      :status => "success",
-      :returnCustomerCountry => "CHE",
-      :sign => "95f3111123e628eab6469c636e0d3f06",
-      :aliasCC => "70323122544311173",
-      :maskedCC => "520000xxxxxx0007",
-      :responseMessage => "Authorized",
-      :useAlias => "yes",
-      :expm => "12",
-      :responseCode => "01",
-      :sign2 => "a9571428be4d9d37b88988656984bfbf",
-      :testOnly => "yes",
-      :currency => "CHF",
-      :amount => "1000",
-      :hiddenMode => "yes",
-      :expy => "15",
-      :merchantId => "1100000000",
-      :authorizationCode => "521029462",
-      :uppTransactionId => "110808173520119430",
-      :refno => "1",
-      :uppMsgType => "web",
-      :uppCustomerName => "",
-      :pmethod => "ECA",
-      :reqtype => "NOA",
-      :uppCustomerEmail => "customer@email.com",
-      :acqAuthorizationCode => "173520"
-    }
-
-    @successful_swisspost_response = @successful_response.merge({
-      :pmethod => "PFC",
-      :txtEp2TrxID => "7777777000000001",
-      :responseMessage => "YellowPay transaction Ok"
-    })
-
-    @failed_response = {
-      :status => "error",
-      :returnCustomerCountry => "CHE",
-      :sign => "95f3123246e628eab6469c636e0d3f06",
-      :aliasCC => "70323122544311173",
-      :maskedCC => "520000xxxxxx0007",
-      :errorMessage => "declined",
-      :useAlias => "yes",
-      :expm => "12",
-      :errorCode => "1403",
-      :testOnly => "yes",
-      :currency => "CHF",
-      :amount => "1000",
-      :hiddenMode => "yes",
-      :expy => "14",
-      :merchantId => "1100000000",
-      :errorDetail => "Declined",
-      :uppTransactionId => "110808173951050102",
-      :refno => "1",
-      :uppMsgType => "web",
-      :uppCustomerName => "",
-      :pmethod => "ECA",
-      :reqtype => "NOA",
-      :uppCustomerEmail => "customer@email.com"
-    }
-
-    @valid_params = {
-      :refno => 'ABCDEF',
-      :amount => 1000,
-      :currency => 'CHF',
-      :uppCustomerEmail => 'customer@email.com'
-      # also params from view helper needed
-    }
-  end
-
-  context "rails form helper" do
-    before do
-      @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
-
-      if Gem.loaded_specs['activesupport'].version >= Gem::Version.create('6.0')
-        @view = ActionView::Base.new(ActionController::Base.view_paths, {}, {})
-      else
-        @view = ActionView::Base.new
-      end
-    end
-
-    it 'should generate valid form field string' do
-      if Gem.loaded_specs['activesupport'].version >= Gem::Version.create('6.0')
-        expected_output = '<input type="hidden" name="merchantId" id="merchantId" value="1100000000" autocomplete="off" /><input type="hidden" name="hiddenMode" id="hiddenMode" value="yes" autocomplete="off" /><input type="hidden" name="reqtype" id="reqtype" value="NOA" autocomplete="off" /><input type="hidden" name="amount" id="amount" value="1000" autocomplete="off" /><input type="hidden" name="currency" id="currency" value="CHF" autocomplete="off" /><input type="hidden" name="useAlias" id="useAlias" value="yes" autocomplete="off" /><input type="hidden" name="sign" id="sign" value="0402fb3fba8c6fcb40df9b7756e7e637" autocomplete="off" /><input type="hidden" name="refno" id="refno" value="ABCDEF" autocomplete="off" /><input type="hidden" name="uppCustomerDetails" id="uppCustomerDetails" autocomplete="off" /><input type="hidden" name="uppCustomerEmail" id="uppCustomerEmail" value="customer@email.com" autocomplete="off" />'
-      else
-        expected_output = '<input type="hidden" name="merchantId" id="merchantId" value="1100000000" /><input type="hidden" name="hiddenMode" id="hiddenMode" value="yes" /><input type="hidden" name="reqtype" id="reqtype" value="NOA" /><input type="hidden" name="amount" id="amount" value="1000" /><input type="hidden" name="currency" id="currency" value="CHF" /><input type="hidden" name="useAlias" id="useAlias" value="yes" /><input type="hidden" name="sign" id="sign" value="0402fb3fba8c6fcb40df9b7756e7e637" /><input type="hidden" name="refno" id="refno" value="ABCDEF" /><input type="hidden" name="uppCustomerDetails" id="uppCustomerDetails" /><input type="hidden" name="uppCustomerEmail" id="uppCustomerEmail" value="customer@email.com" />'
-      end
-
-      expect(@view.datatrans_notification_request_hidden_fields(@datatrans, @transaction)).to eq expected_output
-    end
-  end
-
-  context "successful response" do
-    before do
-      allow_any_instance_of(Datatrans::Web::Transaction::AuthorizeResponse).to receive(:params).and_return(@successful_response)
-    end
-
-    context "process" do
-      it "handles a valid datatrans authorize response" do
-        @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
-        expect(@transaction.authorize).to be true
-      end
-    end
-  end
-
-  context "successful response (swiss post)" do
-    before do
-      allow_any_instance_of(Datatrans::Web::Transaction::AuthorizeResponse).to receive(:params).and_return(@successful_swisspost_response)
-    end
-
-    context "process" do
-      it "handles a valid datatrans authorize response" do
-        @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
-        expect(@transaction.authorize).to be true
-      end
-    end
-  end
-
-  context "compromised response" do
-    before do
-      fake_response = @successful_response
-      fake_response[:sign2] = 'invalid'
-      allow_any_instance_of(Datatrans::Web::Transaction::AuthorizeResponse).to receive(:params).and_return(fake_response)
-      @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
-    end
-
-    it "raises an exception if sign2 is invalid" do
-      expect {
-        @transaction.authorize
-      }.to raise_error(Datatrans::InvalidSignatureError)
-    end
-  end
-
-  context "failed response" do
-    before do
-      allow_any_instance_of(Datatrans::Web::Transaction::AuthorizeResponse).to receive(:params).and_return(@failed_response)
-      @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
-    end
-
-    context "process" do
-      it "handles a failed datatrans authorize response" do
-        expect(@transaction.authorize).to be false
-      end
-
-      it "returns error details" do
-        @transaction.authorize
-        expect(@transaction.error_code.length).to be > 0
-        expect(@transaction.error_message.length).to be > 0
-        expect(@transaction.error_detail.length).to be > 0
-      end
-    end
-  end
-end