oai 1.0.0 → 1.2.0

data/test/activerecord_provider/tc_ar_provider.rb

@@ -81,30 +81,30 @@ class ActiveRecordProviderTest < TransactionalTestCase
 
   def test_from
     first_id = DCField.order("id asc").first.id
-    DCField.where("id < #{first_id + 90}").update_all(updated_at: Time.parse("January 1 2005"))
+    DCField.where("dc_fields.id < #{first_id + 90}").update_all(updated_at: Time.parse("January 1 2005"))
 
-    DCField.where("id < #{first_id + 10}").update_all(updated_at: Time.parse("June 1 2005"))
+    DCField.where("dc_fields.id < #{first_id + 10}").update_all(updated_at: Time.parse("June 1 2005"))
 
 
-    from_param = Time.parse("January 1 2006")
+    from_param = Time.parse("January 1 2006").getutc.iso8601
 
     doc = REXML::Document.new(
       @provider.list_records(
         :metadata_prefix => 'oai_dc', :from => from_param)
     )
-    assert_equal DCField.where(["updated_at >= ?", from_param]).size,
+    assert_equal DCField.where(["dc_fields.updated_at >= ?", from_param]).size,
       doc.elements['OAI-PMH/ListRecords'].size
 
     doc = REXML::Document.new(
       @provider.list_records(
-        :metadata_prefix => 'oai_dc', :from => Time.parse("May 30 2005"))
+        :metadata_prefix => 'oai_dc', :from => Time.parse("May 30 2005").getutc.iso8601)
     )
     assert_equal 20, doc.elements['OAI-PMH/ListRecords'].to_a.size
   end
 
   def test_until
