sru 0.0.7 → 0.0.8

data/lib/sru/client.rb

@@ -33,19 +33,19 @@ module SRU
       @server = URI.parse base
       @parser = options.fetch(:parser, 'rexml')
       case @parser
-         when 'libxml'
-	    begin
-               require 'rubygems'
-               require 'libxml'
- 	    rescue
-              raise SRU::Exception, "unknown parser: #{@parser}", caller 
-	    end
-         when 'rexml'
-	     require 'rexml/document'
-             require 'rexml/xpath'
-         else
-              raise SRU::Exception, "unknown parser: #{@parser}", caller
-         end
+      when 'libxml'
+        begin
+          require 'rubygems'
+          require 'libxml'
+	        rescue
+            raise SRU::Exception, "unknown parser: #{@parser}", caller 
+          end
+      when 'rexml'
+        require 'rexml/document'
+        require 'rexml/xpath'
+      else
+        raise SRU::Exception, "unknown parser: #{@parser}", caller
+      end
         
       # stash this away for future requests
       @version = self.explain.version
@@ -118,7 +118,11 @@ module SRU
       # fetch the xml and build/return a document object from it
       begin
         res = Net::HTTP.start(uri.host, uri.port) {|http|
-          http.get(uri.request_uri, { "Accept" => "text/xml, application/xml"})
+          req = Net::HTTP::Get.new(uri.request_uri, { "Accept" => "text/xml, application/xml"})
+          if uri.user && uri.password
+            req.basic_auth uri.user, uri.password
+          end
+          http.request(req)
         }
         
         xml = res.body
@@ -126,10 +130,9 @@ module SRU
         case @parser
           when 'libxml'
             xmlObj = LibXML::XML::Parser.string(xml)
-	    # not sure why but the explain namespace does bad things to 
+	          # not sure why but the explain namespace does bad things to 
             # libxml
-            #xml = xml.gsub(' xmlns="http://explain.z3950.org/dtd/2.0/"', '')
-            
+            #xml = xml.gsub(' xmlns="http://explain.z3950.org/dtd/2.0/"', '')            
             return xmlObj.parse
           when 'rexml'
             return REXML::Document.new(xml)

data/test/tc_http_client_test.rb

@@ -1,6 +1,6 @@
 class TCHTTPClientTests < Test::Unit::TestCase
   def test_content_negotiation
-    client = SRU::Client.new 'http://viaf.org/search'
+    client = SRU::Client.new 'http://viaf.org/viaf/search'
     assert_nothing_raised do
       results = client.search_retrieve 'local.names any twain'
     end

data/test/tc_libxml_client_test.rb

@@ -30,26 +30,6 @@ class TcLibxmlClientTests < Test::Unit::TestCase
     results = client.search_retrieve 'twain'
     assert_equal 10, results.entries.size
   end
-
-  # need to find a target that supports scan so we can exercise it
-  #def test_scan
-  #  # this scan response appears to be canned might need to change
-  #  client = SRU::Client.new 'http://tweed.lib.ed.ac.uk:8080/elf/search/copac'
-  #  scan = client.scan('foobar')
-  #  assert scan.entries.size > 0
-  #  assert_equal SRU::Term, scan.entries[0].class
-  #  assert_equal 'low', scan.entries[0].value
-  #  assert_equal '1', scan.entries[0].number_of_records
-  #end
-
-  def test_xml_exception
-    assert_raise(SRU::Exception) {SRU::Client.new 'http://www.google.com'}
-  end
-
-  def test_http_exception
-    assert_raise(SRU::Exception) {SRU::Client.new 'http://example.com'}
-  end
-
 end
 
 

data/test/tc_rexml_client_test.rb

@@ -30,26 +30,6 @@ class TCRexmlClientTests < Test::Unit::TestCase
     results = client.search_retrieve 'twain'
     assert_equal 10, results.entries.size
   end
-
-  # need to find a target that supports scan so we can exercise it
-  #def test_scan
-  #  # this scan response appears to be canned might need to change
-  #  client = SRU::Client.new 'http://tweed.lib.ed.ac.uk:8080/elf/search/copac'
-  #  scan = client.scan('foobar')
-  #  assert scan.entries.size > 0
-  #  assert_equal SRU::Term, scan.entries[0].class
-  #  assert_equal 'low', scan.entries[0].value
-  #  assert_equal '1', scan.entries[0].number_of_records
-  #end
-
-  def test_xml_exception
-    assert_raise(SRU::Exception) {SRU::Client.new 'http://www.google.com'}
-  end
-
-  def test_http_exception
-    assert_raise(SRU::Exception) {SRU::Client.new 'http://example.com'}
-  end
-
 end
 
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sru
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Ed Summers
@@ -9,7 +15,7 @@ autorequire: sru
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -05:00
+date: 2011-04-11 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -44,21 +50,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: a Ruby library for Search and Retrieve by URL