adyen 0.3.8 → 1.0.0

data/spec/api/test_helpers_spec.rb

@@ -0,0 +1,83 @@
+# encoding: UTF-8
+
+require 'api/spec_helper'
+require 'adyen/api/test_helpers'
+
+describe "Test helpers" do
+  include APISpecHelper
+
+  after do
+    Net::HTTP.stubbing_enabled = false
+  end
+
+  describe Adyen::API::PaymentService do
+    before do
+      @params = {
+        :reference => 'order-id',
+        :amount => {
+          :currency => 'EUR',
+          :value => '1234',
+        },
+        :shopper => {
+          :email => 's.hopper@example.com',
+          :reference => 'user-id',
+          :ip => '61.294.12.12',
+        },
+        :card => {
+          :expiry_month => 12,
+          :expiry_year => 2012,
+          :holder_name => 'Simon わくわく Hopper',
+          :number => '4444333322221111',
+          :cvc => '737',
+          # Maestro UK/Solo only
+          #:issue_number => ,
+          #:start_month => ,
+          #:start_year => ,
+        }
+      }
+      @payment = @object = Adyen::API::PaymentService.new(@params)
+    end
+
+    it "returns an `authorized' response" do
+      stub_net_http(AUTHORISATION_DECLINED_RESPONSE)
+      Adyen::API::PaymentService.stub_success!
+      @payment.authorise_payment.should be_authorized
+
+      @payment.authorise_payment.should_not be_authorized
+    end
+
+    it "returns a `refused' response" do
+      stub_net_http(AUTHORISE_RESPONSE)
+      Adyen::API::PaymentService.stub_refused!
+      response = @payment.authorise_payment
+      response.should_not be_authorized
+      response.should_not be_invalid_request
+
+      @payment.authorise_payment.should be_authorized
+    end
+
+    it "returns a `invalid request' response" do
+      stub_net_http(AUTHORISE_RESPONSE)
+      Adyen::API::PaymentService.stub_invalid!
+      response = @payment.authorise_payment
+      response.should_not be_authorized
+      response.should be_invalid_request
+
+      @payment.authorise_payment.should be_authorized
+    end
+  end
+
+  describe Adyen::API::RecurringService do
+    before do
+      @params = { :shopper => { :reference => 'user-id' } }
+      @recurring = @object = Adyen::API::RecurringService.new(@params)
+    end
+
+    it "returns a `disabled' response" do
+      stub_net_http(DISABLE_RESPONSE % 'nope')
+      Adyen::API::RecurringService.stub_disabled!
+      @recurring.disable.should be_disabled
+      @recurring.disable.should_not be_disabled
+    end
+  end
+end

data/spec/form_spec.rb

@@ -1,35 +1,38 @@
+# encoding: UTF-8
+
 require 'spec_helper'
+require 'adyen/form'
 
 describe Adyen::Form do
 
   before(:all) do
-    Adyen::Form.register_skin(:testing, '4aD37dJA', 'Kah942*$7sdp0)')
-    Adyen::Form.default_parameters[:merchant_account] = 'TestMerchant'
+    Adyen.configuration.register_form_skin(:testing, '4aD37dJA', 'Kah942*$7sdp0)')
+    Adyen.configuration.default_form_params[:merchant_account] = 'TestMerchant'
   end
 
   describe 'Action URLs' do
 
     before(:each) do
       # Use autodetection for the environment unless otherwise specified
-      Adyen.environment = nil
+      Adyen.configuration.environment = nil
     end
 
     it "should generate correct the testing url" do
-      Adyen::Form.url.should eql('https://test.adyen.com/hpp/select.shtml')
+      Adyen::Form.url.should == 'https://test.adyen.com/hpp/select.shtml'
     end
 
     it "should generate a live url if the environemtn is set top live" do
-      Adyen.environment = :live
-      Adyen::Form.url.should eql('https://live.adyen.com/hpp/select.shtml')
+      Adyen.configuration.environment = :live
+      Adyen::Form.url.should == 'https://live.adyen.com/hpp/select.shtml'
     end
 
     it "should generate correct live url in a production environment" do