-    first_id = DCField.order("id asc").first.id
-    DCField.where("id < #{first_id + 10}").update_all(updated_at: Time.parse("June 1 2005"))
+    first_id = DCField.order(id: :asc).first.id
+    DCField.where("dc_fields.id < ?", first_id + 10).update_all(updated_at: Time.parse("June 1 2005"))
 
     doc = REXML::Document.new(
       @provider.list_records(
@@ -114,19 +114,46 @@ class ActiveRecordProviderTest < TransactionalTestCase
   end
 
   def test_from_and_until
-    first_id = DCField.order("id asc").first.id
+    first_id = DCField.order(id: :asc).first.id
     DCField.update_all(updated_at: Time.parse("June 1 2005"))
-    DCField.where("id < #{first_id + 50}").update_all(updated_at: Time.parse("June 15 2005"))
-    DCField.where("id < #{first_id + 10}").update_all(updated_at: Time.parse("June 30 2005"))
+    DCField.where("dc_fields.id < ?", first_id + 50).update_all(updated_at: Time.parse("June 15 2005"))
+    DCField.where("dc_fields.id < ?", first_id + 10).update_all(updated_at: Time.parse("June 30 2005"))
 
     doc = REXML::Document.new(
       @provider.list_records(
         :metadata_prefix => 'oai_dc',
-        :from => Time.parse("June 3 2005"),
-        :until => Time.parse("June 16 2005"))
+        :from => Time.parse("June 3 2005").getutc.iso8601,
+        :until => Time.parse("June 16 2005").getutc.iso8601)
       )
     assert_equal 40, doc.elements['OAI-PMH/ListRecords'].to_a.size
   end
+  
+  def test_bad_until_raises_exception
+    DCField.order(id: :asc).limit(10).update_all(updated_at: 1.year.ago)
+    DCField.order(id: :desc).limit(10).update_all(updated_at: 1.year.from_now)
+    badTimes = [
+      'junk',
+      'February 92nd, 2015']
+    badTimes.each do |time|
+      assert_raise(OAI::ArgumentException) do
+        @provider.list_records(:metadata_prefix => 'oai_dc', :until => time)
+      end
+    end
+  end
+  
+  def test_bad_from_raises_exception
+    DCField.order(id: :asc).limit(10).update_all(updated_at: 1.year.ago)
+    DCField.order(id: :desc).limit(10).update_all(updated_at: 1.year.from_now)
+    
+    badTimes = [
+      'junk',
+      'February 92nd, 2015']
+    badTimes.each do |time|
+      assert_raise(OAI::ArgumentException) do
+        @provider.list_records(:metadata_prefix => 'oai_dc', :from => time)
+      end
+    end
+  end
 
   def test_handles_empty_collections
     DCField.delete_all
@@ -142,6 +169,21 @@ class ActiveRecordProviderTest < TransactionalTestCase
       REXML::Document.new(@provider.list_records(:metadata_prefix => 'oai_dc'))
     end
   end
+  
+  def test_bad_id_raises_exception
+    badIdentifiers = [
+      'invalid"id',
+      'oai:test/5000',
+      'oai:test/-1',
+      'oai:test/one',
+      'oai:test/\\$1\1!']
+    badIdentifiers.each do |id|
+      assert_raise(OAI::IdException) do
+        @provider.get_record(:identifier => id, :metadata_prefix => 'oai_dc')
+      end
+    end
+  end
+  
 
   def setup
     @provider = ARProvider.new
@@ -149,18 +191,4 @@ class ActiveRecordProviderTest < TransactionalTestCase
 
 end
 
-class ActiveRecordProviderTimezoneTest < ActiveRecordProviderTest
-
-  def setup
-    require 'active_record'
-    ActiveRecord::Base.default_timezone = :utc
-    super
-  end
 
-  def teardown
-    require 'active_record'
-    ActiveRecord::Base.default_timezone = :local
-    super
-  end
-
-end

data/test/activerecord_provider/tc_ar_sets_provider.rb

@@ -51,22 +51,22 @@ class ActiveRecordSetProviderTest < TransactionalTestCase
     set_ab = DCSet.create(:name => "Set A:B", :spec => "A:B")
 
     next_id = 0
-    DCField.limit(10).order("id asc").each do |record|
+    DCField.limit(10).order(id: :asc).each do |record|
       set_a.dc_fields << record
       next_id = record.id
     end
 
-    DCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    DCField.where("dc_fields.id > ?", next_id).limit(10).order(id: :asc).each do |record|
       set_b.dc_fields << record
       next_id = record.id
     end
 
-    DCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    DCField.where("dc_fields.id > ?", next_id).limit(10).order(id: :asc).each do |record|
       set_ab.dc_fields << record
       next_id = record.id
     end
 
-    DCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    DCField.where("dc_fields.id > ?", next_id).limit(10).order(id: :asc).each do |record|
       set_a.dc_fields << record
       set_c.dc_fields << record
       next_id = record.id
@@ -117,25 +117,25 @@ class ActiveRecordExclusiveSetsProviderTest < TransactionalTestCase
   def define_sets
     next_id = 0
 
-    ExclusiveSetDCField.limit(10).order("id asc").each do |record|
+    ExclusiveSetDCField.limit(10).order(id: :asc).each do |record|
       record.set = "A"
       record.save!
       next_id = record.id
     end
 
-    ExclusiveSetDCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    ExclusiveSetDCField.where("id > ?", next_id).limit(10).order(id: :asc).each do |record|
       record.set = "B"
       record.save!
       next_id = record.id
     end
 
-    ExclusiveSetDCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    ExclusiveSetDCField.where("id > ?", next_id).limit(10).order(id: :asc).each do |record|
       record.set = "A:B"
       record.save!
       next_id = record.id
     end
 
-    ExclusiveSetDCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    ExclusiveSetDCField.where("id > ?", next_id).limit(10).order(id: :asc).each do |record|
       record.set = "A"
       record.save!
       next_id = record.id
@@ -150,7 +150,8 @@ class ActiveRecordExclusiveSetsProviderTest < TransactionalTestCase
     )
     disable_logging do
       fixtures.keys.sort.each do |key|
-        ExclusiveSetDCField.create(fixtures[key])
+        lang = DCLang.create(name: fixtures[key].delete('language'))
+        ExclusiveSetDCField.create(fixtures[key].merge(dc_lang: lang))
       end
     end
   end

data/test/activerecord_provider/tc_caching_paging_provider.rb

@@ -17,14 +17,15 @@ class CachingPagingProviderTest < TransactionalTestCase
     token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
     assert_equal 26, doc.elements["/OAI-PMH/ListRecords"].size
     doc = Document.new(@provider.list_records(:resumption_token => token))
