active_merchant_ogone 0.1.2 → 0.2.0

data/README.rdoc

@@ -18,7 +18,7 @@ To install ActiveMerchantOgone in your rails app you can just do:
 
 To install ActiveMerchantOgone in your rails app you can just do:
 
-  config.gem 'simonmenke-active_merchant_ogone', :lib => 'active_merchant_ogone', :source => 'http://gems.github.com'
+  config.gem 'active_merchant_ogone'
 
 == Configuration
 
@@ -26,10 +26,13 @@ As Ogone works with in and out signatures, you will have to set these as constan
 
   OGONE_ACCOUNT = 'account_name'
   Ogone.setup do |c|
-    c.outbound_signature = '094598439859385938958398494' # Item 3.2 of the technical information
-    c.inbound_signature  = '094598439859385938958398494' # Item 4.4 of the technical information
+    c.outbound_signature = '094598439859385938958398494' # You can find this under "Data and origin verification" tab
+    c.inbound_signature  = '094598439859385938958398494' # You can find this under "Data and origin verification" tab
   end
 
+Make sure that Ogone is set to "Each parameter followed by the pass phrase." as hashed value (under "Global security parameters"). 
+If you don't see this setting, then you're probably already in that mode.
+
 == Example Usage
 
 Once you've configured the Ogone settings you need to set up a leaving page with in your view:

data/VERSION.yml

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

data/active_merchant_ogone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_merchant_ogone}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   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-12-15}
+  s.date = %q{2010-08-26}
   s.description = %q{A plugin for Ogone support in ActiveRecord. }
   s.email = %q{github@defv.be}
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/DefV/active_merchant_ogone/tree/master}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A plugin for Ogone support in ActiveRecord.}
   s.test_files = [
     "test/active_merchant_ogone/helper_test.rb",
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activemerchant>, [">= 1.4.2"])
     else
       s.add_dependency(%q<activemerchant>, [">= 1.4.2"])

data/lib/active_merchant_ogone/helper.rb

@@ -25,12 +25,22 @@ module ActiveMerchant #:nodoc:
                              :declineurl   => 'declineurl',
                              :cancelurl    => 'cancelurl',
                              :exceptionurl => 'exceptionurl'
-
+                             
           def customer(mapping = {})
             add_field('ownertelno', mapping[:phone])
             add_field('EMAIL', mapping[:email])
             add_field('CN', "#{mapping[:first_name]} #{mapping[:last_name]}")
           end
+          
+          def operation operation
+            op = case operation
+            when :authorization, :auth; 'RES'
+            when :payment, :pay;        'SAL'
+            else;                       operation
+            end
+
+            add_field('operation', op)
+          end
 
           # return the fields
           def form_fields

data/lib/active_merchant_ogone/notification.rb

@@ -118,6 +118,19 @@ module ActiveMerchant #:nodoc:
             true
           end
           
+          def scoring
+            params['SCORING'].to_i if params['SCORING']
+          end
+          
+          def scoring_category
+            case params['SCO_CATEGORY']
+            when 'G' then :green
+            when 'O' then :orange
+            when 'R' then :red
+            else nil
+            end
+          end
+          
         end
       end
     end

data/lib/active_merchant_ogone.rb

@@ -9,6 +9,8 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module Ogone
         
+        INBOUND_ENCRYPTED_VARIABLES = %w(AAVADDRESS AAVCHECK AAVZIP ACCEPTANCE ALIAS AMOUNT BRAND CARDNO CCCTY SHA-OUT CN COMPLUS CURRENCY CVCCHECK DCC_COMMPERCENTAGE DCC_CONVAMOUNT DCC_CONVCCY DCC_EXCHRATE DCC_EXCHRATESOURCE DCC_EXCHRATETS DCC_INDICATOR DCC_MARGINPERCENTAGE DCC_VALIDHOUS DIGESTCARDNO ECI ED ENCCARDNO IP IPCTY NBREMAILUSAGE NBRIPUSAGE NBRIPUSAGE_ALLTX NBRUSAGE NCERROR ORDERID PAYID PM SCO_CATEGORY SCORING STATUS TRXDATE VC)
+        
         mattr_accessor :inbound_signature
         mattr_accessor :outbound_signature
         
@@ -38,16 +40,20 @@ module ActiveMerchant #:nodoc:
         
         def self.outbound_message_signature(fields, signature=nil)
           signature ||= self.outbound_signature
