Merge pull request #2 from pechase/master

fixed minor bugs

Author: edsu

lib/oai/provider/response.rb

@@ -61,6 +61,9 @@ def valid?
 
       return true if self.class.valid_options.nil? and options.empty?
 
+      # Added by [email protected]. Needed if the request includes an argument and there are no valid arguments for that verb (Identify, for example).
+      raise OAI::ArgumentException.new if self.class.valid_options.nil? && !options.empty?
+      
       if self.class.required_options
         return false unless (self.class.required_options - @options.keys).empty?
       end

lib/oai/provider/resumption_token.rb

@@ -32,7 +32,9 @@ def self.parse(token_string)
         end
         self.new(options)
       rescue => err
-        raise ResumptionTokenException.new
+        # [email protected] 
+        # This was not caught by the tests.
+        raise OAI::ResumptionTokenException.new
       end
     end
 

test/provider/models.rb

@@ -112,7 +112,9 @@ def generate_chunks(records, limit)
   end
 
   def generate_records(number, timestamp = Time.now.utc.xmlschema, sets = [], deleted = false)
-    @earliest = timestamp.dup if @earliest.nil? || timestamp.to_s < @earliest
+    # [email protected] -- causes tests to die
+    # @earliest = timestamp.dup if @earliest.nil? || timestamp.to_s < @earliest
+    @earliest = timestamp.dup if @earliest.nil?
 
     # Add any sets we don't already have
     sets = [sets] unless sets.respond_to?(:each)

test/provider/tc_exceptions.rb

@@ -7,6 +7,13 @@ def setup
     @provider = ComplexProvider.new
   end
 
+  # [email protected]
+  def test_argument_exception
+    assert_raise(OAI::ArgumentException) do
+      @provider.identify(:identifier => 'invalid_arg')
+    end 
+  end
+
   def test_resumption_token_exception
     assert_raise(OAI::ResumptionTokenException) do
       @provider.list_records(:resumption_token => 'aaadddd:1000')

test/provider/tc_simple_provider.rb

@@ -13,6 +13,11 @@ def test_identify
       doc.elements["/OAI-PMH/Identify/repositoryName"].text
     assert_equal SimpleModel.new.earliest.to_s,
       doc.elements["/OAI-PMH/Identify/earliestDatestamp"].text
+      
+      # PC
+  #  lambda { REXML::Document.new(@simple_provider.identify(:set => 'A')) }
+    
+  
   end
 
   def test_list_sets