In cases where the request that generated this response did not result in an error or exception condition, the attributes and attribute values of the request element must match the key=value pairs of the protocol request;

Author: cbeer

lib/oai/provider/response.rb

@@ -27,6 +27,7 @@ def required_parameters(*args)
     end
     def initialize(provider, options = {})
       @provider = provider
+      @request_options = options.dup
       @options = internalize(options)
       raise OAI::ArgumentException.new unless valid?
     end
@@ -35,10 +36,7 @@ def response
       @builder.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
       @builder.tag!('OAI-PMH', header) do
         @builder.responseDate Time.now.utc.xmlschema
-        #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
+        @builder.request(provider.url, (@request_options.merge(:verb => verb) unless self.class == Error))
         yield @builder
       end
     end
@@ -113,6 +111,10 @@ def internalize(hash = {})
       internal
     end
 
+    def verb
+      self.class.to_s.split('::').last
+    end
+
   end
 
 end

test/provider/tc_provider.rb

@@ -16,6 +16,8 @@ def test_additional_description
 
   def test_list_identifiers_for_correct_xml
     doc = REXML::Document.new(@mapped_provider.list_identifiers)
+    assert_not_nil doc.elements['OAI-PMH/request']
+    assert_not_nil doc.elements['OAI-PMH/request/@verb']
     assert_not_nil doc.elements['OAI-PMH/ListIdentifiers']
     assert_not_nil doc.elements['OAI-PMH/ListIdentifiers/header']
     assert_not_nil doc.elements['OAI-PMH/ListIdentifiers/header/identifier']
@@ -26,6 +28,9 @@ def test_list_identifiers_for_correct_xml
   def test_list_records_for_correct_xml
     doc = REXML::Document.new(
       @mapped_provider.list_records(:metadata_prefix => 'oai_dc'))
+    assert_not_nil doc.elements['OAI-PMH/request']
+    assert_not_nil doc.elements['OAI-PMH/request/@verb']
+    assert_not_nil doc.elements['OAI-PMH/request/@metadata_prefix']
     assert_not_nil doc.elements['OAI-PMH/ListRecords/record/header']
     assert_not_nil doc.elements['OAI-PMH/ListRecords/record/metadata']
   end
@@ -85,6 +90,12 @@ def test_from_and_until
         :from => Time.parse("November 1 2000"),
         :until => Time.parse("November 30 2000"))
     )
+
+    assert_not_nil doc.elements['OAI-PMH/request']
+    assert_not_nil doc.elements['OAI-PMH/request/@verb']
+    assert_not_nil doc.elements['OAI-PMH/request/@from']
+    assert_not_nil doc.elements['OAI-PMH/request/@until']
+
     assert_equal 100, doc.elements['OAI-PMH/ListRecords'].to_a.size
 
     doc = REXML::Document.new(