-      Adyen.stub!(:autodetect_environment).and_return('live')
-      Adyen::Form.url.should eql('https://live.adyen.com/hpp/select.shtml')
+      Adyen.configuration.stub!(:autodetect_environment).and_return('live')
+      Adyen::Form.url.should. == 'https://live.adyen.com/hpp/select.shtml'
     end
 
     it "should generate correct live url if explicitely asked for" do
-      Adyen::Form.url(:live).should eql('https://live.adyen.com/hpp/select.shtml')
+      Adyen::Form.url(:live).should == 'https://live.adyen.com/hpp/select.shtml'
     end
   end
 
@@ -44,11 +47,11 @@ describe Adyen::Form do
     end
 
     it "should calculate the signature string correctly" do
-      Adyen::Form.redirect_signature_string(@params).should eql('AUTHORISED1211992213193029Internet Order 123454aD37dJA')
+      Adyen::Form.redirect_signature_string(@params).should == 'AUTHORISED1211992213193029Internet Order 123454aD37dJA'
     end
 
     it "should calculate the signature correctly" do
-      Adyen::Form.redirect_signature(@params).should eql(@params[:merchantSig])
+      Adyen::Form.redirect_signature(@params).should == @params[:merchantSig]
     end
 
     it "should check the signature correctly with explicit shared signature" do
@@ -74,7 +77,7 @@ describe Adyen::Form do
     before(:each) do
       @attributes = { :currency_code => 'GBP', :payment_amount => 10000, :ship_before_date => Date.today,
         :merchant_reference => 'Internet Order 12345', :skin => :testing,
-        :session_validity => 1.hour.from_now }
+        :session_validity => Time.now + 3600 }
 
       @redirect_url = Adyen::Form.redirect_url(@attributes)
     end
@@ -85,7 +88,7 @@ describe Adyen::Form do
     
     it "should include all provided attributes" do
       params = @redirect_url.split('?', 2).last.split('&').map { |param| param.split('=', 2).first }
-      params.should include(*(@attributes.keys.map { |k| k.to_s.camelize(:lower) }))
+      params.should include(*(@attributes.keys.map { |k| Adyen::Form.camelize(k) }))
     end
     
     it "should include the merchant signature" do
@@ -96,17 +99,18 @@ describe Adyen::Form do
 
   describe 'hidden fields generation' do
 
-    include ActionView::Helpers::TagHelper
-
     before(:each) do
       @attributes = { :currency_code => 'GBP', :payment_amount => 10000, :ship_before_date => Date.today,
         :merchant_reference => 'Internet Order 12345', :skin => :testing,
-        :session_validity => 1.hour.from_now }
+        :session_validity => Time.now + 3600 }
     end
 
     it "should generate a valid payment form" do
-      content_tag(:form, Adyen::Form.hidden_fields(@attributes),
-          :action => Adyen::Form.url, :method => :post).should have_adyen_payment_form
+      html_snippet = <<-HTML
+        <form action="#{CGI.escapeHTML(Adyen::Form.url)}" method="post">#{Adyen::Form.hidden_fields(@attributes)}</form>
+      HTML
+      
+      html_snippet.should have_adyen_payment_form
     end
   end
 
@@ -125,12 +129,12 @@ describe Adyen::Form do
 
     it "should construct the signature string correctly" do
       signature_string = Adyen::Form.calculate_signature_string(@parameters)
-      signature_string.should eql("10000GBP2007-10-20Internet Order 123454aD37dJATestMerchant2007-10-11T11:00:00Z")
+      signature_string.should == "10000GBP2007-10-20Internet Order 123454aD37dJATestMerchant2007-10-11T11:00:00Z"
     end
     
     it "should calculate the signature correctly" do
       signature = Adyen::Form.calculate_signature(@parameters)
-      signature.should eql('x58ZcRVL1H6y+XSeBGrySJ9ACVo=')
+      signature.should == 'x58ZcRVL1H6y+XSeBGrySJ9ACVo='
     end
 
     it "should calculate the signature correctly for a recurring payment" do
