oai 0.2.1 → 0.3.0

data/test/provider/tc_resumption_tokens.rb

@@ -3,13 +3,13 @@ require 'test_helper'
 class ResumptionTokenTest < Test::Unit::TestCase
   include REXML
   include OAI::Provider
-  
+
   def setup
     @token = ResumptionToken.new(
       :from => Time.utc(2005,"jan",1,17,0,0),
       :until => Time.utc(2005,"jan",31,17,0,0),
       :set => "A",
-      :metadata_prefix => "oai_dc", 
+      :metadata_prefix => "oai_dc",
       :last => 1
     )
   end
@@ -18,11 +18,11 @@ class ResumptionTokenTest < Test::Unit::TestCase
     assert_equal "oai_dc.s(A).f(2005-01-01T17:00:00Z).u(2005-01-31T17:00:00Z)",
       @token.to_s
   end
-  
+
   def test_resumption_token_next_method
     assert_equal 100, @token.next(100).last
   end
-  
+
   def test_resumption_token_to_condition_hash
     hash = @token.to_conditions_hash
     assert_equal @token.from, hash[:from]
@@ -37,10 +37,10 @@ class ResumptionTokenTest < Test::Unit::TestCase
     )
     assert_equal @token, new_token
   end
-  
+
   def test_resumption_token_to_xml
     doc = REXML::Document.new(@token.to_xml)
     assert_equal "#{@token.to_s}:#{@token.last}", doc.elements['/resumptionToken'].text
   end
-    
+
 end

data/test/provider/tc_simple_provider.rb

@@ -6,18 +6,18 @@ class TestSimpleProvider < Test::Unit::TestCase
     @simple_provider = SimpleProvider.new
     @model = @simple_provider.class.model
   end
-  
+
   def test_identify
     doc = REXML::Document.new(@simple_provider.identify)
     assert_equal @simple_provider.class.name,
       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
@@ -26,72 +26,97 @@ class TestSimpleProvider < Test::Unit::TestCase
     assert_equal @model.sets.size, sets.size
     assert_equal @model.sets[0].name, sets[0].elements["//setName"].text
   end
-  
+
   def test_metadata_formats
     assert_nothing_raised { REXML::Document.new(@simple_provider.list_metadata_formats) }
     doc =  REXML::Document.new(@simple_provider.list_metadata_formats)
     assert_equal "oai_dc",
       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) }
+    assert_nothing_raised { REXML::Document.new(@simple_provider.list_records(:metadata_prefix => 'oai_dc')) }
 
     total = @model.find(:all).size
-    doc = REXML::Document.new(@simple_provider.list_records)
+    doc = REXML::Document.new(@simple_provider.list_records(:metadata_prefix => 'oai_dc'))
     assert_equal total, doc.elements['OAI-PMH/ListRecords'].size
   end
-  
+
   def test_list_records_with_set_equal_a
     total = @model.find(:all, :set => 'A').size
-    doc = REXML::Document.new(@simple_provider.list_records(:set => 'A'))
+    doc = REXML::Document.new(@simple_provider.list_records(:metadata_prefix => 'oai_dc', :set => 'A'))
     assert_equal total, doc.elements['OAI-PMH/ListRecords'].size
   end
-  
+
   def test_list_record_with_set_equal_ab
     total = @model.find(:all, :set => 'A:B').size
-    doc = REXML::Document.new(@simple_provider.list_records(:set => 'A:B'))
+    doc = REXML::Document.new(@simple_provider.list_records(:metadata_prefix => 'oai_dc', :set => 'A:B'))
     assert_equal total, doc.elements['OAI-PMH/ListRecords'].size
   end
 
   def test_list_identifiers_without_constraints
-    assert_nothing_raised { REXML::Document.new(@simple_provider.list_identifiers) }
+    assert_nothing_raised { REXML::Document.new(@simple_provider.list_identifiers(:metadata_prefix => 'oai_dc')) }
 
     total = @model.find(:all).size
-    doc = REXML::Document.new(@simple_provider.list_identifiers)
+    doc = REXML::Document.new(@simple_provider.list_identifiers(:metadata_prefix => 'oai_dc'))
     assert_equal total, doc.elements['OAI-PMH/ListIdentifiers'].to_a.size
   end
-  
+
   def test_list_identifiers_with_set_equal_a
     total = @model.find(:all, :set => 'A').size
-    doc = REXML::Document.new(@simple_provider.list_identifiers(:set => 'A'))
+    doc = REXML::Document.new(@simple_provider.list_identifiers(:metadata_prefix => 'oai_dc', :set => 'A'))
     assert_equal total, doc.elements['OAI-PMH/ListIdentifiers'].to_a.size
   end
-  
+
   def test_list_indentifiers_with_set_equal_ab
     total = @model.find(:all, :set => 'A:B').size
