wvanbergen-adyen 0.0.1 → 0.1.0

data/README.rdoc

@@ -1,100 +1,32 @@
 = Adyen
 
 Package to simplify including the Adyen payments services into a Ruby on Rails application.
-Currently, the package contains functions to easily generate the required hidden fields and
-matchers to easily check your views using rspec.
 
-* For more information about Adyen, see http://www.adyen.com
-* For more information about integrating Adyen, see their manuals at
-  http://support.adyen.com/links/documentation 
-
-== Skins
-
-Adyen using the notion of "skins" to determine what payment methods should be available
-and what the payment environment should look like. At least one skin is required, which
-can be created in the merchant area of Adyen. For every key, a shared secret is generated
-that is required to sign payment forms. You will need to provide this secret as the 
-:shared_secret field to the hidden_fields method (see below).
-
-== Building payment forms
-
-  <% form_tag(:url => Adyen::Form.url) do %>
-    <%= Adyen::Form.hidden_fields(:merchant_account => 'myaccount', ... , 
-           :skin_code => 'myperfectskin', :shared_secret => 'youllneverguess')
-    ...
-    <%= submit_tag('pay') %> 	
-  <% end %>
-
-Please refer to the Adyen integration manual for all the
-
-<tt>Adyen::Form.url</tt> will return the URL to the live environment of Adyen in production 
-mode, otherwise it will return the testing environment. To override this behavior, use:
-
-  <% form_tag(:url => Adyen::Form.url('live')) do %>
-    ...
-  <% end %>
-
-<tt>Adyen::Form.hidden_fields</tt> will generate the hidden fields for the key/value pairs
-you provide to the function. The keys will be camelized automatically. Some notes:
+Adyen integration relies on three modes of communication between Adyen, your server and your client/customer:
 
-* <tt>:recurring => true</tt> will be translated to <tt>:recurringContract => 'DEFAULT'</tt>.
-* <tt>:order_data</tt> will be encoded using gzip/base64.
-* <tt>:shared_secret</tt> must be provided to calculate the merchant signature.
-* <tt>:merchant_sig</tt> will be computed automatically using this secret.
+* Client-to-Adyen communication using forms and redirects.
+* Adyen-to-server communications using notifications.
+* Server-to-Adyen communication using SOAP services.
 
-== Testing payment forms using rspec matchers
+This library aims to ease the implementation of all these modes into your application. Moreover, it provides matchers, assertions and mocks to make it easier to implement an automated test suite to assert the integration is working correctly.
 
-First, make sure that the Adyen matchers are available in your view specs:
+== Installation
 
-  Spec::Runner.configure do |config|
-    ...
-    config.include Adyen::Matchers, :type => :views
-    ...
-  end
+This plugin can either be installed as gem or Rails plugin:
 
-To check the response in a view spec, use the <tt>have_adyen_payment_form</tt>, 
-<tt>have_adyen_recurrent_payment_form</tt> and <tt>have_adyen_single_payment_form matchers</tt>.
-By passing a hash, you can check the values of the hidden fields. By passing :anything
-as value, the matcher will simply check if the hidden field exists and ignore its value.
+    gem install wvanbergen-adyen --source http://gems.github.com    # as gem
+    script/plugin install git://github.com/wvanbergen/adyen.git     # as plugin
 
-Some example specs:
+== Usage
 
-	before(:each) do
-	  render 'payments/new.html.erb'
-	end
+See the project wiki on http://wiki.github.com/wvanbergen/adyen to get started.
 
