oai 0.0.5 → 0.0.6

data/Rakefile

@@ -1,4 +1,4 @@
-RUBY_OAI_VERSION = '0.0.5'
+RUBY_OAI_VERSION = '0.0.6'
 
 require 'rubygems'
 require 'rake'

data/lib/oai/client.rb

@@ -2,6 +2,7 @@
 require 'uri'
 require 'net/http'
 require 'cgi'
+require 'iconv'
 
 if not defined?(OAI::Const::VERBS)
   # Shared stuff
@@ -183,6 +184,7 @@ module OAI
     end
 
     def load_document(xml)
+      retried = false
       case @parser
       when 'libxml'
         begin
@@ -190,13 +192,28 @@ module OAI
           parser.string = xml
           return parser.parse
         rescue XML::Parser::ParseError => e
-          raise OAI::Exception, 'response not well formed XML: '+e, caller
+          if retried
+            raise OAI::Exception, 'response not well formed XML: '+e, caller
+          end
+          ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
+          xml2 = ic.iconv(xml << ' ')[0..-2]
+          puts "equal? #{xml == xml2}"
+          retried = true
+          retry
         end
       when 'rexml'
         begin
           return REXML::Document.new(xml)
         rescue REXML::ParseException => e
-          raise OAI::Exception, 'response not well formed XML: '+e, caller
+          if retried
+            puts xml
+            raise OAI::Exception, 'response not well formed XML: '+e, caller
+          end
+          puts "RETRYING"
+          ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
+          xml = ic.iconv(xml << ' ')[0..-2]
+          retried = true
+          retry
         end
       end
     end
@@ -246,8 +263,8 @@ module OAI
       end
       
       # Convert date formated strings in dates.
-      realopts[:from] = parse_date(realopts[:from]) if realopts[:from]
-      realopts[:until] = parse_date(realopts[:until]) if realopts[:until]
+      #realopts[:from] = parse_date(realopts[:from]) if realopts[:from]
+      #realopts[:until] = parse_date(realopts[:until]) if realopts[:until]
 
       # check for any bad options
       unless (realopts.keys - OAI::Const::VERBS[verb]).empty?

data/lib/oai/constants.rb

@@ -4,7 +4,7 @@ module OAI
     # OAI defines six verbs with various allowable options.
     VERBS = {
       'Identify' => [],
-      'ListMetadataFormats' => [],
+      'ListMetadataFormats' => [:identifier],
       'ListSets' => [:resumption_token],  # unused currently
       'GetRecord' => [:identifier, :from, :until, :set, :metadata_prefix],
       'ListIdentifiers' => [:from, :until, :set, :metadata_prefix, :resumption_token],

data/lib/oai/harvester/harvest.rb

@@ -29,19 +29,21 @@ module OAI
       private
     
       def harvest(site)
-        harvest_time = Time.now.utc
         opts = build_options_hash(@config.sites[site])
-        opts[:until] = harvest_time.xmlschema
-      
-        # Allow a from date to be passed in
-        if(@from)
-          opts[:from] = @from
-        else 
-          opts[:from] = earliest(opts[:url])
+        harvest_time = Time.now.utc
+
+        if "YYYY-MM-DD" == granularity(opts[:url])
+          opts[:until] = harvest_time.strftime("%Y-%m-%d")
+          opts[:from] = @from.strftime("%Y-%m-%d") if @from
+        else
+          opts[:until] = harvest_time.xmlschema
+          opts[:from] = @from.xmlschema if @from
         end
-      
-        opts.delete(:set) if 'all' == opts[:set]
 
+        # Allow a from date to be passed in
+        opts[:from] = earliest(opts[:url]) unless opts[:from]
+        opts.delete(:set) if 'all' == opts[:set]
+        
         begin
           # Connect, and download
           file, records = call(opts.delete(:url), opts)
@@ -68,11 +70,6 @@ module OAI
         client = OAI::Client.new(url, :parser => @parser)
         provider_config = client.identify
         
-        if Harvester::LOW_RESOLUTION == provider_config.granularity
-          options[:from] = Time.parse(options[:from]).strftime("%Y-%m-%d")
-          options[:until] = Time.parse(options[:until]).strftime("%Y-%m-%d")
-        end
-        
         file = Tempfile.new('oai_data')
         gz = Zlib::GzipWriter.new(file)
         gz << "<? xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
@@ -131,11 +128,20 @@ module OAI
         "_at_#{until_time.strftime('%H-%M-%S')}"
       end
     
+      def granularity(url)
+        client = OAI::Client.new url
+        client.identify.granularity
+      end
+
       # Get earliest timestamp from repository
       def earliest(url)
         client = OAI::Client.new url
         identify = client.identify
-        Time.parse(identify.earliest_datestamp).utc.xmlschema
+        if "YYYY-MM-DD" == identify.granularity
+          Time.parse(identify.earliest_datestamp).strftime("%Y-%m-%d")
+        else
+          Time.parse(identify.earliest_datestamp).xmlschema
+        end
       end
     
     end

data/lib/oai/harvester/logging.rb

@@ -8,8 +8,8 @@ module OAI
       alias_method :orig_call, :call
       alias_method :orig_init, :initialize
     
-      def initialize(config = nil, directory = nil, date = nil)
-        orig_init(config, directory, date)
+      def initialize(*args)
+        orig_init(*args)
         @summary = []
         @logger = Logger.new(File.join(@config.logfile, "harvester.log"), 
           shift_age = 'weekly') if @config.logfile

data/lib/oai/harvester/shell.rb

@@ -73,7 +73,7 @@ module OAI
             banner "Harvesting '#{site}'"
             if date && !date.empty?
               begin
-                date = Chronic.parse(date.join(' ')).utc.xmlschema
+                date = Chronic.parse(date.join(' ')).utc
               rescue NoMethodError
                 puts "Couldn't parse the date supplied"
                 return
@@ -110,6 +110,8 @@ module OAI
           print_site(site)
         end
         puts
+      rescue
+        puts args + " doesn't appear to be configured, use list to see configured repositories."
       end
     
       def new

data/lib/oai/provider.rb

@@ -196,7 +196,11 @@ module OAI::Provider
       end
       
       def format(prefix)
-        @formats[prefix]
+        if @formats[prefix].nil?
+          raise OAI::FormatException.new
+        else
+          @formats[prefix]
+        end
       end
 
       protected 

data/lib/oai/provider/metadata_format.rb

@@ -30,8 +30,12 @@ module OAI::Provider::Metadata
           xml.tag!("#{prefix}:#{element_namespace}", header_specification) do
             fields.each do |field|
               values = value_for(field, record, map)
-              values.each do |value|
-                xml.tag! "#{element_namespace}:#{field}", value
+              if values.respond_to?(:each)
+                values.each do |value|
+                  xml.tag! "#{element_namespace}:#{field}", value
+                end
+              else
+                xml.tag! "#{element_namespace}:#{field}", values
               end
             end
           end

data/lib/oai/provider/model.rb

@@ -14,6 +14,9 @@ module OAI::Provider
   # sets - should return an array of sets supported by the repository.
   # deleted? - individual records returned should respond true or false
   # when sent the deleted? message.
+  # available_formats - if overridden, individual records should return an 
+  # array of prefixes for all formats in which that record is available, 
+  # if other than ["oai_dc"]
   #
   # == Resumption Tokens
   #

data/lib/oai/provider/model/activerecord_wrapper.rb

@@ -46,7 +46,7 @@ module OAI::Provider
     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

data/lib/oai/provider/response.rb

@@ -54,6 +54,10 @@ module OAI
           http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd}
       }
     end
