datatrans 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 00dfb98ec54350ac1a4d6d2a932a4ee08ed1ddd5
-  data.tar.gz: 599f998c0f9bd6e489d9571e171893c3b463be24
+SHA256:
+  metadata.gz: e0cd93431049ffc3deba79d3c594ae93aff9e6fd91dc158ad0a68ae1e766a83e
+  data.tar.gz: c67ba41b81de8adfbe9962cb85c80e881a57b69490972dae577f93e269935659
 SHA512:
-  metadata.gz: 06eeebeafc026f0fdfc1296be4f2a2e8201aa7de21a12f950b4f938225bcee6b0ffe19f2e47a4a5432c30d68c478c9733bca30b20a55dda593d5e1135e898738
-  data.tar.gz: 2a285a435167deae93bca53229ad7b01f4b536c739b50ca293c54f599312ad179fe90fbcc06789a4c6b0d94eb45650a585d0cea10d0e6bf7f36895da9fe93d81
+  metadata.gz: 2bf90e36d3ef096f0904cc03309931408d1e26c23761645de6e46ce1588c350850d4466127c7443408eddf2a3475b48a2fd4db69fa761779a2a15d0e5d37031c
+  data.tar.gz: eb8aa923a6599f0cbf10b4ed1fc2fc76e3068fbbd589768635f4d89e55063072c2c691f8a91504c04fb4eec761d798b92ad4522000094b932d775c5c195be6aa

data/.github/workflows/ci.yml

@@ -0,0 +1,40 @@
+---
+name: CI
+on: [push, pull_request]
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.7', '3.0', '3.1' ]
+        rails: [ '5-2', '6-0', '6-1', '7-0' ]
+        exclude:
+          - ruby: 2.6 # Rails 7 requires 2.7 minimum
+            rails: 7-0
+          - ruby: 3.0 # Ruby 3 support for 5.2 hasn't been added
+            rails: 5-2
+          - ruby: 3.1 # Ruby 3.1 only works on the latest Rails 7 version
+            rails: 5-2
+          - ruby: 3.1
+            rails: 6-0
+          - ruby: 3.1
+            rails: 6-1
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: false
+
+      - name: Bundle for Appraisal
+        run: bundle
+
+      - name: Install Appraisal dependencies
+        run: bundle exec appraisal rails-${{ matrix.rails }} bundle
+
+      - name: Run tests
+        run: bundle exec appraisal rails-${{ matrix.rails }} bundle exec rspec

data/.github/workflows/release.yml

@@ -0,0 +1,30 @@
+---
+name: Tag on Github and Release to RubyGems
+on: [workflow_dispatch]
+
+jobs:
+  release:
+    name: Release to RubyGems
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - name: Tag on Github
+        run: |
+          VERSION=$(ruby -e "puts Gem::Specification::load('datatrans.gemspec').version")
+          echo "v$VERSION"
+          git tag "v$VERSION"
+          git push origin "v$VERSION"
+      - name: Publish to RubyGems
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}\n" > $HOME/.gem/credentials
+          gem build *.gemspec
+          gem push *.gem
+        env:
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}

data/.gitignore

