simonmenke-active_merchant_ogone 0.1.1 → 0.1.2

data/Rakefile

@@ -31,8 +31,8 @@ begin
     gemspec.email = "github@defv.be"
     gemspec.homepage = "http://github.com/DefV/active_merchant_ogone/tree/master"
     gemspec.authors = ["Jan De Poorter", "Simon Menke"]
-    gemspec.add_dependency 'activemerchant', '>= 0'
+    gemspec.add_dependency 'activemerchant', '>= 1.4.2'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 1

data/active_merchant_ogone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_merchant_ogone}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan De Poorter", "Simon Menke"]
-  s.date = %q{2009-09-01}
+  s.date = %q{2009-09-03}
   s.description = %q{A plugin for Ogone support in ActiveRecord. }
   s.email = %q{github@defv.be}
   s.extra_rdoc_files = [
@@ -47,11 +47,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activemerchant>, [">= 0"])
+      s.add_runtime_dependency(%q<activemerchant>, [">= 1.4.2"])
     else
-      s.add_dependency(%q<activemerchant>, [">= 0"])
+      s.add_dependency(%q<activemerchant>, [">= 1.4.2"])
     end
   else
-    s.add_dependency(%q<activemerchant>, [">= 0"])
+    s.add_dependency(%q<activemerchant>, [">= 1.4.2"])
   end
 end

data/lib/active_merchant_ogone.rb

@@ -8,13 +8,19 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module Ogone
-
+        
+        mattr_accessor :inbound_signature
+        mattr_accessor :outbound_signature
+        
         mattr_accessor :test_service_url
         mattr_accessor :live_service_url
         
         self.test_service_url = 'https://secure.ogone.com/ncol/test/orderstandard.asp'
         self.live_service_url = 'https://secure.ogone.com/ncol/prod/orderstandard.asp'
         
+        def self.setup
+          yield(self)
+        end
         
         def self.service_url
           mode = ActiveMerchant::Billing::Base.integration_mode
@@ -30,14 +36,16 @@ module ActiveMerchant #:nodoc:
           Notification.new(post, options={})
         end
         
-        def self.outbound_message_signature(fields, signature)
+        def self.outbound_message_signature(fields, signature=nil)
+          signature ||= self.outbound_signature
           keys = %w( orderID amount currency PSPID )
           datastring = keys.inject('') { |m,key| m.concat(fields[key].to_s) ; m }
           datastring.concat(signature)
           Digest::SHA1.hexdigest(datastring).upcase
         end
         
-        def self.inbound_message_signature(fields, signature)
+        def self.inbound_message_signature(fields, signature=nil)
+          signature ||= self.inbound_signature
           keys = %w( orderID currency amount PM ACCEPTANCE STATUS CARDNO PAYID NCERROR BRAND )
           datastring = keys.inject('') { |m,key| m.concat(fields[key].to_s) ; m }
           datastring.concat(signature)

data/lib/active_merchant_ogone/helper.rb

@@ -41,7 +41,7 @@ module ActiveMerchant #:nodoc:
         private
           
           def outbound_message_signature
-            Ogone.outbound_message_signature(@fields, OGONE_SHA1_SIGNATURE_OUT)
+            Ogone.outbound_message_signature(@fields)
           end
           
         end

data/test/active_merchant_ogone/notification_test.rb

@@ -3,15 +3,14 @@ require 'test_helper'
 class OgoneNotificationTest < Test::Unit::TestCase
   include ActiveMerchant::Billing::Integrations
 
-  OGONE_SHA1_SIGNATURE_IN = '08445a31a78661b5c746feff39a9db6e4e2cc5cf'
+  Ogone.inbound_signature = '08445a31a78661b5c746feff39a9db6e4e2cc5cf'
   
   SUCCESSFULL_HTTP_RAW_DATA = "orderID=order_342&currency=EUR&amount=50&PM=CreditCard&ACCEPTANCE=test123&STATUS=9&CARDNO=XXXXXXXXXXXX1111&PAYID=2396925&NCERROR=0&BRAND=VISA&IPCTY=BE&CCCTY=US&ECI=7&CVCCheck=NO&AAVCheck=NO&VC=NO&SHASIGN=FE220C6F4492165533488E35F47F231D6BC357FC&IP=82.146.99.233"
   
   FAULTY_HTTP_RAW_DATA = "orderID=order_342&currency=EUR&amount=50&PM=CreditCard&ACCEPTANCE=test123&STATUS=abc&CARDNO=XXXXXXXXXXXX1111&PAYID=2396925&NCERROR=0&BRAND=VISA&IPCTY=BE&CCCTY=US&ECI=7&CVCCheck=NO&AAVCheck=NO&VC=NO&SHASIGN=FE220C6F4492165533488E35F47F231D6BC357FC&IP=82.146.99.233"
 
   def setup
-    @ogone = Ogone::Notification.new(SUCCESSFULL_HTTP_RAW_DATA,
-      :signature => OGONE_SHA1_SIGNATURE_IN)
+    @ogone = Ogone::Notification.new(SUCCESSFULL_HTTP_RAW_DATA)
   end
 
   def test_accessors
@@ -32,8 +31,7 @@ class OgoneNotificationTest < Test::Unit::TestCase
 
   def test_invalid_status_should_raise_an_error
     assert_raise(ActiveMerchant::OgoneError) do
-      Ogone::Notification.new(FAULTY_HTTP_RAW_DATA,
-        :signature => OGONE_SHA1_SIGNATURE_IN)
+      Ogone::Notification.new(FAULTY_HTTP_RAW_DATA)
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-active_merchant_ogone
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jan De Poorter
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.4.2
     version: 
 description: A plugin for Ogone support in ActiveRecord.
 email: github@defv.be
@@ -47,6 +47,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/DefV/active_merchant_ogone/tree/master
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A plugin for Ogone support in ActiveRecord.