+
+    def extract_identifier(id)
+      id.sub("#{provider.prefix}/", '')
+    end
     
     def valid?
       return true if resumption?

data/lib/oai/provider/response/get_record.rb

@@ -18,13 +18,7 @@ module OAI::Provider::Response
         end
       end
     end
-    
-    private
-    
-    def extract_identifier(id)
-      id.sub("#{provider.prefix}/", '')
-    end
-    
+        
   end
 
 end

data/lib/oai/provider/response/identify.rb

@@ -12,7 +12,7 @@ module OAI::Provider::Response
             r.adminEmail address
           end if provider.email
           r.earliestDatestamp provider.model.earliest
-          r.deleteRecord provider.delete_support.to_s
+          r.deletedRecord provider.delete_support.to_s
           r.granularity provider.granularity
         end
       end

data/lib/oai/provider/response/list_identifiers.rb

@@ -15,11 +15,12 @@ module OAI::Provider::Response
           records.each do |rec|
             header_for rec
           end
-        end
 
-        # append resumption token for getting next group of records
-        if result.respond_to?(:token)
-          r.target! << result.token.to_xml
+          # append resumption token for getting next group of records
+          if result.respond_to?(:token)
+            r.target! << result.token.to_xml
+          end
+
         end
       end
     end

data/lib/oai/provider/response/list_metadata_formats.rb

@@ -1,11 +1,26 @@
 module OAI::Provider::Response
-  
-  class ListMetadataFormats < Base
+
+  class ListMetadataFormats < RecordResponse
+    valid_parameters :identifier
     
     def to_xml
+      # Get a list of all the formats the provider understands.
+      formats = provider.formats.values
+      
+      # if it's a doc-specific request
+      if options.include?(:identifier)
+        id = extract_identifier(options[:identifier])
+        unless record = provider.model.find(id, options)
+          raise OAI::IdException.new
+        end
+      
+        # 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 
-          provider.formats.each do |key, format|
+        r.ListMetadataFormats do
+          formats.each do |format|
             r.metadataFormat do 
               r.metadataPrefix format.prefix
               r.schema format.schema
@@ -15,7 +30,13 @@ module OAI::Provider::Response
         end
       end
     end
-
+    
+    def record_supports(record, prefix)
+      prefix == 'oai_dc' or 
+      record.respond_to?("to_#{prefix}") or
+      record.respond_to?("map_#{prefix}")
+    end
+    
   end  
-  
+
 end

data/lib/oai/provider/response/list_records.rb

@@ -17,11 +17,12 @@ module OAI::Provider::Response
               data_for rec unless deleted?(rec)
             end
           end
