adyen 0.3.7 → 0.3.8

data/.gitignore

@@ -3,3 +3,4 @@
 /doc
 adyen-*.gem
 .yardoc
+*.swp

data/README.rdoc

@@ -15,14 +15,20 @@ automated test suite to assert the integration is working correctly.
 
 == Installation
 
-Add the following line to your <tt>environment.rb</tt> and run <tt>rake gems:install</tt>
+<b>Bundler / Rails 3</b>: Add the following line to your <tt>Gemfile</tt>:
+
+  gem 'adyen'
+
+<b>Rails 2.x</b>: Add the following line to your <tt>environment.rb</tt> and run <tt>rake gems:install</tt>
 to make the Adyen functionality available in your Rails project:
 
-    config.gem 'adyen', :source => 'http://gemcutter.org
+  config.gem 'adyen'
 
 You can also install it as a Rails plugin (*deprecated*):
 
-    script/plugin install git://github.com/wvanbergen/adyen.git
+  script/plugin install git://github.com/wvanbergen/adyen.git
+  
+Depending on your use case, you may also need the following gems: activerecord, handsoap and nokogiri.
 
 == Usage
 
@@ -36,5 +42,6 @@ RDoc documentation for the project can be found on http://rdoc.info/projects/wva
 == 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.
+made public under the MIT license (see LICENSE). Its is currently maintained by Willem van
+Bergen, Stefan Borsje and Eloy Duran. We are not affiliated with Adyen B.V. The software 
+comes without warranty of any kind, so use at your own risk.

data/TODO

@@ -0,0 +1,10 @@
+* Use require/autoload instead of const_missing
+* Make sure Japansese yens work as expected (this is the only currency Adyen does not expect to be in cents)
+* Ditch SOAP library dependency.
+* Complete SOAP API.
+* Add ActiveMerchant integration
+
+* Split up gem to have more explicit dependency requirements, e.g.:
+  * adyen-soap
+  * adyen-railtie
+  * adyen-activemerchant

data/adyen.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name    = 'adyen'
-  s.version = "0.3.7"
-  s.date    = "2010-07-21"
+  s.version = "0.3.8"
+  s.date    = "2010-09-23"
 
-  s.summary = "Integrate Adyen payment services in you Ruby on Rails application."
+  s.summary = "Integrate Adyen payment services in your Ruby on Rails application."
   s.description = <<-EOS
     Package to simplify including the Adyen payments services into a Ruby on Rails application.
     The package provides functionality to create payment forms, handling and storing notifications 
@@ -11,20 +11,26 @@ Gem::Specification.new do |s|
     methods, mocks and matchers to simpify writing tests/specsfor your code.
   EOS
 
-  s.authors  = ['Willem van Bergen', 'Michel Barbosa']
-  s.email    = ['willem@vanbergen.org', 'cicaboo@gmail.com']
+  s.authors  = ['Willem van Bergen', 'Michel Barbosa', 'Stefan Borsje', 'Eloy Duran']
+  s.email    = ['willem@vanbergen.org', 'cicaboo@gmail.com', 'mail@sborsje.nl', 'eloy.de.enige@gmail.com']
   s.homepage = 'http://wiki.github.com/wvanbergen/adyen'
 
+  s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '>= 1.1.4')
   s.add_development_dependency('git', '>= 1.1.0')
+  s.add_development_dependency('gemcutter')
+  
+  # Drop or make runtime dependency.
+  s.add_development_dependency('activerecord')
+  s.add_development_dependency('handsoap')
+  s.add_development_dependency('nokogiri')
 
   s.requirements << 'Handsoap is required for accessing the SOAP services. See http://github.com/troelskn/handsoap.'
-  s.requirements << 'LibXML is required for using the RSpec matchers.'
   s.requirements << 'ActiveRecord is required for storing the notifications in your database.'
 
   s.rdoc_options << '--title' << s.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
   s.extra_rdoc_files = ['README.rdoc']
 
-  s.files = %w(spec/spec_helper.rb spec/adyen_spec.rb lib/adyen/form.rb .gitignore spec/notification_spec.rb lib/adyen/soap.rb LICENSE spec/soap_spec.rb init.rb adyen.gemspec Rakefile spec/form_spec.rb README.rdoc lib/adyen/notification.rb lib/adyen/formatter.rb tasks/github-gem.rake lib/adyen/encoding.rb lib/adyen/matchers.rb lib/adyen.rb)
+  s.files = %w(spec/spec_helper.rb spec/adyen_spec.rb lib/adyen/form.rb .gitignore spec/notification_spec.rb lib/adyen/soap.rb LICENSE spec/soap_spec.rb init.rb adyen.gemspec Rakefile spec/form_spec.rb README.rdoc lib/adyen/notification.rb lib/adyen/formatter.rb tasks/github-gem.rake lib/adyen/encoding.rb TODO lib/adyen/matchers.rb lib/adyen.rb)
   s.test_files = %w(spec/adyen_spec.rb spec/notification_spec.rb spec/soap_spec.rb spec/form_spec.rb)
 end

data/lib/adyen.rb

@@ -13,7 +13,7 @@ module Adyen
   # Version constant for the Adyen plugin.
   # DO NOT CHANGE THIS VALUE BY HAND. It will be updated automatically by
   # the gem:release rake task.
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 
   # Loads configuration settings from a Hash.
   #
@@ -47,9 +47,9 @@ module Adyen
   #
   # It will return the +override+ value if set, it will return the value set
   # using {Adyen.environment=} otherwise. If this value also isn't set, the
-  # environemtn is determined with {Adyen.autodetect_environment}.
+  # environment is determined with {Adyen.autodetect_environment}.
   #
-  # @param ['test', 'live'] override An environemt to override the default with.
+  # @param ['test', 'live'] override An environment to override the default with.
   # @return ['test', 'live'] The Adyen environment that is currently being used.
   def self.environment(override = nil)
     override || @environment || Adyen.autodetect_environment

data/lib/adyen/form.rb

@@ -21,8 +21,8 @@ module Adyen
   # @see Adyen::Form.redirect_url
   # @see Adyen::Form.redirect_signature_check
   module Form
-
-    extend ActionView::Helpers::TagHelper
+    include ActionView::Helpers::TagHelper
+    extend self
 
     ######################################################
     # SKINS
@@ -30,7 +30,7 @@ module Adyen
 
     # Returns all registered skins and their accompanying skin code and shared secret.
     # @return [Hash] The hash of registered skins.
-    def self.skins
+    def skins
       @skins ||= {}
     end
     
@@ -38,7 +38,7 @@ module Adyen
     # @param [Hash<Symbol, Hash>] hash A hash with the skin name as key and the skin parameter hash 
     #    (which should include +:skin_code+ and +:shared_secret+) as value.
     # @see Adyen::Form.register_skin
-    def self.skins=(hash)
+    def skins=(hash)
       @skins = hash.inject({}) do |skins, (name, skin)|
         skins[name.to_sym] = skin.merge(:name => name.to_sym)
         skins
@@ -58,28 +58,28 @@ module Adyen
     # @param [String] skin_code The skin code for this skin, as defined by Adyen.
     # @param [String] shared_secret The shared secret used for signature calculation.
     # @see Adyen.load_config
-    def self.register_skin(name, skin_code, shared_secret)
-      self.skins[name.to_sym] = {:name => name.to_sym, :skin_code => skin_code, :shared_secret => shared_secret }
+    def register_skin(name, skin_code, shared_secret)
+      skins[name.to_sym] = {:name => name.to_sym, :skin_code => skin_code, :shared_secret => shared_secret }
     end
 
     # Returns skin information given a skin name.
     # @param [Symbol] skin_name The name of the skin
     # @return [Hash, nil] A hash with the skin information, or nil if not found.
-    def self.skin_by_name(skin_name)
-      self.skins[skin_name.to_sym]
+    def skin_by_name(skin_name)
+      skins[skin_name.to_sym]
     end
 
     # Returns skin information given a skin code.
     # @param [String] skin_code The skin code of the skin
     # @return [Hash, nil] A hash with the skin information, or nil if not found.
-    def self.skin_by_code(skin_code)
-      self.skins.detect { |(name, skin)| skin[:skin_code] == skin_code }.last rescue nil
+    def skin_by_code(skin_code)
+      skins.detect { |(name, skin)| skin[:skin_code] == skin_code }.last rescue nil
     end
 
     # Returns the shared secret belonging to a skin code.
     # @param [String] skin_code The skin code of the skin
     # @return [String, nil] The shared secret for the skin, or nil if not found. 
-    def self.lookup_shared_secret(skin_code)
+    def lookup_shared_secret(skin_code)
       skin = skin_by_code(skin_code)[:shared_secret] rescue nil
     end
 
@@ -90,14 +90,14 @@ module Adyen
     # Returns the default parameters to use, unless they are overridden.
     # @see Adyen::Form.default_parameters
     # @return [Hash] The hash of default parameters
-    def self.default_parameters
+    def default_parameters
       @default_arguments ||= {}
     end
     
     # Sets the default parameters to use.
     # @see Adyen::Form.default_parameters
     # @param [Hash] hash The hash of default parameters
-    def self.default_parameters=(hash)
+    def default_parameters=(hash)
       @default_arguments = hash
     end
 
@@ -117,7 +117,7 @@ module Adyen
     #    for payment forms or redirects.
     # @see Adyen::Form.environment
     # @see Adyen::Form.redirect_url
-    def self.url(environment = nil)
+    def url(environment = nil)
       environment ||= Adyen.environment
       Adyen::Form::ACTION_URL % environment.to_s
     end
@@ -133,7 +133,7 @@ module Adyen
     #
     # @private
     # @param [Hash] parameters The payment parameters hash to transform
-    def self.do_parameter_transformations!(parameters = {})
+    def do_parameter_transformations!(parameters = {})
       raise "YENs are not yet supported!" if parameters[:currency_code] == 'JPY' # TODO: fixme
 
       parameters.replace(default_parameters.merge(parameters))
@@ -160,7 +160,7 @@ module Adyen
     #    is provided as the +:shared_secret+ parameter.
     # @return [Hash] The payment parameters with the +:merchant_signature+ parameter set.
     # @raise [StandardError] Thrown if some parameter health check fails.
-    def self.payment_parameters(parameters = {}, shared_secret = nil)
+    def payment_parameters(parameters = {}, shared_secret = nil)
       do_parameter_transformations!(parameters)
       
       raise "Cannot generate form: :currency code attribute not found!"         unless parameters[:currency_code]
@@ -204,8 +204,8 @@ module Adyen
     #
     # @param [Hash] parameters The payment parameters to include in the payment request.
     # @return [String] An absolute URL to redirect to the Adyen payment system.
-    def self.redirect_url(parameters = {})
-      self.url + '?' + payment_parameters(parameters).map { |(k, v)| 
+    def redirect_url(parameters = {})
+      url + '?' + payment_parameters(parameters).map { |(k, v)| 
         "#{k.to_s.camelize(:lower)}=#{CGI.escape(v.to_s)}" }.join('&')
     end
     
@@ -230,12 +230,14 @@ module Adyen
     # @param [Hash] parameters The payment parameters to include in the payment request.
     # @return [String] An HTML snippet that can be included in a form that POSTs to the
     #       Adyen payment system.
-    def self.hidden_fields(parameters = {})
+    def hidden_fields(parameters = {})
       
       # Generate a hidden input tag per parameter, join them by newlines.
-      payment_parameters(parameters).map { |key, value|
-        self.tag(:input, :type => 'hidden', :name => key.to_s.camelize(:lower), :value => value)
+      form_str = payment_parameters(parameters).map { |key, value|
+        tag(:input, :type => 'hidden', :name => key.to_s.camelize(:lower), :value => value)
       }.join("\n")
+      
+      form_str.respond_to?(:html_safe) ? form_str.html_safe : form_str
     end
     
     ######################################################
@@ -246,7 +248,7 @@ module Adyen
     # is used by Adyen to check whether the request is genuinely originating from you.
     # @param [Hash] parameters The parameters that will be included in the payment request.
     # @return [String] The string for which the siganture is calculated.
-    def self.calculate_signature_string(parameters)
+    def calculate_signature_string(parameters)
       merchant_sig_string = ""
       merchant_sig_string << parameters[:payment_amount].to_s    << parameters[:currency_code].to_s      <<
                              parameters[:ship_before_date].to_s  << parameters[:merchant_reference].to_s <<
@@ -270,7 +272,7 @@ module Adyen
     #    It should correspond with the skin_code parameter. This parameter can be 
     #    left out if the shared_secret is included as key in the parameters.
     # @return [String] The signature of the payment request
-    def self.calculate_signature(parameters, shared_secret = nil)
+    def calculate_signature(parameters, shared_secret = nil)
       shared_secret ||= parameters.delete(:shared_secret)
       Adyen::Encoding.hmac_base64(shared_secret, calculate_signature_string(parameters))
     end
@@ -282,7 +284,7 @@ module Adyen
     # Generates the string for which the redirect signature is calculated, using the request paramaters.
     # @param [Hash] params A hash of HTTP GET parameters for the redirect request.
     # @return [String] The signature string.
-    def self.redirect_signature_string(params)
+    def redirect_signature_string(params)
       params[:authResult].to_s + params[:pspReference].to_s + params[:merchantReference].to_s + params[:skinCode].to_s
     end
     
@@ -294,7 +296,7 @@ module Adyen
     #     the original payment form. You can leave this out of the skin is registered 
     #     using the {Adyen::Form.register_skin} method.
     # @return [String] The redirect signature
-    def self.redirect_signature(params, shared_secret = nil)
+    def redirect_signature(params, shared_secret = nil)
       shared_secret ||= lookup_shared_secret(params[:skinCode])
       Adyen::Encoding.hmac_base64(shared_secret, redirect_signature_string(params))
     end
@@ -329,7 +331,7 @@ module Adyen
     #     the original payment form. You can leave this out of the skin is registered 
     #     using the {Adyen::Form.register_skin} method.
     # @return [true, false] Returns true only if the signature in the parameters is correct.
-    def self.redirect_signature_check(params, shared_secret = nil)
+    def redirect_signature_check(params, shared_secret = nil)
       params[:merchantSig] == redirect_signature(params, shared_secret)
     end
   end

data/lib/adyen/matchers.rb

@@ -1,4 +1,5 @@
-require 'xml'
+require 'rexml/document'
+require 'rexml/xpath'
 
 module Adyen
   module Matchers
@@ -31,12 +32,10 @@ module Adyen
 
       def self.document(subject)
         if String === subject
-          XML::HTMLParser.string(subject).parse
+          REXML::Document.new(subject.to_s)
         elsif subject.respond_to?(:body)
-          XML::HTMLParser.string(subject.body).parse
-        elsif XML::Node === subject
-          subject
-        elsif XML::Document === subject
+          REXML::Document.new(subject.body.to_s)
+        elsif REXML::Document === subject
           subject
         else
           raise "Cannot handle this XML input type"
@@ -44,7 +43,7 @@ module Adyen
       end
 
       def self.check(subject, checks = {})
-        document(subject).find_first(build_xpath_query(checks))
+        !!REXML::XPath.first(document(subject), build_xpath_query(checks))
       end
     end
 

data/lib/adyen/notification.rb

@@ -105,15 +105,15 @@ module Adyen
       end
 
       def live=(value)
-        self.write_attribute(:live, [true, 1, '1', 'true'].include?(value))
+        super([true, 1, '1', 'true'].include?(value))
       end
 
       def success=(value)
-        self.write_attribute(:success, [true, 1, '1', 'true'].include?(value))
+        super([true, 1, '1', 'true'].include?(value))
       end
 
       def value=(value)
-        self.write_attribute(:value, Adyen::Formatter::Price.from_cents(value)) unless value.blank?
+        super(Adyen::Formatter::Price.from_cents(value)) unless value.blank?
       end
     end
 

data/spec/adyen_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/spec_helper.rb"
+require 'spec_helper'
 
 describe Adyen do
   

data/spec/form_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/spec_helper.rb"
+require 'spec_helper'
 
 describe Adyen::Form do
 

data/spec/notification_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/spec_helper.rb"
+require 'spec_helper'
 
 describe Adyen::Notification do
 

data/spec/soap_spec.rb

@@ -1,31 +1,31 @@
-require "#{File.dirname(__FILE__)}/spec_helper.rb"
+require 'spec_helper'
 
 describe Adyen::SOAP::PaymentService do
 
   describe '#authorise' do
     before(:all) do
-      setup_mock_driver(<<EOF)
-<?xml version="1.0" encoding="UTF-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <soap:Body>
-    <ns1:authoriseResponse xmlns:ns1="http://payment.services.adyen.com">
-      <ns1:paymentResult>
-        <additionalData xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
-        <authCode xmlns="http://payment.services.adyen.com">1234</authCode>
-        <dccAmount xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
-        <dccSignature xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
-        <fraudResult xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
-        <issuerUrl xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
-        <md xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
-        <paRequest xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
-        <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
-        <refusalReason xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
-        <resultCode xmlns="http://payment.services.adyen.com">Authorised</resultCode>
-      </ns1:paymentResult>
-    </ns1:authoriseResponse>
-  </soap:Body>
-</soap:Envelope>
-EOF
+      setup_mock_driver(<<-XML)
+        <?xml version="1.0" encoding="UTF-8"?>
+        <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <soap:Body>
+            <ns1:authoriseResponse xmlns:ns1="http://payment.services.adyen.com">
+              <ns1:paymentResult>
+                <additionalData xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+                <authCode xmlns="http://payment.services.adyen.com">1234</authCode>
+                <dccAmount xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+                <dccSignature xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+                <fraudResult xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+                <issuerUrl xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+                <md xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+                <paRequest xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+                <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
+                <refusalReason xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+                <resultCode xmlns="http://payment.services.adyen.com">Authorised</resultCode>
+              </ns1:paymentResult>
+            </ns1:authoriseResponse>
+          </soap:Body>
+        </soap:Envelope>
+      XML
 
       @response = Adyen::SOAP::PaymentService.authorise({
         :selected_recurring_detail_reference => '6543210987654321',
@@ -93,19 +93,19 @@ EOF
 
   describe '#capture' do
     before(:all) do
-      setup_mock_driver(<<EOF)
-<?xml version="1.0" encoding="UTF-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <soap:Body>
-    <ns1:captureResponse xmlns:ns1="http://payment.services.adyen.com">
-      <ns1:captureResult>
-        <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
-        <response xmlns="http://payment.services.adyen.com">[capture-received]</response>
-      </ns1:captureResult>
-    </ns1:captureResponse>
-  </soap:Body>
-</soap:Envelope>
-EOF
+      setup_mock_driver(<<-XML)
+        <?xml version="1.0" encoding="UTF-8"?>
+        <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <soap:Body>
+            <ns1:captureResponse xmlns:ns1="http://payment.services.adyen.com">
+              <ns1:captureResult>
+                <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
+                <response xmlns="http://payment.services.adyen.com">[capture-received]</response>
+              </ns1:captureResult>
+            </ns1:captureResponse>
+          </soap:Body>
+        </soap:Envelope>
+      XML
 
       @response = Adyen::SOAP::PaymentService.capture({
         :merchant_account => 'YourMerchantAccount',
@@ -154,19 +154,19 @@ EOF
 
   describe "#cancel" do
     before(:all) do
-      setup_mock_driver(<<EOF)
-<?xml version="1.0" encoding="UTF-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <soap:Body>
-    <ns1:cancelResponse xmlns:ns1="http://payment.services.adyen.com">
-      <ns1:cancelResult>
-        <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
-        <response xmlns="http://payment.services.adyen.com">[cancel-received]</response>
-      </ns1:cancelResult>
-    </ns1:cancelResponse>
-  </soap:Body>
-</soap:Envelope>
-EOF
+      setup_mock_driver(<<-XML)
+        <?xml version="1.0" encoding="UTF-8"?>
+        <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <soap:Body>
+            <ns1:cancelResponse xmlns:ns1="http://payment.services.adyen.com">
+              <ns1:cancelResult>
+                <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
+                <response xmlns="http://payment.services.adyen.com">[cancel-received]</response>
+              </ns1:cancelResult>
+            </ns1:cancelResponse>
+          </soap:Body>
+        </soap:Envelope>
+      XML
 
       @response = Adyen::SOAP::PaymentService.cancel({
         :merchant_account => 'YourMerchantAccount',
@@ -205,19 +205,19 @@ EOF
 
   describe "#refund" do
     before(:all) do
-      setup_mock_driver(<<EOF)
-<?xml version="1.0" encoding="UTF-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <soap:Body>
-    <ns1:refundResponse xmlns:ns1="http://payment.services.adyen.com">
-      <ns1:refundResult>
-        <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
-        <response xmlns="http://payment.services.adyen.com">[refund-received]</response>
-      </ns1:refundResult>
-    </ns1:refundResponse>
-  </soap:Body>
-</soap:Envelope>
-EOF
+      setup_mock_driver(<<-XML)
+        <?xml version="1.0" encoding="UTF-8"?>
+        <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <soap:Body>
+            <ns1:refundResponse xmlns:ns1="http://payment.services.adyen.com">
+              <ns1:refundResult>
+                <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
+                <response xmlns="http://payment.services.adyen.com">[refund-received]</response>
+              </ns1:refundResult>
+            </ns1:refundResponse>
+          </soap:Body>
+        </soap:Envelope>
+      XML
 
       @response = Adyen::SOAP::PaymentService.refund({
         :merchant_account => 'YourMerchantAccount',
@@ -261,20 +261,20 @@ EOF
 
   describe "#cancel_or_refund" do
     before(:all) do
-      setup_mock_driver(<<EOF)
-<?xml version="1.0" encoding="UTF-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <soap:Body>
-    <ns1:cancelOrRefundResponse xmlns:ns1="http://payment.services.adyen.com">
-      <ns1:cancelOrRefundResult>
-        <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
-        <response xmlns="http://payment.services.adyen.com">[cancelOrRefund-received]</response>
-      </ns1:cancelOrRefundResult>
-    </ns1:cancelOrRefundResponse>
-  </soap:Body>
-</soap:Envelope>
-EOF
-
+      setup_mock_driver(<<-XML)
+        <?xml version="1.0" encoding="UTF-8"?>
+        <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <soap:Body>
+            <ns1:cancelOrRefundResponse xmlns:ns1="http://payment.services.adyen.com">
+              <ns1:cancelOrRefundResult>
+                <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
+                <response xmlns="http://payment.services.adyen.com">[cancelOrRefund-received]</response>
+              </ns1:cancelOrRefundResult>
+            </ns1:cancelOrRefundResponse>
+          </soap:Body>
+        </soap:Envelope>
+      XML
+        
       @response = Adyen::SOAP::PaymentService.cancel_or_refund({
         :merchant_account => 'YourMerchantAccount',
         :original_reference => '1234567890123456'
@@ -320,7 +320,7 @@ private
         'Server: Apache',
         'Content-Type: text/xml;charset=UTF-8'
       ].join("\r\n"),
-      :content => content
+      :content => content.strip
     })
     Handsoap.http_driver = :mock
   end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
+require 'spec_helper'
 
 require 'rubygems'
 require 'spec'
@@ -6,6 +6,7 @@ require 'spec/autorun'
 require 'active_support'
 
 require 'adyen'
+require 'adyen/matchers'
 
 Spec::Runner.configure do |config|
   config.include Adyen::Matchers

data/tasks/github-gem.rake

@@ -119,24 +119,43 @@ module GithubGem
         checks = [:check_current_branch, :check_clean_status, :check_not_diverged, :check_version]
         checks.unshift('spec:basic') if has_specs?
         checks.unshift('test:basic') if has_tests?
-        checks.push << [:check_rubyforge] if gemspec.rubyforge_project
+        # checks.push << [:check_rubyforge] if gemspec.rubyforge_project
 
         desc "Perform all checks that would occur before a release"
         task(:release_checks => checks)
 
         release_tasks = [:release_checks, :set_version, :build, :github_release, :gemcutter_release]
-        release_tasks << [:rubyforge_release] if gemspec.rubyforge_project
+        # release_tasks << [:rubyforge_release] if gemspec.rubyforge_project
 
-        desc "Release a new verison of the gem"
+        desc "Release a new version of the gem using the VERSION environment variable"
         task(:release => release_tasks) { release_task }
+        
+        namespace(:release) do
+          desc "Release the next version of the gem, by incrementing the last version segment by 1"
+          task(:next => [:next_version] + release_tasks) { release_task }
 
-        task(:check_rubyforge)   { check_rubyforge_task }
-        task(:rubyforge_release) { rubyforge_release_task }
+          desc "Release the next version of the gem, using a patch increment (0.0.1)"
+          task(:patch => [:next_patch_version] + release_tasks) { release_task }
+
+          desc "Release the next version of the gem, using a minor increment (0.1.0)"
+          task(:minor => [:next_minor_version] + release_tasks) { release_task }
+
+          desc "Release the next version of the gem, using a major increment (1.0.0)"
+          task(:major => [:next_major_version] + release_tasks) { release_task }
+        end
+
+        # task(:check_rubyforge)   { check_rubyforge_task }
+        # task(:rubyforge_release) { rubyforge_release_task }
         task(:gemcutter_release) { gemcutter_release_task }
         task(:github_release => [:commit_modified_files, :tag_version]) { github_release_task }
         task(:tag_version) { tag_version_task }
         task(:commit_modified_files) { commit_modified_files_task }
 
+        task(:next_version)       { next_version_task }
+        task(:next_patch_version)  { next_version_task(:patch) }
+        task(:next_minor_version) { next_version_task(:minor) }
+        task(:next_major_version) { next_version_task(:major) }
+        
         desc "Updates the gem release tasks with the latest version on Github"
         task(:update_tasks) { update_tasks_task }
       end
@@ -160,6 +179,32 @@ module GithubGem
       sh "mv #{gemspec.name}-#{gemspec.version}.gem pkg/#{gemspec.name}-#{gemspec.version}.gem"
     end
 
+    def newest_version
+      git.tags.map { |tag| tag.name.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
+    end
+
+    def next_version(increment = nil)
+      next_version = newest_version.segments
+      increment_index = case increment
+        when :micro then 3
+        when :patch then 2
+        when :minor then 1
+        when :major then 0
+        else next_version.length - 1
+      end
+      
+      next_version[increment_index] ||= 0
+      next_version[increment_index] = next_version[increment_index].succ
+      ((increment_index + 1)...next_version.length).each { |i| next_version[i] = 0 }
+      
+      Gem::Version.new(next_version.join('.'))
+    end
+
+    def next_version_task(increment = nil)
+      ENV['VERSION'] = next_version(increment).version
+      puts "Releasing version #{ENV['VERSION']}..."
+    end
+
     # Updates the version number in the gemspec file, the VERSION constant in the main
     # include file and the contents of the VERSION file.
     def version_task
@@ -172,10 +217,8 @@ module GithubGem
 
     def check_version_task
       raise "#{ENV['VERSION']} is not a valid version number!" if ENV['VERSION'] && !Gem::Version.correct?(ENV['VERSION'])
-      proposed_version = Gem::Version.new(ENV['VERSION'] || gemspec.version)
-      # Loads the latest version number using the created tags
-      newest_version   = git.tags.map { |tag| tag.name.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max
-      raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version && newest_version >= proposed_version
+      proposed_version = Gem::Version.new(ENV['VERSION'].dup || gemspec.version)
+      raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version >= proposed_version
     end
 
     # Checks whether the current branch is not diverged from the remote branch
@@ -216,19 +259,19 @@ module GithubGem
       git.push(remote, remote_branch, true)
     end
 
-    # Checks whether Rubyforge is configured properly
-    def check_rubyforge_task
-      # Login no longer necessary when using rubyforge 2.0.0 gem
-      # raise "Could not login on rubyforge!" unless `rubyforge login 2>&1`.strip.empty?
-      output = `rubyforge names`.split("\n")
-      raise "Rubyforge group not found!"   unless output.any? { |line| %r[^groups\s*\:.*\b#{Regexp.quote(gemspec.rubyforge_project)}\b.*] =~ line }
-      raise "Rubyforge package not found!" unless output.any? { |line| %r[^packages\s*\:.*\b#{Regexp.quote(gemspec.name)}\b.*] =~ line }
-    end
-
-    # Task to release the .gem file toRubyforge.
-    def rubyforge_release_task
-      sh 'rubyforge', 'add_release', gemspec.rubyforge_project, gemspec.name, gemspec.version.to_s, "pkg/#{gemspec.name}-#{gemspec.version}.gem"
-    end
+    # # Checks whether Rubyforge is configured properly
+    # def check_rubyforge_task
+    #   # Login no longer necessary when using rubyforge 2.0.0 gem
+    #   # raise "Could not login on rubyforge!" unless `rubyforge login 2>&1`.strip.empty?
+    #   output = `rubyforge names`.split("\n")
+    #   raise "Rubyforge group not found!"   unless output.any? { |line| %r[^groups\s*\:.*\b#{Regexp.quote(gemspec.rubyforge_project)}\b.*] =~ line }
+    #   raise "Rubyforge package not found!" unless output.any? { |line| %r[^packages\s*\:.*\b#{Regexp.quote(gemspec.name)}\b.*] =~ line }
+    # end
+
+    # # Task to release the .gem file toRubyforge.
+    # def rubyforge_release_task
+    #   sh 'rubyforge', 'add_release', gemspec.rubyforge_project, gemspec.name, gemspec.version.to_s, "pkg/#{gemspec.name}-#{gemspec.version}.gem"
+    # end
     
     def gemcutter_release_task
       sh "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"

metadata

@@ -1,55 +1,134 @@
 --- !ruby/object:Gem::Specification 
 name: adyen
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Willem van Bergen
 - Michel Barbosa
+- Stefan Borsje
+- Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +02:00
+date: 2010-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 1
         - 4
         version: 1.1.4
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: git
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
         - 0
         version: 1.1.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: handsoap
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: "    Package to simplify including the Adyen payments services into a Ruby on Rails application.\n    The package provides functionality to create payment forms, handling and storing notifications \n    sent by Adyen and consuming the SOAP services provided by Adyen. Moreover, it contains helper\n    methods, mocks and matchers to simpify writing tests/specsfor your code.\n"
 email: 
 - willem@vanbergen.org
 - cicaboo@gmail.com
+- mail@sborsje.nl
+- eloy.de.enige@gmail.com
 executables: []
 
 extensions: []
@@ -74,6 +153,7 @@ files:
 - lib/adyen/formatter.rb
 - tasks/github-gem.rake
 - lib/adyen/encoding.rb
+- TODO
 - lib/adyen/matchers.rb
 - lib/adyen.rb
 has_rdoc: true
@@ -91,28 +171,31 @@ 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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - Handsoap is required for accessing the SOAP services. See http://github.com/troelskn/handsoap.
-- LibXML is required for using the RSpec matchers.
 - ActiveRecord is required for storing the notifications in your database.
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Integrate Adyen payment services in you Ruby on Rails application.
+summary: Integrate Adyen payment services in your Ruby on Rails application.
 test_files: 
 - spec/adyen_spec.rb
 - spec/notification_spec.rb