ensure default from/until constraint values have valid granularity

- inspect opposite constraint and match type if present
- make private OAI::Provider::Response::Base#parse_date available as protected class method
- fixes #104

Author: barmintor

lib/oai/provider/response.rb

@@ -40,6 +40,21 @@ def response
         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 @@ def externalize(value)
     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 = {})

lib/oai/provider/response/record_response.rb

@@ -3,8 +3,26 @@ class RecordResponse < Base
     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

test/provider/tc_simple_provider.rb

@@ -49,6 +49,22 @@ def test_list_records_without_constraints
     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'))