-        end
 
-        # append resumption token for getting next group of records
-        if result.respond_to?(:token)
-          r.target! << result.token.to_xml
+          # append resumption token for getting next group of records
+          if result.respond_to?(:token)
+            r.target! << result.token.to_xml
+          end
+
         end
       end
     end

data/test/activerecord_provider/database/ar_migration.rb

@@ -19,7 +19,7 @@ class OAIPMHTables < ActiveRecord::Migration
       t.column  :description,   :string
       t.column  :contributor,   :string
       t.column  :publisher,     :string
-      t.column  :date,          :string
+      t.column  :date,          :datetime
       t.column  :type,          :string
       t.column  :format,        :string
       t.column  :source,        :string

data/test/activerecord_provider/fixtures/dc.yml

@@ -5,7 +5,7 @@
   creator: creator_85
   language: language_85
   title: title_85
-  date: date_85
+  date: Sun Feb 04 11:30:22 -0800 2007
   type: type_85
   rights: rights_85
   contributor: contributor_85
@@ -20,7 +20,7 @@
   creator: creator_66
   language: language_66
   title: title_66
-  date: date_66
+  date: Fri Feb 23 11:30:22 -0800 2007
   type: type_66
   rights: rights_66
   contributor: contributor_66
@@ -35,7 +35,7 @@
   creator: creator_9
   language: language_9
   title: title_9
-  date: date_9
+  date: Sat Apr 21 12:30:22 -0700 2007
   type: type_9
   rights: rights_9
   contributor: contributor_9
@@ -50,7 +50,7 @@
   creator: creator_47
   language: language_47
   title: title_47
-  date: date_47
+  date: Wed Mar 14 12:30:22 -0700 2007
   type: type_47
   rights: rights_47
   contributor: contributor_47
@@ -65,7 +65,7 @@
   creator: creator_28
   language: language_28
   title: title_28
-  date: date_28
+  date: Mon Apr 02 12:30:22 -0700 2007
   type: type_28
   rights: rights_28
   contributor: contributor_28
@@ -80,7 +80,7 @@
   creator: creator_95
   language: language_95
   title: title_95
-  date: date_95
+  date: Thu Jan 25 11:30:22 -0800 2007
   type: type_95
   rights: rights_95
   contributor: contributor_95
@@ -95,7 +95,7 @@
   creator: creator_76
   language: language_76
   title: title_76
-  date: date_76
+  date: Tue Feb 13 11:30:22 -0800 2007
   type: type_76
   rights: rights_76
   contributor: contributor_76
@@ -110,7 +110,7 @@
   creator: creator_19
   language: language_19
   title: title_19
-  date: date_19
+  date: Wed Apr 11 12:30:22 -0700 2007
   type: type_19
   rights: rights_19
   contributor: contributor_19
@@ -125,7 +125,7 @@
   creator: creator_57
   language: language_57
   title: title_57
-  date: date_57
+  date: Sun Mar 04 11:30:22 -0800 2007
   type: type_57
   rights: rights_57
   contributor: contributor_57
@@ -140,7 +140,7 @@
   creator: creator_0
   language: language_0
   title: title_0
-  date: date_0
+  date: Mon Apr 30 12:30:22 -0700 2007
   type: type_0
   rights: rights_0
   contributor: contributor_0
@@ -155,7 +155,7 @@
   creator: creator_38
   language: language_38
   title: title_38
-  date: date_38
+  date: Fri Mar 23 12:30:22 -0700 2007
   type: type_38
   rights: rights_38
   contributor: contributor_38
@@ -170,7 +170,7 @@
   creator: creator_86
   language: language_86
   title: title_86
-  date: date_86
+  date: Sat Feb 03 11:30:22 -0800 2007
   type: type_86
   rights: rights_86
   contributor: contributor_86
@@ -185,7 +185,7 @@
   creator: creator_67
   language: language_67
   title: title_67
-  date: date_67
+  date: Thu Feb 22 11:30:22 -0800 2007
   type: type_67
   rights: rights_67
   contributor: contributor_67
@@ -200,7 +200,7 @@
   creator: creator_10
   language: language_10
   title: title_10
-  date: date_10
+  date: Fri Apr 20 12:30:22 -0700 2007
   type: type_10
   rights: rights_10
   contributor: contributor_10
@@ -215,7 +215,7 @@
   creator: creator_48
   language: language_48
   title: title_48
-  date: date_48
+  date: Tue Mar 13 12:30:22 -0700 2007
   type: type_48
   rights: rights_48
   contributor: contributor_48
@@ -230,7 +230,7 @@
   creator: creator_29
   language: language_29
   title: title_29
-  date: date_29
+  date: Sun Apr 01 12:30:22 -0700 2007
   type: type_29
   rights: rights_29
   contributor: contributor_29
@@ -245,7 +245,7 @@
   creator: creator_96
   language: language_96
   title: title_96
-  date: date_96
+  date: Wed Jan 24 11:30:22 -0800 2007
   type: type_96
   rights: rights_96
   contributor: contributor_96
