oai 1.1.0 → 1.2.0

data/lib/oai/provider/model.rb

@@ -29,7 +29,7 @@ module OAI::Provider
   # see the ResumptionToken class for more details.
   #
   class Model
-    attr_reader :timestamp_field, :identifier_field
+    attr_reader :timestamp_field, :identifier_field, :limit
 
     def initialize(limit = nil, timestamp_field = 'updated_at', identifier_field = 'id')
       @limit = limit

data/lib/oai/provider/response/list_records.rb

@@ -2,6 +2,18 @@ module OAI::Provider::Response
 
   class ListRecords < RecordResponse
     required_parameters :metadata_prefix
+    
+    def valid?
+      super && matching_granularity?
+    end
+    
+    def matching_granularity?
+      if options[:from].nil? == false && options[:until].nil? == false && options[:from].class.name != options[:until].class.name
+        raise OAI::ArgumentException.new, "The 'from' and 'until' options specified must have the same granularity"
+      else
+        true
+      end
+    end
 
     def to_xml
       result = provider.model.find(:all, options)

data/lib/oai/provider/response.rb

@@ -90,10 +90,13 @@ module OAI
 
     def parse_date(value)
       return value if value.respond_to?(:strftime)
-
-      Date.parse(value) # This will raise an exception for badly formatted dates
-      Time.parse(value).utc #  -- UTC Bug fix hack 8/08 not in core
-    rescue
+      
+      if value[-1] == "Z"
+        Time.strptime(value, "%Y-%m-%dT%H:%M:%S%Z").utc
+      else
+        Date.strptime(value, "%Y-%m-%d")
+      end
+    rescue ArgumentError => e
       raise OAI::ArgumentException.new, "unparsable date: '#{value}'"
     end
 

data/lib/oai/provider/resumption_token.rb

@@ -1,5 +1,4 @@
 require 'time'
-require 'enumerator'
 require File.dirname(__FILE__) + "/partial_result"
 
 module OAI::Provider
@@ -37,7 +36,7 @@ module OAI::Provider
     attr_reader :prefix, :set, :from, :until, :last, :last_str, :expiration, :total
 
     # parses a token string and returns a ResumptionToken
-    def self.parse(token_string)
+    def self.parse(token_string, expiration = nil, total = nil)
       begin
         options = {}
         matches = /(.+):([^ :]+)$/.match(token_string)
@@ -55,7 +54,7 @@ module OAI::Provider
             options[:until] = Time.parse(part.sub(/^u\(/, '').sub(/\)$/, '')).localtime
           end
         end
-        self.new(options)
+        self.new(options, expiration, total)
       rescue => err
         raise OAI::ResumptionTokenException.new
       end
@@ -123,10 +122,24 @@ module OAI::Provider
     end
 
     def encode_conditions
+      return "" if last_str.nil? || last_str.to_s.strip.eql?("")
+
       encoded_token = @prefix.to_s.dup
       encoded_token << ".s(#{set})" if set
-      encoded_token << ".f(#{self.from.utc.xmlschema})" if self.from
-      encoded_token << ".u(#{self.until.utc.xmlschema})" if self.until
+      if self.from
+        if self.from.respond_to?(:utc)
+          encoded_token << ".f(#{self.from.utc.xmlschema})"
+        else
+          encoded_token << ".f(#{self.from.xmlschema})"
+        end
+      end
+      if self.until
+        if self.until.respond_to?(:utc)
+          encoded_token << ".u(#{self.until.utc.xmlschema})" 
+        else
+          encoded_token << ".u(#{self.until.xmlschema})" 
+        end
+      end
       encoded_token << ":#{last_str}"
     end
 

data/test/activerecord_provider/database/0001_oaipmh_tables.rb

@@ -10,6 +10,12 @@ class OaipmhTables < ActiveRecord::Migration[5.2]
       t.column :oai_token_id, :integer, :null => false
     end
 
+    create_table :dc_langs do |t|
+      t.column :name,           :string
+      t.column :updated_at,     :datetime
+      t.column :created_at,     :datetime
+    end
+
     dc_fields = proc do |t|
       t.column  :title,         :string
       t.column  :creator,       :string
@@ -21,7 +27,7 @@ class OaipmhTables < ActiveRecord::Migration[5.2]
       t.column  :type,          :string
       t.column  :format,        :string
       t.column  :source,        :string
-      t.column  :language,      :string
+      t.column  :dc_lang_id,    :integer
       t.column  :relation,      :string
       t.column  :coverage,      :string
       t.column  :rights,        :string

data/test/activerecord_provider/helpers/providers.rb

@@ -56,11 +56,13 @@ class ARLoader
       File.join(File.dirname(__FILE__), '..', 'fixtures', 'dc.yml')
     )
     fixtures.keys.sort.each do |key|