@@ -1,3 +1,5 @@
 *.gem
 .bundle
 pkg/*
+*.lock
+coverage

data/.ruby-version

@@ -0,0 +1 @@
+2.6.9

data/Appraisals

@@ -0,0 +1,31 @@
+appraise "rails-5-2" do
+  gem "activesupport", "~> 5.2"
+
+  group :development, :test do
+    gem "actionpack", "~> 5.2"
+  end
+end
+
+appraise "rails-6-0" do
+  gem "activesupport", "~> 6.0"
+
+  group :development, :test do
+    gem "actionpack", "~> 6.0"
+  end
+end
+
+appraise "rails-6-1" do
+  gem "activesupport", "~> 6.1"
+
+  group :development, :test do
+    gem "actionpack", "~> 6.1"
+  end
+end
+
+appraise "rails-7-0" do
+  gem "activesupport", "~> 7.0"
+
+  group :development, :test do
+    gem "actionpack", "~> 7.0"
+  end
+end

data/CHANGELOG.md

@@ -0,0 +1,31 @@
+# Datatrans Changelog
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+## 4.0.0 - 2022-02-25
+### Changed
+* [BREAKING CHANGE] Bump minimum required Ruby version to 2.6 and Rails to 5.2 (@andyundso [#34](https://github.com/simplificator/datatrans/pull/34))
+* Change Datatrans hostnames (@rgisiger [#32](https://github.com/simplificator/datatrans/pull/32))
+
+## 3.0.2 - 2014-01-04
+### Added
+* Specified MIT License.
+
+## 3.0.0 - 2013-09-25
+### Changed
+* Refactored code to allow multiple configurations
+* Proxy config now uses HTTParty naming convention.
+
+## 2.2.2 - 2011-10-11
+### Added
+
+* ability to skip signing by setting `config.sign_key = false`
+
+## 1.0.0 - 2011-07-07
+
+Initial release
+
+

data/Gemfile

@@ -2,3 +2,4 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in datatrans.gemspec
 gemspec
+gem "simplecov", group: :test, require: nil

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 info@simplificator.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.markdown

@@ -6,7 +6,7 @@ Ruby adapter for the Datatrans payment gateway (http://www.datatrans.ch).
 Configuration
 -------------
 
-Buidl your Datatrans Configuration like so:
+Build your Datatrans Configuration like so:
 
     datatrans = Datatrans::Config.new(
       :merchant_id => '1234567',
@@ -149,20 +149,6 @@ To make an authorized transaction invalid use void.
       # transaction.error_code, transaction.error_message, transaction.error_detail
     end
 
-
-CHANGELOG
-=========
-
-3.0.0
--------
-* Refactored Code to allow multiple configurations
-* Proxy config now uses HTTParty naming convention.
-
-2.2.2
--------
-* added ability to skip signing by setting config.sign_key = false
-
-
 Todo
 ====
 

data/datatrans.gemspec

@@ -18,13 +18,17 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = '>= 2.6'
+
   s.add_dependency 'httparty'
-  s.add_dependency 'activesupport', '>= 3.0.0'
+  s.add_dependency 'activesupport', '>= 5.2'
   s.add_dependency 'i18n'
   s.add_dependency 'builder'
   s.add_dependency 'multi_xml', '>= 0.5.1'
 
+  s.add_development_dependency 'actionpack', '>= 5.2'
+  s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'actionpack', '>= 3.0.0'
+  s.license = 'MIT'
 end

data/gemfiles/rails_5_2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "simplecov", group: :test, require: nil
+gem "activesupport", "~> 5.2"
+
+group :development, :test do
+  gem "actionpack", "~> 5.2"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "simplecov", group: :test, require: nil
+gem "activesupport", "~> 6.0"
+
+group :development, :test do
+  gem "actionpack", "~> 6.0"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "simplecov", group: :test, require: nil
+gem "activesupport", "~> 6.1"
+
+group :development, :test do
+  gem "actionpack", "~> 6.1"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7_0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "simplecov", group: :test, require: nil
+gem "activesupport", "~> 7.0"
+
+group :development, :test do
+  gem "actionpack", "~> 7.0"
+end
+
+gemspec path: "../"

data/lib/datatrans/config.rb

@@ -5,23 +5,11 @@ module Datatrans
 
     DEFAULT_SIGN_KEY = false
 
-    BASE_URL_PRODUCTION = 'https://payment.datatrans.biz'.freeze
-    BASE_URL_DEVELOPMENT = 'https://pilot.datatrans.biz'.freeze
-
-    URLS = {
-      :development => {
-        :web_authorize_url  => "#{BASE_URL_PRODUCTION}/upp/jsp/upStart.jsp".freeze,
-        :xml_authorize_url  => "#{BASE_URL_PRODUCTION}/upp/jsp/XML_authorize.jsp".freeze,
-        :xml_settlement_url => "#{BASE_URL_PRODUCTION}/upp/jsp/XML_processor.jsp".freeze,
-        :xml_status_url     => "#{BASE_URL_PRODUCTION}/upp/jsp/XML_status.jsp".freeze
-      },
-      :production => {
-        :web_authorize_url  => "#{BASE_URL_DEVELOPMENT}/upp/jsp/upStart.jsp".freeze,
-        :xml_authorize_url  => "#{BASE_URL_DEVELOPMENT}/upp/jsp/XML_authorize.jsp".freeze,
-        :xml_settlement_url => "#{BASE_URL_DEVELOPMENT}/upp/jsp/XML_processor.jsp".freeze,
-        :xml_status_url     => "#{BASE_URL_DEVELOPMENT}/upp/jsp/XML_status.jsp".freeze
-      }.freeze
-    }.freeze
+    SUBDOMAINS = {
+      payment_page: 'pay',
+      server_to_server_api: 'api'
+    }
+    DOMAIN = 'datatrans.com'
 
     attr_reader :environment, :merchant_id, :sign_key, :proxy
 
@@ -49,7 +37,24 @@ module Datatrans
 
     # Access a url, is automatically scoped to environment
     def url(what)
-      URLS[self.environment][what]
+      case what
+      when :web_authorize_url
+        subdomain = SUBDOMAINS[:payment_page]
+        path = '/upp/jsp/upStart.jsp'
+      when :xml_authorize_url
+        subdomain = SUBDOMAINS[:server_to_server_api]
+        path = '/upp/jsp/XML_authorize.jsp'
+      when :xml_settlement_url
+        subdomain = SUBDOMAINS[:server_to_server_api]
+        path = '/upp/jsp/XML_processor.jsp'
+      when :xml_status_url
+        subdomain = SUBDOMAINS[:server_to_server_api]
+        path = '/upp/jsp/XML_status.jsp'
+      else
+        raise "Unknown wanted action '#{what}'."
+      end
+      subdomain += '.sandbox' unless self.environment == :production
+      "https://#{subdomain}.#{DOMAIN}#{path}"
     end
 
     def web_transaction(*args)

data/lib/datatrans/version.rb

@@ -1,3 +1,3 @@
 module Datatrans
-  VERSION = "3.0.0"
+  VERSION = "4.0.0"
 end

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

@@ -8,7 +8,7 @@ class Datatrans::XML::Transaction
 
     def post(url, options = {})
       options = options.merge(self.datatrans.proxy)
-      HTTParty.post(url, options)
+      HTTParty.post(url, **options)
     end
 
     def initialize(datatrans, params)

data/spec/common_spec.rb

@@ -14,7 +14,7 @@ describe Datatrans::Common do
       currency = 'CHF'
       reference_number = 'ABCEDF'
 
-      @request.sign(@datatrans.merchant_id, amount, currency, reference_number).should == '4e7d4d5bbde548c586f3b7f109635ffc'
+      expect(@request.sign(@datatrans.merchant_id, amount, currency, reference_number)).to eq '4e7d4d5bbde548c586f3b7f109635ffc'
     end
   end
 end

data/spec/config_spec.rb

@@ -8,13 +8,13 @@ describe Datatrans::Config do
 
     describe "web_transaction" do
       it "builds a new web transaction object" do
-        @datatrans.web_transaction({}).class.should eq(Datatrans::Web::Transaction)
+        expect(@datatrans.web_transaction({}).class).to 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)
+        expect(@datatrans.xml_transaction({}).class).to eq(Datatrans::XML::Transaction)
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'simplecov'
+SimpleCov.start
 
 require 'active_support'
 require 'datatrans'

data/spec/web/authorize_spec.rb

@@ -1,5 +1,4 @@
-#encoding: utf-8
-
+require 'action_controller'
 require 'spec_helper'
 
 describe Datatrans::Web::Transaction do
@@ -70,23 +69,34 @@ describe Datatrans::Web::Transaction do
   context "rails form helper" do
     before do
       @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
-      @view = ActionView::Base.new
+
+      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
-      @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\" />"
+    it 'should generate valid form field string' do
+      if Gem.loaded_specs['activesupport'].version >= Gem::Version.create('7.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
-      Datatrans::Web::Transaction::AuthorizeResponse.any_instance.stub(:params).and_return(@successful_response)
+      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)
-        @transaction.authorize.should be_true
+        expect(@transaction.authorize).to be true
       end
     end
   end
@@ -95,7 +105,7 @@ describe Datatrans::Web::Transaction do
     before do
       fake_response = @successful_response
       fake_response[:sign2] = 'invalid'
-      Datatrans::Web::Transaction::AuthorizeResponse.any_instance.stub(:params).and_return(fake_response)
+      allow_any_instance_of(Datatrans::Web::Transaction::AuthorizeResponse).to receive(:params).and_return(fake_response)
       @transaction = Datatrans::Web::Transaction.new(@datatrans, @valid_params)
     end
 
@@ -108,21 +118,21 @@ describe Datatrans::Web::Transaction do
 
   context "failed response" do
     before do
-      Datatrans::Web::Transaction::AuthorizeResponse.any_instance.stub(:params).and_return(@failed_response)
+      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
-        @transaction.authorize.should be_false
+        expect(@transaction.authorize).to be false
       end
 
       it "returns error details" do
         @transaction.authorize
-        @transaction.error_code.length.should > 0
-        @transaction.error_message.length.should > 0
-        @transaction.error_detail.length.should > 0
+        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
+end

data/spec/xml/authorize_spec.rb

@@ -74,41 +74,41 @@ describe Datatrans::XML::Transaction::AuthorizeRequest do
 
   context "successful response" do
     before do
-      Datatrans::XML::Transaction::AuthorizeRequest.any_instance.stub(:process).and_return(@successful_response)
+      allow_any_instance_of(Datatrans::XML::Transaction::AuthorizeRequest).to receive(: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(@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>"
+        expect(@request.send(:build_authorize_request)).to eq "<?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(@datatrans, @valid_params)
-        @transaction.authorize.should be_true
+        expect(@transaction.authorize).to be true
       end
     end
   end
 
   context "failed response" do
     before do
-      Datatrans::XML::Transaction::AuthorizeRequest.any_instance.stub(:process).and_return(@failed_response)
+      allow_any_instance_of(Datatrans::XML::Transaction::AuthorizeRequest).to receive(:process).and_return(@failed_response)
       @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
+        expect(@transaction.authorize).to be false
       end
 
       it "returns error details" do
         @transaction.authorize
-        @transaction.error_code.length.should > 0
-        @transaction.error_message.length.should > 0
-        @transaction.error_detail.length.should > 0
+        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
+end

data/spec/xml/capture_spec.rb

@@ -63,41 +63,41 @@ describe Datatrans::XML::Transaction::CaptureRequest do
 
   context "successful response" do
     before do
-      Datatrans::XML::Transaction::CaptureRequest.any_instance.stub(:process).and_return(@successful_response)
+      allow_any_instance_of(Datatrans::XML::Transaction::CaptureRequest).to receive(:process).and_return(@successful_response)
     end
 
     context "build_capture_request" do
       it "generates a valid datatrans capture xml" do
         @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>"
+        expect(@request.send(:build_capture_request)).to eq "<?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(@datatrans, @valid_params)
-        @transaction.capture.should be_true
+        expect(@transaction.capture).to be true
       end
     end
   end
 
   context "failed response" do
     before do
-      Datatrans::XML::Transaction::CaptureRequest.any_instance.stub(:process).and_return(@failed_response)
+      allow_any_instance_of(Datatrans::XML::Transaction::CaptureRequest).to receive(:process).and_return(@failed_response)
       @transaction = Datatrans::XML::Transaction.new(@datatrans, @valid_params)
     end
 
     context "process" do
       it "handles a failed datatrans capture response" do
-        @transaction.capture.should be_false
+        expect(@transaction.capture).to be false
       end
 
       it "returns error details" do
         @transaction.capture
-        @transaction.error_code.length.should > 0
-        @transaction.error_message.length.should > 0
-        @transaction.error_detail.length.should > 0
+        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
+end

data/spec/xml/request_spec.rb

@@ -20,7 +20,7 @@ describe Datatrans::XML::Transaction::Request do
       end
       it "forward those options to HTTParty" do
         request = Datatrans::XML::Transaction::Request.new(@datatrans, {})
-        HTTParty.should_receive(:post).with('lirum',
+        expect(HTTParty).to receive(:post).with('lirum',
          :params => {:foo => :bar},
            :http_proxpass => 'xxx',
            :http_proxyuser => 'hans',
@@ -33,9 +33,9 @@ describe Datatrans::XML::Transaction::Request do
     describe "not configured" do
       it "should not add any proxy settings" do
         request = Datatrans::XML::Transaction::Request.new(@datatrans, {})
-        HTTParty.should_receive(:post).with('lirum', :params => {:foo => :bar})
+        expect(HTTParty).to receive(:post).with('lirum', :params => {:foo => :bar})
         request.post('lirum', :params => {:foo => :bar})
       end
     end
   end
-end
+end

data/spec/xml/status_spec.rb

@@ -61,34 +61,34 @@ describe Datatrans::XML::Transaction::StatusRequest do
 
   context "successful response" do
     before do
-      Datatrans::XML::Transaction::StatusRequest.any_instance.stub(:process).and_return(@successful_response)
+      allow_any_instance_of(Datatrans::XML::Transaction::StatusRequest).to receive(:process).and_return(@successful_response)
     end
 
     context "build_status_request" do
       it "generates a valid datatrans status xml" do
         @request = Datatrans::XML::Transaction::StatusRequest.new(@datatrans, @valid_params)
-        @request.send(:build_status_request).should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><statusService version=\"1\"><body merchantId=\"1100000000\"><transaction refno=\"\"><request><uppTransactionId>111013090000394044</uppTransactionId></request></transaction></body></statusService>"
+        expect(@request.send(:build_status_request)).to eq "<?xml version=\"1.0\" encoding=\"UTF-8\"?><statusService version=\"1\"><body merchantId=\"1100000000\"><transaction refno=\"\"><request><uppTransactionId>111013090000394044</uppTransactionId></request></transaction></body></statusService>"
       end
     end
 
     context "process" do
       it "handles a valid datatrans status response" do
         @transaction = Datatrans::XML::Transaction.new(@datatrans, @valid_params)
-        @transaction.status.should be_true
+        expect(@transaction.status).to be true
       end
     end
   end
 
   context "failed response" do
     before do
-      Datatrans::XML::Transaction::StatusRequest.any_instance.stub(:process).and_return(@failed_response)
+      allow_any_instance_of(Datatrans::XML::Transaction::StatusRequest).to receive(:process).and_return(@failed_response)
       @transaction = Datatrans::XML::Transaction.new(@datatrans, @valid_params)
     end
 
     context "process" do
       it "handles a failed datatrans status response" do
-        @transaction.status.should be_false
+        expect(@transaction.status).to be false
       end
     end
   end
-end
+end

data/spec/xml/void_spec.rb

@@ -63,41 +63,41 @@ describe Datatrans::XML::Transaction::VoidRequest do
 
   context "successful response" do
     before do
-      Datatrans::XML::Transaction::VoidRequest.any_instance.stub(:process).and_return(@successful_response)
+      allow_any_instance_of(Datatrans::XML::Transaction::VoidRequest).to receive(:process).and_return(@successful_response)
     end
 
     context "build_void_request" do
       it "generates a valid datatrans void xml" do
         @request = Datatrans::XML::Transaction::VoidRequest.new(@datatrans, @valid_params)
-        @request.send(:build_void_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>110808143302868124</uppTransactionId><reqtype>DOA</reqtype></request></transaction></body></paymentService>"
+        expect(@request.send(:build_void_request)).to eq "<?xml version=\"1.0\" encoding=\"UTF-8\"?><paymentService version=\"1\"><body merchantId=\"1100000000\"><transaction refno=\"ABCDEF\"><request><amount>1000</amount><currency>CHF</currency><uppTransactionId>110808143302868124</uppTransactionId><reqtype>DOA</reqtype></request></transaction></body></paymentService>"
       end
     end
 
     context "process" do
       it "handles a valid datatrans void response" do
         @transaction = Datatrans::XML::Transaction.new(@datatrans, @valid_params)
-        @transaction.void.should be_true
+        expect(@transaction.void).to be true
       end
     end
   end
 
   context "failed response" do
     before do
-      Datatrans::XML::Transaction::VoidRequest.any_instance.stub(:process).and_return(@failed_response)
+      allow_any_instance_of(Datatrans::XML::Transaction::VoidRequest).to receive(:process).and_return(@failed_response)
       @transaction = Datatrans::XML::Transaction.new(@datatrans, @valid_params)
     end
 
     context "process" do
       it "handles a failed datatrans void response" do
-        @transaction.void.should be_false
+        expect(@transaction.void).to be false
       end
 
       it "returns error details" do
         @transaction.void
-        @transaction.error_code.length.should > 0
-        @transaction.error_message.length.should > 0
-        @transaction.error_detail.length.should > 0
+        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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datatrans
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Tobias Miesel
@@ -11,120 +11,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: appraisal
   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'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   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'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 description: Datatrans Integration for Ruby on Rails
 email:
 - info@simplificator.com
@@ -132,15 +146,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- Appraisals
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
+- LICENSE
 - README.markdown
 - Rakefile
 - datatrans.gemspec
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7_0.gemfile
 - lib/datatrans.rb
 - lib/datatrans/common.rb
 - lib/datatrans/config.rb
@@ -165,7 +186,8 @@ files:
 - spec/xml/status_spec.rb
 - spec/xml/void_spec.rb
 homepage: ''
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -173,17 +195,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: datatrans
-rubygems_version: 2.0.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Datatrans Integration for Ruby on Rails

data/.rvmrc

@@ -1 +0,0 @@
-rvm ruby-1.9.3

data/.travis.yml

@@ -1,8 +0,0 @@
-script: "bundle exec rspec spec"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - ree
-  - 2.0.0
-gemfile:
-  - Gemfile

data/Gemfile.lock

@@ -1,69 +0,0 @@
-PATH
-  remote: .
-  specs:
-    datatrans (3.0.0)
-      activesupport (>= 3.0.0)
-      builder
-      httparty
-      i18n
-      multi_xml (>= 0.5.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    builder (3.0.4)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    hike (1.2.1)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    multi_json (1.5.0)
-    multi_xml (0.5.5)
-    rack (1.4.4)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (>= 3.0.0)
-  datatrans!
-  rake
-  rspec