@@ -260,7 +260,7 @@
   creator: creator_77
   language: language_77
   title: title_77
-  date: date_77
+  date: Mon Feb 12 11:30:22 -0800 2007
   type: type_77
   rights: rights_77
   contributor: contributor_77
@@ -275,7 +275,7 @@
   creator: creator_20
   language: language_20
   title: title_20
-  date: date_20
+  date: Tue Apr 10 12:30:22 -0700 2007
   type: type_20
   rights: rights_20
   contributor: contributor_20
@@ -290,7 +290,7 @@
   creator: creator_58
   language: language_58
   title: title_58
-  date: date_58
+  date: Sat Mar 03 11:30:22 -0800 2007
   type: type_58
   rights: rights_58
   contributor: contributor_58
@@ -305,7 +305,7 @@
   creator: creator_1
   language: language_1
   title: title_1
-  date: date_1
+  date: Sun Apr 29 12:30:22 -0700 2007
   type: type_1
   rights: rights_1
   contributor: contributor_1
@@ -320,7 +320,7 @@
   creator: creator_39
   language: language_39
   title: title_39
-  date: date_39
+  date: Thu Mar 22 12:30:22 -0700 2007
   type: type_39
   rights: rights_39
   contributor: contributor_39
@@ -335,7 +335,7 @@
   creator: creator_87
   language: language_87
   title: title_87
-  date: date_87
+  date: Fri Feb 02 11:30:22 -0800 2007
   type: type_87
   rights: rights_87
   contributor: contributor_87
@@ -350,7 +350,7 @@
   creator: creator_68
   language: language_68
   title: title_68
-  date: date_68
+  date: Wed Feb 21 11:30:22 -0800 2007
   type: type_68
   rights: rights_68
   contributor: contributor_68
@@ -365,7 +365,7 @@
   creator: creator_30
   language: language_30
   title: title_30
-  date: date_30
+  date: Sat Mar 31 12:30:22 -0700 2007
   type: type_30
   rights: rights_30
   contributor: contributor_30
@@ -380,7 +380,7 @@
   creator: creator_11
   language: language_11
   title: title_11
-  date: date_11
+  date: Thu Apr 19 12:30:22 -0700 2007
   type: type_11
   rights: rights_11
   contributor: contributor_11
@@ -395,7 +395,7 @@
   creator: creator_49
   language: language_49
   title: title_49
-  date: date_49
+  date: Mon Mar 12 12:30:22 -0700 2007
   type: type_49
   rights: rights_49
   contributor: contributor_49
@@ -410,7 +410,7 @@
   creator: creator_97
   language: language_97
   title: title_97
-  date: date_97
+  date: Tue Jan 23 11:30:22 -0800 2007
   type: type_97
   rights: rights_97
   contributor: contributor_97
@@ -425,7 +425,7 @@
   creator: creator_78
   language: language_78
   title: title_78
-  date: date_78
+  date: Sun Feb 11 11:30:22 -0800 2007
   type: type_78
   rights: rights_78
   contributor: contributor_78
@@ -440,7 +440,7 @@
   creator: creator_21
   language: language_21
   title: title_21
-  date: date_21
+  date: Mon Apr 09 12:30:22 -0700 2007
   type: type_21
   rights: rights_21
   contributor: contributor_21
@@ -455,7 +455,7 @@
   creator: creator_59
   language: language_59
   title: title_59
-  date: date_59
+  date: Fri Mar 02 11:30:22 -0800 2007
   type: type_59
   rights: rights_59
   contributor: contributor_59
@@ -470,7 +470,7 @@
   creator: creator_2
   language: language_2
   title: title_2
-  date: date_2
+  date: Sat Apr 28 12:30:22 -0700 2007
   type: type_2
   rights: rights_2
   contributor: contributor_2
@@ -485,7 +485,7 @@
   creator: creator_40
   language: language_40
   title: title_40
-  date: date_40
+  date: Wed Mar 21 12:30:22 -0700 2007
   type: type_40
   rights: rights_40
   contributor: contributor_40
@@ -500,7 +500,7 @@
   creator: creator_88
   language: language_88
   title: title_88
-  date: date_88
+  date: Thu Feb 01 11:30:22 -0800 2007
   type: type_88
   rights: rights_88
   contributor: contributor_88
@@ -515,7 +515,7 @@
   creator: creator_69
   language: language_69
   title: title_69
-  date: date_69
+  date: Tue Feb 20 11:30:22 -0800 2007
   type: type_69
   rights: rights_69
   contributor: contributor_69
@@ -530,7 +530,7 @@
   creator: creator_31
   language: language_31
   title: title_31
-  date: date_31
+  date: Fri Mar 30 12:30:22 -0700 2007
   type: type_31
   rights: rights_31
   contributor: contributor_31
@@ -545,7 +545,7 @@
   creator: creator_12
   language: language_12
   title: title_12
-  date: date_12
+  date: Wed Apr 18 12:30:22 -0700 2007
   type: type_12
   rights: rights_12
   contributor: contributor_12
@@ -560,7 +560,7 @@
   creator: creator_50
   language: language_50
   title: title_50
