RubyGems - activemerchant_banklink - Versions diffs - 0.0.5 → 0.0.6 - Mend

activemerchant_banklink 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

data/.gitignore CHANGED

@@ -4,4 +4,6 @@ doc
 .bundle
 .loadpath
 .project
+.idea
+Gemfile.lock

data/README.rdoc CHANGED

@@ -7,7 +7,8 @@ Gem is originally based on ActiveMerchant {fork}[https://github.com/indrekj/acti
 == Supported banks
  Swedbank (Estonia, Lithuania)
- SEB (Estonia)
+ SEB (Estonia, Lithuania)
+ DNB (Lithuania)
 == Installation

data/lib/active_merchant/billing/integrations/banklink.rb CHANGED

@@ -27,72 +27,6 @@ module ActiveMerchant #:nodoc:
         #  end
         #end
-        # Define required fields for each service message.
-        # We need to know this in order to calculate VK_MAC
-        # from a given hash of parameters.
-        # Order of the parameters is important.
-        mattr_accessor :required_service_params
-        self.required_service_params = {
-          1001 => [
-            'VK_SERVICE',
-            'VK_VERSION',
-            'VK_SND_ID',
-            'VK_STAMP',
-            'VK_AMOUNT',
-            'VK_CURR',
-            'VK_ACC',
-            'VK_NAME',
-            'VK_REF',
-            'VK_MSG'],
-          1002 => [
-            'VK_SERVICE',
-            'VK_VERSION',
-            'VK_SND_ID',
-            'VK_STAMP',
-            'VK_AMOUNT',
-            'VK_CURR',
-            'VK_REF',
-            'VK_MSG' ],
-          1101 => [
-            'VK_SERVICE',
-            'VK_VERSION',
-            'VK_SND_ID',
-            'VK_REC_ID',
-            'VK_STAMP',
-            'VK_T_NO',
-            'VK_AMOUNT',
-            'VK_CURR',
-            'VK_REC_ACC',
-            'VK_REC_NAME',
-            'VK_SND_ACC',
-            'VK_SND_NAME',
-            'VK_REF',
-            'VK_MSG',
-            'VK_T_DATE'],
-          1201 => [
-            'VK_SERVICE',
-            'VK_VERSION',
-            'VK_SND_ID',
-            'VK_REC_ID',
-            'VK_STAMP',
-            'VK_AMOUNT',
-            'VK_CURR',
-            'VK_REC_ACC',
-            'VK_REC_NAME',
-            'VK_SND_ACC',
-            'VK_SND_NAME',
-            'VK_REF',
-            'VK_MSG'],
-          1901 => [
-            'VK_SERVICE',
-            'VK_VERSION',
-            'VK_SND_ID',
-            'VK_REC_ID',
-            'VK_STAMP',
-            'VK_REF',
-            'VK_MSG']
-        }
         # Calculation using method VK_VERSION=008:
         # VK_MAC is RSA signature of the request fields coded into BASE64.
         # VK_MAC will be calculated using secret key of the sender using RSA. Signature will
@@ -107,6 +41,85 @@ module ActiveMerchant #:nodoc:
         # d is RSA secret exponent
         # n is RSA modulus
         module Common
+          # Define required fields for each service message.
+          # We need to know this in order to calculate VK_MAC
+          # from a given hash of parameters.
+          # Order of the parameters is important.
+          def required_service_params
+            {
+              1001 => [
+                'VK_SERVICE',
+                'VK_VERSION',
+                'VK_SND_ID',
+                'VK_STAMP',
+                'VK_AMOUNT',
+                'VK_CURR',
+                'VK_ACC',
+                'VK_NAME',
+                'VK_REF',
+                'VK_MSG'],
+              2001 => [
+                'VK_SERVICE',
+                'VK_VERSION',
+                'VK_SND_ID',
+                'VK_STAMP',
+                'VK_AMOUNT',
+                'VK_CURR',
+                'VK_ACC',
+                'VK_PANK',
+                'VK_NAME',
+                'VK_REF',
+                'VK_MSG'],
+              1002 => [
+                'VK_SERVICE',
+                'VK_VERSION',
+                'VK_SND_ID',
+                'VK_STAMP',
+                'VK_AMOUNT',
+                'VK_CURR',
+                'VK_REF',
+                'VK_MSG' ],
+              1101 => [
+                'VK_SERVICE',
+                'VK_VERSION',
+                'VK_SND_ID',
+                'VK_REC_ID',
+                'VK_STAMP',
+                'VK_T_NO',
+                'VK_AMOUNT',
+                'VK_CURR',
+                'VK_REC_ACC',
+                'VK_REC_NAME',
+                'VK_SND_ACC',
+                'VK_SND_NAME',
+                'VK_REF',
+                'VK_MSG',
+                'VK_T_DATE'],
+              1201 => [
+                'VK_SERVICE',
+                'VK_VERSION',
+                'VK_SND_ID',
+                'VK_REC_ID',
+                'VK_STAMP',
+                'VK_AMOUNT',
+                'VK_CURR',
+                'VK_REC_ACC',
+                'VK_REC_NAME',
+                'VK_SND_ACC',
+                'VK_SND_NAME',
+                'VK_REF',
+                'VK_MSG'],
+              1901 => [
+                'VK_SERVICE',
+                'VK_VERSION',
+                'VK_SND_ID',
+                'VK_REC_ID',
+                'VK_STAMP',
+                'VK_REF',
+                'VK_MSG']
+            }
+          end
           # p(x) is the length of the field x in bytes, represented by three digits
           def func_p(val)
             sprintf("%03i", val.bytesize)
@@ -120,7 +133,7 @@ module ActiveMerchant #:nodoc:
           # '003val1003val2006value3'
           def generate_data_string(service_msg_number, sigparams)
             str = ''
-            Banklink.required_service_params[Integer(service_msg_number)].each do |param|
+            required_service_params[Integer(service_msg_number)].each do |param|
               val = sigparams[param].to_s # nil goes to ''
               str << func_p(val) << val
             end

data/lib/active_merchant/billing/integrations/banklink/helper.rb CHANGED

@@ -23,19 +23,9 @@ module ActiveMerchant #:nodoc:
           end
           def initialize(order, account, options = {})
-            old_valid_keys = [:amount, :currency, :test]
-            new_valid_keys = [:description, :reference]
-            valid_keys = (old_valid_keys + new_valid_keys + Banklink.required_service_params.values << :service_msg_number).uniq
-            options.assert_valid_keys(valid_keys)
             @options = options
-            @fields = {}
-            self.order = order
-            self.account = account
-            self.amount = options[:amount]
-            self.currency = options[:currency]
-            self.description = options[:description]
-            self.reference = options[:reference]
+            @fields = ActiveSupport::OrderedHash.new
+            @raw_html_fields = []
             if options[:service_msg_number]
               @service_msg_number = options.delete(:service_msg_number)
@@ -44,23 +34,46 @@ module ActiveMerchant #:nodoc:
             end
             add_required_params
+            self.order = order
+            self.account = account
+            self.amount = options[:amount]
+            self.currency = options[:currency]
+            self.description = options[:description]
+            self.reference = options[:reference]
+            old_valid_keys = [:amount, :currency, :test]
+            new_valid_keys = [:description, :reference]
+            valid_keys = (old_valid_keys + new_valid_keys + required_service_params[@service_msg_number] << :service_msg_number).uniq
+            options.assert_valid_keys(valid_keys)
             add_charset_field
             add_vk_mac
           end
+          def add_field(name, value)
+            return if name.blank?
+            @fields[name.to_s] = value.to_s
+          end
           # Amount can be supplied with a optional dot separator for cents.
           def amount=(amount)
             # TODO check this, sooner or later someone will get a wrong amount.
+            amount = Money.new(amount) unless amount.is_a?(Money)
+            amount = "%0.2f" % amount
+            add_field('VK_AMOUNT', amount)
             # If a string is passed to us, don't do anything.
             # If a Money object is passed to us, don't do anything.
             # Otherwise delegate the handling to the money object
             # and free ourself from the responsibility, yay.
-            if amount.is_a?(String) || amount.is_a?(Money)
-              add_field('VK_AMOUNT', amount)
-            else
-              add_field('VK_AMOUNT', Money.new(amount).to_s)
-            end
+            #if amount.is_a?(String) || amount.is_a?(Money)
+            #  add_field('VK_AMOUNT', amount)
+            #else
+            #  add_field('VK_AMOUNT', Money.new(amount))
+            #end
           end
           def add_vk_mac
@@ -73,7 +86,7 @@ module ActiveMerchant #:nodoc:
           end
           def add_required_params
-            required_params = Banklink.required_service_params[@service_msg_number]
+            required_params = required_service_params[@service_msg_number]
             required_params.each do |param|
               param_value = (@options.delete(param) || send(param.to_s.downcase)).to_s
               add_field param, iconv.iconv(param_value)

data/lib/active_merchant/billing/integrations/dnb_nord_ltu.rb ADDED

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/dnb_nord_ltu/common.rb'
+require File.dirname(__FILE__) + '/dnb_nord_ltu/helper.rb'
+require File.dirname(__FILE__) + '/dnb_nord_ltu/notification.rb'
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module DnbNordLtu
+        # Raw X509 certificate of the bank, string format.
+        mattr_accessor :bank_certificate
+        mattr_accessor :test_bank_certificate
+        # RSA public key of the bank, taken from the X509 certificate of the bank. OpenSSL container.
+        def self.get_bank_public_key
+          if ActiveMerchant::Billing::Base.integration_mode == :production
+            cert = self.bank_certificate
+          else
+            cert = self.test_bank_certificate
+          end
+          OpenSSL::X509::Certificate.new(cert.gsub(/  /, '')).public_key
+        end
+        mattr_accessor :private_key
+        mattr_accessor :test_private_key
+        # Our RSA private key. OpenSSL container.
+        def self.get_private_key
+          if ActiveMerchant::Billing::Base.integration_mode == :production
+            private_key = self.private_key
+          else
+            private_key = self.test_private_key
+          end
+          OpenSSL::PKey::RSA.new(private_key.gsub(/  /, ''))
+        end
+        mattr_accessor :test_url
+        mattr_accessor :production_url
+        def self.service_url
+          mode = ActiveMerchant::Billing::Base.integration_mode
+          case mode
+          when :production
+            self.production_url
+          when :test
+            self.test_url
+          else
+            raise StandardError, "Integration mode set to an invalid value: #{mode}"
+          end
+        end
+        def self.notification(post)
+          Notification.new(post)
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/dnb_nord_ltu/common.rb ADDED

@@ -0,0 +1,11 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module DnbNordLtu #:nodoc:
+        module Common
+          include Banklink::Common
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/dnb_nord_ltu/helper.rb ADDED

@@ -0,0 +1,24 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module DnbNordLtu #:nodoc:
+        class Helper < ActiveMerchant::Billing::Integrations::Helper #:nodoc:
+          include DnbNordLtu::Common
+          include Banklink::Helper
+          def default_service_msg_number
+            2001
+          end
+          def vk_charset
+            'ISO-8859-13'
+          end
+          def add_charset_field
+            # skip
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/dnb_nord_ltu/notification.rb ADDED

@@ -0,0 +1,12 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module DnbNordLtu #:nodoc:
+        class Notification < ActiveMerchant::Billing::Integrations::Notification #:nodoc:
+          include DnbNordLtu::Common
+          include Banklink::Notification
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/seb_ltu.rb ADDED

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/seb_ltu/common.rb'
+require File.dirname(__FILE__) + '/seb_ltu/helper.rb'
+require File.dirname(__FILE__) + '/seb_ltu/notification.rb'
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module SebLtu
+        # Raw X509 certificate of the bank, string format.
+        mattr_accessor :bank_certificate
+        mattr_accessor :test_bank_certificate
+        # RSA public key of the bank, taken from the X509 certificate of the bank. OpenSSL container.
+        def self.get_bank_public_key
+          if ActiveMerchant::Billing::Base.integration_mode == :production
+            cert = self.bank_certificate
+          else
+            cert = self.test_bank_certificate
+          end
+          OpenSSL::X509::Certificate.new(cert.gsub(/  /, '')).public_key
+        end
+        mattr_accessor :private_key
+        mattr_accessor :test_private_key
+        # Our RSA private key. OpenSSL container.
+        def self.get_private_key
+          if ActiveMerchant::Billing::Base.integration_mode == :production
+            private_key = self.private_key
+          else
+            private_key = self.test_private_key
+          end
+          OpenSSL::PKey::RSA.new(private_key.gsub(/  /, ''))
+        end
+        mattr_accessor :test_url
+        mattr_accessor :production_url
+        def self.service_url
+          mode = ActiveMerchant::Billing::Base.integration_mode
+          case mode
+          when :production
+            self.production_url
+          when :test
+            self.test_url
+          else
+            raise StandardError, "Integration mode set to an invalid value: #{mode}"
+          end
+        end
+        def self.notification(post)
+          Notification.new(post)
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/seb_ltu/common.rb ADDED

@@ -0,0 +1,65 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module SebLtu #:nodoc:
+        module Common
+          include Banklink::Common
+          def required_service_params
+            {
+              1001 => [
+                'VK_SERVICE',
+                'VK_VERSION',
+                'VK_SND_ID',
+                'VK_STAMP',
+                'VK_AMOUNT',
+                'VK_CURR',
+                'VK_ACC',
+                'VK_NAME',
+                'VK_REF',
+                'VK_MSG'],
+              1101 => [
+                'VK_SERVICE',
+                'VK_VERSION',
+                'VK_SND_ID',
+                'VK_REC_ID',
+                'VK_STAMP',
+                'VK_T_NO',
+                'VK_AMOUNT',
+                'VK_CURR',
+                'VK_REC_ACC',
+                'VK_REC_NAME',
+                'VK_SND_ACC',
+                'VK_SND_NAME',
+                'VK_REF',
+                'VK_MSG',
+                'VK_T_DATE'],
+              1201 => [
+                'VK_SERVICE',
+                'VK_VERSION',
+                'VK_SND_ID',
+                'VK_REC_ID',
+                'VK_STAMP',
+                'VK_AMOUNT',
+                'VK_CURR',
+                'VK_ACC',
+                'VK_REC_NAME',
+                'VK_SND_ACC',
+                'VK_SND_NAME',
+                'VK_REF',
+                'VK_MSG'],
+              1901 => [
+                'VK_SERVICE',
+                'VK_VERSION',
+                'VK_SND_ID',
+                'VK_REC_ID',
+                'VK_STAMP',
+                'VK_REF',
+                'VK_MSG']
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/seb_ltu/helper.rb ADDED

@@ -0,0 +1,25 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module SebLtu #:nodoc:
+        class Helper < ActiveMerchant::Billing::Integrations::Helper #:nodoc:
+          include SebLtu::Common
+          include Banklink::Helper
+          def default_service_msg_number
+            1001
+          end
+          def vk_charset
+            'ISO-8859-13'
+          end
+          def add_charset_field
+            # skip
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/seb_ltu/notification.rb ADDED

@@ -0,0 +1,12 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module SebLtu #:nodoc:
+        class Notification < ActiveMerchant::Billing::Integrations::Notification #:nodoc:
+          include SebLtu::Common
+          include Banklink::Notification
+        end
+      end
+    end
+  end
+end

data/lib/activemerchant_banklink.rb CHANGED

@@ -4,3 +4,5 @@ require 'active_merchant/billing/integrations/swedbank_est'
 require 'active_merchant/billing/integrations/seb_est'
 require 'active_merchant/billing/integrations/sampo_est'
 require 'active_merchant/billing/integrations/swedbank_ltu'
+require 'active_merchant/billing/integrations/seb_ltu'
+require 'active_merchant/billing/integrations/dnb_nord_ltu'

data/lib/activemerchant_banklink/version.rb CHANGED

@@ -1,4 +1,4 @@
 module ActivemerchantBanklink
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant_banklink
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease:
 platform: ruby
 authors:
@@ -10,8 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-03-04 00:00:00.000000000 +13:00
-default_executable:
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies: []
 description: Adds Banklink support to ActiveMerchant library. Banklink is provided
   by major banks in the Baltic states.
@@ -31,12 +30,20 @@ files:
 - lib/active_merchant/billing/integrations/banklink.rb
 - lib/active_merchant/billing/integrations/banklink/helper.rb
 - lib/active_merchant/billing/integrations/banklink/notification.rb
+- lib/active_merchant/billing/integrations/dnb_nord_ltu.rb
+- lib/active_merchant/billing/integrations/dnb_nord_ltu/common.rb
+- lib/active_merchant/billing/integrations/dnb_nord_ltu/helper.rb
+- lib/active_merchant/billing/integrations/dnb_nord_ltu/notification.rb
 - lib/active_merchant/billing/integrations/sampo_est.rb
 - lib/active_merchant/billing/integrations/sampo_est/helper.rb
 - lib/active_merchant/billing/integrations/sampo_est/notification.rb
 - lib/active_merchant/billing/integrations/seb_est.rb
 - lib/active_merchant/billing/integrations/seb_est/helper.rb
 - lib/active_merchant/billing/integrations/seb_est/notification.rb
+- lib/active_merchant/billing/integrations/seb_ltu.rb
+- lib/active_merchant/billing/integrations/seb_ltu/common.rb
+- lib/active_merchant/billing/integrations/seb_ltu/helper.rb
+- lib/active_merchant/billing/integrations/seb_ltu/notification.rb
 - lib/active_merchant/billing/integrations/swedbank_est.rb
 - lib/active_merchant/billing/integrations/swedbank_est/helper.rb
 - lib/active_merchant/billing/integrations/swedbank_est/notification.rb
@@ -50,7 +57,6 @@ files:
 - test/unit/integrations/sampo_est_module_test.rb
 - test/unit/integrations/seb_est_module_test.rb
 - test/unit/integrations/swedbank_est_module_test.rb
-has_rdoc: true
 homepage: http://github.com/laurynas/activemerchant_banklink
 licenses: []
 post_install_message:
@@ -71,8 +77,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activemerchant_banklink
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: ActiveMerchant Banklink add-on (alpha version)
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/unit/integrations/notifications/seb_est_notification_test.rb
+- test/unit/integrations/sampo_est_module_test.rb
+- test/unit/integrations/seb_est_module_test.rb
+- test/unit/integrations/swedbank_est_module_test.rb