From/Until may be Time or Date depending on granularity

Author: jamesprior

examples/models/file_model.rb

@@ -45,8 +45,8 @@ def find(selector, opts={})
     case selector
     when :all
       records = Dir["#{@directory}/*.xml"].sort.collect do |file|
-        File.new(file) unless File.stat(file).mtime.utc < opts[:from] or
-          File.stat(file).mtime.utc > opts[:until]
+        File.new(file) unless File.stat(file).mtime.utc < opts[:from].to_time or
+          File.stat(file).mtime.utc > opts[:until].to_time
       end
       records
     else

lib/oai/provider/model/activerecord_wrapper.rb

@@ -177,6 +177,7 @@ def sql_conditions(opts)
         sql << "#{timestamp_field} < :until"
         esc_values[:until] = parse_to_local(opts[:until]) { |t| t + 1 }
       end
+      
       return [sql.join(" AND "), esc_values]
     end
 
@@ -190,22 +191,26 @@ def parse_to_local(time)
           if time[-1] == "Z"
             time_obj = Time.strptime(time, "%Y-%m-%dT%H:%M:%S%Z")
           else
-            time_obj = Time.strptime(time, "%Y-%m-%d")
+            time_obj = Date.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
 
-      if ActiveRecord::VERSION::MAJOR >= 7
-        tzconv = "get#{ActiveRecord.default_timezone.to_s}".to_sym
+      if time_obj.kind_of?(Date)
+        time_obj.strftime("%Y-%m-%d")
       else
-        tzconv = "get#{model.default_timezone.to_s}".to_sym
+        # Convert to same as DB - :local => :getlocal, :utc => :getutc
+        if ActiveRecord::VERSION::MAJOR >= 7
+          tzconv = "get#{ActiveRecord.default_timezone.to_s}".to_sym
+        else
+          tzconv = "get#{model.default_timezone.to_s}".to_sym
+        end
+        time_obj.send(tzconv).strftime("%Y-%m-%d %H:%M:%S")
       end
-      time_obj.send(tzconv).strftime("%Y-%m-%d %H:%M:%S")
     end
 
   end

lib/oai/provider/response.rb

@@ -94,7 +94,7 @@ def parse_date(value)
       if value[-1] == "Z"
         Time.strptime(value, "%Y-%m-%dT%H:%M:%S%Z").utc
       else
-        Time.strptime(value, "%Y-%m-%d").utc
+        Date.strptime(value, "%Y-%m-%d")
       end
     rescue ArgumentError => e
       raise OAI::ArgumentException.new, "unparsable date: '#{value}'"

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)

lib/oai/provider/resumption_token.rb

@@ -126,8 +126,20 @@ def encode_conditions
 
       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
 

test/provider/models.rb

@@ -76,8 +76,8 @@ def find(selector, opts={})
       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]) &&

test/provider/tc_provider.rb

@@ -78,6 +78,32 @@ def test_until
     )
     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