@@ -138,7 +142,7 @@ describe Adyen::Form do
       @parameters.merge!(:recurring_contract => 'DEFAULT', :shopper_reference => 'grasshopper52', :shopper_email => 'gras.shopper@somewhere.org')
 
       signature_string = Adyen::Form.calculate_signature_string(@parameters)
-      signature_string.should eql("10000GBP2007-10-20Internet Order 123454aD37dJATestMerchant2007-10-11T11:00:00Zgras.shopper@somewhere.orggrasshopper52DEFAULT")
+      signature_string.should == "10000GBP2007-10-20Internet Order 123454aD37dJATestMerchant2007-10-11T11:00:00Zgras.shopper@somewhere.orggrasshopper52DEFAULT"
     end
 
     it "should calculate the signature correctly for a recurring payment" do
@@ -146,7 +150,7 @@ describe Adyen::Form do
       @parameters.merge!(:recurring_contract => 'DEFAULT', :shopper_reference => 'grasshopper52', :shopper_email => 'gras.shopper@somewhere.org')
 
       signature = Adyen::Form.calculate_signature(@parameters)
-      signature.should eql('F2BQEYbE+EUhiRGuPtcD16Gm7JY=')
+      signature.should == 'F2BQEYbE+EUhiRGuPtcD16Gm7JY='
     end
   end
-end
+end

data/spec/functional/api_spec.rb

@@ -0,0 +1,90 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+require 'rubygems'
+require 'nokogiri'
+
+API_SPEC_INITIALIZER = File.expand_path("../initializer.rb", __FILE__)
+
+if File.exist?(API_SPEC_INITIALIZER)
+
+  describe Adyen::API, "with an actual remote connection" do
+    before :all do
+      require API_SPEC_INITIALIZER
+      Net::HTTP.stubbing_enabled = false
+      @order_id = @user_id = Time.now.to_i
+      perform_payment_request
+    end
+
+    after :all do
+      Net::HTTP.stubbing_enabled = true
+    end
+
+    def perform_payment_request
+      @payment_response = Adyen::API.authorise_payment(
+        @order_id,
+        { :currency => 'EUR', :value => '1234' },
+        { :email => "#{@user_id}@example.com", :reference => @user_id },
+        { :expiry_month => 12, :expiry_year => 2012, :holder_name => "Simon #{@user_id} Hopper", :number => '4444333322221111', :cvc => '737' },
+        true
+      )
+    end
+
+    it "performs a payment request" do
+      @payment_response.should be_authorized
+      @payment_response.psp_reference.should_not be_empty
+    end
+
+    it "performs a recurring payment request" do
+      response = Adyen::API.authorise_recurring_payment(
+        @order_id,
+        { :currency => 'EUR', :value => '1234' },
+        { :email => "#{@user_id}@example.com", :reference => @user_id }
+      )
+      response.should be_authorized
+      response.psp_reference.should_not be_empty
+    end
+
+    it "performs a one-click payment request" do
+      detail   = Adyen::API.list_recurring_details(@user_id).references.last
+      response = Adyen::API.authorise_one_click_payment(
+        @order_id,
+        { :currency => 'EUR', :value => '1234' },
+        { :email => "#{@user_id}@example.com", :reference => @user_id },
+        '737',
+        detail
+      )
+      response.should be_authorized
+      response.psp_reference.should_not be_empty
+    end
+
+    it "captures a payment" do
+      response = Adyen::API.capture_payment(@payment_response.psp_reference, { :currency => 'EUR', :value => '1234' })
+      response.should be_success
+    end
+
+    it "refunds a payment" do
+      response = Adyen::API.refund_payment(@payment_response.psp_reference, { :currency => 'EUR', :value => '1234' })
+      response.should be_success
+    end
+
+    it "cancels or refunds a payment" do
+      response = Adyen::API.cancel_or_refund_payment(@payment_response.psp_reference)
+      response.should be_success
+    end
+
+    it "cancels a payment" do
+      response = Adyen::API.cancel_payment(@payment_response.psp_reference)
+      response.should be_success
+    end
+
+    it "disables a recurring contract" do
+      response = Adyen::API.disable_recurring_contract(@user_id)
+      response.should be_success
+      response.should be_disabled
+    end
+  end
+
+else
+  puts "[!] To run the functional tests you'll need to create `spec/functional/initializer.rb' and configure with your test account settings. See `spec/functional/initializer.rb.sample'."
+end