-  it "should contain an Adyen payment form" do
-    # either single or recurring
-    response.should have_adyen_payment_form(:currency_code => 'EUR', :payment_amount => 1000)
-  end
-
-  it "should contain an Adyen recurrent payment form" do
-    response.should have_adyen_recurrent_payment_form
-  end
-
-  it "should contain an Adyen recurrent payment form" do
-    response.should have_adyen_single_payment_form(:merchant_reference => :anything)
-  end
-
-== Testing payment forms using assertions
-
-To use the assertions in unit tests, first include the matchers module in your test class:
-
-  class PaymentControllerTest < Test::Unit
-    include Adyen::Matchers
-    ...
-
-Use the assertion methods <tt>assert_adyen_payment_form</tt>, <tt>assert_adyen_single_payment_form</tt> 
-and <tt>assert_adyen_recurring_payment_form</tt>. They work similarly to the RSpec matcher methods
-described above. An example:
-
-  def test_payment_form
-    get new_payment_path
-    assert_adyen_payment_form(@response, :currency_code => 'EUR', :payment_amount => 1000)
-  end
+* For more information about Adyen, see http://www.adyen.com
+* For more information about integrating Adyen, see their manuals at
+  http://support.adyen.com/links/documentation 
 
 == About
 
 This package is written by Michel Barbosa and Willem van Bergen for Floorplanner.com,
 and made public under the MIT license (see LICENSE). It comes without warranty of any kind,
-so use at your own risk.
+so use at your own risk.

data/lib/adyen/encoding.rb

@@ -0,0 +1,21 @@
+require 'base64'
+require 'openssl'
+require 'stringio'
+require 'zlib'
+
+module Adyen
+  module Encoding
+    def self.hmac_base64(hmac_key, message)
+      digest = OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), hmac_key, message)
+      Base64.encode64(digest).strip
+    end
+
+    def self.gzip_base64(message)
+      sio = StringIO.new
+      gz  = Zlib::GzipWriter.new(sio)
+      gz.write(message)
+      gz.close
+      Base64.encode64(sio.string).gsub("\n", "")
+    end
+  end
+end

data/lib/adyen/form.rb

@@ -36,6 +36,7 @@ module Adyen
       attributes[:session_validity]   = Adyen::Formatter::DateTime.fmt_time(attributes[:session_validity])
     end
     
+
     def self.hidden_fields(attributes = {})
       do_attribute_transformations!(attributes)
 
@@ -54,5 +55,17 @@ module Adyen
       }.join("\n")
     end
     
+    def self.redirect_signature_string(params)
+      params[:authResult].to_s + params[:pspReference].to_s + params[:merchantReference].to_s + params[:skinCode].to_s
+    end
+    
+    def self.redirect_signature(params, shared_secret)
+      Adyen::Encoding.hmac_base64(shared_secret, redirect_signature_string(params))
+    end
+    
+    def self.redirect_signature_check(params, shared_secret)
+      params[:merchantSig] == redirect_signature(params, shared_secret)
+    end    
+    
   end
 end

data/lib/adyen/formatter.rb

@@ -0,0 +1,37 @@
+module Adyen
+  module Formatter
+    module DateTime
+      # Returns a valid Adyen string representation for a date
+      def self.fmt_date(date)
+        case date
+        when Date, DateTime, Time
+          date.strftime('%Y-%m-%d')
+        else
+          raise "Invalid date notation: #{date.inspect}!" unless /^\d{4}-\d{2}-\d{2}$/ =~ date
+          date
+        end
+      end
+
+      # Returns a valid Adyen string representation for a timestamp
+      def self.fmt_time(time)
+        case time
+        when Date, DateTime, Time
+          time.strftime('%Y-%m-%dT%H:%M:%SZ')
+        else
+          raise "Invalid timestamp notation: #{time.inspect}!" unless /^\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}Z$/ =~ time
+          time
+        end
+      end
+    end
+
+    module Price
+      def self.in_cents(price)
+        ((price * 100).round).to_i
+      end
+      
+      def self.from_cents(price)
+        BigDecimal.new(price.to_s) / 100
+      end
+    end
+  end
+end

data/lib/adyen/notification.rb

