oai 0.2.1 → 0.3.0

data/test/activerecord_provider/tc_ar_sets_provider.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ActiveRecordSetProviderTest < Test::Unit::TestCase
+class ActiveRecordSetProviderTest < TransactionalTestCase
 
   def test_list_sets
     doc = REXML::Document.new(@provider.list_sets)
@@ -8,51 +8,54 @@ class ActiveRecordSetProviderTest < Test::Unit::TestCase
     assert sets.size == 4
     assert sets[0].elements["//setName"].text == "Set A"
   end
-  
+
   def test_set_a
-    doc = REXML::Document.new(@provider.list_records(:set => "A"))
+    doc = REXML::Document.new(@provider.list_records(
+      :metadata_prefix => 'oai_dc', :set => "A"))
     assert_equal 20, doc.elements['OAI-PMH/ListRecords'].to_a.size
   end
-  
+
   def test_set_b
-    doc = REXML::Document.new(@provider.list_records(:set => "B"))
+    doc = REXML::Document.new(@provider.list_records(
+      :metadata_prefix => 'oai_dc', :set => "B"))
     assert_equal 10, doc.elements['OAI-PMH/ListRecords'].to_a.size
   end
-  
+
   def test_set_ab
-    doc = REXML::Document.new(@provider.list_records(:set => "A:B"))
+    doc = REXML::Document.new(@provider.list_records(
+      :metadata_prefix => 'oai_dc', :set => "A:B"))
     assert_equal 10, doc.elements['OAI-PMH/ListRecords'].to_a.size
   end
-  
+
   def test_record_with_multiple_sets
     record = DCSet.find(:first, :conditions => "spec = 'C'").dc_fields.first
     assert_equal 2, record.sets.size
   end
 
+  def test_missing_set
+    assert_raise(OAI::NoMatchException) do
+      doc = REXML::Document.new(@provider.list_records(
+        :metadata_prefix => 'oai_dc', :set => "D"))
+    end
+  end
+
   def setup
     @provider = ARSetProvider.new
-    ARLoader.load
     define_sets
   end
 
-  def teardown
-    ARLoader.unload
-    DCSet.connection.execute("delete from dc_fields_dc_sets")
-    DCSet.delete_all
-  end
-
   def define_sets
     set_a = DCSet.create(:name => "Set A", :spec => "A")
     set_b = DCSet.create(:name => "Set B", :spec => "B")
     set_c = DCSet.create(:name => "Set C", :spec => "C")
     set_ab = DCSet.create(:name => "Set A:B", :spec => "A:B")
-  
+
     next_id = 0
     DCField.find(:all, :limit => 10, :order => "id asc").each do |record|
       set_a.dc_fields << record
       next_id = record.id
     end
-    
+
     DCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
       set_b.dc_fields << record
       next_id = record.id
@@ -62,11 +65,94 @@ class ActiveRecordSetProviderTest < Test::Unit::TestCase
       set_ab.dc_fields << record
       next_id = record.id
     end
-  
+
     DCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
       set_a.dc_fields << record
       set_c.dc_fields << record
       next_id = record.id
     end
   end
