reverting accidental trunk commit to rev 810

Author: Dan Avery

lib/oai/constants.rb

@@ -29,10 +29,6 @@ module Delete
       PERSISTENT = :persistent
     end
 
-    module Strict
-      STRICT = :strict
-      LAX    = :lax
-    end
   end
 
 end

lib/oai/provider.rb

@@ -184,7 +184,7 @@ class Base
 
     class << self
       attr_reader :formats
-      attr_accessor :name, :url, :prefix, :email, :delete_support, :granularity, :model, :strict
+      attr_accessor :name, :url, :prefix, :email, :delete_support, :granularity, :model
 
       def register_format(format)
         @formats ||= {}
@@ -218,7 +218,6 @@ def inherited(klass)
       alias_method :deletion_support,   :delete_support=  
       alias_method :update_granularity, :granularity=     
       alias_method :source_model,       :model=
-      alias_method :strict_mode,        :strict=
 
     end
 
@@ -229,7 +228,6 @@ def inherited(klass)
     Base.admin_email 'nobody@localhost'
     Base.deletion_support OAI::Const::Delete::TRANSIENT
     Base.update_granularity OAI::Const::Granularity::HIGH
-    Base.strict_mode OAI::Const::Strict::LAX
 
     Base.register_format(OAI::Provider::Metadata::DublinCore.instance)
 
@@ -278,7 +276,7 @@ def process_request(params = {})
 
         # Allow the request to pass in a url
         self.class.url = params['url'] ? params.delete('url') : self.class.url
-
+          
         verb = params.delete('verb') || params.delete(:verb)
 
         unless verb and OAI::Const::VERBS.keys.include?(verb)

lib/oai/provider/response/get_record.rb

@@ -1,7 +1,7 @@
 module OAI::Provider::Response
 
   class GetRecord < RecordResponse
-    required_parameters :identifier, :metadataPrefix
+    required_parameters :identifier
 
     def to_xml
       id = extract_identifier(options.delete(:identifier))

lib/oai/provider/response/list_identifiers.rb

@@ -2,8 +2,6 @@ module OAI::Provider::Response
 
   class ListIdentifiers < RecordResponse
 
-    required_parameters :metadataPrefix
-    
     def to_xml
       result = provider.model.find(:all, options)
 

lib/oai/provider/response/list_records.rb

@@ -2,8 +2,6 @@ module OAI::Provider::Response
 
   class ListRecords < RecordResponse
 
-    required_parameters :metadataPrefix
-    
     def to_xml
       result = provider.model.find(:all, options)
       # result may be an array of records, or a partial result

lib/oai/provider/response/record_response.rb

@@ -2,8 +2,8 @@ module OAI::Provider::Response
   class RecordResponse < Base
 
     def self.inherited(klass)
-      klass.valid_parameters    :from, :until, :set
-      klass.default_parameters  
+      klass.valid_parameters    :metadata_prefix, :from, :until, :set
+      klass.default_parameters  :metadata_prefix => "oai_dc", 
             :from => Proc.new {|x| Time.parse(x.provider.model.earliest.to_s) },
             :until => Proc.new {|x| Time.parse(x.provider.model.latest.to_s) }
     end

test/activerecord_provider/database/oaipmhtest

@@ -60,13 +60,4 @@ def test_no_records_match_bad_set
     assert_raise(OAI::NoMatchException) { @provider.list_records(:set => 'unknown') }
   end
 
-  def test_no_metadata_prefix_on_record_request_raises_exception
-    assert_raise(OAI::ArgumentException) { @provider.process_request(:verb => "ListRecords") }
-  end
-
-  def test_bad_character_raises_exception
-    assert_raise(OAI::ArgumentException) do
-      @provider.process_request(:verb => "GetRecord", :metadataPrefix => "oai_dc", :identifier => "bad\"id")
-    end
-  end
 end

test/provider/tc_exceptions.rb

@@ -2,33 +2,23 @@
 #
 #  Created by William Groppe on 2007-01-17.
 require 'yaml'
-require 'rubygems'
-require 'chronic'
 
 # Dublin Core fields
 FIELDS = %w{title creator subject description contributor publisher 
   date type format source language relation coverage rights}
 
-  unless ARGV[0]
-    puts "Please specify how many records to generate."
-    exit
-  end
+unless ARGV[0]
+  puts "Please specify how many records to generate."
+  exit
+end
+  
+# Hash for records
+records = {}
 
-  # Hash for records
-  records = {}
-
-  ARGV[0].to_i.times do |i|
-    records[i] = 
-    Hash[*FIELDS.collect { |field| 
-      # date is a special case--we want a real date in the records
-      if field == "date"
-        record_date = Chronic.parse("#{i} days ago")
-        [field, "#{record_date}"]
-      else
-        [field, "#{field}_#{i}"]
-      end
-    } .flatten]
-    end
-
-    puts records.to_yaml
+ARGV[0].to_i.times do |i|
+  records[i] = 
+    Hash[*FIELDS.collect { |field| [field, "#{field}_#{i}"] }.flatten]
+end
 
+puts records.to_yaml
+