-    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
-    assert_equal 25, doc.elements["/OAI-PMH/ListRecords"].size
+    assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
+    assert_equal 26, doc.elements["/OAI-PMH/ListRecords"].to_a.size
   end
 
   def test_from_and_until
-    first_id = DCField.order("id asc").first.id
-    DCField.where("id <= #{first_id + 25}").update_all(updated_at: Time.parse("September 15 2005"))
-    DCField.where("id < #{first_id + 50} and id > #{first_id + 25}").update_all(updated_at: Time.parse("November 1 2005"))
+    first_id = DCField.order(id: :asc).first.id
+    DCField.where("dc_fields.id <= ?", first_id + 25).update_all(updated_at: Time.parse("September 15 2005"))
+    DCField.where(["dc_fields.id < ? and dc_fields.id > ?", first_id + 50, first_id + 25]).update_all(updated_at: Time.parse("November 1 2005"))
 
     # Should return 50 records broken into 2 groups of 25.
     doc = Document.new(
@@ -37,8 +38,9 @@ class CachingPagingProviderTest < TransactionalTestCase
     token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
     assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
     doc = Document.new(@provider.list_records(:resumption_token => token))
-    assert_equal 25, doc.elements["/OAI-PMH/ListRecords"].size
-    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
+    assert_equal 26, doc.elements["/OAI-PMH/ListRecords"].to_a.size
   end
 
   def setup

data/test/activerecord_provider/tc_simple_paging_provider.rb

@@ -8,25 +8,45 @@ class SimpleResumptionProviderTest < TransactionalTestCase
     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
+
     doc = Document.new(@provider.list_records(:resumption_token => token))
     assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
     token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
     assert_equal 26, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+
     doc = Document.new(@provider.list_records(:resumption_token => token))
     assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
     token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
     assert_equal 26, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+
     doc = Document.new(@provider.list_records(:resumption_token => token))
-    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
-    assert_equal 25, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+    assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
+    assert_equal 26, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+  end
+
+  def test_non_integer_identifiers_resumption
+    @provider = SimpleResumptionProviderWithNonIntegerID.new
+
+    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
+
+    next_doc = Document.new(@provider.list_records(:resumption_token => token))
+    assert_not_nil next_doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    next_token = next_doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
+    assert_equal 26, next_doc.elements["/OAI-PMH/ListRecords"].to_a.size
+
+    assert_not_equal token, next_token
   end
 
   def test_from_and_until
     first_id = DCField.order("id asc").first.id
-    DCField.where("id < #{first_id + 25}").update_all(updated_at: Time.parse("September 15 2005"))
-    DCField.where("id <= #{first_id + 50} and id > #{first_id + 25}").update_all(updated_at: Time.parse("November 1 2005"))
+    DCField.where("dc_fields.id < ?", first_id + 25).update_all(updated_at: Time.parse("September 15 2005"))
+    DCField.where(["dc_fields.id <= ? and dc_fields.id > ?", first_id + 50, first_id + 25]).update_all(updated_at: Time.parse("November 1 2005"))
 
-    total = DCField.where(["updated_at >= ? AND updated_at <= ?", Time.parse("September 1 2005"), Time.parse("November 30 2005")]).count
+    total = DCField.where(["dc_fields.updated_at >= ? AND dc_fields.updated_at <= ?", Time.parse("September 1 2005"), Time.parse("November 30 2005")]).count
 
     # Should return 50 records broken into 2 groups of 25.
     doc = Document.new(
@@ -39,8 +59,9 @@ class SimpleResumptionProviderTest < TransactionalTestCase
     assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
     token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
     doc = Document.new(@provider.list_records(:resumption_token => token))
-    assert_equal 25, doc.elements["/OAI-PMH/ListRecords"].to_a.size
-    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
+    assert_equal 26, doc.elements["/OAI-PMH/ListRecords"].to_a.size
   end
 
   def setup

data/test/client/tc_exception.rb

@@ -18,7 +18,7 @@ class ExceptionTest < Test::Unit::TestCase
 
   def test_oai_error
     client = OAI::Client.new 'http://localhost:3333/oai'
-    assert_raises(OAI::Exception) do
+    assert_raises(OAI::ResumptionTokenException) do
       client.list_identifiers :resumption_token => 'bogus'
     end
   end

data/test/client/tc_get_record.rb

@@ -25,7 +25,7 @@ class GetRecordTest < Test::Unit::TestCase
     begin
       client.get_record :metadata_prefix => 'oai_dc'
       flunk 'invalid get_record did not throw OAI::Exception'
-    rescue OAI::Exception => e
+    rescue OAI::ArgumentException => e
       assert_match /The request includes illegal arguments/, e.to_s
     end
   end

data/test/client/tc_http_client.rb

@@ -58,8 +58,8 @@ eos
     end
 
     faraday_stub = Faraday.new do |builder|
-      require 'faraday_middleware'
-      builder.use FaradayMiddleware::FollowRedirects
+      require 'faraday/follow_redirects'
+      builder.use Faraday::FollowRedirects::Middleware
       builder.adapter :test, stubs
     end
 

data/test/client/tc_libxml.rb

@@ -7,7 +7,7 @@ class LibXMLTest < Test::Unit::TestCase
 
     uri = 'http://localhost:3333/oai'
     client = OAI::Client.new uri, :parser => 'libxml'
-    assert_raises(OAI::Exception) {client.get_record(:identifier => 'nosuchid')}
+    assert_raises(OAI::IdException) {client.get_record(:identifier => 'nosuchid')}
   end
 
   def test_list_records

data/test/client/tc_utf8_escaping.rb

@@ -1,12 +1,19 @@
 require 'test_helper_client'
 
 class UTF8Test < Test::Unit::TestCase
+  def client
+    @client ||= OAI::Client.new 'http://localhost:3333/oai'
+  end
 
   def test_escaping_invalid_utf_8_characters
-    client = OAI::Client.new 'http://localhost:3333/oai' #, :parser => 'libxml'
     invalid_utf_8 = [2, 3, 4, 104, 5, 101, 6, 108, 66897, 108, 66535, 111, 1114112, 33, 55234123, 33].pack("U*")
     invalid_utf_8 = invalid_utf_8.force_encoding("binary") if invalid_utf_8.respond_to? :force_encoding
     assert_equal("hello!!", client.send(:strip_invalid_utf_8_chars, invalid_utf_8).gsub(/\?/, ''))
   end
 
+  def test_unescaped_ampersand_content_correction
+    src = '<test>Frankie & Johnny <character>&#9829;</character></test>'
+    expected = '<test>Frankie &amp; Johnny <character>&#9829;</character></test>'
+    assert_equal(expected, client.sanitize_xml(src))
+  end
 end

data/test/harvester/tc_harvest.rb

@@ -0,0 +1,42 @@
+require 'test_helper_harvester'
+
+class HarvestTest < Test::Unit::TestCase
+  ONE_HOUR = 3600
+  EARLIEST_FIXTURE = "1998-05-02T04:00:00Z"
+  LATEST_FIXTURE = "2005-12-25T05:00:00Z"
+  def test_harvest
+    until_value = Time.now.utc - ONE_HOUR
+    config = OpenStruct.new(sites: { 'test' => { 'url' => 'http://localhost:3333/oai' }})
+    OAI::Harvester::Harvest.new(config).start
+    last = config.sites.dig('test', 'last')
+    assert_kind_of Time, last
+    assert last >= (until_value + ONE_HOUR), "#{last} < #{(until_value + ONE_HOUR)}"
+  end
+
+  def test_harvest_from_last
+    from_value = Time.parse(LATEST_FIXTURE).utc
+    now = Time.now.utc
+    config = OpenStruct.new(sites: { 'test' => { 'url' => 'http://localhost:3333/oai' }})
+    OAI::Harvester::Harvest.new(config, nil, from_value).start
+    last = config.sites.dig('test', 'last')
+    assert last >= now, "#{last} < #{now}"
+  end
+
+  def test_harvest_after_last
+    from_value = Time.parse(LATEST_FIXTURE).utc + 1
+    config = OpenStruct.new(sites: { 'test' => { 'url' => 'http://localhost:3333/oai' }})
+    OAI::Harvester::Harvest.new(config, nil, from_value).start
+    last = config.sites.dig('test', 'last')
+    assert_kind_of NilClass, last
+  end
+
+  def test_harvest_with_until
+    until_value = Time.parse(EARLIEST_FIXTURE).utc + ONE_HOUR
+    config = OpenStruct.new(sites: { 'test' => { 'url' => 'http://localhost:3333/oai' }})
+    OAI::Harvester::Harvest.new(config, nil, nil, until_value).start
+    last = config.sites.dig('test', 'last')
+    assert_kind_of Time, last
+    assert_equal last, until_value
+  end
+end
+

data/test/harvester/test_helper_harvester.rb

@@ -0,0 +1,6 @@
+require 'oai'
+require 'oai/harvester'
+require 'test/unit'
+
+require File.dirname(__FILE__) + '/../client/helpers/provider'
+require File.dirname(__FILE__) + '/../client/helpers/test_wrapper'

data/test/provider/models.rb

@@ -68,7 +68,7 @@ class TestModel < OAI::Provider::Model
           if token.last < @groups.size - 1
             PartialResult.new(@groups[token.last], token.next(token.last + 1))
           else
-            @groups[token.last]
+            PartialResult.new(@groups[token.last], token.next(nil))
           end
         rescue
           raise OAI::ResumptionTokenException.new
@@ -76,8 +76,8 @@ class TestModel < OAI::Provider::Model
       else
         records = @records.select do |rec|
              ((opts[:set].nil? || rec.in_set(opts[:set])) &&
-	      (opts[:from].nil? || rec.updated_at >= opts[:from]) &&
-	      (opts[:until].nil? || rec.updated_at <= opts[:until]))
+	      (opts[:from].nil? || rec.updated_at >= opts[:from].to_time) &&
+	      (opts[:until].nil? || rec.updated_at <= opts[:until].to_time))
            #else
            #  ((opts[:set].nil? || rec.in_set(opts[:set])) &&
            #   (opts[:from].nil? || rec.updated_at >= opts[:from]) &&

data/test/provider/tc_functional_tokens.rb

@@ -13,15 +13,16 @@ class ResumptionTokenFunctionalTest < Test::Unit::TestCase
     end
     doc = Document.new(@provider.list_records(:metadata_prefix => 'oai_dc'))
     assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
-    assert_equal 101, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+    assert_equal (@provider.model.limit + 1), doc.elements["/OAI-PMH/ListRecords"].to_a.size
     token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
     doc = Document.new(@provider.list_records(:resumption_token => token))
     assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
-    assert_equal 101, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+    assert_equal (@provider.model.limit + 1), doc.elements["/OAI-PMH/ListRecords"].to_a.size
   end
 
   def test_from_and_until_with_resumption_tokens
-    # Should return 300 records broken into 3 groups of 100.
+    # Should return 550 records broken into 5 groups of 100, and a final group of 50.
+    # checked elements under ListRecords are limit + 1, accounting for the resumptionToken element
     assert_nothing_raised do
       Document.new(@provider.list_records(:metadata_prefix => 'oai_dc'))
     end
@@ -29,19 +30,24 @@ class ResumptionTokenFunctionalTest < Test::Unit::TestCase
       @provider.list_records(
         :metadata_prefix => 'oai_dc',
         :from => Time.parse("September 1 2004"),
-        :until => Time.parse("November 30 2004"))
+        :until => Time.parse("December 25 2005"))
       )