+end
+
+
+class ActiveRecordExclusiveSetsProviderTest < TransactionalTestCase
+
+  def test_list_sets
+    doc = REXML::Document.new(@provider.list_sets)
+    sets = doc.elements["/OAI-PMH/ListSets"]
+    assert_equal 3, sets.size
+    assert_equal "Set A", sets[0].elements["//setName"].text
+  end
+
+  def test_set_a
+    doc = REXML::Document.new(@provider.list_records(
+      :metadata_prefix => 'oai_dc', :set => "A"))
+    assert_equal 20, doc.elements['OAI-PMH/ListRecords'].to_a.size
+  end
+
+  def test_set_b
+    doc = REXML::Document.new(@provider.list_records(
+      :metadata_prefix => 'oai_dc', :set => "B"))
+    assert_equal 10, doc.elements['OAI-PMH/ListRecords'].to_a.size
+  end
+
+  def test_set_ab
+    doc = REXML::Document.new(@provider.list_records(
+      :metadata_prefix => 'oai_dc', :set => "A:B"))
+    assert_equal 10, doc.elements['OAI-PMH/ListRecords'].to_a.size
+  end
+
+  def test_missing_set
+    assert_raise(OAI::NoMatchException) do
+      doc = REXML::Document.new(@provider.list_records(
+        :metadata_prefix => 'oai_dc', :set => "D"))
+    end
+  end
+
+  def setup
+    @provider = ARExclusiveSetProvider.new
+    define_sets
+  end
+
+  def define_sets
+    next_id = 0
+
+    ExclusiveSetDCField.find(:all, :limit => 10, :order => "id asc").each do |record|
+      record.set = "A"
+      record.save!
+      next_id = record.id
+    end
+
+    ExclusiveSetDCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
+      record.set = "B"
+      record.save!
+      next_id = record.id
+    end
+
+    ExclusiveSetDCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
+      record.set = "A:B"
+      record.save!
+      next_id = record.id
+    end
+
+    ExclusiveSetDCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
+      record.set = "A"
+      record.save!
+      next_id = record.id
+    end
+  end
+
+  protected
+
+  def load_fixtures
+    fixtures = YAML.load_file(
+      File.join(File.dirname(__FILE__), 'fixtures', 'dc.yml')
+    )
+    disable_logging do
+      fixtures.keys.sort.each do |key|
+        ExclusiveSetDCField.create(fixtures[key])
+      end
+    end
+  end
+
 end

data/test/activerecord_provider/tc_caching_paging_provider.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
-class CachingPagingProviderTest < Test::Unit::TestCase
+class CachingPagingProviderTest < TransactionalTestCase
   include REXML
-  
+
   def test_full_harvest
-    doc = Document.new(@provider.list_records)
+    doc = Document.new(@provider.list_records(:metadata_prefix => 'oai_dc'))
     assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
     assert_equal 26, doc.elements["/OAI-PMH/ListRecords"].size
     token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
@@ -20,7 +20,7 @@ class CachingPagingProviderTest < Test::Unit::TestCase
     assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
     assert_equal 25, doc.elements["/OAI-PMH/ListRecords"].size
   end