-      DCField.create(fixtures[key])
+      lang = DCLang.create(name: fixtures[key].delete('language'))
+      DCField.create(fixtures[key].merge(dc_lang: lang))
     end
   end
 
   def self.unload
     DCField.delete_all
+    DCLang.delete_all
   end
 end

data/test/activerecord_provider/helpers/transactional_test_case.rb

@@ -19,7 +19,8 @@ class TransactionalTestCase < Test::Unit::TestCase
     )
     disable_logging do
       fixtures.keys.sort.each do |key|
-        DCField.create(fixtures[key])
+        lang = DCLang.create(name: fixtures[key].delete('language'))
+        DCField.create(fixtures[key].merge(dc_lang: lang))
       end
     end
   end

data/test/activerecord_provider/models/dc_field.rb

@@ -4,4 +4,12 @@ class DCField < ActiveRecord::Base
     :join_table => "dc_fields_dc_sets",
     :foreign_key => "dc_field_id",
     :class_name => "DCSet"
+
+  belongs_to :dc_lang, class_name: "DCLang", optional: true
+
+  default_scope -> { left_outer_joins(:dc_lang) }
+
+  def language
+    dc_lang&.name
+  end
 end

data/test/activerecord_provider/models/dc_lang.rb

@@ -0,0 +1,3 @@
+class DCLang < ActiveRecord::Base
+  has_many :dc_fields
+end

data/test/activerecord_provider/models/exclusive_set_dc_field.rb

@@ -8,4 +8,10 @@ class ExclusiveSetDCField < ActiveRecord::Base
     end
   end
 
+  belongs_to :dc_lang, class_name: "DCLang", optional: true
+
+  def language
+    dc_lang&.name
+  end
+
 end

data/test/activerecord_provider/tc_activerecord_wrapper.rb

@@ -0,0 +1,63 @@
+require 'test_helper_ar_provider'
+
+class ActiveRecordWrapperTest < TransactionalTestCase
+  def test_sql_conditions_from_date
+    input = "2005-12-25"
+    expected = input.dup
+    sql_template, sql_opts = sql_conditions(from: input)
+    assert_equal "dc_fields.updated_at >= :from", sql_template
+    assert_equal expected, sql_opts[:from]
+    sql_template, sql_opts = sql_conditions(from: Date.strptime(input, "%Y-%m-%d"))
+    assert_equal "dc_fields.updated_at >= :from", sql_template
+    assert_equal expected, sql_opts[:from]
+  end
+
+  def test_sql_conditions_from_time
+    input = "2005-12-25T00:00:00Z"
+    expected = "2005-12-25 00:00:00"
+    sql_template, sql_opts = sql_conditions(from: input)
+    assert_equal "dc_fields.updated_at >= :from", sql_template
+    assert_equal expected, sql_opts[:from]
+    sql_template, sql_opts = sql_conditions(from: Time.strptime(input, "%Y-%m-%dT%H:%M:%S%Z"))
+    assert_equal "dc_fields.updated_at >= :from", sql_template
+    assert_equal expected, sql_opts[:from]
+  end
+
+  def test_sql_conditions_until_date
+    input = "2005-12-25"
+    expected = "2005-12-26"
+    sql_template, sql_opts = sql_conditions(until: input)
+    assert_equal "dc_fields.updated_at < :until", sql_template
+    assert_equal expected, sql_opts[:until]
+    sql_template, sql_opts = sql_conditions(until: Date.strptime(input, "%Y-%m-%d"))
+    assert_equal "dc_fields.updated_at < :until", sql_template
+    assert_equal expected, sql_opts[:until]
+  end
+
+  def test_sql_conditions_until_time
+    input = "2005-12-25T00:00:00Z"
+    expected = "2005-12-25 00:00:01"
+    sql_template, sql_opts = sql_conditions(until: input)
+    assert_equal "dc_fields.updated_at < :until", sql_template
+    assert_equal expected, sql_opts[:until]
+    sql_template, sql_opts = sql_conditions(until: Time.strptime(input, "%Y-%m-%dT%H:%M:%S%Z"))
+    assert_equal "dc_fields.updated_at < :until", sql_template
+    assert_equal expected, sql_opts[:until]
+  end
+
+  def test_sql_conditions_both
+    input = "2005-12-25"
+    sql_template, sql_opts = sql_conditions(from: input, until: input)
+    assert_equal "dc_fields.updated_at >= :from AND dc_fields.updated_at < :until", sql_template
+  end
+
+  def setup
+    @wrapper = OAI::Provider::ActiveRecordWrapper.new(DCField)
+  end
+
+  def sql_conditions(opts)
+    @wrapper.send :sql_conditions, opts
+  end
+end
+
+

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

@@ -20,8 +20,9 @@ class SimpleResumptionProviderTest < TransactionalTestCase
     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
@@ -42,10 +43,10 @@ class SimpleResumptionProviderTest < TransactionalTestCase
 
   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(
@@ -58,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]) &&