-    assert_equal 101, doc.elements["/OAI-PMH/ListRecords"].to_a.size
-    token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
-
-    doc = Document.new(@provider.list_records(:resumption_token => token))
+    assert_equal (@provider.model.limit + 1), doc.elements["/OAI-PMH/ListRecords"].to_a.size
     assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
-    assert_equal 101, doc.elements["/OAI-PMH/ListRecords"].to_a.size
     token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
 
+    4.times do
+      doc = Document.new(@provider.list_records(:resumption_token => token))
+      assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+      assert_equal (@provider.model.limit + 1), doc.elements["/OAI-PMH/ListRecords"].to_a.size
+      token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
+    end
+
     doc = Document.new(@provider.list_records(:resumption_token => token))
-    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
-    assert_equal 100, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+    # assert that ListRecords includes remaining records and an empty resumption token
+    assert_equal (551 % @provider.model.limit), doc.elements["/OAI-PMH/ListRecords"].to_a.size
+    assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
   end
 
 end

data/test/provider/tc_instance_provider.rb

@@ -0,0 +1,41 @@
+require 'test_helper_provider'
+
+class TestInstanceProvider < Test::Unit::TestCase
+
+  # Prior to the commit introducing this code, the InstanceProvider#identify
+  # method would instantiate a Response::Identify object, passing the
+  # InstanceProvider class as the provider for the Response::Identify
+  # instance. With the commit introducing this test, the
+  # InstanceProvider#identify now passes the instance of InstanceProvider
+  # to the instantiation of Response::Identify.
+  #
+  # Thus we can override, on an instance by instance basis, the behavior of a
+  # response object.
+  def test_instance_used_in_responses
+    @url_path = "/stringy-mc-string-face"
+    @instance_provider = InstanceProvider.new({ :provider_context => :instance_based, :url_path => @url_path })
+
+    xml = @instance_provider.identify
+    doc =  REXML::Document.new(xml)
+    assert_equal "http://localhost#{@url_path}", doc.elements["OAI-PMH/Identify/baseURL"].text
+  end
+
+  def test_class_used_in_responses
+    @url_path = "/stringy-mc-string-face"
+    @instance_provider = InstanceProvider.new({ :provider_context => :class_based, :url_path => @url_path })
+
+    xml = @instance_provider.identify
+    doc =  REXML::Document.new(xml)
+    assert_equal "http://localhost", doc.elements["OAI-PMH/Identify/baseURL"].text
+  end
+
+  def test_by_default_class_used_in_responses
+    @url_path = "/stringy-mc-string-face"
+    @instance_provider = InstanceProvider.new({ :url_path => @url_path })
+
+    xml = @instance_provider.identify
+    doc =  REXML::Document.new(xml)
+    assert_equal "http://localhost", doc.elements["OAI-PMH/Identify/baseURL"].text
+  end
+
+end