@@ -0,0 +1,101 @@
+require 'activerecord'
+
+module Adyen
+  class Notification < ActiveRecord::Base
+    
+    DEFAULT_TABLE_NAME = :adyen_notifications
+    set_table_name(DEFAULT_TABLE_NAME)
+    
+    validates_presence_of :event_code
+    validates_presence_of :psp_reference    
+    validates_uniqueness_of :success, :scope => [:psp_reference, :event_code]
+    
+    # Make sure we don't end up with an original_reference with an empty string
+    before_validation { |notification| notification.original_reference = nil if notification.original_reference.blank? }
+
+    def self.log(params)
+      converted_params = {}
+      # Convert each attribute from CamelCase notation to under_score notation
+      # For example, merchantReference will be converted to merchant_reference
+      params.each do |key, value| 
+        field_name                   = key.to_s.underscore
+        converted_params[field_name] = value if self.column_names.include?(field_name)
+      end
+      self.create!(converted_params)
+    end
+    
+    def authorisation?
+      event_code == 'AUTHORISATION'
+    end
+    
+    alias :authorization? :authorisation?
+    
+    def successful_authorisation?
+      event_code == 'AUTHORISATION' && success?
+    end
+    
+    def collect_payment_for_recurring_contract!(options)
+      # Make sure we convert the value to cents
+      options[:value] = Adyen::Formatter::Price.in_cents(options[:value])
+      raise "This is not a recurring contract!" unless event_code == 'RECURRING_CONTRACT'
+      Adyen::SOAP::RecurringService.submit(options.merge(:recurring_reference => self.psp_reference))
+    end
+    
+    def deactivate_recurring_contract!(options)
+      raise "This is not a recurring contract!" unless event_code == 'RECURRING_CONTRACT'      
+      Adyen::SOAP::RecurringService.deactivate(options.merge(:recurring_reference => self.psp_reference))
+    end
+    
+    alias :successful_authorization? :successful_authorisation?
+    
+    class HttpPost < Notification
+
+      def self.log(request)
+        super(request.params)
+      end
+
+      def live=(value)
+        self.write_attribute(:live, [true, 1, '1', 'true'].include?(value)) 
+      end
+
+      def success=(value)
+        self.write_attribute(:success, [true, 1, '1', 'true'].include?(value)) 
+      end 
+      
+      def value=(value)
+        self.write_attribute(:value, Adyen::Formatter::Price.from_cents(value)) unless value.blank?
+      end
+    end
+    
+    class Migration < ActiveRecord::Migration
+    
+      def self.up(table_name = Adyen::Notification::DEFAULT_TABLE_NAME)
+        create_table(table_name) do |t|      
+          t.boolean  :live,                  :null => false, :default => false
+          t.string   :event_code,            :null => false
+          t.string   :psp_reference,         :null => false
+          t.string   :original_reference,    :null => true
+          t.string   :merchant_reference,    :null => false
+          t.string   :merchant_account_code, :null => false
+          t.datetime :event_date,            :null => false
+          t.boolean  :success,               :null => false, :default => false
+          t.string   :payment_method,        :null => true
+          t.string   :operations,            :null => true
+          t.text     :reason
+          t.string   :currency,              :null => false, :limit => 3
+          t.decimal  :value,                 :null => true, :precision => 9, :scale => 2
+          t.boolean  :processed,             :null => false, :default => false
+          t.timestamps
+        end
+        add_index table_name, [:psp_reference, :event_code, :success], :unique => true
+      end
+      
+      def self.down(table_name = Adyen::Notification::DEFAULT_TABLE_NAME)
+        remove_index(table_name, [:psp_reference, :event_code, :success])
+        drop_table(table_name)
+      end
+      
+    end
+    
+  end
+end

data/lib/adyen/soap.rb

