Skip to content

Commit

Permalink
Version bump to 0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Priit Haamer committed Oct 23, 2010
1 parent b44fc9e commit 4dde879
Show file tree
Hide file tree
Showing 27 changed files with 134 additions and 134 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.1
0.1.0
2 changes: 1 addition & 1 deletion init.rb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
require 'pizza'
require 'ipizza'
62 changes: 31 additions & 31 deletions ipizza.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,53 +23,53 @@ Gem::Specification.new do |s|
"VERSION",
"init.rb",
"ipizza.gemspec",
"lib/pizza.rb",
"lib/pizza/authentication_request.rb",
"lib/pizza/config.rb",
"lib/pizza/payment.rb",
"lib/pizza/payment_request.rb",
"lib/pizza/payment_response.rb",
"lib/pizza/provider/nordea.rb",
"lib/pizza/provider/nordea/payment_request.rb",
"lib/pizza/provider/nordea/payment_response.rb",
"lib/pizza/provider/sampo.rb",
"lib/pizza/provider/seb.rb",
"lib/pizza/provider/swedbank.rb",
"lib/pizza/util.rb",
"lib/ipizza.rb",
"lib/ipizza/authentication_request.rb",
"lib/ipizza/config.rb",
"lib/ipizza/payment.rb",
"lib/ipizza/payment_request.rb",
"lib/ipizza/payment_response.rb",
"lib/ipizza/provider/nordea.rb",
"lib/ipizza/provider/nordea/payment_request.rb",
"lib/ipizza/provider/nordea/payment_response.rb",
"lib/ipizza/provider/sampo.rb",
"lib/ipizza/provider/seb.rb",
"lib/ipizza/provider/swedbank.rb",
"lib/ipizza/util.rb",
"spec/certificates/bank.key",
"spec/certificates/bank.pub",
"spec/certificates/dealer.key",
"spec/certificates/dealer.pub",
"spec/config/config.yml",
"spec/config/plain_config.yml",
"spec/pizza/config_spec.rb",
"spec/pizza/provider/nordea/payment_request_spec.rb",
"spec/pizza/provider/nordea/payment_response_spec.rb",
"spec/pizza/provider/nordea_spec.rb",
"spec/pizza/provider/sampo_spec.rb",
"spec/pizza/provider/seb_spec.rb",
"spec/pizza/provider/swedbank_spec.rb",
"spec/pizza/util_spec.rb",
"spec/ipizza/config_spec.rb",
"spec/ipizza/provider/nordea/payment_request_spec.rb",
"spec/ipizza/provider/nordea/payment_response_spec.rb",
"spec/ipizza/provider/nordea_spec.rb",
"spec/ipizza/provider/sampo_spec.rb",
"spec/ipizza/provider/seb_spec.rb",
"spec/ipizza/provider/swedbank_spec.rb",
"spec/ipizza/util_spec.rb",
"spec/spec.opts",
"spec/spec_helper.rb",
"spec/support/pizza.rb"
"spec/support/ipizza.rb"
]
s.homepage = %q{http://github.com/priith/ipizza}
s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
s.rubygems_version = %q{1.3.7}
s.summary = %q{Implements iPizza protocol to communicate with Estonian Banks}
s.test_files = [
"spec/pizza/config_spec.rb",
"spec/pizza/provider/nordea/payment_request_spec.rb",
"spec/pizza/provider/nordea/payment_response_spec.rb",
"spec/pizza/provider/nordea_spec.rb",
"spec/pizza/provider/sampo_spec.rb",
"spec/pizza/provider/seb_spec.rb",
"spec/pizza/provider/swedbank_spec.rb",
"spec/pizza/util_spec.rb",
"spec/ipizza/config_spec.rb",
"spec/ipizza/provider/nordea/payment_request_spec.rb",
"spec/ipizza/provider/nordea/payment_response_spec.rb",
"spec/ipizza/provider/nordea_spec.rb",
"spec/ipizza/provider/sampo_spec.rb",
"spec/ipizza/provider/seb_spec.rb",
"spec/ipizza/provider/swedbank_spec.rb",
"spec/ipizza/util_spec.rb",
"spec/spec_helper.rb",
"spec/support/pizza.rb"
"spec/support/ipizza.rb"
]

if s.respond_to? :specification_version then
Expand Down
9 changes: 9 additions & 0 deletions lib/ipizza.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
require 'ipizza/config'
require 'ipizza/util'
require 'ipizza/payment'
require 'ipizza/payment_request'
require 'ipizza/payment_response'
require 'ipizza/provider/swedbank'
require 'ipizza/provider/seb'
require 'ipizza/provider/sampo'
require 'ipizza/provider/nordea'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Pizza
module Ipizza
class AuthenticationRequest
end
end
4 changes: 2 additions & 2 deletions lib/pizza/config.rb → lib/ipizza/config.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'yaml'

module Pizza
module Ipizza
class Config
class << self

Expand All @@ -24,7 +24,7 @@ def configure

def method_missing(m, *args)
if /^(swedbank|seb|sampo|nordea)_(.*)=$/ =~ m.to_s
clz = Pizza::Provider.const_get($1.capitalize)
clz = Ipizza::Provider.const_get($1.capitalize)
if clz.respond_to?(:"#{$2}=")
return clz.send(:"#{$2}=", *args)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/pizza/payment.rb → lib/ipizza/payment.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Pizza
module Ipizza
class Payment

attr_accessor :stamp, :amount, :currency, :refnum, :receiver_account, :receiver_name, :sender_account, :sender_name, :message, :transaction_id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'openssl'
require 'base64'

module Pizza
module Ipizza
class PaymentRequest

attr_accessor :extra_params
Expand All @@ -13,7 +13,7 @@ def sign(privkey_path, privkey_secret, order, mac_param = 'VK_MAC')

privkey = OpenSSL::PKey::RSA.new(privkey.gsub(/ /, ''), privkey_secret)

signature = privkey.sign(OpenSSL::Digest::SHA1.new, Pizza::Util.mac_data_string(sign_params, order))
signature = privkey.sign(OpenSSL::Digest::SHA1.new, Ipizza::Util.mac_data_string(sign_params, order))
signature = Base64.encode64(signature).gsub(/\n/, '')

self.sign_params[mac_param] = signature
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Pizza
module Ipizza
class PaymentResponse

attr_accessor :provider
Expand All @@ -21,7 +21,7 @@ def verify(certificate_path, charset = 'UTF-8')
verify_params = param_order.inject(Hash.new) { |h, p| h[p] = @params[p]; h }

certificate = OpenSSL::X509::Certificate.new(File.read(certificate_path).gsub(/ /, '')).public_key
mac_string = Pizza::Util.mac_data_string(verify_params, param_order, 'UTF-8', charset)
mac_string = Ipizza::Util.mac_data_string(verify_params, param_order, 'UTF-8', charset)

@valid = certificate.verify(OpenSSL::Digest::SHA1.new, Base64.decode64(@params['VK_MAC']), mac_string)
end
Expand All @@ -39,7 +39,7 @@ def automatic_message?
end

def payment_info
@payment_info ||= Pizza::Payment.new(
@payment_info ||= Ipizza::Payment.new(
:stamp => @params['VK_STAMP'], :amount => @params['VK_AMOUNT'], :currency => @params['VK_CURR'],
:refnum => @params['VK_REF'], :message => @params['VK_MSG'], :transaction_id => @params['VK_T_NO'],
:receiver_account => @params['VK_REC_ACC'], :receiver_name => @params['VK_REC_NAME'],
Expand Down
14 changes: 7 additions & 7 deletions lib/pizza/provider/nordea.rb → lib/ipizza/provider/nordea.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module Pizza::Provider
module Ipizza::Provider

# TODO: configure whether use sha-1 or md5 for signing and verification
class Nordea

require 'pizza/provider/nordea/payment_request'
require 'pizza/provider/nordea/payment_response'
require 'ipizza/provider/nordea/payment_request'
require 'ipizza/provider/nordea/payment_response'

class << self
attr_accessor :service_url, :return_url, :reject_url, :cancel_url, :key, :rcv_id, :rcv_account, :rcv_name, :language, :confirm, :keyvers
end

def payment_request(payment, service = 1002)
req = Pizza::Provider::Nordea::PaymentRequest.new
req = Ipizza::Provider::Nordea::PaymentRequest.new
req.service_url = self.service_url
req.params = {
'VERSION' => '0003',
Expand All @@ -21,7 +21,7 @@ def payment_request(payment, service = 1002)
# 'RCV_NAME' => self.rcv_name,
'LANGUAGE' => self.language,
'AMOUNT' => sprintf('%.2f', payment.amount),
'REF' => Pizza::Util.sign_731(payment.refnum),
'REF' => Ipizza::Util.sign_731(payment.refnum),
'DATE' => 'EXPRESS',
'MSG' => payment.message,
'CONFIRM' => self.confirm,
Expand All @@ -37,8 +37,8 @@ def payment_request(payment, service = 1002)
end

def payment_response(params)
response = Pizza::Provider::Nordea::PaymentResponse.new(params)
response.provider = Pizza::Util::NORDEA
response = Ipizza::Provider::Nordea::PaymentResponse.new(params)
response.provider = Ipizza::Util::NORDEA
response.verify(self.key)

return response
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'digest/md5'

module Pizza::Provider
class Nordea::PaymentRequest < Pizza::PaymentRequest
module Ipizza::Provider
class Nordea::PaymentRequest < Ipizza::PaymentRequest

attr_accessor :params
attr_accessor :service_url
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'digest/md5'

module Pizza::Provider
class Nordea::PaymentResponse < Pizza::PaymentResponse
module Ipizza::Provider
class Nordea::PaymentResponse < Ipizza::PaymentResponse

def initialize(params)
@params = params
Expand All @@ -21,7 +21,7 @@ def valid?
end

def payment_info
@payment_info ||= Pizza::Payment.new(:stamp => @params['RETURN_STAMP'], :refnum => @params['RETURN_REF'])
@payment_info ||= Ipizza::Payment.new(:stamp => @params['RETURN_STAMP'], :refnum => @params['RETURN_REF'])
end

private
Expand Down
8 changes: 4 additions & 4 deletions lib/pizza/provider/sampo.rb → lib/ipizza/provider/sampo.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module Pizza::Provider
module Ipizza::Provider
class Sampo

class << self
attr_accessor :service_url, :return_url, :file_key, :key_secret, :file_cert, :snd_id, :lang, :rec_acc, :rec_name
end

def payment_request(payment, service = 1002)
req = Pizza::PaymentRequest.new
req = Ipizza::PaymentRequest.new
req.service_url = self.service_url
req.sign_params = {
'VK_SERVICE' => service.to_s,
Expand All @@ -15,7 +15,7 @@ def payment_request(payment, service = 1002)
'VK_STAMP' => payment.stamp,
'VK_AMOUNT' => sprintf('%.2f', payment.amount),
'VK_CURR' => payment.currency,
'VK_REF' => Pizza::Util.sign_731(payment.refnum),
'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
'VK_MSG' => payment.message
}

Expand All @@ -40,7 +40,7 @@ def payment_request(payment, service = 1002)
end

def payment_response(params)
response = Pizza::PaymentResponse.new(params, Pizza::Util::SAMPO)
response = Ipizza::PaymentResponse.new(params, Ipizza::Util::SAMPO)
response.verify(cert)

return response
Expand Down
8 changes: 4 additions & 4 deletions lib/pizza/provider/seb.rb → lib/ipizza/provider/seb.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module Pizza::Provider
module Ipizza::Provider
class Seb

class << self
attr_accessor :service_url, :return_url, :cancel_url, :file_key, :key_secret, :file_cert, :snd_id, :encoding, :rec_acc, :rec_name
end

def payment_request(payment, service = 1002)
req = Pizza::PaymentRequest.new
req = Ipizza::PaymentRequest.new
req.service_url = self.service_url
req.sign_params = {
'VK_SERVICE' => service.to_s,
Expand All @@ -15,7 +15,7 @@ def payment_request(payment, service = 1002)
'VK_STAMP' => payment.stamp,
'VK_AMOUNT' => sprintf('%.2f', payment.amount),
'VK_CURR' => payment.currency,
'VK_REF' => Pizza::Util.sign_731(payment.refnum),
'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
'VK_MSG' => payment.message
}

Expand All @@ -41,7 +41,7 @@ def payment_request(payment, service = 1002)
end

def payment_response(params)
response = Pizza::PaymentResponse.new(params, Pizza::Util::SEB)
response = Ipizza::PaymentResponse.new(params, Ipizza::Util::SEB)
response.verify(cert)

return response
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module Pizza::Provider
module Ipizza::Provider
class Swedbank

class << self
attr_accessor :service_url, :return_url, :cancel_url, :file_key, :key_secret, :file_cert, :snd_id, :encoding
end

def payment_request(payment, service = 1002)
req = Pizza::PaymentRequest.new
req = Ipizza::PaymentRequest.new
req.service_url = self.class.service_url
req.sign_params = {
'VK_SERVICE' => '1002',
Expand All @@ -15,7 +15,7 @@ def payment_request(payment, service = 1002)
'VK_STAMP' => payment.stamp,
'VK_AMOUNT' => sprintf('%.2f', payment.amount),
'VK_CURR' => payment.currency,
'VK_REF' => Pizza::Util.sign_731(payment.refnum),
'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
'VK_MSG' => payment.message
}

Expand All @@ -32,7 +32,7 @@ def payment_request(payment, service = 1002)
end

def payment_response(params)
response = Pizza::PaymentResponse.new(params, Pizza::Util::SWEDBANK)
response = Ipizza::PaymentResponse.new(params, Ipizza::Util::SWEDBANK)
response.verify(self.class.file_cert, 'ISO-8859-4')

return response
Expand Down
2 changes: 1 addition & 1 deletion lib/pizza/util.rb → lib/ipizza/util.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Pizza
module Ipizza
class Util

SWEDBANK = 'swedbank'
Expand Down
9 changes: 0 additions & 9 deletions lib/pizza.rb

This file was deleted.

Loading

0 comments on commit 4dde879

Please sign in to comment.