Fixes for reported date bug, and new version of libxml(0.5.2.0)

Author: wilig

Rakefile

@@ -25,8 +25,6 @@ spec = Gem::Specification.new do |s|
     s.bindir = 'bin'
     s.executables = 'oai'
 
-    s.add_dependency('activesupport', '>=1.3.1')
-    s.add_dependency('chronic', '>=0.0.3')
     s.add_dependency('builder', '>=2.0.0')
 
     s.files = %w(README Rakefile) +

lib/oai/client.rb

@@ -176,8 +176,10 @@ def build_uri(verb, opts)
 
     def encode(value)
       return CGI.escape(value) unless value.respond_to?(:strftime)
-      if value.respond_to?(:to_time) # Usually a DateTime or Time
-        value.to_time.utc.xmlschema
+      if value.kind_of?(DateTime)
+        Time.parse(value.asctime).utc.xmlschema
+      elsif value.kind_of?(Time)
+        value.utc.xmlschema
       else # Assume something date like
         value.strftime('%Y-%m-%d')
       end
@@ -272,12 +274,10 @@ def externalize(value)
     def parse_date(value)
       return value if value.respond_to?(:strftime)
 
-      # Oddly Chronic doesn't parse an UTC encoded datetime.  
-      # Luckily Time does
-      dt = Chronic.parse(value) || Time.parse(value)
-      raise OAI::ArgumentError.new unless dt
-      
-      dt.utc
+      Date.parse(value) # This will raise an exception for badly formatted dates
+      Time.parse(value).utc # Sadly, this will not
+    rescue
+      raise OAI::ArgumentError.new 
     end
 
     # Strip out invalid UTF-8 characters.  Regex from the W3C, inverted.

lib/oai/harvester/harvest.rb

@@ -107,7 +107,7 @@ def call(url, opts)
       end
 
       def get_records(doc)
-        doc.doc.root.elements.to_a("/OAI-PMH/ListRecords/record")
+        doc.find("/OAI-PMH/ListRecords/record").to_a
       end
 
       def build_options_hash(site)

lib/oai/provider.rb

@@ -1,6 +1,6 @@
-require 'active_support'
+require 'rexml/document'
+require 'singleton'
 require 'builder'
-require 'chronic'
 
 if not defined?(OAI::Const::VERBS)
   require 'oai/exception'
@@ -266,8 +266,8 @@ def get_record(options = {})
       Response::GetRecord.new(self.class, options).to_xml
     end
 
-    #  xml_response = process_verb('ListRecords', :from => 'October', 
-    #    :until => 'November') # thanks Chronic!
+    #  xml_response = process_verb('ListRecords', :from => 'October 1, 2005', 
+    #    :until => 'November 1, 2005') 
     #
     # If you are implementing a web interface using process_request is the
     # preferred way.

lib/oai/provider/metadata_format.rb

@@ -1,3 +1,5 @@
+require 'singleton'
+
 module OAI::Provider::Metadata
   # == Metadata Base Class
   #
@@ -55,8 +57,8 @@ def value_for(field, record, map)
       method = map[field] ? map[field].to_s : field.to_s
 
       methods = record.public_methods(false)
-      if methods.include?(method.pluralize)
-        record.send method.pluralize
+      if methods.include?(pluralize(method))
+        record.send pluralize(method)
       elsif methods.include?(method)
         record.send method
       else
@@ -68,6 +70,46 @@ def value_for(field, record, map)
     def header_specification
       raise NotImplementedError.new
     end
+    
+    # Shamelessly lifted form ActiveSupport.  Thanks Rails community!
+    def pluralize(word)
+      # Use ActiveSupports pluralization if it's available.
+      return word.pluralize if word.respond_to?(:pluralize)
+      
+      # Otherwise use our own simple pluralization rules.
+      result = word.to_s.dup
+      
+      # Uncountable words
+      return result if %w(equipment information rice money species series fish sheep).include?(result)
+      
+      # Irregular words
+      { 'person' => 'people', 'man' => 'men', 'child' => 'children', 'sex' => 'sexes', 
+        'move' => 'moves', 'cow' => 'kine' }.each { |k,v| return v if word == k }
+      
+      rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+    end
+    
+    def rules
+      [
+        [/$/, 's'],
+        [/s$/i, 's'],
+        [/(ax|test)is$/i, '\1es'],
+        [/(octop|vir)us$/i, '\1i'],
+        [/(alias|status)$/i, '\1es'],
+        [/(bu)s$/i, '\1ses'],
+        [/(buffal|tomat)o$/i, '\1oes'],
+        [/([ti])um$/i, '\1a'],
+        [/sis$/i, 'ses'],
+        [/(?:([^f])fe|([lr])f)$/i, '\1\2ves'],
+        [/(hive)$/i, '\1s'],
+        [/([^aeiouy]|qu)y$/i, '\1ies'],
+        [/(x|ch|ss|sh)$/i, '\1es'],
+        [/(matr|vert|ind)(?:ix|ex)$/i, '\1ices'],
+        [/([m|l])ouse$/i, '\1ice'],
+        [/^(ox)$/i, '\1en'],
+        [/(quiz)$/i, '\1zes']
+      ]
+    end
 
   end
 

lib/oai/provider/model/activerecord_caching_wrapper.rb

@@ -103,7 +103,6 @@ def select_partial(token)
       end
 
       oaitoken = OaiToken.find_by_token(token.to_s)
-      
       raise ResumptionTokenException.new unless oaitoken
 
       PartialResult.new(

lib/oai/provider/model/activerecord_wrapper.rb

@@ -20,8 +20,8 @@ def initialize(model, options={})
       @limit = options.delete(:limit)
 
       unless options.empty?
-        raise ArgumentException.new(
-          "Unsupported options [#{options.join(', ')}]"
+        raise ArgumentError.new(
+          "Unsupported options [#{options.keys.join(', ')}]"
         )
       end
     end

lib/oai/provider/response.rb

@@ -94,12 +94,10 @@ def externalize(value)
     def parse_date(value)
       return value if value.respond_to?(:strftime)
 
-      # Oddly Chronic doesn't parse an UTC encoded datetime.  
-      # Luckily Time does
-      dt = Chronic.parse(value) || Time.parse(value)
-      raise OAI::ArgumentError.new unless dt
-      
-      dt.utc
+      Date.parse(value) # This will raise an exception for badly formatted dates
+      Time.parse(value).utc # Sadly, this will not
+    rescue
+      raise OAI::ArgumentError.new 
     end
 
     def internalize(hash = {})

lib/oai/xpath.rb

@@ -5,7 +5,7 @@ module XPath
     def xpath_all(doc, path)
       case parser_type(doc)
       when 'libxml'
-        return doc.find(path)
+        return doc.find(path).to_a if doc.find(path)
       when 'rexml'
         return REXML::XPath.match(doc, path)
       end