@@ -0,0 +1,149 @@
+require "handsoap"
+
+module Adyen
+  
+  # The SOAP module contains classes that interact with the Adyen
+  # SOAP services. The clients are based on the Handsoap library.
+  # Shared functionality for all services is implemented in the
+  # Adyen::SOAP::Base class.
+  #
+  # Note that you'll need an Adyen notification PSP reference for
+  # most SOAP calls. Because of this, store all notifications that
+  # Adyen sends to you. (e.g. using the Adyen::Notification ActiveRecord 
+  # class). Moreover, most SOAP calls do not respond that they were
+  # successful immediately, but a notifications to indicate that will
+  # be sent later on.
+  #  
+  # You'll need to provide a username and password to interact
+  # with the Adyen SOAP services:
+  #
+  #     Adyen::SOAP.username = 'ws@Company.MyAccount'
+  #     Adyen::SOAP.password = 'very$ecret'
+  #
+  # You can setup default values for every SOAP call that needs them:
+  #
+  #     Adyen::SOAP.default_arguments[:merchent_account] = 'MyMerchant'
+  #
+  # For now, only the recurring payment service client is implemented 
+  # (Adyen::SOAP::RecurringService). 
+  module SOAP
+
+    class << self 
+      # Set up accessors for HTTP Basic Authentication and
+      # for adding default arguments to SOAP calls.
+      attr_accessor :username, :password, :default_arguments
+    end
+
+    # Use no default arguments by default
+    self.default_arguments = {}
+    
+    # The base class sets up XML namespaces and HTTP authentication
+    # for all the Adyen SOAP services
+    class Base < Handsoap::Service
+
+      def self.inherited(klass)
+        # The version must be set to construct the request envelopes,
+        # the URI wil be set later using the correct Adyen.environment.
+        klass.endpoint :version => 1, :uri => 'bogus'
+      end
+
+      # Setup basic auth headers in the HTTP client
+      def on_after_create_http_client(http_client) 
+        debug { |logger| logger.puts "Authorization: #{Adyen::SOAP.username}:#{Adyen::SOAP.password}..." }
+        # Handsoap BUG: Setting headers does not work, using a Curb specific method for now.
+        # auth = Base64.encode64("#{Adyen::SOAP.username}:#{Adyen::SOAP.password}").chomp
+        # http_client.headers['Authorization'] = "Basic #{auth}"
+        http_client.userpwd = "#{Adyen::SOAP.username}:#{Adyen::SOAP.password}"
+      end
+    
+      # Setup XML namespaces for SOAP request body
+      def on_create_document(doc)    
+        doc.alias 'payment',   'http://payment.services.adyen.com'
+        doc.alias 'recurring', 'http://recurring.services.adyen.com'
+        doc.alias 'common',    'http://common.services.adyen.com'
+      end
+      
+      # Setup XML namespaces for SOAP response
+      def on_response_document(doc)
+        doc.add_namespace 'payment',   'http://payment.services.adyen.com'
+        doc.add_namespace 'recurring', 'http://recurring.services.adyen.com'
+        doc.add_namespace 'common',    'http://common.services.adyen.com'        
+      end
+      
+      # Set endpoint URI before dispatch, so that changes in environment
+      # are reflected correctly.
+      def on_before_dispatch
+        self.class.endpoint(:uri => self.class::ENDPOINT_URI % Adyen.environment.to_s, :version => 1)
+      end
+    end
+    
+    # SOAP client to interact with the payment modification service of Adyen.
+    # At this moment, none of the calls are implemented.
+    class PaymentService < Base
+    
+      ENDPOINT_URI = 'https://pal-%s.adyen.com/pal/servlet/soap/Payment'
+          
+    end
+    
+    # SOAP client to interact with the recurring payment service of Adyen.
+    # This client implements the submitRecurring call to submit payments
+    # for a recurring contract. Moreover, it implements the deactiveRecurring
+    # call to cancel a recurring contract.
+    #
+    # See the Adyen Recurring manual for more information about this SOAP service
+    class RecurringService < Base
+      
+      ENDPOINT_URI = 'https://pal-%s.adyen.com/pal/servlet/soap/Recurring'
+      
+      # Submits a recurring payment. Requires the following arguments as hash:
+      #
+      # * <tt>:currency</tt> The currency code (EUR, GBP, USD, etc)
+      # * <tt>:value</tt> The value of the payments in cents
+      # * <tt>:merchent_account</tt> The merchant account under which to place
+      #       this payment.
+      # * <tt>:recurring_reference</tt> The psp_reference of the RECURRING_CONTRACT 
+      #       notification that was sent after the initial payment.
+      # * <tt>:reference</tt> The (merchant) reference for this payment.
+      # * <tt>:shopper_email</tt> The email address of the shopper.
+      # * <tt>:shopper_reference</tt> The refrence of the shopper. This should be 
+      #       the same as the reference that was used to create the recurring contract.
+      def submit(args = {})
+        invoke_args = Adyen::SOAP.default_arguments.merge(args)
+        response = invoke('recurring:submitRecurring') do |message|
+          message.add('recurring:recurringRequest') do |req|
+            req.add('recurring:amount') do |amount|
+              amount.add('common:currency', invoke_args[:currency])
+              amount.add('common:value', invoke_args[:value])  
+            end
+            req.add('recurring:merchantAccount', invoke_args[:merchant_account])   
+            req.add('recurring:recurringReference', invoke_args[:recurring_reference])
+            req.add('recurring:reference', invoke_args[:reference])
+            req.add('recurring:shopperEmail', invoke_args[:shopper_email])
+            req.add('recurring:shopperReference', invoke_args[:shopper_reference])             
+          end
+        end
+      end
+      
+      # Deactivates a recurring payment contract. Requires the following arguments:
+      #
+      # * <tt>:merchent_account</tt> The merchant account under which to place
+      #       this payment.
+      # * <tt>:recurring_reference</tt> The psp_reference of the RECURRING_CONTRACT 
+      #       notification that was sent after the initial payment.
+      # * <tt>:reference</tt> The (merchant) reference for this deactivation.
+      # * <tt>:shopper_reference</tt> The refrence of the shopper. This should be 
+      #       the same as the reference that was used to create the recurring contract.      
+      def deactivate(args = {})
+        invoke_args = Adyen::SOAP.default_arguments.merge(args)        
+        response = invoke('recurring:deactivateRecurring') do |message|
+          message.add('recurring:recurringRequest') do |req|          
+            req.add('recurring:merchantAccount', invoke_args[:merchant_account])   
+            req.add('recurring:recurringReference', invoke_args[:recurring_reference])
+            req.add('recurring:reference', invoke_args[:reference])
+            req.add('recurring:shopperReference', invoke_args[:shopper_reference])          
+          end
+        end
+      end
+    end
+  end  
+end