-  date: date_50
+  date: Sun Mar 11 12:30:22 -0700 2007
   type: type_50
   rights: rights_50
   contributor: contributor_50
@@ -575,7 +575,7 @@
   creator: creator_98
   language: language_98
   title: title_98
-  date: date_98
+  date: Mon Jan 22 11:30:22 -0800 2007
   type: type_98
   rights: rights_98
   contributor: contributor_98
@@ -590,7 +590,7 @@
   creator: creator_79
   language: language_79
   title: title_79
-  date: date_79
+  date: Sat Feb 10 11:30:22 -0800 2007
   type: type_79
   rights: rights_79
   contributor: contributor_79
@@ -605,7 +605,7 @@
   creator: creator_3
   language: language_3
   title: title_3
-  date: date_3
+  date: Fri Apr 27 12:30:22 -0700 2007
   type: type_3
   rights: rights_3
   contributor: contributor_3
@@ -620,7 +620,7 @@
   creator: creator_41
   language: language_41
   title: title_41
-  date: date_41
+  date: Tue Mar 20 12:30:22 -0700 2007
   type: type_41
   rights: rights_41
   contributor: contributor_41
@@ -635,7 +635,7 @@
   creator: creator_22
   language: language_22
   title: title_22
-  date: date_22
+  date: Sun Apr 08 12:30:22 -0700 2007
   type: type_22
   rights: rights_22
   contributor: contributor_22
@@ -650,7 +650,7 @@
   creator: creator_60
   language: language_60
   title: title_60
-  date: date_60
+  date: Thu Mar 01 11:30:22 -0800 2007
   type: type_60
   rights: rights_60
   contributor: contributor_60
@@ -665,7 +665,7 @@
   creator: creator_89
   language: language_89
   title: title_89
-  date: date_89
+  date: Wed Jan 31 11:30:22 -0800 2007
   type: type_89
   rights: rights_89
   contributor: contributor_89
@@ -680,7 +680,7 @@
   creator: creator_70
   language: language_70
   title: title_70
-  date: date_70
+  date: Mon Feb 19 11:30:22 -0800 2007
   type: type_70
   rights: rights_70
   contributor: contributor_70
@@ -695,7 +695,7 @@
   creator: creator_32
   language: language_32
   title: title_32
-  date: date_32
+  date: Thu Mar 29 12:30:22 -0700 2007
   type: type_32
   rights: rights_32
   contributor: contributor_32
@@ -710,7 +710,7 @@
   creator: creator_13
   language: language_13
   title: title_13
-  date: date_13
+  date: Tue Apr 17 12:30:22 -0700 2007
   type: type_13
   rights: rights_13
   contributor: contributor_13
@@ -725,7 +725,7 @@
   creator: creator_51
   language: language_51
   title: title_51
-  date: date_51
+  date: Sat Mar 10 11:30:22 -0800 2007
   type: type_51
   rights: rights_51
   contributor: contributor_51
@@ -740,7 +740,7 @@
   creator: creator_99
   language: language_99
   title: title_99
-  date: date_99
+  date: Sun Jan 21 11:30:22 -0800 2007
   type: type_99
   rights: rights_99
   contributor: contributor_99
@@ -755,7 +755,7 @@
   creator: creator_80
   language: language_80
   title: title_80
-  date: date_80
+  date: Fri Feb 09 11:30:22 -0800 2007
   type: type_80
   rights: rights_80
   contributor: contributor_80
@@ -770,7 +770,7 @@
   creator: creator_4
   language: language_4
   title: title_4
-  date: date_4
+  date: Thu Apr 26 12:30:22 -0700 2007
   type: type_4
   rights: rights_4
   contributor: contributor_4
@@ -785,7 +785,7 @@
   creator: creator_42
   language: language_42
   title: title_42
-  date: date_42
+  date: Mon Mar 19 12:30:22 -0700 2007
   type: type_42
   rights: rights_42
   contributor: contributor_42
@@ -800,7 +800,7 @@
   creator: creator_23
   language: language_23
   title: title_23
-  date: date_23
+  date: Sat Apr 07 12:30:22 -0700 2007
   type: type_23
   rights: rights_23
   contributor: contributor_23
@@ -815,7 +815,7 @@
   creator: creator_61
   language: language_61
   title: title_61
-  date: date_61
+  date: Wed Feb 28 11:30:22 -0800 2007
   type: type_61
   rights: rights_61
   contributor: contributor_61
@@ -830,7 +830,7 @@
   creator: creator_90
   language: language_90
   title: title_90
-  date: date_90
+  date: Tue Jan 30 11:30:22 -0800 2007
   type: type_90
   rights: rights_90
   contributor: contributor_90
@@ -845,7 +845,7 @@
   creator: creator_71
   language: language_71
   title: title_71
-  date: date_71
+  date: Sun Feb 18 11:30:22 -0800 2007
   type: type_71
   rights: rights_71
   contributor: contributor_71
@@ -860,7 +860,7 @@
   creator: creator_14
   language: language_14
   title: title_14
-  date: date_14
+  date: Mon Apr 16 12:30:22 -0700 2007
   type: type_14
   rights: rights_14
   contributor: contributor_14