-          keys = %w( orderID amount currency PSPID )
-          datastring = keys.collect{|key| fields[key]}.join('')
-          Digest::SHA1.hexdigest("#{datastring}#{signature}").upcase
+          datastring = fields.select {|k, v| !v.blank? }.
+                              sort_by {|k, v| k.upcase }.
+                              collect{|key, value| "#{key.upcase}=#{value}#{signature}"}.join
+                              
+          Digest::SHA1.hexdigest(datastring).upcase
         end
         
         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.collect{|key| fields[key]}.join('')
-          Digest::SHA1.hexdigest("#{datastring}#{signature}").upcase
+          datastring = fields.select  {|k, v| !v.blank? && INBOUND_ENCRYPTED_VARIABLES.include?(k.upcase) }.
+                              sort_by {|k, v| k.upcase }.
+                              collect {|key, value| "#{key.upcase}=#{value}#{signature}"}.join
+                             
+          Digest::SHA1.hexdigest(datastring).upcase
         end
       end
     end

data/test/active_merchant_ogone/helper_test.rb

@@ -20,6 +20,17 @@ class OgoneHelperTest < Test::Unit::TestCase
     assert_field 'CN', 'Jan De Poorter'
     assert_field 'EMAIL', 'ogone@openminds.be'
   end
+  
+  def test_operation
+    @helper.operation :payment
+    assert_field 'operation', 'SAL'
+    
+    @helper.operation :auth
+    assert_field 'operation', 'RES'
+    
+    @helper.operation 'SAL'
+    assert_field 'operation', 'SAL'
+  end
 
   def test_address_mapping
     @helper.billing_address :address1 => 'Zilverenberg 39',

data/test/active_merchant_ogone/notification_test.rb

@@ -5,9 +5,9 @@ class OgoneNotificationTest < Test::Unit::TestCase
 
   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"
+  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=0B5DB4D379C32331939DA40DCCA16B1556FB6256&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"
+  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=0B5DB4D379C32331939DA40DCCA16B1556FB6256&IP=82.146.99.233"
 
   def setup
     @ogone = Ogone::Notification.new(SUCCESSFULL_HTTP_RAW_DATA)

data/test/active_merchant_ogone_test.rb

@@ -8,11 +8,12 @@ class ActiveMerchantOgoneTest < Test::Unit::TestCase
     data = {'orderID'  => '1234',
             'currency' => 'EUR',
             'amount'   => 1500,
-            'PSPID'    => 'MyPSPID' }
+            'PSPID'    => 'MyPSPID',
+            'operation' => 'RES' }
 
-    signature = 'Mysecretsig'
+    signature = 'Mysecretsig1875!?'
 
-    assert_equal 'CC88E974F684C0804FD98BEA2FE403E9D11534BB',
+    assert_equal 'EB52902BCC4B50DC1250E5A7C1068ECF97751256',
       Ogone.outbound_message_signature(data, signature)
   end
 
@@ -29,9 +30,9 @@ class ActiveMerchantOgoneTest < Test::Unit::TestCase
             'NCERROR'    => '0',
             'BRAND'      => 'VISA'}
 
-    signature = 'Mysecretsig'
+    signature = 'Mysecretsig1875!?'
 
-    assert_equal '6DDD8C4538ACD0462837DB66F5EAB39C58086A29',
+    assert_equal 'B209960D5703DD1047F95A0F97655FFE5AC8BD52',
       Ogone.inbound_message_signature(data, signature)
   end
 end

data/test/test_helper.rb

@@ -2,18 +2,19 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
-require 'active_merchant'
-require 'money'
-require 'test/unit'
-require 'mocha'
-require 'yaml'
 
 begin
-  gem 'actionpack'
+  gem 'actionpack', '2.3.8'
 rescue LoadError
   raise StandardError, "The view tests need ActionPack installed as gem to run"
 end
 
+require 'active_merchant'
+require 'money'
+require 'test/unit'
+require 'mocha'
+require 'yaml'
+
 require 'action_controller'
 require 'action_controller/test_process'
 require 'active_merchant/billing/integrations/action_view_helper'

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_merchant_ogone
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jan De Poorter
@@ -10,19 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 +01:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemerchant
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: "A plugin for Ogone support in ActiveRecord. "
 email: github@defv.be
 executables: []
@@ -55,21 +67,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A plugin for Ogone support in ActiveRecord.