activemerchant_banklink 0.0.1 → 0.0.2

data/.gitignore

@@ -1,3 +1,7 @@
 pkg/*
+doc
 *.gem
 .bundle
+.loadpath
+.project
+

data/README.rdoc

@@ -1,30 +1,33 @@
 = Active Merchant Banklink
 
-WARNING: this is an early release. THINGS WILL CHANGE.
-
 This library adds Banklink payment integration support to {ActiveMerchant}[http://activemerchant.org].
 
 Gem is originally based on ActiveMerchant {fork}[https://github.com/indrekj/active_merchant] by Indrek Juhkam.
 
+== Supported banks
+
+ Swedbank (Estonia, Lithuania)
+ SEB (Estonia)
+
 == Installation
 
 === From Ruby Gems
 
 Installation from RubyGems
 
-  > gem install activemerchant_banklink
+  gem install activemerchant_banklink
 
 === From Git
 
 You can check out the latest source from git:
 
-  > git pull git://github.com/laurynas/activemerchant_banklink.git
+  git clone git://github.com/laurynas/activemerchant_banklink.git
 
 == Testing
 
 You can run the tests from this gem with (inside the activemerchant_banklink directory):
 
-  > rake test
+  rake test
 
 == Maintainer
 

data/lib/active_merchant/billing/integrations/{pizza → banklink}/helper.rb

@@ -1,7 +1,7 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
-      module Pizza #:nodoc:
+      module Banklink #:nodoc:
         module Helper #:nodoc:
 
           def self.included(base)
@@ -25,7 +25,7 @@ module ActiveMerchant #:nodoc:
           def initialize(order, account, options = {})
             old_valid_keys = [:amount, :currency, :test]
             new_valid_keys = [:description, :reference]
-            valid_keys = (old_valid_keys + new_valid_keys + Pizza.required_service_params.values << :service_msg_number).uniq
+            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
@@ -73,7 +73,7 @@ module ActiveMerchant #:nodoc:
           end
 
           def add_required_params
-            required_params = Pizza.required_service_params[@service_msg_number]
+            required_params = Banklink.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/{pizza → banklink}/notification.rb

@@ -1,15 +1,15 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
-      module Pizza
+      module Banklink
         module Notification
 
           # A helper method to parse the raw post of the request & return
           # the right Notification subclass based on the sender id.
-          def self.get_notification(http_raw_data)
-            params = ActiveMerchant::Billing::Integrations::Notification.new(http_raw_data).params
-            Pizza.get_class(params['VK_SND_ID'])::Notification.new(params)
-          end
+          #def self.get_notification(http_raw_data)
+          #  params = ActiveMerchant::Billing::Integrations::Notification.new(http_raw_data).params
+          #  Banklink.get_class(params)::Notification.new(http_raw_data)
+          #end
 
           def bank_signature_valid?(bank_signature, service_msg_number, sigparams)
             self.class.parent.get_bank_public_key.verify(OpenSSL::Digest::SHA1.new, bank_signature, generate_data_string(service_msg_number, sigparams))
@@ -18,6 +18,14 @@ module ActiveMerchant #:nodoc:
           def complete?
             params['VK_SERVICE'] == '1101'
           end
+          
+          def wait?
+            params['VK_SERVICE'] == '1201'
+          end
+          
+          def failed?
+            params['VK_SERVICE'] == '1901'
+          end
 
           def currency
             params['VK_CURR']
@@ -90,10 +98,10 @@ module ActiveMerchant #:nodoc:
           private
           # Take the posted data and move the relevant data into a hash
           # No parsing since we're already expecting a hash.
-          def parse(params)
-            raise(ArgumentError, 'Need a hash') unless params.is_a?(Hash)
-            @params = params
-          end
+          #def parse(params)
+          #  raise(ArgumentError, 'Need a hash') unless params.is_a?(Hash)
+          #  @params = params
+          #end
         end
       end
     end

data/lib/active_merchant/billing/integrations/{pizza.rb → banklink.rb}

@@ -1,19 +1,31 @@
-require 'active_merchant/billing/integrations/pizza/helper.rb'
-require 'active_merchant/billing/integrations/pizza/notification.rb'
+require 'active_merchant/billing/integrations/banklink/helper.rb'
+require 'active_merchant/billing/integrations/banklink/notification.rb'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
-      module Pizza
+      module Banklink
 
-        # Define sender id (VK_SND_ID) to bank module mappings.
-        def self.get_class(vk_snd_id)
-          case vk_snd_id
-            when 'EYP' then SebEst
-            when 'SAMPOPANK' then SampoEst
-            when 'HP' then SwedbankEst
-            else raise(ArgumentError, "unknown sender id: #{vk_snd_id}")
-          end
-        end
+        # Detect bank module from params
+        #def self.get_class(params)
+        #  case params['VK_SND_ID']
+        #    when 'EYP' then SebEst
+        #    when 'SAMPOPANK' then SampoEst
+        #    when 'HP' then SwedbankEst
+
+			      # Swedbank uses same sender id for different countries, currently can't detect Lithuanian
+            # use:
+            #   notify = SwedbankLtu::Notification.new(params)
+            #when 'HP' then SwedbankLtu
+            
+      			#when '70440' then SebLtu
+            #when 'SMPOLT22' then DanskeLtu
+            #when 'SNORLT22' then SnorasLtu
+            #when '112029720' then DnbnordLtu
+            #when '70100' then UbLtu            
+			
+        #    else raise(ArgumentError, "unknown sender id: #{params['VK_SND_ID']}")
+        #  end
+        #end
 
         # Define required fields for each service message.
         # We need to know this in order to calculate VK_MAC
@@ -57,6 +69,20 @@ module ActiveMerchant #:nodoc:
             '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',
@@ -94,7 +120,7 @@ module ActiveMerchant #:nodoc:
           # '003val1003val2006value3'
           def generate_data_string(service_msg_number, sigparams)
             str = ''
-            Pizza.required_service_params[Integer(service_msg_number)].each do |param|
+            Banklink.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/sampo_est/helper.rb

@@ -3,8 +3,8 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module SampoEst #:nodoc:
         class Helper < ActiveMerchant::Billing::Integrations::Helper #:nodoc:
-          include Pizza::Common
-          include Pizza::Helper
+          include Banklink::Common
+          include Banklink::Helper
 
           def vk_charset
             'ISO-8859-4'

data/lib/active_merchant/billing/integrations/sampo_est/notification.rb

@@ -3,8 +3,8 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module SampoEst #:nodoc:
         class Notification < ActiveMerchant::Billing::Integrations::Notification #:nodoc:
-          include Pizza::Common
-          include Pizza::Notification
+          include Banklink::Common
+          include Banklink::Notification
         end
       end
     end

data/lib/active_merchant/billing/integrations/sampo_est.rb

@@ -38,7 +38,7 @@ module ActiveMerchant #:nodoc:
       #
       #     def notify
       #       # Notification class is automatically fetched based on the request parameters.
-      #       notify = Pizza::Notification.get_notification(params)
+      #       notify = Banklink::Notification.get_notification(params)
       #
       #       if notify.acknowledge
       #         ... process order ... if notify.complete?

data/lib/active_merchant/billing/integrations/seb_est/helper.rb

@@ -3,8 +3,8 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module SebEst #:nodoc:
         class Helper < ActiveMerchant::Billing::Integrations::Helper #:nodoc:
-          include Pizza::Common
-          include Pizza::Helper
+          include Banklink::Common
+          include Banklink::Helper
 
           def vk_charset
             'UTF-8'

data/lib/active_merchant/billing/integrations/seb_est/notification.rb

@@ -3,8 +3,8 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module SebEst #:nodoc:
         class Notification < ActiveMerchant::Billing::Integrations::Notification #:nodoc:
-          include Pizza::Common
-          include Pizza::Notification
+          include Banklink::Common
+          include Banklink::Notification
         end
       end
     end

data/lib/active_merchant/billing/integrations/seb_est.rb

@@ -38,7 +38,7 @@ module ActiveMerchant #:nodoc:
       #
       #     def notify
       #       # Notification class is automatically fetched based on the request parameters.
-      #       notify = Pizza::Notification.get_notification(params)
+      #       notify = Banklink::Notification.get_notification(params)
       #
       #       if notify.acknowledge
       #         ... process order ... if notify.complete?

data/lib/active_merchant/billing/integrations/swedbank_est/helper.rb

@@ -3,8 +3,8 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module SwedbankEst #:nodoc:
         class Helper < ActiveMerchant::Billing::Integrations::Helper #:nodoc:
-          include Pizza::Common
-          include Pizza::Helper
+          include Banklink::Common
+          include Banklink::Helper
 
           def vk_charset
             'ISO-8859-1'

data/lib/active_merchant/billing/integrations/swedbank_est/notification.rb

@@ -3,8 +3,8 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module SwedbankEst #:nodoc:
         class Notification < ActiveMerchant::Billing::Integrations::Notification #:nodoc:
-          include Pizza::Common
-          include Pizza::Notification
+          include Banklink::Common
+          include Banklink::Notification
         end
       end
     end

data/lib/active_merchant/billing/integrations/swedbank_est.rb

@@ -38,7 +38,7 @@ module ActiveMerchant #:nodoc:
       #
       #     def notify
       #       # Notification class is automatically fetched based on the request parameters.
-      #       notify = Pizza::Notification.get_notification(params)
+      #       notify = Banklink::Notification.get_notification(params)
       #
       #       if notify.acknowledge
       #         ... process order ... if notify.complete?

data/lib/active_merchant/billing/integrations/swedbank_ltu/helper.rb

@@ -0,0 +1,20 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module SwedbankLtu #:nodoc:
+        class Helper < ActiveMerchant::Billing::Integrations::Helper #:nodoc:
+          include Banklink::Common
+          include Banklink::Helper
+
+          def vk_charset
+            'ISO-8859-1'
+          end
+
+          def vk_charset_param
+            'VK_ENCODING'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/swedbank_ltu/notification.rb

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

data/lib/active_merchant/billing/integrations/swedbank_ltu.rb

@@ -0,0 +1,99 @@
+require File.dirname(__FILE__) + '/swedbank_ltu/helper.rb'
+require File.dirname(__FILE__) + '/swedbank_ltu/notification.rb'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+
+      # This module implements bank payments through
+      # Swedbank using their bank link service
+      # (http://www.swedbank.lt/lt/pages/verslo/banklink).
+      #
+      # Configuration:
+      # ActiveMerchant::Billing::Integrations::SwedbankLtu.bank_certificate = File.read('cert')
+      # ActiveMerchant::Billing::Integrations::SwedbankLtu.test_bank_certificate = File.read('cert')
+      # ActiveMerchant::Billing::Integrations::SwedbankLtu.private_key = File.read('keyfile')
+      # ActiveMerchant::Billing::Integrations::SwedbankLtu.test_private_key = File.read('keyfile')
+      # ActiveMerchant::Billing::Integrations::SwedbankLtu.production_url = 'https://production-gateway.tld/gw/'
+      #
+      #
+      # The syntax of the helper is as follows:
+      #   <% payment_service_for order_id, account_id,
+      #     :amount => 50.00,
+      #     :service => :swedbank_ltu do |service| %>
+      #
+      #     <% service.notify_url url_for(:action => 'notify', :only_path => false) %>
+      #     <% service.cancel_return_url 'http://mystore.com' %>
+      #   <% end %>
+      #
+      # The order_id parameter is a random id referencing the transaction (VK_STAMP)
+      # The account_id parameter is a id given to you from the bank (VK_SND_ID)
+      # The notify_url is the URL that the bank will send its responses.
+      #
+      # You can handle the notification in
+      # your controller action as follows:
+      #
+      #   class NotificationController < ApplicationController
+      #     include ActiveMerchant::Billing::Integrations
+      #
+      #     def notify
+      #       # Notification class is automatically fetched based on the request parameters.
+      #       notify = Banklink::Notification.get_notification(params)
+      #
+      #       if notify.acknowledge
+      #         ... process order ... if notify.complete?
+      #       else
+      #         ... log possible hacking attempt ...
+      #       end
+      #     end
+      #   end
+
+      module SwedbankLtu
+
+        # 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/activemerchant_banklink/version.rb

@@ -1,3 +1,3 @@
 module ActivemerchantBanklink
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/activemerchant_banklink.rb

@@ -1,5 +1,6 @@
 require 'active_merchant'
-require 'active_merchant/billing/integrations/pizza'
+require 'active_merchant/billing/integrations/banklink'
 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'

data/test/unit/integrations/notifications/seb_est_notification_test.rb

@@ -47,13 +47,14 @@ class SebEstNotificationTest < Test::Unit::TestCase
   include ActiveMerchant::Billing::Integrations
 
   def setup
-    @seb_est = Pizza::Notification.get_notification(http_raw_data)
+    #@seb_est = Banklink::Notification.get_notification(http_raw_data)
+    @seb_est = SebEst::Notification.new(http_raw_data)
   end
 
-  def test_get_notification_class_from_pizza
-    notify_class = Pizza::Notification.get_notification(http_raw_data)
-    assert notify_class.is_a?(ActiveMerchant::Billing::Integrations::SebEst::Notification)
-  end
+  #def test_get_notification_class_from_banklink
+  #  notify_class = Banklink::Notification.get_notification(http_raw_data)
+  #  assert notify_class.is_a?(ActiveMerchant::Billing::Integrations::SebEst::Notification)
+  #end
 
   def test_accessors
     assert_equal true, @seb_est.complete?
@@ -75,7 +76,8 @@ class SebEstNotificationTest < Test::Unit::TestCase
   end
 
   def test_acknowledgement_fail_with_params_changed
-    @seb_est_wrong = Pizza::Notification.get_notification(http_raw_data.gsub('VK_AMOUNT=33', 'VK_AMOUNT=100'))
+    #@seb_est_wrong = Banklink::Notification.get_notification(http_raw_data.gsub('VK_AMOUNT=33', 'VK_AMOUNT=100'))
+    @seb_est_wrong = SebEst::Notification.new(http_raw_data.gsub('VK_AMOUNT=33', 'VK_AMOUNT=100'))
     assert_equal false, @seb_est_wrong.acknowledge
   end
 

data/test/unit/integrations/sampo_est_module_test.rb

@@ -4,6 +4,7 @@ class SampoEstModuleTest < Test::Unit::TestCase
   include ActiveMerchant::Billing::Integrations
 
   def test_notification_method
-    assert_instance_of SampoEst::Notification, SampoEst.notification({'name' => 'cody'})
+#    assert_instance_of SampoEst::Notification, SampoEst.notification({'name' => 'cody'})
+    assert_instance_of SampoEst::Notification, SampoEst.notification('name=cody')
   end
 end

data/test/unit/integrations/seb_est_module_test.rb

@@ -4,6 +4,7 @@ class SebEstModuleTest < Test::Unit::TestCase
   include ActiveMerchant::Billing::Integrations
 
   def test_notification_method
-    assert_instance_of SebEst::Notification, SebEst.notification({'name' => 'cody'})
+    #assert_instance_of SebEst::Notification, SebEst.notification({'name' => 'cody'})
+    assert_instance_of SebEst::Notification, SebEst.notification('name=cody')
   end
 end

data/test/unit/integrations/swedbank_est_module_test.rb

@@ -4,6 +4,7 @@ class SwedbankEstModuleTest < Test::Unit::TestCase
   include ActiveMerchant::Billing::Integrations
 
   def test_notification_method
-    assert_instance_of SwedbankEst::Notification, SwedbankEst.notification({'name' => 'cody'})
+    #assert_instance_of SwedbankEst::Notification, SwedbankEst.notification({'name' => 'cody'})
+    assert_instance_of SwedbankEst::Notification, SwedbankEst.notification('name=cody')
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant_banklink
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Indrek Juhkam
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 +02:00
+date: 2011-02-04 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -37,9 +37,9 @@ files:
 - Rakefile
 - activemerchant_banklink.gemspec
 - init.rb
-- lib/active_merchant/billing/integrations/pizza.rb
-- lib/active_merchant/billing/integrations/pizza/helper.rb
-- lib/active_merchant/billing/integrations/pizza/notification.rb
+- 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/sampo_est.rb
 - lib/active_merchant/billing/integrations/sampo_est/helper.rb
 - lib/active_merchant/billing/integrations/sampo_est/notification.rb
@@ -49,6 +49,9 @@ files:
 - 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
+- lib/active_merchant/billing/integrations/swedbank_ltu.rb
+- lib/active_merchant/billing/integrations/swedbank_ltu/helper.rb
+- lib/active_merchant/billing/integrations/swedbank_ltu/notification.rb
 - lib/activemerchant_banklink.rb
 - lib/activemerchant_banklink/version.rb
 - test/test_helper.rb