@@ -875,7 +875,7 @@
   creator: creator_52
   language: language_52
   title: title_52
-  date: date_52
+  date: Fri Mar 09 11:30:22 -0800 2007
   type: type_52
   rights: rights_52
   contributor: contributor_52
@@ -890,7 +890,7 @@
   creator: creator_33
   language: language_33
   title: title_33
-  date: date_33
+  date: Wed Mar 28 12:30:22 -0700 2007
   type: type_33
   rights: rights_33
   contributor: contributor_33
@@ -905,7 +905,7 @@
   creator: creator_81
   language: language_81
   title: title_81
-  date: date_81
+  date: Thu Feb 08 11:30:22 -0800 2007
   type: type_81
   rights: rights_81
   contributor: contributor_81
@@ -920,7 +920,7 @@
   creator: creator_43
   language: language_43
   title: title_43
-  date: date_43
+  date: Sun Mar 18 12:30:22 -0700 2007
   type: type_43
   rights: rights_43
   contributor: contributor_43
@@ -935,7 +935,7 @@
   creator: creator_24
   language: language_24
   title: title_24
-  date: date_24
+  date: Fri Apr 06 12:30:22 -0700 2007
   type: type_24
   rights: rights_24
   contributor: contributor_24
@@ -950,7 +950,7 @@
   creator: creator_62
   language: language_62
   title: title_62
-  date: date_62
+  date: Tue Feb 27 11:30:22 -0800 2007
   type: type_62
   rights: rights_62
   contributor: contributor_62
@@ -965,7 +965,7 @@
   creator: creator_5
   language: language_5
   title: title_5
-  date: date_5
+  date: Wed Apr 25 12:30:22 -0700 2007
   type: type_5
   rights: rights_5
   contributor: contributor_5
@@ -980,7 +980,7 @@
   creator: creator_91
   language: language_91
   title: title_91
-  date: date_91
+  date: Mon Jan 29 11:30:22 -0800 2007
   type: type_91
   rights: rights_91
   contributor: contributor_91
@@ -995,7 +995,7 @@
   creator: creator_72
   language: language_72
   title: title_72
-  date: date_72
+  date: Sat Feb 17 11:30:22 -0800 2007
   type: type_72
   rights: rights_72
   contributor: contributor_72
@@ -1010,7 +1010,7 @@
   creator: creator_15
   language: language_15
   title: title_15
-  date: date_15
+  date: Sun Apr 15 12:30:22 -0700 2007
   type: type_15
   rights: rights_15
   contributor: contributor_15
@@ -1025,7 +1025,7 @@
   creator: creator_53
   language: language_53
   title: title_53
-  date: date_53
+  date: Thu Mar 08 11:30:22 -0800 2007
   type: type_53
   rights: rights_53
   contributor: contributor_53
@@ -1040,7 +1040,7 @@
   creator: creator_34
   language: language_34
   title: title_34
-  date: date_34
+  date: Tue Mar 27 12:30:22 -0700 2007
   type: type_34
   rights: rights_34
   contributor: contributor_34
@@ -1055,7 +1055,7 @@
   creator: creator_82
   language: language_82
   title: title_82
-  date: date_82
+  date: Wed Feb 07 11:30:22 -0800 2007
   type: type_82
   rights: rights_82
   contributor: contributor_82
@@ -1070,7 +1070,7 @@
   creator: creator_25
   language: language_25
   title: title_25
-  date: date_25
+  date: Thu Apr 05 12:30:22 -0700 2007
   type: type_25
   rights: rights_25
   contributor: contributor_25
@@ -1085,7 +1085,7 @@
   creator: creator_63
   language: language_63
   title: title_63
-  date: date_63
+  date: Mon Feb 26 11:30:22 -0800 2007
   type: type_63
   rights: rights_63
   contributor: contributor_63
@@ -1100,7 +1100,7 @@
   creator: creator_6
   language: language_6
   title: title_6
-  date: date_6
+  date: Tue Apr 24 12:30:22 -0700 2007
   type: type_6
   rights: rights_6
   contributor: contributor_6
@@ -1115,7 +1115,7 @@
   creator: creator_44
   language: language_44
   title: title_44
-  date: date_44
+  date: Sat Mar 17 12:30:22 -0700 2007
   type: type_44
   rights: rights_44
   contributor: contributor_44
@@ -1130,7 +1130,7 @@
   creator: creator_92
   language: language_92
   title: title_92
-  date: date_92
+  date: Sun Jan 28 11:30:22 -0800 2007
   type: type_92
   rights: rights_92
   contributor: contributor_92
@@ -1145,7 +1145,7 @@
   creator: creator_73
   language: language_73
   title: title_73
-  date: date_73
+  date: Fri Feb 16 11:30:22 -0800 2007
   type: type_73
   rights: rights_73
   contributor: contributor_73
@@ -1160,7 +1160,7 @@
   creator: creator_54
   language: language_54
   title: title_54
-  date: date_54
+  date: Wed Mar 07 11:30:22 -0800 2007
   type: type_54
   rights: rights_54
   contributor: contributor_54
