oai 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a80559d64aa25add07953e978e93f9abfbc89e03c67bf306e79f0d7b18b0f7
-  data.tar.gz: 7989ff1c6dec95c3965cb3adc1d0bc156d250b6129002be50193443994d03caf
+  metadata.gz: '0739f4d294a977be9445e06f872feb4aa421ecc35c65d4ba4c07af0f48f98070'
+  data.tar.gz: b444b8a7f6cfbeccf045e6794b2d6d001dc319fcf362383404735215adcb3cfa
 SHA512:
-  metadata.gz: db8b7e74c65625da8b47b35ef23a7e620777dfefb0a6a8d63a6a7314534dbfe46606bf863aef4a839087547280700519f35e3b10bdf10bf70ba93959ae3125e2
-  data.tar.gz: ad14343ae9a61b6516f7e079db4afc0b7eddbb5e70d8d962221842a5fe4f8b49da63d37dc8eeb7cfe9e163617d4d2a3cae93e37e8943b784df7d0dc1eb1a7cce
+  metadata.gz: 0edac39be81e755d256f5f39b0772d8568450e2dd6bc837982ad3568547e8ee46b94c3f17d14e69ad94a1ef95458992f9538108f919a3623b9994a42b11203f5
+  data.tar.gz: c182374267d3acf402f9f9a24c3342739f4e3b72fac229076237126444e7aa674acaea7ae8122de71bc7aa9615cfe9a5864fe3ed4e6c31e3a8f848ed27db41aa

data/README.md

@@ -125,4 +125,4 @@ That may make changes to appraisal gemfiles that you should commit to repo.
 License
 -------
 
-[![CC0 - Public Domain](http://i.creativecommons.org/p/zero/1.0/88x15.png)](http://creativecommons.org/publicdomain/zero/1.0/)
+[MIT](./LICENSE)

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

@@ -3,8 +3,26 @@ module OAI::Provider::Response
     def self.inherited(klass)
       klass.valid_parameters    :metadata_prefix, :from, :until, :set
       klass.default_parameters  :metadata_prefix => "oai_dc",
-           :from => Proc.new {|x| Time.parse(x.provider.model.earliest.to_s) }, #-- OAI 2.0 hack - UTC
-           :until => Proc.new {|x| Time.parse(x.provider.model.latest.to_s) }   #-- OAI 2.0 hack - UTC
+           :from => method(:default_from).to_proc,
+           :until => method(:default_until).to_proc
+    end
+
+    def self.default_from(response)
+      value = Time.parse(response.provider.model.earliest.to_s).utc
+      if response.options[:until]
+        u = parse_date(response.options[:until])
+        value = value.to_date if u.is_a? Date
+      end
+      value
+    end
+
+    def self.default_until(response)
+      value = Time.parse(response.provider.model.latest.to_s).utc
+      if response.options[:from]
+        f = parse_date(response.options[:from])
+        value = value.to_date if f.is_a? Date
+      end
+      value
     end
 
     # emit record header

data/lib/oai/provider/response.rb

@@ -40,6 +40,21 @@ module OAI
         yield @builder
       end
     end
+
+    protected
+
+    def self.parse_date(value)
+      return value if value.respond_to?(:strftime)
+
+      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
+
     private
 
     def header
@@ -89,15 +104,7 @@ module OAI
     end
 
     def parse_date(value)
-      return value if value.respond_to?(:strftime)
-      
-      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}'"
+      self.class.parse_date(value)
     end
 
     def internalize(hash = {})

data/test/provider/tc_simple_provider.rb

@@ -49,6 +49,22 @@ class TestSimpleProvider < Test::Unit::TestCase
     assert_equal total, doc.elements['OAI-PMH/ListRecords'].size
   end
 
+  def test_list_records_with_from_constraints
+    assert_nothing_raised { REXML::Document.new(@simple_provider.list_records(:metadata_prefix => 'oai_dc')) }
+
+    total = @model.find(:all).size
+    doc = REXML::Document.new(@simple_provider.list_records(:metadata_prefix => 'oai_dc', from: "2002-10-05"))
+    assert_equal total, doc.elements['OAI-PMH/ListRecords'].size
+  end
+
+  def test_list_records_with_until_constraints
+    assert_nothing_raised { REXML::Document.new(@simple_provider.list_records(:metadata_prefix => 'oai_dc')) }
+
+    total = @model.find(:all).size
+    doc = REXML::Document.new(@simple_provider.list_records(:metadata_prefix => 'oai_dc', until: "2002-11-05"))
+    assert_equal total, doc.elements['OAI-PMH/ListRecords'].size
+  end
+
   def test_list_records_with_set_equal_a
     total = @model.find(:all, :set => 'A').size
     doc = REXML::Document.new(@simple_provider.list_records(:metadata_prefix => 'oai_dc', :set => 'A'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oai
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ed Summers
 autorequire: oai
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder