adyen 1.4.0 → 1.4.1

data/lib/adyen/api/response.rb

@@ -41,7 +41,7 @@ module Adyen
 
       # @return [XMLQuerier] The response body wrapped in a XMLQuerier.
       def xml_querier
-        @xml_querier ||= XMLQuerier.new(@http_response.body)
+        @xml_querier ||= XMLQuerier.xml(@http_response.body)
       end
 
       # @return [Hash] Subclasses return the parsed response body.

data/lib/adyen/api/xml_querier.rb

@@ -15,43 +15,78 @@ module Adyen
         'common'    => 'http://common.services.adyen.com'
       }
 
-      class << self
-        # @return [:rexml, :nokogiri] The XML backend to use.
-        attr_reader :backend
-        def backend=(backend)
-          @backend = backend
-          class_eval do
-            private
-            if backend == :nokogiri
-              def document_for_xml(xml)
-                Nokogiri::XML::Document.parse(xml)
-              end
-              def perform_xpath(query)
-                @node.xpath(query, NS)
-              end
-            else
-              def document_for_xml(xml)
-                REXML::Document.new(xml)
-              end
-              def perform_xpath(query)
-                REXML::XPath.match(@node, query, NS)
-              end
-            end
-          end
+      class NokogiriBackend
+        def initialize
+          require 'nokogiri'
+        end
+
+        def document_for_html(html)
+          Nokogiri::HTML::Document.parse(html, nil, 'UTF-8')
+        end
+
+        def document_for_xml(xml)
+          Nokogiri::XML::Document.parse(xml)
+        end
+
+        def perform_xpath(query, root_node)
+          root_node.xpath(query, NS)
         end
       end
 
-      begin
-        require 'nokogiri'
-        self.backend = :nokogiri
-      rescue LoadError
-        require 'rexml/document'
-        self.backend = :rexml
+      class REXMLBackend
+        def initialize
+          require 'rexml/document'
+        end
+
+        def document_for_html(html)
+          REXML::Document.new(html)
+        end
+
+        def document_for_xml(xml)
+          REXML::Document.new(xml)
+        end
+
+        def perform_xpath(query, root_node)
+          REXML::XPath.match(root_node, query, NS)
+        end        
       end
 
-      # @param [String, Array, Nokogiri::XML::NodeSet] data The XML data to wrap.
-      def initialize(data)
-        @node = data.is_a?(String) ? document_for_xml(data) : data
+      # @return A backend to handle XML parsing.
+      def self.default_backend
+        @default_backend ||= begin
+          NokogiriBackend.new
+        rescue LoadError => e
+          REXMLBackend.new
+        end
+      end
+
+      # Creates an XML querier for an XML document
+      def self.xml(data, backend = nil)
+        backend ||= default_backend
+        self.new(backend.document_for_xml(string_from(data)), backend)
+      end
+
+      # Creates an XML querier for an HTML document
+      def self.html(data, backend = nil)
+        backend ||= default_backend
+        self.new(backend.document_for_html(string_from(data)), backend)
+      end
+
+      def self.string_from(data)
+        if data.is_a?(String)
+          data
+        elsif data.responds_to?(:body)
+          data.body.to_s
+        else 
+          data.to_s
+        end
+      end
+
+      attr_reader :backend
+
+      # @param [Nokogiri::XML::NodeSet] data The XML data to wrap.
+      def initialize(node, backend)
+        @node, @backend = node, backend
       end
 
       # @param [String] query The xpath query to perform.
@@ -59,7 +94,7 @@ module Adyen
       # @return [XMLQuerier] A new XMLQuerier scoped to the given +query+. Or, if a block is given,
       #                      the result of calling the block.
       def xpath(query)
-        result = self.class.new(perform_xpath(query))
+        result = self.class.new(backend.perform_xpath(query, @node), backend)
         block_given? ? yield(result) : result
       end
 
@@ -87,7 +122,7 @@ module Adyen
       # @yield [XMLQuerier] A member of this node set, ready to be queried.
       # @return [Array] The list of nodes wrapped in XMLQuerier instances.
       def map(&block)