@@ -1175,7 +1175,7 @@
   creator: creator_35
   language: language_35
   title: title_35
-  date: date_35
+  date: Mon Mar 26 12:30:22 -0700 2007
   type: type_35
   rights: rights_35
   contributor: contributor_35
@@ -1190,7 +1190,7 @@
   creator: creator_16
   language: language_16
   title: title_16
-  date: date_16
+  date: Sat Apr 14 12:30:22 -0700 2007
   type: type_16
   rights: rights_16
   contributor: contributor_16
@@ -1205,7 +1205,7 @@
   creator: creator_83
   language: language_83
   title: title_83
-  date: date_83
+  date: Tue Feb 06 11:30:22 -0800 2007
   type: type_83
   rights: rights_83
   contributor: contributor_83
@@ -1220,7 +1220,7 @@
   creator: creator_26
   language: language_26
   title: title_26
-  date: date_26
+  date: Wed Apr 04 12:30:22 -0700 2007
   type: type_26
   rights: rights_26
   contributor: contributor_26
@@ -1235,7 +1235,7 @@
   creator: creator_64
   language: language_64
   title: title_64
-  date: date_64
+  date: Sun Feb 25 11:30:22 -0800 2007
   type: type_64
   rights: rights_64
   contributor: contributor_64
@@ -1250,7 +1250,7 @@
   creator: creator_7
   language: language_7
   title: title_7
-  date: date_7
+  date: Mon Apr 23 12:30:22 -0700 2007
   type: type_7
   rights: rights_7
   contributor: contributor_7
@@ -1265,7 +1265,7 @@
   creator: creator_45
   language: language_45
   title: title_45
-  date: date_45
+  date: Fri Mar 16 12:30:22 -0700 2007
   type: type_45
   rights: rights_45
   contributor: contributor_45
@@ -1280,7 +1280,7 @@
   creator: creator_93
   language: language_93
   title: title_93
-  date: date_93
+  date: Sat Jan 27 11:30:22 -0800 2007
   type: type_93
   rights: rights_93
   contributor: contributor_93
@@ -1295,7 +1295,7 @@
   creator: creator_74
   language: language_74
   title: title_74
-  date: date_74
+  date: Thu Feb 15 11:30:22 -0800 2007
   type: type_74
   rights: rights_74
   contributor: contributor_74
@@ -1310,7 +1310,7 @@
   creator: creator_36
   language: language_36
   title: title_36
-  date: date_36
+  date: Sun Mar 25 12:30:22 -0700 2007
   type: type_36
   rights: rights_36
   contributor: contributor_36
@@ -1325,7 +1325,7 @@
   creator: creator_17
   language: language_17
   title: title_17
-  date: date_17
+  date: Fri Apr 13 12:30:22 -0700 2007
   type: type_17
   rights: rights_17
   contributor: contributor_17
@@ -1340,7 +1340,7 @@
   creator: creator_55
   language: language_55
   title: title_55
-  date: date_55
+  date: Tue Mar 06 11:30:22 -0800 2007
   type: type_55
   rights: rights_55
   contributor: contributor_55
@@ -1355,7 +1355,7 @@
   creator: creator_84
   language: language_84
   title: title_84
-  date: date_84
+  date: Mon Feb 05 11:30:22 -0800 2007
   type: type_84
   rights: rights_84
   contributor: contributor_84
@@ -1370,7 +1370,7 @@
   creator: creator_65
   language: language_65
   title: title_65
-  date: date_65
+  date: Sat Feb 24 11:30:22 -0800 2007
   type: type_65
   rights: rights_65
   contributor: contributor_65
@@ -1385,7 +1385,7 @@
   creator: creator_8
   language: language_8
   title: title_8
-  date: date_8
+  date: Sun Apr 22 12:30:22 -0700 2007
   type: type_8
   rights: rights_8
   contributor: contributor_8
@@ -1400,7 +1400,7 @@
   creator: creator_46
   language: language_46
   title: title_46
-  date: date_46
+  date: Thu Mar 15 12:30:22 -0700 2007
   type: type_46
   rights: rights_46
   contributor: contributor_46
@@ -1415,7 +1415,7 @@
   creator: creator_27
   language: language_27
   title: title_27
-  date: date_27
+  date: Tue Apr 03 12:30:22 -0700 2007
   type: type_27
   rights: rights_27
   contributor: contributor_27
@@ -1430,7 +1430,7 @@
   creator: creator_94
   language: language_94
   title: title_94
-  date: date_94
+  date: Fri Jan 26 11:30:22 -0800 2007
   type: type_94
   rights: rights_94
   contributor: contributor_94
@@ -1445,7 +1445,7 @@
   creator: creator_75
   language: language_75
   title: title_75
-  date: date_75
+  date: Wed Feb 14 11:30:22 -0800 2007
   type: type_75
   rights: rights_75
   contributor: contributor_75
@@ -1460,7 +1460,7 @@
   creator: creator_37
   language: language_37
   title: title_37
-  date: date_37
+  date: Sat Mar 24 12:30:22 -0700 2007
   type: type_37
   rights: rights_37
   contributor: contributor_37
