activemerchant 1.12.1 → 1.13.0

data/CHANGELOG

@@ -1,5 +1,26 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.13.0 (Apr 19, 2011)
+
+* Add a Gemfile for optional bundler support [ssoroka]
+* Stop using has_rdoc= when rubygems version is 1.7.0 or greater, since it's deprecated [ssoroka]
+* Add tax field to braintree [wisq]
+* Quickpay: Also add Sweden as supported country [Soleone]
+* Adding refund method for gateways that are using the credit method for referenced based refunds, added deprecation worning to the credit method [John Duff]
+* Return the Braintree transaction id in the response for void and refund transaction calls [John Duff]
+* PayPal Express: Extract phone number from address if no contact phone was sent [Soleone]
+* Unify all offsite gateways that verify the signature of Returns or Notifications by always using the #acknowledge method and calling the secret :credential2 [Soleone]
+* Valitor: Change name of credential for Return and Notification from :password to :credential2 in symmetry with the other Integrations [Soleone]
+* Moneybookers: Add support for tracking token [Soleone]
+* Moneybookers: Require credential when creating Notifications instead of adding an argument to #acknowledge [Soleone]
+* Moneybookers: Fix Notification to return correct status [Soleone]
+* Support default Return class for all Integrations that don't use returns [Soleone]
+* Add support for passing additional options when creating a Notification to all Integrations [Soleone]
+* Update BraintreeBlue#refund to have consistent method signature [Jonathan Rudenberg]
+* Add rails/init.rb for gem campatability in Rails [Rūdolfs Ošiņš]
+* Fix Paypal Express response parser [Jonathan Rudenberg]
+* Braintree/Transax: Add tax field [wisq]
+
 == Version 1.12.1 (Mar 21, 2011)
 
 * Ogone: Make sure response.params is a real Hash [Soleone]

data/README.rdoc