data/spec/adyen_spec.rb

@@ -0,0 +1,53 @@
+require "#{File.dirname(__FILE__)}/spec_helper.rb"
+
+describe Adyen do
+  describe Adyen::Encoding do
+    it "should a hmac_base64 correcly" do
+      encoded_str = Adyen::Encoding.hmac_base64('bla', 'bla')
+      encoded_str.should_not be_blank
+      encoded_str.size.should == 28
+    end    
+    
+    it "should gzip_base64 correcly" do
+      encoded_str = Adyen::Encoding.gzip_base64('bla')
+      encoded_str.should_not be_blank
+      encoded_str.size.should == 32
+    end
+  end
+
+  describe Adyen::Formatter::DateTime do
+    it "should accept dates" do
+      Adyen::Formatter::DateTime.fmt_date(Date.today).should match(/^\d{4}-\d{2}-\d{2}$/)
+    end
+    
+    it "should accept times" do
+      Adyen::Formatter::DateTime.fmt_time(Time.now).should match(/^\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}Z$/)
+    end
+    
+    it "should accept valid time strings" do
+      Adyen::Formatter::DateTime.fmt_time('2009-01-01T11:11:11Z').should match(/^\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}Z$/)
+    end    
+    
+    it "should accept valid time strings" do    
+      Adyen::Formatter::DateTime.fmt_date('2009-01-01').should match(/^\d{4}-\d{2}-\d{2}$/)
+    end
+
+    it "should raise on an invalid time string" do
+      lambda { Adyen::Formatter::DateTime.fmt_time('2009-01-01 11:11:11') }.should raise_error
+    end    
+
+    it "should raise on an invalid date string" do
+      lambda { Adyen::Formatter::DateTime.fmt_date('2009-1-1') }.should raise_error
+    end    
+  end
+
+  describe Adyen::Formatter::Price do
+    it "should return a Fixnum with digits only when converting to cents" do
+      Adyen::Formatter::Price.in_cents(33.76).should be_kind_of(Fixnum)
+    end
+
+    it "should return a BigDecimal when converting from cents" do
+      Adyen::Formatter::Price.from_cents(1234).should be_kind_of(BigDecimal)
+    end
+  end
+end