-    doc = REXML::Document.new(@simple_provider.list_identifiers(:set => 'A:B'))
+    doc = REXML::Document.new(@simple_provider.list_identifiers(:metadata_prefix => 'oai_dc', :set => 'A:B'))
     assert_equal total, doc.elements['OAI-PMH/ListIdentifiers'].to_a.size
   end
 
   def test_get_record
-    assert_nothing_raised { REXML::Document.new(@simple_provider.get_record(:identifier => 'oai:test/1')) }
-    doc = REXML::Document.new(@simple_provider.get_record(:identifier => 'oai:test/1'))
-    assert_equal 'oai:test/1', doc.elements['OAI-PMH/GetRecord/record/header/identifier'].text
+    assert_nothing_raised do
+      REXML::Document.new(
+        @simple_provider.get_record(
+          :identifier => 'oai:test/1',
+          :metadataPrefix => 'oai_dc'
+        )
+      )
+    end
+    doc = REXML::Document.new(
+      @simple_provider.get_record(
+        :identifier => 'oai:test/1',
+        :metadataPrefix => 'oai_dc'
+      )
+    )
+    assert_equal 'oai:test/1',
+      doc.elements['OAI-PMH/GetRecord/record/header/identifier'].text
   end
-  
+
   def test_deleted_record
-    assert_nothing_raised { REXML::Document.new(@simple_provider.get_record(:identifier => 'oai:test/6')) }
-    doc = REXML::Document.new(@simple_provider.get_record(:identifier => 'oai:test/5'))
+    assert_nothing_raised do
+      REXML::Document.new(
+        @simple_provider.get_record(
+          :identifier => 'oai:test/6',
+          :metadataPrefix => 'oai_dc'
+        )
+      )
+    end
+    doc = REXML::Document.new(
+      @simple_provider.get_record(
+        :identifier => 'oai:test/5',
+        :metadataPrefix => 'oai_dc'
+      )
+    )
     assert_equal 'oai:test/5', doc.elements['OAI-PMH/GetRecord/record/header/identifier'].text
     assert_equal 'deleted', doc.elements['OAI-PMH/GetRecord/record/header'].attributes["status"]
   end
-          
+
 end

data/test/provider/test_helper.rb

@@ -1,3 +1,10 @@
+if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start
+end
 require 'oai'
 require 'test/unit'
 

metadata

@@ -1,143 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oai
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Ed Summers
 autorequire: oai
 bindir: bin
 cert_chain: []
-
-date: 2012-07-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-12-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
-  prerelease: false
   type: :runtime
-  name: builder
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
   name: faraday
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: faraday_middleware
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  type: :development
-  name: rake
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :development
-  name: activerecord
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  name: sqlite3
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :development
-  name: rdoc
-  requirement: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: ehs@pobox.com
-executables: 
+executables:
 - oai
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - Rakefile
 - bin/oai
 - test/activerecord_provider/config/connection.rb
-- test/activerecord_provider/config/database.yml
-- test/activerecord_provider/database/ar_migration.rb
-- test/activerecord_provider/database/oaipmhtest
+- test/activerecord_provider/database/0001_oaipmh_tables.rb
 - test/activerecord_provider/fixtures/dc.yml
 - test/activerecord_provider/helpers/providers.rb
 - test/activerecord_provider/helpers/set_provider.rb
+- test/activerecord_provider/helpers/transactional_test_case.rb
 - test/activerecord_provider/models/dc_field.rb
 - test/activerecord_provider/models/dc_set.rb
+- test/activerecord_provider/models/exclusive_set_dc_field.rb
 - test/activerecord_provider/models/oai_token.rb
 - test/activerecord_provider/tc_ar_provider.rb
 - test/activerecord_provider/tc_ar_sets_provider.rb
@@ -177,6 +117,7 @@ files:
 - lib/oai/client/metadata_format.rb
 - lib/oai/client/record.rb
 - lib/oai/client/response.rb
+- lib/oai/client/resumable.rb
 - lib/oai/client.rb
 - lib/oai/constants.rb
 - lib/oai/exception.rb
@@ -211,36 +152,34 @@ files:
 - examples/providers/dublin_core.rb
 homepage: http://github.com/code4lib/ruby-oai
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2108195439113391200
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2108195439113391200
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A ruby library for working with the Open Archive Initiative Protocol for Metadata Harvesting (OAI-PMH)
+summary: A ruby library for working with the Open Archive Initiative Protocol for
+  Metadata Harvesting (OAI-PMH)
 test_files: []
-
+has_rdoc: 

data/test/activerecord_provider/config/database.yml

@@ -1,6 +0,0 @@
-# Test database connection, this database will be created and
-# dropped by the activerecord units tests.
-adapter: sqlite3
-database: test/activerecord_provider/database/oaipmhtest
-username: 
-password: