mollie-payment 0.5.0 → 0.6.0

data/README.md

@@ -1,9 +1,7 @@
 Mollie Payment
 ========
 
-This repository is currently a work in progress and under [Documentation Driven Development](http://thinkingphp.org/spliceit/docs/0.1_alpha/pages/ddd_info.html).
-
-On the one hand to get familiar with documenting and [YARD](http://yardoc.org/). On the other hand to focus on creating an opiniated Ruby-wrapper for the Mollie [iDEAL API](https://www.mollie.nl/beheer/betaaldiensten/documentatie/ideal/).
+A client to interact with the Mollie API. Currently only the [iDEAL operations](https://www.mollie.nl/support/documentatie/betaaldiensten/ideal/) are supported.
 
 The generated docs can be [found here](http://rubydoc.info/gems/mollie-payment).
 
@@ -13,7 +11,9 @@ Develop
     $ git clone git://github.com/eval/mollie-payment.git
     $ cd mollie-payment
     $ bundle
-    $ bundle exec autotest -s rspec2
+    $ rake spec
+    # or
+    $ bundle exec autotest
 
 Author
 ------

data/lib/mollie/ideal.rb

@@ -1,11 +1,37 @@
 require 'httparty'
 
 module Mollie
+  class IdealException < RuntimeError;end
+  
+  class HTTParty::Response
+    def error?
+      parsed_response && 
+      (item = parsed_response['item']) && (type = item['type']) && 
+      'error' == type
+    end
+  end
+
+  class Parser < HTTParty::Parser
+    def xml
+      result = super['response']
+    end
+
+    # Some responses (mostly error-responses) have content-type 'text/html',
+    # but an xml-body; therefor handle all html-responses *initially* as xml.
+    def html
+      xml
+    rescue MultiXml::ParseError, StandardError
+      super
+    end
+  end
+
   class Ideal
     include HTTParty
+    parser Mollie::Parser
     base_uri 'https://secure.mollie.nl/xml/ideal'
 
     attr_reader :partner_id, :production
+
     # Create a new Ideal object
     #
     # @param [String] partner_id your Mollie partner id
@@ -29,8 +55,11 @@ module Mollie
     #
     # @return [Array<Hash{Symbol => String}>] the list of banks.
     def self.banks
-      resp = get('', :query => {:a => 'banklist'}).parsed_response
-      resp["response"]["bank"].map do |b|
+      resp = get('', :query => {:a => 'banklist'})
+      parsed_response = resp.parsed_response
+      return error_response(resp) if resp.error?
+
+      parsed_response["bank"].map do |b|
         {:id => b["bank_id"], :name => b["bank_name"]}
       end
     end
@@ -48,7 +77,7 @@ module Mollie
     # @option opts [String] :description description of the transaction
     #   (max. 30 characters).
     # @option opts [String] :report_url address where the result of the
-    #   transaction is sent (POSTed?).
+    #   transaction is sent.
     # @option opts [String] :return_url address where the visitor is sent.
     # @option opts [String] :profile_key (nil) the profile this transaction
     #   should be linked to.
@@ -75,11 +104,14 @@ module Mollie
       query_options.merge!(:a => 'fetch', :partnerid => self.partner_id)
       query_options.merge!(:testmode => 'true') unless self.production?
 
-      resp = self.class.get('', :query => query_options).parsed_response
-      order = resp["response"]["order"]
+      resp = self.class.get('', :query => query_options, :accept => 'text/xml')
+      parsed_response = resp.parsed_response
+      return error_response(resp) if resp.error?
+
+      order = parsed_response["order"]
 
       %w(transaction_id amount currency url).map(&:to_sym).inject({}) do |res, k|
-        v = order[k.to_s]
+        v = order[k.to_s] || order[k.to_s.upcase]
         v = v.to_i if k == :amount
 
         res[k] = v
@@ -111,21 +143,31 @@ module Mollie
     #   #                     and this is the first time you check it.',
     #   #        :status => 'Expired'
     #   #      }
+    #   # Example of an error:
+    #   # => {
+    #   #      :error => {
+    #   #        :code => "-10",
+    #   #        :message => "This is an unknown order."
+    #   #      }
+    #   #    }
     #
     # @note Once a transaction is payed, only the next time you verify the
     #   transaction will the value of 'payed' be 'true'.
     #   Else it will be 'false'.
-    # @return [Hash] the status of the transaction (see example)
+    # @return [Hash] the status of the transaction (see example). 
     def verify_transaction(options={})
       query_options = options_to_query_options(options)
       query_options.merge!(:a => 'check', :partnerid => self.partner_id)
       query_options.merge!(:testmode => 'true') unless self.production?
 
-      resp = self.class.get('', :query => query_options).parsed_response
-      order = resp["response"]["order"]
+      resp = self.class.get('', :query => query_options)
+      parsed_response = resp.parsed_response
+      return error_response(resp) if resp.error?
+
+      order = parsed_response["order"]
 
       result = %w(transaction_id amount currency payed status message).map(&:to_sym).inject({}) do |res, k|
-        v = order[k.to_s]
+        v = order[k.to_s] || order[k.to_s.upcase]
         v = v.to_i if k == :amount
         v = (v == 'true') if k == :payed
 
@@ -158,5 +200,10 @@ module Mollie
         result
       end
     end
+
+    def error_response(response)
+      error = response.parsed_response['item']
+      {:error => {:code => error['errorcode'], :message => error['message']}}
+    end
   end
 end

data/lib/mollie/payment/version.rb

@@ -1,5 +1,5 @@
 module Mollie
   class Payment
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/mollie-ideal.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Gert Goet"]
   s.email       = ["gert@thinkcreate.nl"]
   s.homepage    = "https://github.com/eval/mollie-payment"
-  s.summary     = %q{Client for the Mollie API (currently iDEAL only}
-  s.description = %q{Client for the Mollie API (currently iDEAL only}
+  s.summary     = %q{Client for the Mollie API (currently iDEAL-only)}
+  s.description = %q{Client for the Mollie API (currently iDEAL-only)}
 
   s.rubyforge_project = "mollie-payment"
 
@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "httparty"
+  s.add_dependency "httparty", "~> 0.8.1"
 
-  s.add_development_dependency "yard"
-  s.add_development_dependency "rdiscount"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "ZenTest"
-  s.add_development_dependency "vcr"
-  s.add_development_dependency "webmock"
+  s.add_development_dependency "yard", "~> 0.7.4"
+  s.add_development_dependency "rdiscount", "~> 1.6.8"
+  s.add_development_dependency "rspec", "~> 2.7.0"
+  s.add_development_dependency "ZenTest", "~> 4.6.2"
+  s.add_development_dependency "vcr", "~> 1.11.3"
+  s.add_development_dependency "webmock", "~> 1.7.8"
 end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require "bundler"
 Bundler.setup
 
 $:.unshift File.expand_path("../../lib", __FILE__)
-require "mollie-ideal"
+require "mollie/ideal"
 
 Bundler.require(:test)
 require 'vcr'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mollie-payment
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,86 +9,86 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000Z
+date: 2011-12-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70206244600140 !ruby/object:Gem::Requirement
+  requirement: &70226691896980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70206244600140
+  version_requirements: *70226691896980
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70206244599500 !ruby/object:Gem::Requirement
+  requirement: &70226691896340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *70206244599500
+  version_requirements: *70226691896340
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70206244598920 !ruby/object:Gem::Requirement
+  requirement: &70226691895820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *70206244598920
+  version_requirements: *70226691895820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206244598340 !ruby/object:Gem::Requirement
+  requirement: &70226691895300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70206244598340
+  version_requirements: *70226691895300
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70206244597780 !ruby/object:Gem::Requirement
+  requirement: &70226691894720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *70206244597780
+  version_requirements: *70226691894720
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70206244597020 !ruby/object:Gem::Requirement
+  requirement: &70226691894060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.3
   type: :development
   prerelease: false
-  version_requirements: *70206244597020
+  version_requirements: *70226691894060
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70206244596440 !ruby/object:Gem::Requirement
+  requirement: &70226691893540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.8
   type: :development
   prerelease: false
-  version_requirements: *70206244596440
-description: Client for the Mollie API (currently iDEAL only
+  version_requirements: *70226691893540
+description: Client for the Mollie API (currently iDEAL-only)
 email:
 - gert@thinkcreate.nl
 executables: []
@@ -133,7 +133,7 @@ rubyforge_project: mollie-payment
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Client for the Mollie API (currently iDEAL only
+summary: Client for the Mollie API (currently iDEAL-only)
 test_files:
 - spec/fixtures/vcr_cassettes/banks.yml
 - spec/fixtures/vcr_cassettes/request_transaction.yml