data/spec/form_spec.rb

@@ -28,6 +28,41 @@ describe Adyen::Form do
     end
   end  
   
+  describe 'redirect signature check' do
+    before(:each) do
+      # Example taken from integration manual
+      
+      # Shared secret between you and Adyen, only valid for this skinCode!
+      @shared_secret = 'Kah942*$7sdp0)' 
+      
+      # Example get params sent back with redirect
+      @params = { :authResult => 'AUTHORISED', :pspReference => '1211992213193029',
+        :merchantReference => 'Internet Order 12345', :skinCode => '4aD37dJA',
+        :merchantSig => 'ytt3QxWoEhAskUzUne0P5VA9lPw='}
+    end
+    
+    it "should calculate the signature string correctly" do
+      Adyen::Form.redirect_signature_string(@params).should eql('AUTHORISED1211992213193029Internet Order 123454aD37dJA')
+    end
+    
+    it "should calculate the signature correctly" do
+      Adyen::Form.redirect_signature(@params, @shared_secret).should eql(@params[:merchantSig])
+    end
+    
+    it "should check the signature correctly" do
+      Adyen::Form.redirect_signature_check(@params, @shared_secret).should be_true
+    end    
+    
+    it "should detect a tampered field" do
+      Adyen::Form.redirect_signature_check(@params.merge(:pspReference => 'tampered'), @shared_secret).should be_false
+    end    
+
+    it "should detect a tampered signature" do
+      Adyen::Form.redirect_signature_check(@params.merge(:merchantSig => 'tampered'), @shared_secret).should be_false
+    end    
+
+  end
+  
   describe 'hidden fields generation' do
     
     include ActionView::Helpers::TagHelper

data/spec/notification_spec.rb

@@ -0,0 +1,101 @@
+require "#{File.dirname(__FILE__)}/spec_helper.rb"
+
+require 'action_controller'
+require 'action_controller/test_process'
+
+describe Adyen::Notification do
+
+  before(:all) do
+    ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+
+    ActiveRecord::Migration.verbose = false
+    Adyen::Notification::Migration.up    
+  end
+  
+  after(:all) do
+    Adyen::Notification::Migration.down
+  end
+  
+  describe Adyen::Notification::HttpPost do
+
+    describe 'receiving payment authorization notification' do
+          
+      before(:each) do
+        @request = mock('request')
+        @request.stub!(:params).and_return({
+              "merchantAccountCode"=>"FloorPlannerNL", "eventCode"=>"AUTHORISATION", 
+              "paymentMethod"=>"mc", "eventDate"=>"2009-08-10T09:00:08.04Z", 
+              "operations"=>"CANCEL,CAPTURE,REFUND", "merchantReference"=>"4", 
+              "action"=>"process_adyen", "live"=>"false", "controller"=>"payment_notifications", 
+              "value"=>"2500", "success"=>"false", "reason"=>"10676:1111:12/2012", 
+              "originalReference"=>"", "pspReference"=>"8712498948081194", "currency"=>"USD"})
+
+        @notification = Adyen::Notification::HttpPost.log(@request)
+      end
+      
+      after(:each) { @notification.destroy }
+      
+      it "should have saved the notification record" do
+        @notification.should_not be_new_record
+      end
+    
+      it "should be an authorization" do
+        @notification.should be_authorisation
+      end
+    
+      it "should convert the amount to a bigdecimal" do
+        @notification.value.should eql(BigDecimal.new('25.00'))
+      end
+      
+      it "should convert live to a boolean" do
+        @notification.should_not be_live
+      end
+      
+      it "should convert success to a boolean" do
+        @notification.should_not be_success
+      end
+      
+      it "should not be a successfull authorization" do
+        @notification.should_not be_successful_authorization
+      end
+      
+      it "should convert the eventDate" do
+        @notification.event_date.should be_kind_of(Time)
+      end
+      
+      it "should convert the empty original reference to NULL" do
+        @notification.original_reference.should be_nil
+      end      
+    end
+    
+    context 'duplicate detection' do
+      before(:each) do
+
+        @fields = { "merchantAccountCode"=>"FloorPlannerNL", "eventCode"=>"AUTHORISATION", 
+                    "paymentMethod"=>"mc", "eventDate"=>"2009-08-10T09:00:08.04Z", 
+                    "operations"=>"CANCEL,CAPTURE,REFUND", "merchantReference"=>"4", 
+                    "action"=>"process_adyen", "live"=>"false", "controller"=>"payment_notifications", 
+                    "value"=>"2500", "success"=>"false", "reason"=>"10676:1111:12/2012", 
+                    "originalReference"=>"", "pspReference"=>"8712498948081194", "currency"=>"USD"}
+
+        @request = mock('request')
+        @request.stub!(:params).and_return(@fields)
+        @notification = Adyen::Notification::HttpPost.log(@request)
+      end
+      
+      after(:each) { @notification.destroy }
+
+      it "should raise an error on a duplicate notification" do
+        lambda { Adyen::Notification::HttpPost.log(@request) }.should raise_error(ActiveRecord::RecordInvalid)
+      end
+
+      it "should not raise an error on a when success is set to true" do
+        second_request = mock('request')
+        second_request.stub!(:params).and_return(@fields.merge('success' => 'true'))
+        lambda { Adyen::Notification::HttpPost.log(second_request) }.should_not raise_error
+      end
+
+    end    
+  end
+
+end

