oai 1.1.0 → 1.2.0

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_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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oai
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ed Summers
 autorequire: oai
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -28,30 +28,36 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +67,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +77,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +92,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: ehs@pobox.com
 executables:
 - oai
@@ -146,9 +152,11 @@ files:
 - test/activerecord_provider/helpers/set_provider.rb
 - test/activerecord_provider/helpers/transactional_test_case.rb
 - test/activerecord_provider/models/dc_field.rb
+- test/activerecord_provider/models/dc_lang.rb
 - test/activerecord_provider/models/dc_set.rb
 - test/activerecord_provider/models/exclusive_set_dc_field.rb
 - test/activerecord_provider/models/oai_token.rb
+- test/activerecord_provider/tc_activerecord_wrapper.rb
 - test/activerecord_provider/tc_ar_provider.rb
 - test/activerecord_provider/tc_ar_sets_provider.rb
 - test/activerecord_provider/tc_caching_paging_provider.rb
@@ -169,6 +177,8 @@ files:
 - test/client/tc_utf8_escaping.rb
 - test/client/tc_xpath.rb
 - test/client/test_helper_client.rb
+- test/harvester/tc_harvest.rb
+- test/harvester/test_helper_harvester.rb
 - test/provider/models.rb
 - test/provider/tc_exceptions.rb
 - test/provider/tc_functional_tokens.rb
@@ -179,9 +189,10 @@ files:
 - test/provider/test_helper_provider.rb
 - test/test.xml
 homepage: http://github.com/code4lib/ruby-oai
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -196,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A ruby library for working with the Open Archive Initiative Protocol for
   Metadata Harvesting (OAI-PMH)