banklink_lv 0.0.2 → 0.0.3

data/lib/banklink_lv/banklink.rb

@@ -1,135 +1,135 @@
-module Banklink
-
-  # 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
-  # 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
-  # be calculated for string that consists of all field lengths and contents in the query. Also
-  # empty fields are used in calculation – lenght “000”. Unnumbered (optional) fields are
-  # not used in calculation.
-  # MAC(x1,x2,...,xn) := RSA( SHA-1(p(x1 )|| x1|| p(x2 )|| x2 || ... ||p( xn )||xn),d,n)
-  # where:
-  # || is string concatenation mark
-  # x1, x2, ..., xn are parameters of the query
-  # p(x) is length of the field x represented by three digits
-  # d is RSA secret exponent
-  # n is RSA modulus
-  module Common
-    # p(x) is length of the field x represented by three digits
-    def func_p(val)
-      sprintf("%03i", val.length_utf8)
-    end
-    
-    # Generate a string to be signed out of service message parameters.
-    # p(x1 )|| x1|| p(x2 )|| x2 || ... ||p( xn )||xn
-    # || is string concatenation mark
-    # p(x) is length of the field x represented by three digits
-    # Parameters val1, val2, value3 would be turned into:
-    # '003val1003val2006value3'
-    def generate_data_string(service_msg_number, sigparams)
-      str = ''
-      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
-      str
-    end
-    
-    def generate_signature(service_msg_number, sigparams)
-      # privkey = self.class.parent.get_private_key
-      privkey = SwedbankLv.get_private_key
-      privkey.sign(OpenSSL::Digest::SHA1.new, generate_data_string(service_msg_number, sigparams))
-    end
-    
-    def generate_mac(service_msg_number, sigparams)
-      Base64.encode64(generate_signature(service_msg_number, sigparams)).gsub(/\n/,'')
-    end
-  end
+module Banklink
+
+  # 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
+  # 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
+  # be calculated for string that consists of all field lengths and contents in the query. Also
+  # empty fields are used in calculation – lenght “000”. Unnumbered (optional) fields are
+  # not used in calculation.
+  # MAC(x1,x2,...,xn) := RSA( SHA-1(p(x1 )|| x1|| p(x2 )|| x2 || ... ||p( xn )||xn),d,n)
+  # where:
+  # || is string concatenation mark
+  # x1, x2, ..., xn are parameters of the query
+  # p(x) is length of the field x represented by three digits
+  # d is RSA secret exponent
+  # n is RSA modulus
+  module Common
+    # p(x) is length of the field x represented by three digits
+    def func_p(val)
+      sprintf("%03i", val.length)
+    end
+    
+    # Generate a string to be signed out of service message parameters.
+    # p(x1 )|| x1|| p(x2 )|| x2 || ... ||p( xn )||xn
+    # || is string concatenation mark
+    # p(x) is length of the field x represented by three digits
+    # Parameters val1, val2, value3 would be turned into:
+    # '003val1003val2006value3'
+    def generate_data_string(service_msg_number, sigparams)
+      str = ''
+      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
+      str
+    end
+    
+    def generate_signature(service_msg_number, sigparams)
+      # privkey = self.class.parent.get_private_key
+      privkey = SwedbankLv.get_private_key
+      privkey.sign(OpenSSL::Digest::SHA1.new, generate_data_string(service_msg_number, sigparams))
+    end
+    
+    def generate_mac(service_msg_number, sigparams)
+      Base64.encode64(generate_signature(service_msg_number, sigparams)).gsub(/\n/,'')
+    end
+  end
 end

data/lib/banklink_lv/base.rb

@@ -1,9 +1,9 @@
-class Hash
-  def to_params
-    map{ |k, v| URI.escape("#{k}=#{v}") }.join("&")
-  end
-end
-
-module BanklinkLv
-  
+class Hash
+  def to_params
+    map{ |k, v| URI.escape("#{k}=#{v}") }.join("&")
+  end
+end
+
+module BanklinkLv
+  
 end

data/lib/banklink_lv/helper.rb