data/spec/soap_spec.rb

@@ -0,0 +1,5 @@
+require "#{File.dirname(__FILE__)}/spec_helper.rb"
+
+describe Adyen::SOAP do
+
+end

data/tasks/github-gem.rake

@@ -26,27 +26,37 @@ module Rake
         desc "Updates the file lists for this gem"
         task(:manifest) { manifest_task }
 
-        desc "Releases a new version of #{@name}"
+        desc "Builds a gem package for #{@name}"
         task(:build => [:manifest]) { build_task } 
         
         
         release_dependencies = [:check_clean_master_branch, :version, :build, :create_tag]
-        release_dependencies.push 'doc:publish' if generate_rdoc?
+        release_dependencies.push 'doc:publish' if has_rdoc?
         release_dependencies.unshift 'test' if has_tests?
         release_dependencies.unshift 'spec' if has_specs?
                 
         desc "Releases a new version of #{@name}"
         task(:release => release_dependencies) { release_task } 
         
+        namespace(:release) do
+          release_checks = [:check_clean_master_branch, :check_version, :build]
+          release_checks.push 'doc:compile' if has_rdoc?
+          release_checks.unshift 'test' if has_tests?
+          release_checks.unshift 'spec' if has_specs?          
+          
+          desc "Test release conditions"
+          task(:check => release_checks) { release_check_task }
+        end
+        
         # helper task for releasing
-        task(:check_clean_master_branch) { verify_clean_status('master') }
+        task(:check_clean_master_branch) { verify_fast_forward('master', 'origin', 'master'); verify_clean_status('master') }
         task(:check_version) { verify_version(ENV['VERSION'] || @specification.version) }
         task(:version => [:check_version]) { set_gem_version! }
         task(:create_tag) { create_version_tag! }
       end
       
       # Register RDoc tasks
-      if generate_rdoc?
+      if has_rdoc?
         require 'rake/rdoctask'
         
         namespace(:doc) do 
@@ -77,7 +87,7 @@ module Rake
 
         desc "Run all specs for #{@name}"
         Spec::Rake::SpecTask.new(:spec) do |t|
-          t.spec_files = FileList[File.dirname(__FILE__) + '/../spec/**/*_spec.rb']
+          t.spec_files = FileList['spec/**/*_spec.rb']
         end
       end
       
@@ -87,7 +97,7 @@ module Rake
 
         desc "Run all unit tests for #{@name}"
         Rake::TestTask.new(:test) do |t|
