Stricter ISO 8601 date parsing

Author: jamesprior

lib/oai/client/response.rb

@@ -37,14 +37,14 @@ def initialize(doc, &resumption_block)
           message = error.content
           code = ""
           if defined?(error.property) == nil
-              code = error.attributes['code']
-           else
-	      begin
-	 	code = error["code"]
-	      rescue
-                code = error.property('code')
-	      end
+            code = error.attributes['code']
+         else
+           begin
+             code = error["code"]
+           rescue
+             code = error.property('code')
            end
+         end
       end
       raise OAI::Exception.new(message, code)
     end

lib/oai/provider/model/activerecord_wrapper.rb

@@ -183,7 +183,20 @@ def sql_conditions(opts)
     private
 
     def parse_to_local(time)
-      time_obj = Time.parse(time.to_s)
+      if time.respond_to?(:strftime)
+        time_obj = time
+      else
+        begin
+          if time.ends_with?("Z")
+            time_obj = Time.strptime(time, "%Y-%m-%dT%H:%M:%SZ")
+          else
+            time_obj = Time.strptime(time, "%Y-%m-%d")
+          end
+        rescue
+          raise OAI::ArgumentException.new, "unparsable date: '#{time}'"
+        end
+      end
+        
       time_obj = yield(time_obj) if block_given?
       # Convert to same as DB - :local => :getlocal, :utc => :getutc
 

lib/oai/provider/response.rb

@@ -90,10 +90,13 @@ def externalize(value)
 
     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 provider.granularity == OAI::Const::Granularity::HIGH
+        Time.strptime(value, "%Y-%m-%dT%H:%M:%SZ").utc
+      else
+        Time.strptime(value, "%Y-%m-%d").utc
+      end
+    rescue ArgumentError => e
       raise OAI::ArgumentException.new, "unparsable date: '#{value}'"
     end
 

test/activerecord_provider/tc_ar_provider.rb

@@ -86,7 +86,7 @@ def test_from
     DCField.where("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(
@@ -97,7 +97,7 @@ def test_from
 
     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
@@ -122,11 +122,38 @@ def test_from_and_until
     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

test/client/helpers/provider.rb

@@ -10,7 +10,7 @@ class ComplexClientProvider < OAI::Provider::Base
     source_model ComplexModel.new(100)
   end
 
-  attr_reader :consumed, :server
+  attr_reader :consumed, :server, :provider
 
   def initialize(port, mount_point)
     @consumed = []

test/client/tc_list_identifiers.rb

@@ -47,6 +47,7 @@ def test_list_full
   end
 
   def test_list_with_date_range
+    $provider_server.provider.class.update_granularity OAI::Const::Granularity::LOW
     client = OAI::Client.new 'http://localhost:3333/oai'
     from_date = Date.new(1998,1,1)
     until_date  = Date.new(2002,1,1)