-  
+
   def test_from_and_until
     first_id = DCField.find(:first, :order => "id asc").id
     DCField.update_all(['updated_at = ?', Time.parse("September 15 2005")],
@@ -31,6 +31,7 @@ class CachingPagingProviderTest < Test::Unit::TestCase
     # Should return 50 records broken into 2 groups of 25.
     doc = Document.new(
       @provider.list_records(
+        :metadata_prefix => 'oai_dc',
         :from => Time.parse("September 1 2005"),
         :until => Time.parse("November 30 2005"))
       )
@@ -44,11 +45,6 @@ class CachingPagingProviderTest < Test::Unit::TestCase
 
   def setup
     @provider = CachingResumptionProvider.new
-    ARLoader.load
   end
-  
-  def teardown
-    ARLoader.unload
-  end
-  
+
 end

data/test/activerecord_provider/tc_simple_paging_provider.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
-class SimpleResumptionProviderTest < Test::Unit::TestCase
+class SimpleResumptionProviderTest < TransactionalTestCase
   include REXML
-  
+
   def test_full_harvest
-    doc = Document.new(@provider.list_records)
+    doc = Document.new(@provider.list_records(:metadata_prefix => 'oai_dc'))
     assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
     assert_equal 26, doc.elements["/OAI-PMH/ListRecords"].to_a.size
     token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
@@ -20,19 +20,20 @@ class SimpleResumptionProviderTest < Test::Unit::TestCase
     assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
     assert_equal 25, doc.elements["/OAI-PMH/ListRecords"].to_a.size
   end
-  
+
   def test_from_and_until
     first_id = DCField.find(:first, :order => "id asc").id
     DCField.update_all(['updated_at = ?', Time.parse("September 15 2005")],
       "id < #{first_id + 25}")
     DCField.update_all(['updated_at = ?', Time.parse("November 1 2005")],
       "id <= #{first_id + 50} and id > #{first_id + 25}")
-    
+
     total = DCField.count(:id, :conditions => ["updated_at >= ? AND updated_at <= ?", Time.parse("September 1 2005"), Time.parse("November 30 2005")])
 
     # Should return 50 records broken into 2 groups of 25.
     doc = Document.new(
       @provider.list_records(
+        :metadata_prefix => 'oai_dc',
         :from => Time.parse("September 1 2005"),
         :until => Time.parse("November 30 2005"))
       )
@@ -46,11 +47,6 @@ class SimpleResumptionProviderTest < Test::Unit::TestCase
 
   def setup
     @provider = SimpleResumptionProvider.new
-    ARLoader.load
   end
-  
-  def teardown
-    ARLoader.unload
-  end
-  
+
 end

data/test/activerecord_provider/test_helper.rb

@@ -1,4 +1,14 @@
 require 'rubygems'
+
+if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start
+end
 require 'test/unit'
+require File.dirname(__FILE__) + '/config/connection'
 require File.dirname(__FILE__) + '/helpers/providers'
 require File.dirname(__FILE__) + '/helpers/set_provider'
+require File.dirname(__FILE__) + '/helpers/transactional_test_case'

data/test/client/helpers/provider.rb

@@ -8,61 +8,58 @@ class ComplexProvider < OAI::Provider::Base
   source_model ComplexModel.new(100)
 end
 
-class ProviderServer < WEBrick::HTTPServlet::AbstractServlet
-  @@server = nil
-  
-  def initialize(server)
-    super(server)
+class ProviderServer
+
+  attr_reader :consumed, :server
+
+  def initialize(port, mount_point)
+    @consumed = []
     @provider = ComplexProvider.new
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => '127.0.0.1',
+      :Logger => WEBrick::Log.new('/dev/null'),
+      :AccessLog => [],
+      :Port => port)
+    @server.mount_proc(mount_point, server_proc)
   end
-  
-  def do_GET(req, res)
-    begin
-      res.body = @provider.process_request(req.query)
-      res.status = 200
-      res['Content-Type'] = 'text/xml'
-    rescue => err
-      puts err
-      puts err.backtrace.join("\n")
-      res.body = err.backtrace.join("\n")
-      res.status = 500
-    end
+
+  def port
+    @server.config[:Port]
   end
-  
-  def self.start(port)
-    unless @@server
-      @@server = WEBrick::HTTPServer.new(
-        :BindAddress => '127.0.0.1', 
-        :Logger => WEBrick::Log.new('/dev/null'),
-        :AccessLog => [],
-        :Port => port)
-      @@server.mount("/oai", ProviderServer)
 
-      trap("INT") { @@server.shutdown }
-      @@thread = Thread.new { @@server.start }
-      puts "Starting Webrick/Provider on port[#{port}]"
-    end
+  def start
+    @thread = Thread.new { @server.start }
   end
-  
-  def self.stop
-    puts "Stopping Webrick/Provider"
-    if @@thread
-      @@thread.exit
-    end
+
+  def stop
+    @thread.exit if @thread
   end
-  
-  def self.wrap(port = 3333)
+
+  def self.wrap(port = 3333, mount_point='/oai')
+    server = self.new(port, mount_point)
     begin
-      start(port)
+      server.start
+      yield(server)
+    ensure
+      server.stop
+    end
+  end
 
-      # Wait for startup
-      sleep 2
-    
-      yield
+  protected
 
-    ensure
-      stop
+  def server_proc
+    Proc.new do |req, res|
+      begin
+        res.body = @provider.process_request(req.query)
+        res.status = 200
+        res['Content-Type'] = 'text/xml'
+      rescue => err
+        puts err
+        puts err.backtrace.join("\n")
+        res.body = err.backtrace.join("\n")
+        res.status = 500
+      end
     end
   end
-  
-end
+
+end

data/test/client/helpers/test_wrapper.rb

@@ -1,18 +1,6 @@
-module Test::Unit
-  class AutoRunner
-    alias_method :real_run, :run
-    
-    def run
-      ProviderServer.wrap { real_run }
-    end
-
-  end
-  
-end
-
-unless $provider_server_already_started
-  $provider_server_already_started = true
-  ProviderServer.start(3333)
-  sleep 2
+unless $provider_server
+  $provider_server = ProviderServer.new(3333, '/oai')
+  $provider_server.start
+  sleep 0.2
 end
 

data/test/client/tc_http_client.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'webrick'
 
 class HttpClientTest < Test::Unit::TestCase
 
@@ -6,7 +7,7 @@ class HttpClientTest < Test::Unit::TestCase
     oai_response = <<-eos
     <Identify>
       <repositoryName>Mock OAI Provider</repositoryName>
-      <baseURL>http://nowhere.example.com</baseURL> 
+      <baseURL>http://nowhere.example.com</baseURL>
     </Identify>
 eos
 
@@ -20,7 +21,94 @@ eos
 
     assert_kind_of OAI::IdentifyResponse, response
     assert_equal 'Mock OAI Provider [http://nowhere.example.com]', response.to_s
-    
+
+  end
+
+  def test_http_client_handles_trailing_slash_redirects
+    # First, test that this works when mocking out Faraday client
+    oai_response = <<-eos
+      <Identify>
+        <repositoryName>Mock OAI Provider</repositoryName>
+        <baseURL>http://nowhere.example.com</baseURL>
+      </Identify>
+    eos
+
+    stubs = TrailingSlashAwareStubs.new do |stub|
+      stub.get('/oai/?verb=Identify') { [200, {}, oai_response] }
+      stub.get('/oai?verb=Identify') {
+        [301, {
+          'Location' => 'http://localhost:3334/oai/?verb=Identify'
+        }, '']
+      }
+    end
+
+    faraday_stub = Faraday.new do |builder|
+      require 'faraday_middleware'
+      builder.use FaradayMiddleware::FollowRedirects
+      builder.adapter :test, stubs
+    end
+
+    client = OAI::Client.new 'http://localhost:3334/oai', :http => faraday_stub
+    response = client.identify
+
+    assert_kind_of OAI::IdentifyResponse, response
+    assert_equal 'Mock OAI Provider [http://nowhere.example.com]', response.to_s
+    assert_equal 2, stubs.consumed[:get].length
+    assert_equal stubs.consumed[:get].first.path, '/oai'
+    assert_equal stubs.consumed[:get].last.path, '/oai/'
+
+    # Now try it with a real server and default Faraday client
+    TrailingSlashProviderServer.wrap(3334) do |server|
+      client = OAI::Client.new "http://localhost:#{server.port}/oai"
+      response = client.identify
+
+      assert_kind_of OAI::IdentifyResponse, response
+      assert_equal 'Complex Provider [http://localhost]', response.to_s
+      assert_equal 2, server.consumed.length
+      assert_equal server.consumed.first.path, '/oai'
+      assert_equal server.consumed.last.path, '/oai/'
+    end
+  end
+
+  private
+
+  class TrailingSlashProviderServer < ProviderServer
+    def server_proc
+      Proc.new do |req, res|
+        @consumed << req
+        case req.path
+        when "/oai/"
+          begin
+            res.body = @provider.process_request(req.query)
+            res.status = 200
+            res['Content-Type'] = 'text/xml'
+          rescue => err
+            puts err
+            puts err.backtrace.join("\n")
+            res.body = err.backtrace.join("\n")
+            res.status = 500
+          end
+        else
+          res.body = ''
+          res.status = 301
+          res['Location'] = "http://localhost:#{port}/oai/?#{req.query_string}"
+        end
+        res
+      end
+    end
+  end
+
+  class TrailingSlashAwareStubs < Faraday::Adapter::Test::Stubs
+    attr_reader :consumed
+
+    # ensure leading, but not trailing slash
+    def normalize_path(path)
+      path = '/' + path if path.index('/') != 0
+      #path = path.sub('?', '/?')
+      #path = path + '/' unless $&
+      path.gsub('//', '/')
+    end
+
   end
 end