banklink_lv 0.0.2 → 0.0.3

data/lib/banklink_lv/notification.rb

@@ -1,167 +1,167 @@
-module Banklink
-  
-  class Notification
-    include Banklink::Common
-    attr_accessor :params
-    attr_accessor :raw
-    
-    # set this to an array in the subclass, to specify which IPs are allowed to send requests
-    class_inheritable_accessor :production_ips
-
-    def initialize(post, options = {})
-      @options = options
-      empty!
-      parse(post)
-    end
-
-    def gross_cents
-      (gross.to_f * 100.0).round
-    end
-
-    # This combines the gross and currency and returns a proper Money object. 
-    # this requires the money library located at http://dist.leetsoft.com/api/money
-    def amount
-      return gross_cents
-    end
-
-    # reset the notification. 
-    def empty!
-      @params  = Hash.new
-      @raw     = ""      
-    end
-    
-    # Check if the request comes from an official IP
-    def valid_sender?(ip)
-      return true if Rails.env == :test || production_ips.blank?
-      production_ips.include?(ip)
-    end
-    
-        # 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
-    #  Banklink.get_class(params)::Notification.new(http_raw_data)
-    #end
-    
-    def get_data_string
-      generate_data_string(params['VK_SERVICE'], params)
-    end
-  
-    def bank_signature_valid?(bank_signature, service_msg_number, sigparams)
-      SwedbankLv.get_bank_public_key.verify(OpenSSL::Digest::SHA1.new, bank_signature, generate_data_string(service_msg_number, sigparams))
-    end
-  
-    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']
-    end
-  
-    # The order id we passed to the form helper.
-    def item_id
-      params['VK_STAMP']
-    end
-  
-    def transaction_id
-      params['VK_T_NO']
-    end
-    
-    def sender_name
-      params['VK_SND_NAME']
-    end
-    
-    def sender_bank_account
-      params['VK_SND_ACC']
-    end
-    
-    def reciever_name
-      params['VK_REC_NAME']
-    end
-    
-    def reciever_bank_account
-      params['VK_REC_ACC']
-    end
-  
-    # When was this payment received by the client.
-    # We're expecting a dd.mm.yyyy format.
-    def received_at
-      date = params['VK_T_DATE']
-      return nil unless date
-      day, month, year = *date.split('.').map(&:to_i)
-      Date.civil(year, month, day)
-    end
-  
-    def signature
-      Base64.decode64(params['VK_MAC'])
-    end
-  
-    # The money amount we received, string.
-    def gross
-      params['VK_AMOUNT']
-    end
-  
-    # Was this a test transaction?
-    def test?
-      params['VK_REC_ID'] == 'testvpos'
-    end
-  
-    # TODO what should be here?
-    def status
-      complete? ? 'Completed' : 'Failed'
-    end
-  
-    # If our request was sent automatically by the bank (true) or manually
-    # by the user triggering the callback by pressing a "return" button (false).
-    def automatic?
-      params['VK_AUTO'].upcase == 'Y'
-    end
-  
-    def success?
-      acknowledge && complete?
-    end
-  
-    # We don't actually acknowledge the notification by making another request ourself,
-    # instead, we check the notification by checking the signature that came with the notification.
-    # This method has to be called when handling the notification & deciding whether to process the order.
-    # Example:
-    #
-    #   def notify
-    #     notify = Notification.new(params)
-    #
-    #     if notify.acknowledge
-    #       ... process order ... if notify.complete?
-    #     else
-    #       ... log possible hacking attempt ...
-    #     end
-    def acknowledge
-      bank_signature_valid?(signature, params['VK_SERVICE'], params)
-    end
-    
-    
-    private
-
-    # Take the posted data and move the relevant data into a hash
-    def parse(post)
-      @raw = post.to_s
-      puts "====== FROM BANK ======"
-      for line in @raw.split('&')    
-        key, value = *line.scan( %r{^([A-Za-z0-9_.]+)\=(.*)$} ).flatten
-        params[key] = CGI.unescape(value)
-        
-        puts "<#{key}> #{params[key]}"        
-      end
-      puts "======================="
-    end
-  end
-end
+module Banklink
+  
+  class Notification
+    include Banklink::Common
+    attr_accessor :params
+    attr_accessor :raw
+    
+    # set this to an array in the subclass, to specify which IPs are allowed to send requests
+    attr_accessor :production_ips
+
+    def initialize(post, options = {})
+      @options = options
+      empty!
+      parse(post)
+    end
+
+    def gross_cents
+      (gross.to_f * 100.0).round
+    end
+
+    # This combines the gross and currency and returns a proper Money object. 
+    # this requires the money library located at http://dist.leetsoft.com/api/money
+    def amount
+      return gross_cents
+    end
+
+    # reset the notification. 
+    def empty!
+      @params  = Hash.new
+      @raw     = ""      
+    end
+    
+    # Check if the request comes from an official IP
+    def valid_sender?(ip)
+      return true if Rails.env == :test || production_ips.blank?
+      production_ips.include?(ip)
+    end
+    
+        # 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
+    #  Banklink.get_class(params)::Notification.new(http_raw_data)
+    #end
+    
+    def get_data_string
+      generate_data_string(params['VK_SERVICE'], params)
+    end
+  
+    def bank_signature_valid?(bank_signature, service_msg_number, sigparams)
+      SwedbankLv.get_bank_public_key.verify(OpenSSL::Digest::SHA1.new, bank_signature, generate_data_string(service_msg_number, sigparams))
+    end
+  
+    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']
+    end
+  
+    # The order id we passed to the form helper.
+    def item_id
+      params['VK_STAMP']
+    end
+  
+    def transaction_id
+      params['VK_T_NO']
+    end
+    
+    def sender_name
+      params['VK_SND_NAME']
+    end
+    
+    def sender_bank_account
+      params['VK_SND_ACC']
+    end
+    
+    def reciever_name
+      params['VK_REC_NAME']
+    end
+    
+    def reciever_bank_account
+      params['VK_REC_ACC']
+    end
+  
+    # When was this payment received by the client.
+    # We're expecting a dd.mm.yyyy format.
+    def received_at
+      date = params['VK_T_DATE']
+      return nil unless date
+      day, month, year = *date.split('.').map(&:to_i)
+      Date.civil(year, month, day)
+    end
+  
+    def signature
+      Base64.decode64(params['VK_MAC'])
+    end
+  
+    # The money amount we received, string.
+    def gross
+      params['VK_AMOUNT']
+    end
+  
+    # Was this a test transaction?
+    def test?
+      params['VK_REC_ID'] == 'testvpos'
+    end
+  
+    # TODO what should be here?
+    def status
+      complete? ? 'Completed' : 'Failed'
+    end
+  
+    # If our request was sent automatically by the bank (true) or manually
+    # by the user triggering the callback by pressing a "return" button (false).
+    def automatic?
+      params['VK_AUTO'].upcase == 'Y'
+    end
+  
+    def success?
+      acknowledge && complete?
+    end
+  
+    # We don't actually acknowledge the notification by making another request ourself,
+    # instead, we check the notification by checking the signature that came with the notification.
+    # This method has to be called when handling the notification & deciding whether to process the order.
+    # Example:
+    #
+    #   def notify
+    #     notify = Notification.new(params)
+    #
+    #     if notify.acknowledge
+    #       ... process order ... if notify.complete?
+    #     else
+    #       ... log possible hacking attempt ...
+    #     end
+    def acknowledge
+      bank_signature_valid?(signature, params['VK_SERVICE'], params)
+    end
+    
+    
+    private
+
+    # Take the posted data and move the relevant data into a hash
+    def parse(post)
+      @raw = post.to_s
+      puts "====== FROM BANK ======"
+      for line in @raw.split('&')    
+        key, value = *line.scan( %r{^([A-Za-z0-9_.]+)\=(.*)$} ).flatten
+        params[key] = CGI.unescape(value)
+        
+        puts "<#{key}> #{params[key]}"        
+      end
+      puts "======================="
+    end
+  end
+end
   

