Updates to the provider element to allow it to pass oai 2.0 validation tests. Without it, the date values passed by the oai elements are invalid.

Author: Terry Reese

Rakefile

@@ -1,4 +1,4 @@
-RUBY_OAI_VERSION = '0.0.9'
+RUBY_OAI_VERSION = '0.0.10'
 
 require 'rubygems'
 require 'rake'

lib/oai/provider/metadata_format.rb

@@ -54,11 +54,13 @@ def encode(model, record)
     # 2.  Try calling the pluralized name method on the model.
     # 3.  Try calling the singular name method on the model
     def value_for(field, record, map)
-      method = map[field] ? map[field].to_s : field.to_s
-      
+      method = map[field] ? map[field].to_s : field.to_s 
+     
       if record.respond_to?(pluralize(method))
         record.send pluralize(method)
       elsif record.respond_to?(method)
+        # at this point, this function will throw a dep. error because of the call to type -- a reserved work
+        # in ruby
         record.send method
       else
         []

lib/oai/provider/model/activerecord_wrapper.rb

@@ -1,5 +1,4 @@
 require 'active_record'
-
 module OAI::Provider
   # = OAI::Provider::ActiveRecordWrapper
   # 
@@ -35,7 +34,6 @@ def latest
       model.find(:first, 
         :order => "#{timestamp_field} desc").send(timestamp_field)
     end
-
     # A model class is expected to provide a method Model.sets that
     # returns all the sets the model supports.  See the 
     # activerecord_provider tests for an example.   
@@ -46,7 +44,6 @@ def sets
     def find(selector, options={})
       return next_set(options[:resumption_token]) if options[:resumption_token]
       conditions = sql_conditions(options)
-
       if :all == selector
         total = model.count(:id, :conditions => conditions)
         if @limit && total > @limit
@@ -93,9 +90,7 @@ def select_partial(token)
         :conditions => token_conditions(token),
         :limit => @limit, 
         :order => "#{model.primary_key} asc")
-
       raise OAI::ResumptionTokenException.new unless records
-
       offset = records.last.send(model.primary_key.to_sym)
 
       PartialResult.new(records, token.next(offset))
@@ -124,13 +119,13 @@ def sql_conditions(opts)
       sql = []
       sql << "#{timestamp_field} >= ?" << "#{timestamp_field} <= ?" 
       sql << "set = ?" if opts[:set]
-
       esc_values = [sql.join(" AND ")]
-      esc_values << opts[:from].localtime << opts[:until].localtime
+      esc_values << Time.parse(opts[:from]).localtime << Time.parse(opts[:until]).localtime #-- OAI 2.0 hack - UTC fix from record_responce 
       esc_values << opts[:set] if opts[:set]
 
       return esc_values
     end
 
   end
 end
+

lib/oai/provider/response.rb

@@ -1,5 +1,4 @@
 require 'builder' unless defined?(Builder)
-
 module OAI
   module Provider
     module Response
@@ -9,7 +8,6 @@ class Base
 
     class << self
       attr_reader :valid_options, :default_options, :required_options
-
       def valid_parameters(*args)
         @valid_options ||= []
         @valid_options = (@valid_options + args.dup).uniq
@@ -27,23 +25,23 @@ def required_parameters(*args)
       end
 
     end 
-
     def initialize(provider, options = {})
       @provider = provider
       @options = internalize(options)
       raise OAI::ArgumentException.new unless valid?
     end
-
     def response
       @builder = Builder::XmlMarkup.new
       @builder.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
       @builder.tag!('OAI-PMH', header) do 
         @builder.responseDate Time.now.utc.xmlschema
-        @builder.request(provider.url, options)
+        #options parameter has been removed here because with it
+        #the data won't validate against oai validators.  Without, it 
+        #validates.  
+        @builder.request(provider.url) #-- OAI 2.0 Hack - removed request options 
         yield @builder
       end
     end