-        @node.map { |n| self.class.new(n) }.map(&block)
+        @node.map { |n| self.class.new(n, backend) }.map(&block)
       end
     end
   end

data/lib/adyen/encoding.rb

@@ -6,7 +6,7 @@ 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)
+      digest = OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha1'), hmac_key, message)
       Base64.encode64(digest).strip
     end
 

data/lib/adyen/matchers.rb

@@ -1,5 +1,4 @@
-require 'rexml/document'
-require 'rexml/xpath'
+require 'adyen/api/xml_querier'
 
 module Adyen
   module Matchers
@@ -30,20 +29,13 @@ module Adyen
         return xpath_query
       end
 
-      def self.document(subject)
-        if String === subject
-          REXML::Document.new(subject.to_s)
-        elsif subject.respond_to?(:body)
-          REXML::Document.new(subject.body.to_s)
-        elsif REXML::Document === subject
-          subject
-        else
-          raise "Cannot handle this XML input type"
-        end
-      end
-
       def self.check(subject, checks = {})
-        !!REXML::XPath.first(document(subject), build_xpath_query(checks))
+        found = false
+        document = Adyen::API::XMLQuerier.html(subject)
+        document.xpath(build_xpath_query(checks)) do |result|
+          found = true
+        end
+        return found
       end
     end
 

data/lib/adyen/version.rb

@@ -0,0 +1,5 @@
+module Adyen
+  # Version constant for the Adyen plugin.
+  # Set it & commit the change before running rake release.
+  VERSION = "1.4.1"
+end

data/spec/api/spec_helper.rb

@@ -84,7 +84,7 @@ end
 
 module APISpecHelper
   def node_for_current_object_and_method
-    Adyen::API::XMLQuerier.new(@object.send(@method))
+    Adyen::API::XMLQuerier.xml(@object.send(@method))
   end
 
   def xpath(query, &block)
@@ -108,10 +108,10 @@ module APISpecHelper
 
   module ClassMethods
     def for_each_xml_backend(&block)
-      [:nokogiri, :rexml].each do |xml_backend|
+      backends = [Adyen::API::XMLQuerier::NokogiriBackend, Adyen::API::XMLQuerier::REXMLBackend]
+      backends.each do |xml_backend|
         describe "with a #{xml_backend} backend" do
-          before { Adyen::API::XMLQuerier.backend = xml_backend }
-          after  { Adyen::API::XMLQuerier.backend = :nokogiri }
+          before { Adyen::API::XMLQuerier.stub(:default_backend => xml_backend.new) }
           instance_eval(&block)
         end
       end

data/spec/form_spec.rb

@@ -139,6 +139,7 @@ describe Adyen::Form do
   end
 
   describe 'hidden fields generation' do
+    include APISpecHelper
     subject { %Q'<form action="#{CGI.escapeHTML(Adyen::Form.url)}" method="post">#{Adyen::Form.hidden_fields(@attributes)}</form>' }
 
     before(:each) do
@@ -147,7 +148,10 @@ describe Adyen::Form do
         :session_validity => Time.now + 3600 }
     end
 
-    it { should have_adyen_payment_form }
+    for_each_xml_backend do
+      it { should have_adyen_payment_form }
+    end
+
     it { should include('<input type="hidden" name="merchantAccount" value="TestMerchant" />') }
 
     context "width default_form_params" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adyen
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Willem van Bergen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,6 +113,7 @@ files:
 - lib/adyen/railtie.rb
 - lib/adyen/templates/notification_migration.rb
 - lib/adyen/templates/notification_model.rb
+- lib/adyen/version.rb
 - spec/adyen_spec.rb
 - spec/api/api_spec.rb
 - spec/api/payment_service_spec.rb
@@ -125,7 +126,6 @@ files:
 - spec/functional/api_spec.rb
 - spec/functional/initializer.rb.sample
 - spec/spec_helper.rb