data/lib/banklink_lv/swedbank.rb

@@ -1,49 +1,49 @@
-module SwedbankLv
-
-  # 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 Rails.env == '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 Rails.env == '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 = Rails.env
-    case mode
-    when 'production'
-      self.production_url
-    when 'test'
-      self.test_url
-    when 'development'
-      self.production_url
-    else
-      self.production_url
-      # raise StandardError, "Integration mode set to an invalid value: #{mode}"
-    end
-  end
-
-  def self.notification(post)
-    Notification.new(post)
-  end
-
+module SwedbankLv
+
+  # 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 Rails.env == '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 Rails.env == '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 = Rails.env
+    case mode
+    when 'production'
+      self.production_url
+    when 'test'
+      self.test_url
+    when 'development'
+      self.production_url
+    else
+      self.production_url
+      # raise StandardError, "Integration mode set to an invalid value: #{mode}"
+    end
+  end
+
+  def self.notification(post)
+    Notification.new(post)
+  end
+
 end

data/lib/banklink_lv/version.rb

@@ -1,3 +1,3 @@
-module BanklinkLv
-  VERSION = "0.0.2"
+module BanklinkLv
+  VERSION = "0.0.3"
 end

data/lib/banklink_lv.rb

@@ -1,31 +1,27 @@
 require 'banklink_lv/version'
 
-require 'active_support'
+require "rails"
+require "active_support/dependencies"
 
 require 'net/http'
 require 'net/https'
 require 'uri'
 
 require 'digest'
-require 'md5'
+require 'digest/md5'
 require 'openssl'
 
-require 'iconv'
 require 'cgi'
 
-require 'banklink_lv/core_ext'
 require 'banklink_lv/banklink'
 require 'banklink_lv/base'
 require 'banklink_lv/helper'
 require 'banklink_lv/swedbank'
 require 'banklink_lv/notification'
-require 'app/helpers/banklink_helper'
-
-#include ActiveSupport
 
 %w{ models controllers helpers }.each do |dir|
   path = File.join(File.dirname(__FILE__), 'app', dir)
   $LOAD_PATH << path
-  #ActiveSupport::Dependencies.load_paths << path
-  #ActiveSupport::Dependencies.load_once_paths.delete(path)
+  # ActiveSupport::Dependencies.load_paths << path
+  # ActiveSupport::Dependencies.load_once_paths.delete(path)
 end

data/test/banklink_common_test.rb

@@ -1,14 +1,16 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class BanklinkCommonTest < Test::Unit::TestCase
-  include Banklink::Common
-  
-  def test_should_decide_string_lenght
-    assert_equal "007", func_p("ĀĒŪĪĻĶŠ")
-  end
-  
-  def test_should_generate_data_string
-    assert_equal "003foo003bar003goo006tooboo00510565003LVL003dsa004test", generate_data_string(1002, PARAMS_1002)
-  end
-  
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/test_helper'
+
+class BanklinkCommonTest < Test::Unit::TestCase
+  include Banklink::Common
+  
+  def test_should_decide_string_lenght
+    assert_equal "007", func_p("ĀĒŪĪĻĶŠ")
+  end
+  
+  def test_should_generate_data_string
+    assert_equal "003foo003bar003goo006tooboo00510565003LVL003dsa005Āžēīū", generate_data_string(1002, PARAMS_1002)
+  end
+  
 end

data/test/banklink_helper_test.rb

@@ -1,21 +1,23 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class BanklinkHelperTest < Test::Unit::TestCase
-  include Banklink
-  
-  def test_should_create_fields_for_1002
-    options = {}
-    options[:amount] = '1.55'
-    options[:currency] = 'LVL'
-    options[:return] = 'http://default/'
-    options[:reference] = '54'
-    options[:message] = 'Pay for smtx'
-    
-    helper = Helper.new(300, '300', options)
-    helper.form_fields.each do |field, value|
-      puts "<#{field}> #{value}"
-    end
-    assert_equal 12, helper.form_fields.size
-  end
-  
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/test_helper'
+
+class BanklinkHelperTest < Test::Unit::TestCase
+  include Banklink
+  
+  def test_should_create_fields_for_1002
+    options = {}
+    options[:amount] = '1.55'
+    options[:currency] = 'LVL'
+    options[:return] = 'http://default/'
+    options[:reference] = '54'
+    options[:message] = 'Pay for smtx'
+    
+    helper = Helper.new(300, '300', options)
+    helper.form_fields.each do |field, value|
+      puts "<#{field}> #{value}"
+    end
+    assert_equal 12, helper.form_fields.size
+  end
+  
 end

data/test/banklink_notification_test.rb