-
     private
 
     def header
@@ -54,7 +52,6 @@ def header
           http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd}
       }
     end
-
     def extract_identifier(id)
       id.sub("#{provider.prefix}/", '')
     end
@@ -67,9 +64,7 @@ def valid?
       if self.class.required_options
         return false unless (self.class.required_options - @options.keys).empty?
       end
-
       return false unless (@options.keys - self.class.valid_options).empty?
-
       populate_defaults
     end
 
@@ -95,7 +90,7 @@ 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 # Sadly, this will not
+      Time.parse(value).utc #  -- UTC Bug fix hack 8/08 not in core
     rescue
       raise OAI::ArgumentError.new 
     end
@@ -119,3 +114,4 @@ def internalize(hash = {})
 end
 end
 end
+

lib/oai/provider/response/identify.rb

@@ -13,7 +13,7 @@ def to_xml
           else
             r.adminEmail provider.email.to_s
           end
-          r.earliestDatestamp provider.model.earliest
+          r.earliestDatestamp Time.parse(provider.model.earliest.to_s).utc.xmlschema
           r.deletedRecord provider.delete_support.to_s
           r.granularity provider.granularity
         end
@@ -23,4 +23,3 @@ def to_xml
   end
 
 end
-  

lib/oai/provider/response/list_metadata_formats.rb

@@ -1,5 +1,4 @@
 module OAI::Provider::Response
-
   class ListMetadataFormats < RecordResponse
     valid_parameters :identifier
 
@@ -17,7 +16,6 @@ def to_xml
         # Remove any format that this particular record can't be provided in.
         formats.reject! { |f| !record_supports(record, f.prefix) }
       end
-
       response do |r|
         r.ListMetadataFormats do
           formats.each do |format|
@@ -38,5 +36,4 @@ def record_supports(record, prefix)
     end
 
   end  
-
-end
+end

lib/oai/provider/response/record_response.rb

@@ -1,11 +1,10 @@
 module OAI::Provider::Response
   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) },
-            :until => Proc.new {|x| Time.parse(x.provider.model.latest.to_s) }
+           :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
     end
 
     # emit record header
@@ -20,7 +19,6 @@ def header_for(record)
         end
       end
     end
-
     # metadata - core routine for delivering metadata records
     #
     def data_for(record)
@@ -51,7 +49,6 @@ def requested_format
       elsif options[:resumption_token]
         OAI::Provider::ResumptionToken.extract_format(options[:resumption_token])
       end
-
       raise OAI::FormatException.new unless provider.format_supported?(format)
 
       format
@@ -65,4 +62,4 @@ def deleted?(record)
     end
 
   end
-end
+end

lib/oai/provider/resumption_token.rb

@@ -89,7 +89,7 @@ def to_s
     def encode_conditions
       encoded_token = @prefix.to_s.dup
       encoded_token << ".s(#{set})" if set
-      encoded_token << ".f(#{from.utc.xmlschema})" if from
+      encoded_token << ".f(#{self.from.utc.xmlschema})" if self.from
       encoded_token << ".u(#{self.until.utc.xmlschema})" if self.until
       encoded_token << ":#{last}"
     end

test/client/tc_libxml.rb

@@ -33,7 +33,7 @@ def test_list_records
       records.each do |record|
         assert record.header.identifier
         next if record.deleted?
-        assert_kind_of XML::Node, record.metadata
+        assert_kind_of LibXML::XML::Node, record.metadata
       end
     end
   end

test/client/tc_xpath.rb

@@ -18,9 +18,9 @@ def test_libxml
       return
     end
 
-    doc = XML::Document.file('test/test.xml')
+    doc = LibXML::XML::Document.file('test/test.xml')
     assert_equal xpath(doc, './/responseDate'), '2006-09-11T14:33:15Z'
     assert_equal xpath(doc, './/foobar'), nil
   end
 
-end
+end