-- tasks/github-gem.rake
 - yard_extensions.rb
 homepage: http://github.com/wvanbergen/adyen/wiki
 licenses:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Having Nokogiri installed will speed up XML handling when using the SOAP API.
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Integrate Adyen payment services in your Ruby on Rails application.
@@ -165,7 +165,9 @@ test_files:
 - spec/api/recurring_service_spec.rb
 - spec/api/response_spec.rb
 - spec/api/simple_soap_client_spec.rb
+- spec/api/spec_helper.rb
 - spec/api/test_helpers_spec.rb
 - spec/form_spec.rb
 - spec/functional/api_spec.rb
-has_rdoc: 
+- spec/functional/initializer.rb.sample
+- spec/spec_helper.rb

data/tasks/github-gem.rake

@@ -1,367 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/tasklib'
-require 'date'
-require 'set'
-
-module GithubGem
-
-  # Detects the gemspc file of this project using heuristics.
-  def self.detect_gemspec_file
-    FileList['*.gemspec'].first
-  end
-
-  # Detects the main include file of this project using heuristics
-  def self.detect_main_include
-    if File.exist?(File.expand_path("../lib/#{File.basename(detect_gemspec_file, '.gemspec').gsub(/-/, '/')}.rb", detect_gemspec_file))
-      "lib/#{File.basename(detect_gemspec_file, '.gemspec').gsub(/-/, '/')}.rb"
-    elsif FileList['lib/*.rb'].length == 1
-      FileList['lib/*.rb'].first
-    else
-      nil
-    end
-  end
-
-  class RakeTasks
-
-    include Rake::DSL if Rake.const_defined?('DSL')
-
-    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
-    # and defines the rake tasks based on the gemspec file.
-    def initialize(task_namespace = :gem)
-      @gemspec_file   = GithubGem.detect_gemspec_file
-      @task_namespace = task_namespace
-      @main_include   = GithubGem.detect_main_include
-      @modified_files = Set.new
-      @root_dir       = Dir.pwd
-      @test_pattern   = 'test/**/*_test.rb'
-      @spec_pattern   = 'spec/**/*_spec.rb'
-      @local_branch   = 'master'
-      @remote         = 'origin'
-      @remote_branch  = 'master'
-
-      yield(self) if block_given?
-
-      load_gemspec!
-      define_tasks!
-    end
-
-    protected
-
-    def git
-      @git ||= ENV['GIT'] || 'git'
-    end
-
-    # Define Unit test tasks
-    def define_test_tasks!
-      require 'rake/testtask'
-
-      namespace(:test) do
-        Rake::TestTask.new(:basic) do |t|
-          t.pattern = test_pattern
-          t.verbose = true
-          t.libs << 'test'
-        end
-      end
-
-      desc "Run all unit tests for #{gemspec.name}"
-      task(:test => ['test:basic'])
-    end
-
-    # Defines RSpec tasks
-    def define_rspec_tasks!
-      require 'rspec/core/rake_task'
-
-      namespace(:spec) do
-        desc "Verify all RSpec examples for #{gemspec.name}"
-        RSpec::Core::RakeTask.new(:basic) do |t|
-          t.pattern = spec_pattern
-        end
-
-        desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-        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}"
-        RSpec::Core::RakeTask.new(:rcov) do |t|
-          t.pattern = spec_pattern
-          t.rcov = true
-          t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
-        end
-      end
-
-      desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-      task(:spec => ['spec:specdoc'])
-    end
-
-    # Defines the rake tasks
-    def define_tasks!
-
-      define_test_tasks!  if has_tests?
-      define_rspec_tasks! if has_specs?
-
-      namespace(@task_namespace) do
-        desc "Updates the filelist in the gemspec file"
-        task(:manifest) { manifest_task }
-
-        desc "Builds the .gem package"
-        task(:build => :manifest) { build_task }
-
-        desc "Sets the version of the gem in the gemspec"
-        task(:set_version => [:check_version, :check_current_branch]) { version_task }
-        task(:check_version => :fetch_origin) { check_version_task }
-
-        task(:fetch_origin) { fetch_origin_task }
-        task(:check_current_branch) { check_current_branch_task }
-        task(:check_clean_status) { check_clean_status_task }
-        task(:check_not_diverged => :fetch_origin) { check_not_diverged_task }
-
-        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
-
-        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
-
-        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 }
-
-          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
-    end
-
-    # Updates the files list and test_files list in the gemspec file using the list of files
-    # 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`.split("\n")
-      test_files       = Dir[test_pattern] + Dir[spec_pattern]
-
-      update_gemspec(:files, repository_files)
-      update_gemspec(:test_files, repository_files & test_files)
-    end
-
-    # Builds the gem
-    def build_task
-      sh "gem build -q #{gemspec_file}"
-      Dir.mkdir('pkg') unless File.exist?('pkg')
-      sh "mv #{gemspec.name}-#{gemspec.version}.gem pkg/#{gemspec.name}-#{gemspec.version}.gem"
-    end
-
-    def newest_version
-      `#{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)
-      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
-      update_gemspec(:version, ENV['VERSION']) if ENV['VERSION']
-      update_gemspec(:date, Date.today)
-
-      update_version_file(gemspec.version)
-      update_version_constant(gemspec.version)
-    end
-
-    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).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} 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} 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`.split("\n").detect { |b| /^\* / =~ b } == "* #{local_branch}"
-    end
-
-    # Fetches the latest updates from Github
-    def fetch_origin_task
-      sh git, 'fetch', remote
-    end
-
-    # Commits every file that has been changed by the release task.
-    def commit_modified_files_task
-      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
-      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
-      sh git, 'push', '--tags', remote, remote_branch
-    end
-
-    def gemcutter_release_task
-      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 "Release successful."
-    end
-
-    private
-
-    # Checks whether this project has any RSpec files
-    def has_specs?
-      FileList[spec_pattern].any?
-    end
-
-    # Checks whether this project has any unit test files
-    def has_tests?
-      FileList[test_pattern].any?
-    end
-
-    # Loads the gemspec file
-    def load_gemspec!
-      @gemspec = eval(File.read(@gemspec_file))
-    end
-
-    # Updates the VERSION file with the new version
-    def update_version_file(version)
-      if File.exists?('VERSION')
-        File.open('VERSION', 'w') { |f| f << version.to_s }
-        modified_files << 'VERSION'
-      end
-    end
-
-    # Updates the VERSION constant in the main include file if it exists
-    def update_version_constant(version)
-      if main_include && File.exist?(main_include)
-        file_contents = File.read(main_include)
-        if file_contents.sub!(/^(\s+VERSION\s*=\s*)[^\s].*$/) { $1 + version.to_s.inspect }
-          File.open(main_include, 'w') { |f| f << file_contents }
-          modified_files << main_include
-        end
-      end
-    end
-
-    # Updates an attribute of the gemspec file.
-    # This function will open the file, and search/replace the attribute using a regular expression.
-    def update_gemspec(attribute, new_value, literal = false)
-
-      unless literal
-        new_value = case new_value
-          when Array        then "%w(#{new_value.join(' ')})"
-          when Hash, String then new_value.inspect
-          when Date         then new_value.strftime('%Y-%m-%d').inspect
-          else              raise "Cannot write value #{new_value.inspect} to gemspec file!"
-        end
-      end
-
-      spec   = File.read(gemspec_file)
-      regexp = Regexp.new('^(\s+\w+\.' + Regexp.quote(attribute.to_s) + '\s*=\s*)[^\s].*$')
-      if spec.sub!(regexp) { $1 + new_value }
-        File.open(gemspec_file, 'w') { |f| f << spec }
-        modified_files << gemspec_file
-
-        # 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/https'
-      require 'uri'
-      
-      uri = URI.parse('https://raw.github.com/wvanbergen/github-gem/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))
-
-      if Net::HTTPSuccess === response
-        open(__FILE__, "w") { |file| file.write(response.body) }
-        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
-        raise "Download failed with HTTP status #{response.code}!"
-      end
-    end
-  end
-end