@@ -59,7 +59,7 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {PSL Payment Solutions}[http://www.paymentsolutionsltd.com/] - GB
 * {Quantum}[http://www.quantumgateway.com] - US
 * {QuickBooks Merchant Services}[http://payments.intuit.com/] - US
-* {Quickpay}[http://quickpay.dk/] - DK
+* {Quickpay}[http://quickpay.dk/] - DK, SE
 * {Rabobank Nederland}[http://www.rabobank.nl/] - NL
 * {Realex}[http://www.realexpayments.com/] - IE, GB
 * {Sage Payment Solutions}[http://www.sagepayments.com] - US, CA

data/lib/active_merchant/billing/gateway.rb

@@ -63,6 +63,7 @@ module ActiveMerchant #:nodoc:
       
       DEBIT_CARDS = [ :switch, :solo ]
       CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY' ]
+      CREDIT_DEPRECATION_MESSAGE = "Support for using credit to refund existing transactions is deprecated and will be removed from a future release of ActiveMerchant. Please use the refund method instead."
             
       cattr_reader :implementations
       @@implementations = []

data/lib/active_merchant/billing/gateways/barclays_epdq.rb

@@ -64,12 +64,17 @@ module ActiveMerchant #:nodoc:
       # code returned by ePDQ
       def credit(money, creditcard_or_authorization, options = {})
         if creditcard_or_authorization.is_a?(String)
-          credit_existing_order(money, creditcard_or_authorization, options)
+          warn CREDIT_DEPRECATION_MESSAGE
+          refund(money, creditcard_or_authorization, options)
         else
           credit_new_order(money, creditcard_or_authorization, options)
         end
       end
 
+      def refund(money, authorization, options = {})
+        credit_existing_order(money, authorization, options)
+      end
+
       def void(authorization, options = {})
         document = Document.new(self, @options) do
           add_order_form(authorization) do

data/lib/active_merchant/billing/gateways/braintree_blue.rb

@@ -46,10 +46,18 @@ module ActiveMerchant #:nodoc:
         create_transaction(:credit, money, credit_card_or_vault_id, options)
       end
 
-      def refund(transaction_id, options = {})
+      def refund(*args)
+        # legacy signature: #refund(transaction_id, options = {})
+        # new signature: #refund(money, transaction_id, options = {})
+        money, transaction_id, options = extract_refund_args(args)
+        money = amount(money).to_s if money
+
         commit do
-          result = Braintree::Transaction.find(transaction_id).refund
-          Response.new(result.success?, message_from_result(result))
+          result = Braintree::Transaction.refund(transaction_id, money)
+          Response.new(result.success?, message_from_result(result),
+            {:braintree_transaction => (result.transaction if result.success?)},
+            {:authorization => (result.transaction.id if result.success?)}
+           )
         end
       end
 
@@ -57,7 +65,8 @@ module ActiveMerchant #:nodoc:
         commit do
           result = Braintree::Transaction.void(authorization)
           Response.new(result.success?, message_from_result(result),
-            :braintree_transaction => (result.transaction if result.success?)
+            {:braintree_transaction => (result.transaction if result.success?)},
+            {:authorization => (result.transaction.id if result.success?)}
           )
         end
       end
@@ -204,6 +213,19 @@ module ActiveMerchant #:nodoc:
           response
         end
       end
+
+      def extract_refund_args(args)
+        options = args.extract_options!
+
+        # money, transaction_id, options
+        if args.length == 1 # legacy signature
+          return nil, args[0], options
+        elsif args.length == 2
+          return args[0], args[1], options
+        else
+          raise ArgumentError, "wrong number of arguments (#{args.length} for 2)"
+        end
+      end
     end
   end
 end

data/lib/active_merchant/billing/gateways/data_cash.rb

@@ -139,12 +139,16 @@ module ActiveMerchant
       #   * <tt>:address</tt>:: billing address for card
       def credit(money, reference_or_credit_card, options = {})
         if reference_or_credit_card.is_a?(String)
-          request = build_transaction_refund_request(money, reference_or_credit_card)
+          warn CREDIT_DEPRECATION_MESSAGE
+          refund(money, reference_or_credit_card)
         else
           request = build_refund_request(money, reference_or_credit_card, options)
+          commit(request)
         end
+      end
 
-        commit(request)
+      def refund(money, reference, options = {})
+        commit(build_transaction_refund_request(money, reference))
       end
 
       # Is the gateway running in test mode?

data/lib/active_merchant/billing/gateways/efsnet.rb

@@ -41,9 +41,9 @@ module ActiveMerchant #:nodoc:
 
       def credit(money, identification_or_credit_card, options = {})
         if identification_or_credit_card.is_a?(String)
+          warn CREDIT_DEPRECATION_MESSAGE
           # Perform authorization reversal
-          request = build_refund_or_settle_request(money, identification_or_credit_card, options)
-          commit(:credit_card_refund, request)
+          refund(money, identification_or_credit_card, options)
         else
           # Perform credit
           request = build_credit_card_request(money, identification_or_credit_card, options)
@@ -51,6 +51,12 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def refund(money, reference, options = {})
+        # Perform authorization reversal
+        request = build_refund_or_settle_request(money, reference, options)
+        commit(:credit_card_refund, request)
+      end
+
       def void(identification, options = {})
         requires!(options, :order_id)
         original_transaction_id, original_transaction_amount = identification.split(";")

data/lib/active_merchant/billing/gateways/iridium.rb

@@ -59,6 +59,11 @@ module ActiveMerchant #:nodoc:
       end
       
       def credit(money, authorization, options={})
+        warn CREDIT_DEPRECATION_MESSAGE
+        refund(money, authorization, options)
+      end
+
+      def refund(money, authorization, options={})
         commit(build_reference_request('REFUND', money, authorization, options), options)
       end
       

data/lib/active_merchant/billing/gateways/jetpay.rb

@@ -85,17 +85,20 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, transaction_id_or_card, options = {})
-        
         if transaction_id_or_card.is_a?(String)
-          transaction_id = transaction_id_or_card.split(";").first
-          credit_card = options[:credit_card]
+          warn CREDIT_DEPRECATION_MESSAGE
+          refund(money, transaction_id_or_card, options)
         else
-          transaction_id = nil
-          credit_card = transaction_id_or_card
+          commit(money, build_credit_request('CREDIT', money, nil, transaction_id_or_card))
         end
+      end
 
+      def refund(money, reference, options = {})
+        transaction_id = reference.split(";").first
+        credit_card = options[:credit_card]
         commit(money, build_credit_request('CREDIT', money, transaction_id, credit_card))
       end
+
       
       private
       

data/lib/active_merchant/billing/gateways/merchant_ware.rb

@@ -98,11 +98,17 @@ module ActiveMerchant #:nodoc:
       #   * <tt>:order_id</tt> - A unique reference for this order (required when performing a non-referenced credit)
       def credit(money, identification, options = {})
         if identification.is_a?(String)          
-          perform_reference_credit(money, identification, options)
+          warn CREDIT_DEPRECATION_MESSAGE
+          refund(money, identification, options)
         else
           perform_credit(money, identification, options)
         end
       end
+
+      def refund(money, reference, options = {})
+        perform_reference_credit(money, reference, options)
+      end
+
     
       private
       

data/lib/active_merchant/billing/gateways/moneris.rb

@@ -71,9 +71,13 @@ module ActiveMerchant #:nodoc:
       # Moneris interface consistent with other gateways. (See +capture+ for 
       # details.)
       def credit(money, authorization, options = {})
-        commit 'refund', crediting_params(authorization, :amount => amount(money))
+        warn CREDIT_DEPRECATION_MESSAGE
+        refund(money, authorization, options)
       end
    
+      def refund(money, authorization, options = {})
+        commit 'refund', crediting_params(authorization, :amount => amount(money))
+      end
     private # :nodoc: all
     
       def expdate(creditcard)

data/lib/active_merchant/billing/gateways/ogone.rb

@@ -126,13 +126,19 @@ module ActiveMerchant #:nodoc:
       # Credit the specified account by a specific amount.
       def credit(money, identification_or_credit_card, options = {})        
         if reference_transaction?(identification_or_credit_card)
+          warn CREDIT_DEPRECATION_MESSAGE
           # Referenced credit: refund of a settled transaction
-          perform_reference_credit(money, identification_or_credit_card, options)
+          refund(money, identification_or_credit_card, options)
         else # must be a credit card or card reference
           perform_non_referenced_credit(money, identification_or_credit_card, options)
         end
       end
       
+      # Refund of a settled transaction
+      def refund(money, reference, options = {})        
+        perform_reference_credit(money, reference, options)
+      end
+
       def test?
         @options[:test] || super
       end
@@ -283,4 +289,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

data/lib/active_merchant/billing/gateways/paybox_direct.rb

@@ -99,6 +99,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
+        warn CREDIT_DEPRECATION_MESSAGE
+        refund(money, identification, options)
+      end
+
+      def refund(money, identification, options = {})
         post = {}
         add_invoice(post, options)
         add_reference(post, identification)

data/lib/active_merchant/billing/gateways/payflow.rb

@@ -27,16 +27,19 @@ module ActiveMerchant #:nodoc:
       
       def credit(money, identification_or_credit_card, options = {})
         if identification_or_credit_card.is_a?(String)
+          warn CREDIT_DEPRECATION_MESSAGE
           # Perform referenced credit
-          request = build_reference_request(:credit, money, identification_or_credit_card, options)
+          refund(money, identification_or_credit_card, options)
         else
           # Perform non-referenced credit
           request = build_credit_card_request(:credit, money, identification_or_credit_card, options)
+          commit(request)
         end
-        
-        commit(request)
       end
       
+      def refund(money, reference, options = {})
+        commit(build_reference_request(:credit, money, reference, options))
+      end
       # Adds or modifies a recurring Payflow profile.  See the Payflow Pro Recurring Billing Guide for more details:
       # https://www.paypal.com/en_US/pdf/PayflowPro_RecurringBilling_Guide.pdf
       #    

data/lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb

@@ -197,6 +197,26 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(action, xml)
+        legacy_hash = legacy_parse(action, xml)
+        xml = strip_attributes(xml)
+        hash = Hash.from_xml(xml)
+        hash = hash.fetch('Envelope').fetch('Body').fetch("#{action}Response")
+        hash = hash["#{action}ResponseDetails"] if hash["#{action}ResponseDetails"]
+
+        legacy_hash.merge(hash)
+      rescue IndexError
+        legacy_hash.merge(hash['Envelope']['Body'])
+      end
+
+      def strip_attributes(xml)
+        xml = REXML::Document.new(xml)
+        REXML::XPath.each(xml, '//SOAP-ENV:Envelope//*[@*]') do |el|
+          el.attributes.each_attribute { |a| a.remove }
+        end
+        xml.to_s
+      end
+
+      def legacy_parse(action, xml)
         response = {}
         
         error_messages = []
@@ -225,22 +245,22 @@ module ActiveMerchant #:nodoc:
                 error_messages << message
               end
             else
-              parse_element(response, node)
+              legacy_parse_element(response, node)
             end
           end
           response[:message] = error_messages.uniq.join(". ") unless error_messages.empty?
           response[:error_codes] = error_codes.uniq.join(",") unless error_codes.empty?
         elsif root = REXML::XPath.first(xml, "//SOAP-ENV:Fault")
-          parse_element(response, root)
+          legacy_parse_element(response, root)
           response[:message] = "#{response[:faultcode]}: #{response[:faultstring]} - #{response[:detail]}"
         end
 
         response
       end
 
-      def parse_element(response, node)
+      def legacy_parse_element(response, node)
         if node.has_elements?
-          node.elements.each{|e| parse_element(response, e) }
+          node.elements.each{|e| legacy_parse_element(response, e) }
         else
           response[node.name.underscore.to_sym] = node.text
           node.attributes.each do |k, v|

data/lib/active_merchant/billing/gateways/paypal/paypal_express_response.rb

@@ -2,37 +2,44 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PaypalExpressResponse < Response
       def email
-        @params['payer']
+        @params['PayerInfo']['Payer']
       end
       
       def name
-        [@params['first_name'], @params['middle_name'], @params['last_name']].compact.join(' ')
+        payer = @params['PayerInfo']['PayerName']
+        [payer['FirstName'], payer['MiddleName'], payer['LastName']].compact.join(' ')
       end
       
       def token
-        @params['token']
+        @params['Token']
       end
       
       def payer_id
-        @params['payer_id']
+        @params['PayerInfo']['PayerID']
       end
       
       def payer_country
-        @params['payer_country']
+        @params['PayerInfo']['PayerCountry']
+      end
+      
+      # PayPal returns a contact telephone number only if your Merchant account profile settings require that the buyer enter one.
+      def contact_phone
+        @params['ContactPhone']
       end
       
       def address
-        {  'name'       => @params['name'],
-           'company'    => @params['payer_business'],
-           'address1'   => @params['street1'],
-           'address2'   => @params['street2'],
-           'city'       => @params['city_name'],
-           'state'      => @params['state_or_province'],
-           'country'    => @params['country'],
-           'zip'        => @params['postal_code'],
-           'phone'      => @params['contact_phone']
+        address = @params['PaymentDetails']['ShipToAddress']
+        {  'name'       => address['Name'],
+           'company'    => @params['PayerInfo']['PayerBusiness'],
+           'address1'   => address['Street1'],
+           'address2'   => address['Street2'],
+           'city'       => address['CityName'],
+           'state'      => address['StateOrProvince'],
+           'country'    => address['Country'],
+           'zip'        => address['PostalCode'],
+           'phone'      => contact_phone || address['Phone']
         }
       end
     end
   end
-end
+end

data/lib/active_merchant/billing/gateways/plugnpay.rb

@@ -156,9 +156,8 @@ module ActiveMerchant
         add_amount(post, money, options)
        
         if identification_or_creditcard.is_a?(String)
-          post[:orderID] = identification_or_creditcard
-          
-          commit(:refund, post)
+          warn CREDIT_DEPRECATION_MESSAGE
+          refund(money, identification_or_creditcard, options)
         else
           add_creditcard(post, identification_or_creditcard)        
           add_addresses(post, options)   
@@ -167,6 +166,13 @@ module ActiveMerchant
           commit(:credit, post)
         end
       end
+
+      def refund(money, reference, options = {})
+        post = PlugnpayPostData.new
+        add_amount(post, money, options)
+        post[:orderID] = reference
+        commit(:refund, post)
+      end
       
       private                                 
       def commit(action, post)

data/lib/active_merchant/billing/gateways/psigate.rb

@@ -79,6 +79,11 @@ module ActiveMerchant #:nodoc:
 
       # Psigate Credit
       def credit(money, authorization, options = {})
+        warn CREDIT_DEPRECATION_MESSAGE
+        refund(money, authorization, options)
+      end
+
+      def refund(money, authorization, options = {})
         options.update({ :CardAction => "3", :order_id => authorization })
         commit(money, nil, options)
       end

data/lib/active_merchant/billing/gateways/qbms.rb

@@ -104,6 +104,11 @@ module ActiveMerchant #:nodoc:
       #
       #
       def credit(money, identification, options = {})
+        warn CREDIT_DEPRECATION_MESSAGE
+        refund(money, identification, options = {})
+      end
+
+      def refund(money, identification, options = {})
         commit(:refund, money, options.merge(:transaction_id => identification))
       end
 

data/lib/active_merchant/billing/gateways/quickpay.rb

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'DKK'  
       self.money_format = :cents
       self.supported_cardtypes = [ :dankort, :forbrugsforeningen, :visa, :master, :american_express, :diners_club, :jcb, :maestro ]
-      self.supported_countries = ['DK']
+      self.supported_countries = ['DK', 'SE']
       self.homepage_url = 'http://quickpay.dk/'
       self.display_name = 'Quickpay'
       

data/lib/active_merchant/billing/gateways/smart_ps.rb

@@ -27,6 +27,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options[:shipping_address], "shipping")
         add_customer_data(post, options)
         add_currency(post, money, options)
+        add_taxes(post, options)
         add_processor(post, options)
         commit('auth', money, post)
       end
@@ -39,6 +40,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options[:shipping_address], "shipping")
         add_customer_data(post, options)
         add_currency(post, money, options)
+        add_taxes(post, options)
         add_processor(post, options)     
         commit('sale', money, post)
       end                       
@@ -145,7 +147,11 @@ module ActiveMerchant #:nodoc:
       def add_currency(post, money, options)
         post[:currency] = options[:currency] || currency(money)
       end
-      
+
+      def add_taxes(post, options)
+        post[:tax] = amount(options[:tax])
+      end
+
       def add_processor(post, options)
         post[:processor] = options[:processor] unless options[:processor].nil?
       end

data/lib/active_merchant/billing/gateways/verifi.rb

@@ -87,12 +87,17 @@ module ActiveMerchant #:nodoc:
       
       def credit(money, credit_card_or_authorization, options = {})
         if credit_card_or_authorization.is_a?(String)
-          capture_void_or_refund_template(:refund, money, credit_card_or_authorization, options)
+          warn CREDIT_DEPRECATION_MESSAGE
+          refund(money, credit_card_or_authorization, options)
         else
           sale_authorization_or_credit_template(:credit, money, credit_card_or_authorization, options)
         end
       end
 
+      def refund(money, reference, options = {})
+        capture_void_or_refund_template(:refund, money, reference, options)
+      end
+
       private  
              
       def sale_authorization_or_credit_template(trx_type, money, credit_card, options = {})

data/lib/active_merchant/billing/integrations/bogus.rb

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
         mattr_accessor :service_url
         self.service_url = 'http://www.bogus.com'
 
-        def self.notification(post)
+        def self.notification(post, options = {})
           Notification.new(post)
         end
         

data/lib/active_merchant/billing/integrations/chronopay.rb

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
         mattr_accessor :service_url
         self.service_url = 'https://secure.chronopay.com/index_shop.cgi'
 
-        def self.notification(post)
+        def self.notification(post, options = {})
           Notification.new(post)
         end
         

data/lib/active_merchant/billing/integrations/direc_pay.rb

@@ -24,7 +24,7 @@ module ActiveMerchant #:nodoc:
           end
         end
         
-        def self.notification(post)
+        def self.notification(post, options = {})
           Notification.new(post)
         end
         

data/lib/active_merchant/billing/integrations/gestpay.rb

@@ -12,7 +12,7 @@ module ActiveMerchant #:nodoc:
         mattr_accessor :service_url
         self.service_url = 'https://ecomm.sella.it/gestpay/pagam.asp'
 
-        def self.notification(post)
+        def self.notification(post, options = {})
           Notification.new(post)
         end  
         

data/lib/active_merchant/billing/integrations/hi_trust.rb

@@ -14,7 +14,7 @@ module ActiveMerchant #:nodoc:
           ActiveMerchant::Billing::Base.integration_mode == :test ? TEST_URL : LIVE_URL
         end
 
-        def self.notification(post)
+        def self.notification(post, options = {})
           Notification.new(post)
         end
         

data/lib/active_merchant/billing/integrations/moneybookers.rb

@@ -13,10 +13,13 @@ module ActiveMerchant #:nodoc:
           self.production_url
         end
 
-        def self.notification(post)
-          Notification.new(post)
+        def self.notification(post, options)
+          Notification.new(post, options)
         end
 
+        def self.return(post, options = {})
+          Return.new(post, options)
+        end
       end
     end
   end

data/lib/active_merchant/billing/integrations/moneybookers/helper.rb

@@ -26,6 +26,22 @@ module ActiveMerchant #:nodoc:
           mapping :return_url, 'return_url'
           mapping :cancel_return_url, 'cancel_url'
           mapping :description, 'detail1_text'
+          
+          def initialize(order, account, options = {})
+            super
+            add_tracking_token
+          end
+
+
+          private
+          
+          def add_tracking_token
+            return if application_id.blank? || application_id == 'ActiveMerchant'
+
+            add_field('merchant_fields', 'platform')
+            add_field('platform', application_id)
+            puts @fields.inspect
+          end
         end
       end
     end

data/lib/active_merchant/billing/integrations/moneybookers/notification.rb

@@ -6,27 +6,50 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module Moneybookers
         class Notification < ActiveMerchant::Billing::Integrations::Notification
-          include PostsData
 
-          # was the transaction comlete?
+          def initialize(data, options)
+            if options[:credential2].nil?
+              raise ArgumentError, "You need to provide the md5 secret as the option :credential2 to verify that the notification originated from Moneybookers"
+            end
+            super
+          end
+          
           def complete?
-            status == "2"
+            status == 'Completed'
           end
 
+          # ‘2’ Processed – This status is sent when the transaction is processed and the funds have been received on your Moneybookers account.
+          # ‘0’ Pending – This status is sent when the customers pays via the pending bank transfer option. Such transactions will auto-process IF the bank transfer is received by Moneybookers. We strongly recommend that you do NOT process the order/transaction in your system upon receipt of a pending status from Moneybookers.
+          # ‘-1’ Cancelled – Pending transactions can either be cancelled manually by the sender in their online account history or they will auto-cancel after 14 days if still pending.
+          # ‘-2’ Failed – This status is sent when the customer tries to pay via Credit Card or Direct Debit but our provider declines the transaction. If you do not accept Credit Card or Direct Debit payments via Moneybookers (see page 17) then you will never receive the failed status.
+          # ‘-3’ Chargeback – This status could be received only if your account is configured to receive chargebacks. If this is the case, whenever a chargeback is received by Moneybookers, a -3 status will be posted on the status_url for the reversed transaction.
           def status
+            case status_code
+            when '2'
+              'Completed'
+            when '0'
+              'Pending'
+            when '-1'
+              'Cancelled'
+            when '-2'
+              'Failed'
+            when '-3'
+              'Reversed'
+            else
+              'Error'
+            end
+          end
+          
+          def status_code
             params['status']
           end
-
+          
           def item_id
-            nil
+            params['transaction_id']
           end
 
           def transaction_id
-            if params.has_key?("transaction_id")
-              params['transaction_id']
-            else
-              params['mb_transaction_id']
-            end
+            params['mb_transaction_id']
           end
 
           # When was this payment received by the client. 
@@ -51,47 +74,52 @@ module ActiveMerchant #:nodoc:
             params['merchant_id']
           end
 
-          # currency of mb_amount, will always be the same as the currency of the beneficiary's account at Moneybookers.com
+          # currency of the payment as posted by the merchant on the entry form
           def currency
-            params['mb_currency']
+            params['currency']
           end
 
-          # total amount of the payment in Merchants currency (ex 25.46/25.4/25)
+          # amount of the payment as posted by the merchant on the entry form (ex. 39.60/39.6/39)
           def gross
-            params['mb_amount']
+            params['amount']
           end
 
-          # currency of the payment as posted by the merchant on the entry form
-          def posted_currency
-            params['currency']
+          # currency of mb_amount, will always be the same as the currency of the beneficiary's account at Moneybookers.com
+          def merchant_currency
+            params['mb_currency']
           end
 
-          # amount of the payment as posted by the merchant on the entry form (ex. 39.60/39.6/39)
-          def posted_amount
-            params['amount']
+          # total amount of the payment in Merchants currency (ex 25.46/25.4/25)
+          def merchant_amount
+            params['mb_amount']
           end
 
           # Was this a test transaction?
           def test?
             false
           end
-
+          
+          def secret
+            @options[:credential2]
+          end
+          
           # Acknowledge the transaction to MoneyBooker. This method has to be called after a new 
           # apc arrives. It will verify that all the information we received is correct and will return a
-          # ok or a fail.
+          # ok or a fail. The secret (second credential) has to be provided in the parameter :credential2
+          # when instantiating the Notification object.
           # 
           # Example:
           # 
           #   def ipn
-          #     notify = Moneybookers::Notification.new(request.raw_post)
+          #     notify = Moneybookers.notification(request.raw_post, :credential2 => 'secret')
           #
-          #     if notify.acknowledge('secretpass')
+          #     if notify.acknowledge
           #       ... process order ... if notify.complete?
           #     else
           #       ... log possible hacking attempt ...
           #     end
-          def acknowledge(secret = '')
-            fields = [merchant_id, transaction_id, Digest::MD5.hexdigest(secret).upcase, gross, currency, status].join
+          def acknowledge
+            fields = [merchant_id, item_id, Digest::MD5.hexdigest(secret).upcase, merchant_amount, merchant_currency, status_code].join
             md5sig == Digest::MD5.hexdigest(fields).upcase
           end
         end

data/lib/active_merchant/billing/integrations/nochex.rb

@@ -75,7 +75,7 @@ module ActiveMerchant #:nodoc:
 
         # Simply a convenience method that returns a new 
         # ActiveMerchant::Billing::Integrations::Nochex::Notification
-        def self.notification(post)
+        def self.notification(post, options = {})
           Notification.new(post)
         end  
         

data/lib/active_merchant/billing/integrations/paypal.rb

@@ -26,7 +26,7 @@ module ActiveMerchant #:nodoc:
           end
         end
             
-        def self.notification(post)
+        def self.notification(post, options = {})
           Notification.new(post)
         end
         

data/lib/active_merchant/billing/integrations/quickpay.rb

@@ -8,9 +8,13 @@ module ActiveMerchant #:nodoc:
         mattr_accessor :service_url
         self.service_url = 'https://secure.quickpay.dk/form/'
 
-        def self.notification(post)
+        def self.notification(post, options = {})
           Notification.new(post)
-        end  
+        end
+        
+        def self.return(post, options = {})
+          Return.new(post, options)
+        end
       end
     end
   end

data/lib/active_merchant/billing/integrations/quickpay/helper.rb

@@ -59,7 +59,7 @@ module ActiveMerchant #:nodoc:
           mapping :ipaddress, 'ipaddress'
           mapping :testmode, 'testmode'
 
-          mapping :md5secret, 'md5secret'
+          mapping :credential2, 'md5secret'
 
           mapping :customer, ''
           mapping :billing_address, {}

data/lib/active_merchant/billing/integrations/quickpay/notification.rb

@@ -55,7 +55,7 @@ module ActiveMerchant #:nodoc:
           ]
 
           def generate_md5string
-            MD5_CHECK_FIELDS.map { |key| params[key.to_s] } * "" + @options[:md5secret]
+            MD5_CHECK_FIELDS.map { |key| params[key.to_s] } * "" + @options[:credential2]
           end
           
           def generate_md5check

data/lib/active_merchant/billing/integrations/two_checkout.rb

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
         mattr_accessor :service_url
         self.service_url = 'https://www.2checkout.com/2co/buyer/purchase'
 
-        def self.notification(post)
+        def self.notification(post, options = {})
           Notification.new(post)
         end  
         

data/lib/active_merchant/billing/integrations/two_checkout/notification.rb

@@ -87,14 +87,14 @@ module ActiveMerchant #:nodoc:
             end
           end
           
-          def verify(secret)
-            return false if security_key.blank?
-            
-            Digest::MD5.hexdigest("#{secret}#{params['sid']}#{transaction_id}#{gross}").upcase == security_key.upcase
+          def secret
+            @options[:credential2]
           end
           
           def acknowledge
-            true
+            return false if security_key.blank?
+            
+            Digest::MD5.hexdigest("#{secret}#{params['sid']}#{transaction_id}#{gross}").upcase == security_key.upcase
           end
           
           private

data/lib/active_merchant/billing/integrations/valitor/response_fields.rb

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
       module Valitor
         module ResponseFields
           def success?
-            valid?
+            acknowledge
           end
           alias :complete? :success?
           
@@ -74,15 +74,12 @@ module ActiveMerchant #:nodoc:
             params['Athugasemdir']
           end
           
-          def valid?
-            unless @valid
-              @valid = if(security_number = @options[:password])
-                (params['RafraenUndirskriftSvar'] == Digest::MD5.hexdigest("#{security_number}#{order}"))
-              else
-                true
-              end
-            end
-            @valid
+          def password
+            @options[:credential2]
+          end
+          
+          def acknowledge
+            password ? Digest::MD5.hexdigest("#{password}#{order}") == params['RafraenUndirskriftSvar'] : true
           end
         end
       end

data/lib/active_merchant/billing/integrations/world_pay.rb

@@ -25,9 +25,13 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        def self.notification(post)
-          Notification.new(post)
-        end  
+        def self.notification(post, options = {})
+          Notification.new(post, options)
+        end
+        
+        def self.return(post, options = {})
+          Return.new(post, options)
+        end
       end
     end
   end

data/lib/active_merchant/common.rb

@@ -11,4 +11,4 @@ module ActiveMerchant
   autoload :RequiresParameters,        'active_merchant/common/requires_parameters'
   autoload :Utils,                     'active_merchant/common/utils'
   autoload :Validateable,              'active_merchant/common/validateable'
-end
+end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.12.1"
+  VERSION = "1.13.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 1
-  - 12
-  - 1
-  version: 1.12.1
+  - 13
+  - 0
+  version: 1.13.0
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -36,13 +36,14 @@ cert_chain:
   hPaSTyVU0yCSnw==
   -----END CERTIFICATE-----
 
-date: 2011-03-21 00:00:00 +01:00
+date: 2011-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: activesupport
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -53,12 +54,12 @@ dependencies:
         - 3
         - 8
         version: 2.3.8
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: builder
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -69,12 +70,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: braintree
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: braintree
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,8 +86,7 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 description: Active Merchant is a simple payment abstraction library used in and sponsored by Shopify. It is written by Tobias Luetke, Cody Fauser, and contributors. The aim of the project is to feel natural to Ruby users and to abstract as many parts as possible away from the user to offer a consistent interface across all supported gateways.
 email: tobi@leetsoft.com
 executables: []