@@ -1475,7 +1475,7 @@
   creator: creator_18
   language: language_18
   title: title_18
-  date: date_18
+  date: Thu Apr 12 12:30:22 -0700 2007
   type: type_18
   rights: rights_18
   contributor: contributor_18
@@ -1490,7 +1490,7 @@
   creator: creator_56
   language: language_56
   title: title_56
-  date: date_56
+  date: Mon Mar 05 11:30:22 -0800 2007
   type: type_56
   rights: rights_56
   contributor: contributor_56

data/test/activerecord_provider/tc_ar_provider.rb

@@ -12,6 +12,12 @@ class ActiveRecordProviderTest < Test::Unit::TestCase
     assert doc.elements['/OAI-PMH/ListMetadataFormats/metadataFormat/metadataPrefix'].text == 'oai_dc'
   end
   
+  def test_metadata_formats_for_record
+    assert_nothing_raised { REXML::Document.new(@provider.list_metadata_formats(:identifier => 'oai:test/1')) }
+    doc =  REXML::Document.new(@provider.list_metadata_formats)
+    assert doc.elements['/OAI-PMH/ListMetadataFormats/metadataFormat/metadataPrefix'].text == 'oai_dc'
+  end
+  
   def test_list_records
     assert_nothing_raised { REXML::Document.new(@provider.list_records) }
     doc = REXML::Document.new(@provider.list_records)

data/test/provider/tc_functional_tokens.rb

@@ -10,12 +10,12 @@ class ResumptionTokenFunctionalTest < Test::Unit::TestCase
   def test_resumption_tokens
     assert_nothing_raised { Document.new(@provider.list_records) }
     doc = Document.new(@provider.list_records)
-    assert_not_nil doc.elements["/OAI-PMH/resumptionToken"]
-    assert_equal 100, doc.elements["/OAI-PMH/ListRecords"].to_a.size
-    token = doc.elements["/OAI-PMH/resumptionToken"].text
+    assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    assert_equal 101, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+    token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
     doc = Document.new(@provider.list_records(:resumption_token => token))
-    assert_not_nil doc.elements["/OAI-PMH/resumptionToken"]
-    assert_equal 100, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+    assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    assert_equal 101, doc.elements["/OAI-PMH/ListRecords"].to_a.size
   end
 
   def test_from_and_until_with_resumption_tokens
@@ -26,16 +26,16 @@ class ResumptionTokenFunctionalTest < Test::Unit::TestCase
         :from => Chronic.parse("September 1 2004"),
         :until => Chronic.parse("November 30 2004"))
       )
-    assert_equal 100, doc.elements["/OAI-PMH/ListRecords"].to_a.size
-    token = doc.elements["/OAI-PMH/resumptionToken"].text
+    assert_equal 101, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+    token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
   
     doc = Document.new(@provider.list_records(:resumption_token => token))
-    assert_not_nil doc.elements["/OAI-PMH/resumptionToken"]
-    assert_equal 100, doc.elements["/OAI-PMH/ListRecords"].to_a.size
-    token = doc.elements["/OAI-PMH/resumptionToken"].text
+    assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
+    assert_equal 101, doc.elements["/OAI-PMH/ListRecords"].to_a.size
+    token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
 
     doc = Document.new(@provider.list_records(:resumption_token => token))
-    assert_nil doc.elements["/OAI-PMH/resumptionToken"]
+    assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
     assert_equal 100, doc.elements["/OAI-PMH/ListRecords"].to_a.size
   end
     

data/test/provider/tc_resumption_tokens.rb

@@ -6,8 +6,8 @@ class ResumptionTokenTest < Test::Unit::TestCase
   
   def setup
     @token = ResumptionToken.new(
-      :from => Chronic.parse("January 1 2005"),
-      :until => Chronic.parse("January 31 2005"), 
+      :from => Time.utc(2005,"jan",1,17,0,0),
+      :until => Time.utc(2005,"jan",31,17,0,0),
       :set => "A",
       :metadata_prefix => "oai_dc", 
       :last => 1

data/test/provider/tc_simple_provider.rb

@@ -29,6 +29,13 @@ class TestSimpleProvider < Test::Unit::TestCase
       doc.elements['/OAI-PMH/ListMetadataFormats/metadataFormat/metadataPrefix'].text
   end
   
+  def test_metadata_formats_for_document
+    assert_nothing_raised { REXML::Document.new(@simple_provider.list_metadata_formats(:identifier => "oai:test/1")) }
+    doc =  REXML::Document.new(@simple_provider.list_metadata_formats)
+    assert_equal "oai_dc",
+      doc.elements['/OAI-PMH/ListMetadataFormats/metadataFormat/metadataPrefix'].text
+  end
+    
   def test_list_records_without_constraints
     assert_nothing_raised { REXML::Document.new(@simple_provider.list_records) }
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: oai
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
-date: 2007-02-16 00:00:00 -05:00
+  version: 0.0.6
+date: 2007-06-05 00:00:00 -04:00
 summary: A ruby library for working with the Open Archive Initiative Protocol for Metadata Harvesting (OAI-PMH)
 require_paths: 
 - lib