data/spec/functional/initializer.rb.sample

@@ -0,0 +1,3 @@
+Adyen.configuration.default_api_params = { :merchant_account => 'SuperShopper' }
+Adyen.configuration.api_username = 'SuperShopper'
+Adyen.configuration.api_password = 'secret'

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
-require 'spec_helper'
+# encoding: UTF-8
 
 require 'rubygems'
-require 'spec'
-require 'spec/autorun'
-require 'active_support'
+require 'rspec'
+
+$:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'adyen'
 require 'adyen/matchers'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include Adyen::Matchers
 end

data/tasks/github-gem.rake

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'rake/tasklib'
 require 'date'
-require 'git'
+require 'set'
 
 module GithubGem
 
@@ -24,7 +24,7 @@ module GithubGem
 
   class RakeTasks
 
-    attr_reader   :gemspec, :modified_files, :git
+    attr_reader   :gemspec, :modified_files
     attr_accessor :gemspec_file, :task_namespace, :main_include, :root_dir, :spec_pattern, :test_pattern, :remote, :remote_branch, :local_branch
 
     # Initializes the settings, yields itself for configuration
@@ -33,7 +33,7 @@ module GithubGem
       @gemspec_file   = GithubGem.detect_gemspec_file
       @task_namespace = task_namespace
       @main_include   = GithubGem.detect_main_include
-      @modified_files = []
+      @modified_files = Set.new
       @root_dir       = Dir.pwd
       @test_pattern   = 'test/**/*_test.rb'
       @spec_pattern   = 'spec/**/*_spec.rb'
@@ -43,13 +43,16 @@ module GithubGem
 
       yield(self) if block_given?
 
-      @git = Git.open(@root_dir)
       load_gemspec!
       define_tasks!
     end
 
     protected
 
+    def git
+      @git ||= ENV['GIT'] || 'git'
+    end
+
     # Define Unit test tasks
     def define_test_tasks!
       require 'rake/testtask'
@@ -68,23 +71,23 @@ module GithubGem
 
     # Defines RSpec tasks
     def define_rspec_tasks!
-      require 'spec/rake/spectask'
+      require 'rspec/core/rake_task'
 
       namespace(:spec) do
         desc "Verify all RSpec examples for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:basic) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:basic) do |t|
+          t.pattern = spec_pattern
         end
 
         desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-        Spec::Rake::SpecTask.new(:specdoc) do |t|
-          t.spec_files = FileList[spec_pattern]
-          t.spec_opts << '--format' << 'specdoc' << '--color'
+        RSpec::Core::RakeTask.new(:specdoc) do |t|
+          t.pattern = spec_pattern
+          t.rspec_opts = ['--format', 'documentation', '--color']
         end
 
         desc "Run RCov on specs for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:rcov) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:rcov) do |t|
+          t.pattern = spec_pattern
           t.rcov = true
           t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
         end
@@ -165,7 +168,7 @@ module GithubGem
     # in the repository and the spec/test file pattern.
     def manifest_task
       # Load all the gem's files using "git ls-files"
-      repository_files = git.ls_files.keys
+      repository_files = `#{git} ls-files`.split("\n")
       test_files       = Dir[test_pattern] + Dir[spec_pattern]
 
       update_gemspec(:files, repository_files)
@@ -180,7 +183,7 @@ module GithubGem
     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')