@@ -1,41 +1,43 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class BanklinkNotificationTest < Test::Unit::TestCase
-  include Banklink
-
-  def setup
-    @swedbank = Banklink::Notification.new(http_raw_data)
-  end
-  
-  # TODO: fix test
-  def test_acknowledgement
-    assert_equal false, @swedbank.acknowledge
-  end
-
-  def test_accessors
-    assert_equal true, @swedbank.complete?
-    assert_equal 'Completed', @swedbank.status
-    assert_equal "88", @swedbank.item_id
-    assert_equal "2774", @swedbank.transaction_id
-    assert_equal '33', @swedbank.gross
-    assert_equal "EEK", @swedbank.currency
-    assert_equal '26.11.2007', @swedbank.received_at.strftime("%d.%m.%Y")
-    assert_equal true, @swedbank.test?
-  end
-
-  def test_compositions
-    assert_equal 3300, @swedbank.amount
-  end
-
-  def test_acknowledgement_fail_with_params_changed
-    @swedbank = Banklink::Notification.new(http_raw_data.gsub('VK_AMOUNT=33', 'VK_AMOUNT=100'))
-    assert_equal false, @swedbank.acknowledge
-  end
-
-  private
-
-  def http_raw_data
-    "VK_SERVICE=1101&VK_VERSION=008&VK_SND_ID=EYP&VK_REC_ID=testvpos&VK_STAMP=88&VK_T_NO=2774&VK_AMOUNT=33&VK_CURR=EEK&VK_REC_ACC=10002050618003&VK_REC_NAME=ALLAS+ALLAR&VK_SND_ACC=10010046155012&VK_SND_NAME=t%C3%B5%C3%B5ger+%2C+Le%C3%B5p%C3%A4%C3%B6ld%C5%BE%C5%BD%C5%A1%C5%A0&VK_REF=123&VK_MSG=Porgandid&VK_T_DATE=26.11.2007&VK_MAC=LyCZRncu%2F%2BOi5nwzOkI6C9UMFohN6tSl3tLFyIJyNp2lGKBrDKZ2H8b%2BadU3XalzS7MwnAj8r%2FRhLpbsGNE5ysNyM4CKkSrsVzxoXbt9%2BB1foH9Rlp9LCeoR2H774f8UcMe9RVsE%2B%2BZfrEZzzXYyR1PXDCVOShQOAxlD9pbh8nk%3D&VK_LANG=EST&VK_RETURN=http%3A%2F%2F90.190.110.154%2Fseb_est%2Fnotify&VK_AUTO=N&VK_CHARSET=UTF-8&keel=EST&appname=UN3MIN&act=UPOSTEST2"
-  end
-  
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/test_helper'
+
+class BanklinkNotificationTest < Test::Unit::TestCase
+  include Banklink
+
+  def setup
+    @swedbank = Banklink::Notification.new(http_raw_data)
+  end
+  
+  # TODO: fix test
+  def test_acknowledgement
+    assert_equal false, @swedbank.acknowledge
+  end
+
+  def test_accessors
+    assert_equal true, @swedbank.complete?
+    assert_equal 'Completed', @swedbank.status
+    assert_equal "88", @swedbank.item_id
+    assert_equal "2774", @swedbank.transaction_id
+    assert_equal '33', @swedbank.gross
+    assert_equal "EEK", @swedbank.currency
+    assert_equal '26.11.2007', @swedbank.received_at.strftime("%d.%m.%Y")
+    assert_equal true, @swedbank.test?
+  end
+
+  def test_compositions
+    assert_equal 3300, @swedbank.amount
+  end
+
+  def test_acknowledgement_fail_with_params_changed
+    @swedbank = Banklink::Notification.new(http_raw_data.gsub('VK_AMOUNT=33', 'VK_AMOUNT=100'))
+    assert_equal false, @swedbank.acknowledge
+  end
+
+  private
+
+  def http_raw_data
+    "VK_SERVICE=1101&VK_VERSION=008&VK_SND_ID=EYP&VK_REC_ID=testvpos&VK_STAMP=88&VK_T_NO=2774&VK_AMOUNT=33&VK_CURR=EEK&VK_REC_ACC=10002050618003&VK_REC_NAME=ALLAS+ALLAR&VK_SND_ACC=10010046155012&VK_SND_NAME=t%C3%B5%C3%B5ger+%2C+Le%C3%B5p%C3%A4%C3%B6ld%C5%BE%C5%BD%C5%A1%C5%A0&VK_REF=123&VK_MSG=Porgandid&VK_T_DATE=26.11.2007&VK_MAC=LyCZRncu%2F%2BOi5nwzOkI6C9UMFohN6tSl3tLFyIJyNp2lGKBrDKZ2H8b%2BadU3XalzS7MwnAj8r%2FRhLpbsGNE5ysNyM4CKkSrsVzxoXbt9%2BB1foH9Rlp9LCeoR2H774f8UcMe9RVsE%2B%2BZfrEZzzXYyR1PXDCVOShQOAxlD9pbh8nk%3D&VK_LANG=EST&VK_RETURN=http%3A%2F%2F90.190.110.154%2Fseb_est%2Fnotify&VK_AUTO=N&VK_CHARSET=UTF-8&keel=EST&appname=UN3MIN&act=UPOSTEST2"
+  end
+  
 end

data/test/database.yml

@@ -1,3 +1,3 @@
-sqlite:
-  :adapter: sqlite
+sqlite:
+  :adapter: sqlite
   :dbfile: vendor/plugins/banklink_lv/test/banklink_lv_plugin.sqlite.db

data/test/debug.log

@@ -1,6 +1,6 @@
-  SQL (0.0ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  SQL (0.0ms)  SELECT version FROM "schema_migrations"
-  SQL (80.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+  SQL (0.0ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.0ms)  SELECT version FROM "schema_migrations"
+  SQL (80.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')

data/test/schema.rb

@@ -1,2 +1,2 @@
-ActiveRecord::Schema.define(:version => 0) do
+ActiveRecord::Schema.define(:version => 0) do
 end