Changes to support 1.9

Author: wilig

lib/oai/client.rb

@@ -199,7 +199,7 @@ def load_document(xml)
         begin
           return REXML::Document.new(xml)
         rescue REXML::ParseException => e
-          raise OAI::Exception, 'response not well formed XML: '+e, caller
+          raise OAI::Exception, 'response not well formed XML: '+e.message, caller
         end
       end
     end

lib/oai/provider/metadata_format.rb

@@ -56,10 +56,9 @@ def encode(model, record)
     def value_for(field, record, map)
       method = map[field] ? map[field].to_s : field.to_s
 
-      methods = record.public_methods(false)
-      if methods.include?(pluralize(method))
+      if record.respond_to?(pluralize(method))
         record.send pluralize(method)
-      elsif methods.include?(method)
+      elsif record.respond_to?(method)
         record.send method
       else
         []
@@ -87,6 +86,7 @@ def pluralize(word)
         'move' => 'moves', 'cow' => 'kine' }.each { |k,v| return v if word == k }
 
       rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+      result
     end
 
     def rules

lib/oai/provider/response/identify.rb

@@ -8,9 +8,11 @@ def to_xml
           r.repositoryName provider.name
           r.baseURL provider.url
           r.protocolVersion 2.0
-          provider.email.each do |address|
-            r.adminEmail address
-          end if provider.email
+          if provider.email and provider.email.respond_to?(:each)
+            provider.email.each { |address| r.adminEmail address }
+          else
+            r.adminEmail provider.email.to_s
+          end
           r.earliestDatestamp provider.model.earliest
           r.deletedRecord provider.delete_support.to_s
           r.granularity provider.granularity

test/client/tc_utf8_escaping.rb

@@ -3,7 +3,7 @@
 class UTF8Test < Test::Unit::TestCase
 
   def test_escaping_invalid_utf_8_characters
-    client = OAI::Client.new 'http://localhost:3333/oai', :parser => 'libxml'
+    client = OAI::Client.new 'http://localhost:3333/oai' #, :parser => 'libxml'
     invalid_utf_8 = [2, 3, 4, 104, 5, 101, 6, 108, 66897, 108, 66535, 111, 1114112, 33, 55234123, 33].pack("U*")
     assert_equal("hello!!", client.send(:strip_invalid_utf_8_chars, invalid_utf_8).gsub(/\?/, ''))
   end

test/client/tc_xpath.rb

@@ -13,7 +13,7 @@ def test_rexml
   def test_libxml
     begin 
       require 'xml/libxml'
-    rescue
+    rescue LoadError
       # libxml not available so nothing to test!
       return
     end
@@ -23,7 +23,4 @@ def test_libxml
     assert_equal xpath(doc, './/foobar'), nil
   end
 
-end
-
-__END__
-
+end