data/test/provider/tc_provider.rb

@@ -78,6 +78,32 @@ class OaiTest < Test::Unit::TestCase
     )
     assert_equal 100, doc.elements['OAI-PMH/ListRecords'].to_a.size
   end
+  
+  def test_from_and_until_match
+    assert_nothing_raised do
+      @big_provider.list_records(
+        :metadata_prefix => 'oai_dc',
+        :from => "2000-11-01T05:00:00Z",
+        :until =>  "2000-11-30T05:00:00Z"
+      )
+    end
+    
+    assert_nothing_raised do
+      @big_provider.list_records(
+        :metadata_prefix => 'oai_dc',
+        :from => "2000-11-01",
+        :until =>  "2000-11-30"
+      )
+    end
+    
+    assert_raise(OAI::ArgumentException) do
+      @big_provider.list_records(
+        :metadata_prefix => 'oai_dc',
+        :from => "2000-11-01T05:00:00Z",
+        :until =>  "2000-11-30"
+      )
+    end
+  end
 
   def test_from_and_until
     assert_nothing_raised do

data/test/provider/tc_resumption_tokens.rb

@@ -43,4 +43,10 @@ class ResumptionTokenTest < Test::Unit::TestCase
     assert_equal "#{@token.to_s}:#{@token.last}", doc.elements['/resumptionToken'].text
   end
 
+  def test_resumption_token_id_does_not_need_to_be_numeric
+    serialized = "oai_dc.s(A).f(2005-01-01T17:00:00Z).u(2005-01-31T17:00:00Z):FA129C"
+
+    token = ResumptionToken.parse(serialized)
+    assert_equal serialized, token.send(:encode_conditions)
+  end
 end

data/test/provider/test_helper_provider.rb

@@ -43,3 +43,20 @@ class DescribedProvider < Provider::Base
   sample_id '13900'
   extra_description "<my_custom_xml />"
 end
+
+class InstanceProvider < Provider::Base
+  repository_name 'Instance Provider'
+  record_prefix 'oai:test'
+  repository_url 'http://localhost'
+  source_model SimpleModel.new
+
+  def initialize(options = {})
+    super
+    @url_path = options.fetch(:url_path)
+  end
+  attr_reader :url_path
+
+  def url
+    File.join(super, url_path)
+  end
+end