+      `#{git} tag`.split("\n").map { |tag| tag.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
     end
 
     def next_version(increment = nil)
@@ -217,72 +220,58 @@ 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'].dup || gemspec.version)
+      proposed_version = Gem::Version.new((ENV['VERSION'] || gemspec.version).dup)
       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
     def check_not_diverged_task
-      raise "The current branch is diverged from the remote branch!" if git.log.between('HEAD', git.remote(remote).branch(remote_branch).gcommit).any?
+      raise "The current branch is diverged from the remote branch!" if `#{git} rev-list HEAD..#{remote}/#{remote_branch}`.split("\n").any?
     end
 
     # Checks whether the repository status ic clean
     def check_clean_status_task
-      raise "The current working copy contains modifications" if git.status.changed.any?
+      raise "The current working copy contains modifications" if `#{git} ls-files -m`.split("\n").any?
     end
 
     # Checks whether the current branch is correct
     def check_current_branch_task
-      raise "Currently not on #{local_branch} branch!" unless git.branch.name == local_branch.to_s
+      raise "Currently not on #{local_branch} branch!" unless `#{git} branch`.split("\n").detect { |b| /^\* / =~ b } == "* #{local_branch}"
     end
 
     # Fetches the latest updates from Github
     def fetch_origin_task
-      git.fetch('origin')
+      sh git, 'fetch', remote
     end
 
     # Commits every file that has been changed by the release task.
     def commit_modified_files_task
-      if modified_files.any?
-        modified_files.each { |file| git.add(file) }
-        git.commit("Released #{gemspec.name} gem version #{gemspec.version}")
+      really_modified = `#{git} ls-files -m #{modified_files.entries.join(' ')}`.split("\n")
+      if really_modified.any?
+        really_modified.each { |file| sh git, 'add', file }
+        sh git, 'commit', '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
       end
     end
 
     # Adds a tag for the released version
     def tag_version_task
-      git.add_tag("#{gemspec.name}-#{gemspec.version}")
+      sh git, 'tag', '-a', "#{gemspec.name}-#{gemspec.version}", '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
     end
 
     # Pushes the changes and tag to github
     def github_release_task
-      git.push(remote, remote_branch, true)
+      sh git, 'push', '--tags', remote, remote_branch
     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"
+      sh "gem", 'push', "pkg/#{gemspec.name}-#{gemspec.version}.gem"
     end
 
     # Gem release task.
     # All work is done by the task's dependencies, so just display a release completed message.
     def release_task
       puts
-      puts '------------------------------------------------------------'
-      puts "Released #{gemspec.name} version #{gemspec.version}"
+      puts "Release successful."
     end
 
     private
@@ -342,30 +331,35 @@ module GithubGem
 
         # Reload the gemspec so the changes are incorporated
         load_gemspec!
+
+        # Also mark the Gemfile.lock file as changed because of the new version.
+        modified_files << 'Gemfile.lock' if File.exist?(File.join(root_dir, 'Gemfile.lock'))
       end
     end
 
     # Updates the tasks file using the latest file found on Github
     def update_tasks_task
-      require 'net/http'
+      require 'net/https'
+      require 'uri'
 
-      server = 'github.com'
-      path   = '/wvanbergen/github-gem/raw/master/tasks/github-gem.rake'
+      uri = URI.parse('https://github.com/wvanbergen/github-gem/raw/master/tasks/github-gem.rake')
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      response = http.request(Net::HTTP::Get.new(uri.path))
 
-      Net::HTTP.start(server) do |http|
-        response = http.get(path)
+      if Net::HTTPSuccess === response
         open(__FILE__, "w") { |file| file.write(response.body) }
-      end
-
-      relative_file = File.expand_path(__FILE__).sub(%r[^#{git.dir.path}/], '')
-      if git.status[relative_file] && git.status[relative_file].type == 'M'
-        git.add(relative_file)
-        git.commit("Updated to latest gem release management tasks.")
-        puts "Updated to latest version of gem release management tasks."
+        relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
+        if `#{git} ls-files -m #{relative_file}`.split("\n").any?
+          sh git, 'add', relative_file
+          sh git, 'commit', '-m', "Updated to latest gem release management tasks."
+        else
+          puts "Release managament tasks already are at the latest version."
+        end
       else
-        puts "Release managament tasks already are at the latest version."
+        raise "Download failed with HTTP status #{response.code}!"
       end
     end
-
   end
 end