@@ -1,111 +1,113 @@
-module Banklink #:nodoc:
- class Helper
-    attr_reader :fields
-    include Banklink::Common
-   
-    def initialize(order, account, options = {})
-    
-      @options = options
-      @fields = {}
-      
-      @options['VK_SND_ID'] = account
-      @options['VK_STAMP'] = order
-      @options['VK_AMOUNT'] = options[:amount]
-      @options['VK_CURR'] = options[:currency]
-      @options['VK_RETURN'] = options[:return]
-      @options['VK_REF'] = options[:reference]
-      @options['VK_MSG'] = options[:message]
-      
-      if options[:service_msg_number]
-        @service_msg_number = options.delete(:service_msg_number)
-      else
-        @service_msg_number = default_service_msg_number
-      end
-
-      add_required_params
-      add_vk_mac
-      add_charset_field
-      add_return_url_field
-      add_lang_field
-    end
-    
-    
-    def form_fields
-      @fields
-    end
-    
-    def self.mapping(attribute, options = {})
-      self.mappings ||= {}
-      self.mappings[attribute] = options
-    end
-
-    def add_field(name, value)
-      return if name.blank? || value.blank?
-      @fields[name.to_s] = value.to_s
-    end
-
-    def add_vk_mac
-      # Signature used to validate previous parameters
-      add_field('VK_MAC', generate_mac(@service_msg_number, form_fields))
-    end
-    
-    def add_return_url_field
-      add_field('VK_RETURN', @options['VK_RETURN'])
-    end
-    
-    def add_lang_field
-      add_field vk_lang_param, vk_lang
-    end
-
-    def add_charset_field
-      add_field vk_charset_param, vk_charset
-    end
- 
-    def add_required_params
-      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)
-      end
-    end
-
-    # Default parameters
-    def vk_charset
-      'UTF-8'
-    end
-
-    def vk_charset_param
-      'VK_ENCODING'
-    end
-    
-    # Default parameters
-    def vk_lang
-      'LAT'
-    end
-
-    def vk_lang_param
-      'VK_LANG'
-    end
-
-    def vk_service
-      @service_msg_number
-    end
-
-    def vk_version
-      '008'
-    end
-
-    # Default service message number.
-    # Use '1002' because it requires the least amount of parameters.
-    def default_service_msg_number
-      1002
-    end
-
-    private
-    # Iconv converter to convert from utf8 to
-    # the charset the bank api expects.
-    def iconv
-      @iconv ||= Iconv.new(vk_charset, 'UTF-8')
-    end
-  end
+module Banklink #:nodoc:
+ class Helper
+    attr_reader :fields
+    include Banklink::Common
+   
+    def initialize(order, account, options = {})
+    
+      @options = options
+      @fields = {}
+      
+      @options['VK_SND_ID'] = account
+      @options['VK_STAMP'] = order
+      @options['VK_AMOUNT'] = options[:amount]
+      @options['VK_CURR'] = options[:currency]
+      @options['VK_RETURN'] = options[:return]
+      @options['VK_REF'] = options[:reference]
+      @options['VK_MSG'] = options[:message]
+      
+      if options[:service_msg_number]
+        @service_msg_number = options.delete(:service_msg_number)
+      else
+        @service_msg_number = default_service_msg_number
+      end
+
+      add_required_params
+      add_vk_mac
+      add_charset_field
+      add_return_url_field
+      add_lang_field
+    end
+    
+    
+    def form_fields
+      @fields
+    end
+    
+    def self.mapping(attribute, options = {})
+      self.mappings ||= {}
+      self.mappings[attribute] = options
+    end
+
+    def add_field(name, value)
+      return if name.blank? || value.blank?
+      @fields[name.to_s] = value.to_s
+    end
+
+    def add_vk_mac
+      # Signature used to validate previous parameters
+      add_field('VK_MAC', generate_mac(@service_msg_number, form_fields))
+    end
+    
+    def add_return_url_field
+      add_field('VK_RETURN', @options['VK_RETURN'])
+    end
+    
+    def add_lang_field
+      add_field vk_lang_param, vk_lang
+    end
+
+    def add_charset_field
+      add_field vk_charset_param, vk_charset
+    end
+ 
+    def add_required_params
+      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, encode_to_utf8(param_value)
+      end
+    end
+
+    # Default parameters
+    def vk_charset
+      'UTF-8'
+    end
+
+    def vk_charset_param
+      'VK_ENCODING'
+    end
+    
+    # Default parameters
+    def vk_lang
+      'LAT'
+    end
+
+    def vk_lang_param
+      'VK_LANG'
+    end
+
+    def vk_service
+      @service_msg_number
+    end
+
+    def vk_version
+      '008'
+    end
+
+    # Default service message number.
+    # Use '1002' because it requires the least amount of parameters.
+    def default_service_msg_number
+      1002
+    end
+
+    private
+    # Iconv converter to convert from utf8 to
+    # the charset the bank api expects.
+    
+    def encode_to_utf8 string
+      string.encode('UTF-8', :invalid => :replace, :replace => '').encode('UTF-8')
+    end
+    
+  end
 end