-          t.pattern = File.dirname(__FILE__) + '/../test/**/*_test.rb'
+          t.pattern = 'test/**/*_test.rb'
           t.verbose = true
           t.libs << 'test'
         end
@@ -96,16 +106,16 @@ module Rake
     
     protected 
 
-    def generate_rdoc?
-      git_branch_exists?('gh-pages')
+    def has_rdoc?
+      run_command('git branch').any? { |line| /gh-pages\s*$/ =~ line}
     end
 
     def has_specs?
-      Dir[File.dirname(__FILE__) + '/../spec/**/*_spec.rb'].any?
+      Dir['spec/**/*_spec.rb'].any?
     end
     
     def has_tests?
-      Dir[File.dirname(__FILE__) + '/../test/**/*_test.rb'].any?
+      Dir['test/**/*_test.rb'].any?
     end
 
     def reload_gemspec!
@@ -161,23 +171,22 @@ module Rake
     end
     
     def gemspec_file 
-      @gemspec_file ||= Dir[File.dirname(__FILE__) + '/../*.gemspec'].first
-    end
-    
-    def git_branch_exists?(branch_name)
-      branches = run_command('git branch').map { |line| /^\*?\s+(\w+)/ =~ line; $1 }
-      branches.include?(branch_name.to_s)
+      @gemspec_file ||= Dir['*.gemspec'].first
     end
     
     def verify_current_branch(branch)
       run_command('git branch').detect { |line| /^\* (.+)/ =~ line }
-      raise "You are currently not working in the master branch!" unless branch == $1
+      raise "You are currently not working in the #{branch} branch!" unless branch == $1
     end
     
-    def verify_clean_status(on_branch = nil)
-      sh "git fetch"
+    def verify_fast_forward(local_branch = 'master', remote = 'origin', remote_branch = 'master')
+      sh "git fetch #{remote}"
+      lines = run_command("git rev-list #{local_branch}..remotes/#{remote}/#{remote_branch}")
+      raise "Remote branch #{remote}/#{remote_branch} has commits that are not yet incorporated in local #{local_branch} branch" unless lines.length == 0
+    end
+    
+    def verify_clean_status(on_branch = nil)      
       lines = run_command('git status')
-      raise "You don't have the most recent version available. Run git pull first." if /^\# Your branch is behind/ =~ lines[1]
       raise "You are currently not working in the #{on_branch} branch!" unless on_branch.nil? || (/^\# On branch (.+)/ =~ lines.first && $1 == on_branch)
       raise "Your master branch contains modifications!" unless /^nothing to commit \(working directory clean\)/ =~ lines.last
     end
@@ -249,7 +258,15 @@ module Rake
       puts '------------------------------------------------------------'
       puts "Released #{@name} - version #{@specification.version}"
     end
+    
+    def release_check_task
+      puts
+      puts '------------------------------------------------------------'
+      puts "Checked all conditions for a release of version #{ENV['VERSION'] || @specification.version}!"
+      puts 'You should be safe to do a release now.'
+      puts '------------------------------------------------------------'
+    end
   end
 end
 
-Rake::GithubGem.define_tasks!
+Rake::GithubGem.define_tasks!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wvanbergen-adyen
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 -07:00
+date: 2009-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,10 +41,17 @@ files:
 - lib
 - lib/adyen
 - lib/adyen.rb
+- lib/adyen/encoding.rb
 - lib/adyen/form.rb
+- lib/adyen/formatter.rb
 - lib/adyen/matchers.rb
+- lib/adyen/notification.rb
+- lib/adyen/soap.rb
 - spec
+- spec/adyen_spec.rb
 - spec/form_spec.rb
+- spec/notification_spec.rb
+- spec/soap_spec.rb
 - spec/spec_helper.rb
 - tasks
 - tasks/github-gem.rake
@@ -81,4 +88,7 @@ signing_key:
 specification_version: 2
 summary: Integrate Adyen payment services in you Ruby on Rails application
 test_files: 
+- spec/adyen_spec.rb
 - spec/form_spec.rb
+- spec/notification_spec.rb
+- spec/soap_spec.rb