active_merchant_mollie 0.1.0 → 0.1.1

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,22 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+.bundle/

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in active_merchant_targetpay.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: .
+  specs:
+    active_merchant_mollie (0.1.1)
+      activemerchant
+      nokogiri
+      rspec
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    active_utils (1.0.3)
+      activesupport (>= 2.3.11)
+      i18n
+    activemerchant (1.25.0)
+      active_utils (>= 1.0.2)
+      activesupport (>= 2.3.11)
+      builder (>= 2.0.0)
+      i18n
+      json (>= 1.5.1)
+      money
+      nokogiri
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    json (1.7.3)
+    money (5.0.0)
+      i18n (~> 0.4)
+      json
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_merchant_mollie!

data/Rakefile

@@ -1,52 +1,2 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "active_merchant_mollie"
-    gem.summary = "ActiveMerchant extension to support the Dutch PSP Mollie with iDeal transactions"
-    gem.email = "info@moneybird.com"
-    gem.homepage = "http://github.com/bluetools/active_merchant_mollie"
-    gem.description = "ActiveMerchant extension to support the Dutch PSP Mollie with iDeal transactions"
-    gem.authors = ["Edwin Vlieg"]
-    gem.files =  FileList["[A-Z]*", "{bin,generators,lib,test}/**/*"]
-    gem.add_dependency 'active_merchant'
-    gem.add_dependency 'hpricot'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-
-require 'spec/rake/spectask'
-desc "Run all examples"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/*_spec.rb']
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "active_merchant_mollie #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/active_merchant_mollie.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = %q{active_merchant_mollie}
+  s.version     = "0.1.1"
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Berend"]
+  s.email       = ["info@bluetools.nl"]
+  s.homepage    = ""
+  s.summary     = %q{ActiveMerchant extension to support the Dutch PSP Mollie with iDeal transactions}
+  s.description = %q{ActiveMerchant extension to support the Dutch PSP Mollie with iDeal transactions}
+
+  s.rubyforge_project = "active_merchant_mollie"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency('activemerchant')
+  s.add_dependency('nokogiri')
+  s.add_dependency('rspec')
+end

data/init.rb

@@ -0,0 +1 @@
+require 'active_merchant_mollie'

data/lib/active_merchant/billing/mollie_ideal.rb

@@ -1,4 +1,4 @@
-require "hpricot"
+require "nokogiri"
 
 module ActiveMerchant
   module Billing
@@ -8,14 +8,14 @@ module ActiveMerchant
       
       def initialize(options={})
         requires!(options, :partner_id)
-        
         @options = options
+        super
       end
       
       def setup_purchase(money, options)
         requires!(options, :return_url, :report_url, :bank_id, :description)
         
-        raise ArgumentError.new("Amount should be at least 1,80EUR") if money < 180
+        raise ArgumentError.new("Amount should be at least EUR 1,18") if money < 118
         
         @response = build_response_fetch(commit("fetch", {
           :amount         => money,
@@ -45,19 +45,23 @@ module ActiveMerchant
         url   = URL + "?a=#{action}&#{parameters.collect { |k,v| "#{k}=#{v}" }.join("&") }"
         uri   = URI.parse(url)
         http  = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = (uri.scheme == 'https')
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ActiveMerchant::Billing::Base.test?
         http.get(uri.request_uri).body
       end
       
       def build_response_fetch(response)
+
         vars = {}
-        doc = Hpricot.XML(response)
         success = false
-        if doc.search("response/item").size > 0
-          errorcode = doc.at('response/item/errorcode').inner_text
-          message = doc.at('response/item/message').inner_text + " (#{errorcode})"
-        elsif doc.search("response/order").size > 0
+        
+        doc = Nokogiri.XML(response)
+        if doc.search("//response/item").size > 0
+          errorcode = doc.at('//response/item/errorcode').inner_text
+          message = doc.at('//response/item/message').inner_text + " (#{errorcode})"
+        elsif doc.search("//response/order").size > 0
           vars = {}
-          resp = doc.at('response/order')
+          resp = doc.at('//response/order')
           if resp && resp.at('amount') && resp.at('transaction_id') && resp.at('URL')
             vars[:amount] = resp.at('amount').inner_text
             vars[:transaction_id] = resp.at('transaction_id').inner_text
@@ -69,18 +73,28 @@ module ActiveMerchant
       end
       
       def build_response_check(response)
-        doc = Hpricot.XML(response)
+        
+        vars = {}
         success = false
-        if doc.search("response/item").size > 0
-          errorcode = doc.at('response/item/errorcode').inner_text
-          message = doc.at('response/item/message').inner_text + " (#{errorcode})"      
-        elsif doc.search("response/order").size > 0
-          resp = doc.at('response/order')
+
+        doc = Nokogiri.XML(response)
+        if doc.search("//response/item").size > 0
+          errorcode = doc.at('//response/item/errorcode').inner_text
+          message = doc.at('//response/item/message').inner_text + " (#{errorcode})"      
+        elsif doc.search("//response/order").size > 0
+          resp = doc.at('//response/order')
           success = resp && resp.at('payed') && resp.at('payed').inner_text.downcase == "true"
+          
+          resp = doc.at("//response/order/consumer")
+          if resp && resp.at('consumerAccount') && resp.at('consumerName')
+            vars[:consumer_account]  = resp.at('consumerAccount').inner_text
+            vars[:consumer_city]     = resp.at('consumerCity').inner_text
+            vars[:consumer_name]     = resp.at('consumerName').inner_text
+          end
         end
-        MollieIdealCheckResponse.new(success, message)
+        MollieIdealCheckResponse.new(success, message, vars)
       end
       
     end
   end
-end
+end

data/lib/active_merchant/billing/mollie_ideal_check_response.rb

@@ -2,6 +2,18 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class MollieIdealCheckResponse < Response
       
+      def consumer_account
+        @params['consumer_account']
+      end
+      
+      def consumer_city
+        @params['consumer_city']
+      end
+      
+      def consumer_name
+        @params['consumer_name']
+      end
+      
     end
   end
-end
+end

data/lib/active_merchant/billing/mollie_ideal_fetch_response.rb

@@ -16,4 +16,4 @@ module ActiveMerchant #:nodoc:
       
     end
   end
-end
+end

data/lib/active_merchant_mollie.rb

@@ -2,5 +2,3 @@ require 'active_merchant'
 require 'active_merchant/billing/mollie_ideal'
 require 'active_merchant/billing/mollie_ideal_check_response'
 require 'active_merchant/billing/mollie_ideal_fetch_response'
-
-VERSION = "0.0.1"

data/spec/mollie_ideal_spec.rb

@@ -25,6 +25,7 @@ describe "Mollie iDeal implementation for ActiveMerchant" do
     
     it "should create a new purchase via the Mollie API" do
       http_mock = mock(Net::HTTP)      
+      http_mock.should_receive(:use_ssl=).once.with(true)
       Net::HTTP.should_receive(:new).with("secure.mollie.nl", 443).and_return(http_mock)
       
       response_mock = mock(Net::HTTPResponse)
@@ -34,7 +35,7 @@ describe "Mollie iDeal implementation for ActiveMerchant" do
               <transaction_id>482d599bbcc7795727650330ad65fe9b</transaction_id>
               <amount>123</amount>
               <currency>EUR</currency>
-              <URL>https://mijn.postbank.nl/internetbankieren/SesamLoginServlet?sessie=ideal&trxid=003123456789123&random=123456789abcdefgh</URL>
+              <URL>https://ideal.ing.nl/internetbankieren/SesamLoginServlet?sessie=ideal&amp;trxid=0030000123497790&amp;random=bac53c612328151</URL>
               <message>Your iDEAL-payment has succesfuly been setup. Your customer should visit the given URL to make the payment</message>
           </order>
       </response>')
@@ -54,7 +55,7 @@ describe "Mollie iDeal implementation for ActiveMerchant" do
       })
       
       @response.token.should == "482d599bbcc7795727650330ad65fe9b"
-      @gateway.redirect_url_for(@response.token).should == "https://mijn.postbank.nl/internetbankieren/SesamLoginServlet?sessie=ideal&trxid=003123456789123&random=123456789abcdefgh"
+      @gateway.redirect_url_for(@response.token).should == "https://ideal.ing.nl/internetbankieren/SesamLoginServlet?sessie=ideal&trxid=0030000123497790&random=bac53c612328151"
     end
     
     it "should not allow a purchase without a return url" do
@@ -97,9 +98,9 @@ describe "Mollie iDeal implementation for ActiveMerchant" do
       }.should  raise_error(ArgumentError)
     end
     
-    it "should not allow a purchase with less than 1,80EUR" do
+    it "should not allow a purchase with less than 1,18EUR" do
       lambda {
-        @gateway.setup_purchase(179, {
+        @gateway.setup_purchase(117, {
           :return_url       => @return_url,
           :report_url       => @report_url,
           :bank_id          => @bank_id,
@@ -110,6 +111,7 @@ describe "Mollie iDeal implementation for ActiveMerchant" do
     
     it "should return information about the error Mollie is throwing" do
       http_mock = mock(Net::HTTP)      
+      http_mock.should_receive(:use_ssl=).once.with(true)
       Net::HTTP.should_receive(:new).with("secure.mollie.nl", 443).and_return(http_mock)
       
       response_mock = mock(Net::HTTPResponse)
@@ -145,6 +147,7 @@ describe "Mollie iDeal implementation for ActiveMerchant" do
     
     it "should return information about a successfull transaction" do
       http_mock = mock(Net::HTTP)      
+      http_mock.should_receive(:use_ssl=).once.with(true)
       Net::HTTP.should_receive(:new).with("secure.mollie.nl", 443).and_return(http_mock)
       
       response_mock = mock(Net::HTTPResponse)
@@ -173,10 +176,14 @@ describe "Mollie iDeal implementation for ActiveMerchant" do
       
       @details_response = @gateway.details_for(@token)
       @details_response.success?.should be_true
+      @details_response.consumer_account.should == "P001234567"
+      @details_response.consumer_city.should == "Amsterdam"
+      @details_response.consumer_name.should == "Hr J Janssen"
     end
     
     it "should return information about a successfull transaction" do
       http_mock = mock(Net::HTTP)      
+      http_mock.should_receive(:use_ssl=).once.with(true)
       Net::HTTP.should_receive(:new).with("secure.mollie.nl", 443).and_return(http_mock)
       
       response_mock = mock(Net::HTTPResponse)
@@ -204,6 +211,7 @@ describe "Mollie iDeal implementation for ActiveMerchant" do
     
     it "should return information about the error Mollie is throwing" do
       http_mock = mock(Net::HTTP)      
+      http_mock.should_receive(:use_ssl=).once.with(true)
       Net::HTTP.should_receive(:new).with("secure.mollie.nl", 443).and_return(http_mock)
       
       response_mock = mock(Net::HTTPResponse)
@@ -229,4 +237,4 @@ describe "Mollie iDeal implementation for ActiveMerchant" do
     
   end
   
-end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
 require "rubygems"
-require "spec"
 require "active_merchant"
+require "active_merchant_mollie"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require "active_merchant_mollie"
-
-ActiveMerchant::Billing::Base.mode = :test
-

metadata

@@ -1,94 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_merchant_mollie
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.1.1
+  prerelease: 
 platform: ruby
-authors: 
-- Edwin Vlieg
+authors:
+- Berend
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-04-18 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: active_merchant
+date: 2012-08-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemerchant
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hpricot
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveMerchant extension to support the Dutch PSP Mollie with iDeal transactions
-email: info@moneybird.com
+email:
+- info@bluetools.nl
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- .document
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
+- active_merchant_mollie.gemspec
+- init.rb
 - lib/active_merchant/billing/mollie_ideal.rb
 - lib/active_merchant/billing/mollie_ideal_check_response.rb
 - lib/active_merchant/billing/mollie_ideal_fetch_response.rb
 - lib/active_merchant_mollie.rb
-has_rdoc: true
-homepage: http://github.com/bluetools/active_merchant_mollie
+- spec/mollie_ideal_spec.rb
+- spec/spec_helper.rb
+homepage: ''
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: active_merchant_mollie
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ActiveMerchant extension to support the Dutch PSP Mollie with iDeal transactions
-test_files: 
+test_files:
 - spec/mollie_ideal_spec.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.0