borrow_direct 1.0.4 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTY4MWZjYWFkNWZlM2UyNzQxMWQ3M2E0OTcwZGY2MjBlMTlkZDI5ZQ==
+    Zjk4M2VkNzA1NWRmNjY5YmNkOTYyYTcyMmUxMzA5ZDkzZWQwNWU3OA==
   data.tar.gz: !binary |-
-    YjQ5OTI1N2NjNGQzZjQ3Njc4NGQ0ZmE0MTlmNzY1NjA0ODlmNmIzYw==
+    ODVhYjgxMjhkZTA1MjhjYTNlOTE1OWEwN2Y5NDVlYmZmM2M3ZjQxOA==
 SHA512:
   metadata.gz: !binary |-
-    YzVhYmY2OTg2ZDg1ZmI5ZjMwOTIwYWNiYmQ1MzUwZDBiZWZhZjhmNjAxOWQ5
-    OWNkYWFjZWY3ZDNlN2ZhMmYyNDI0OWFkMzQwMmE4MWQ0NTZhY2IxNjg2ZTBk
-    OGE4M2RhYmM2MGRjMmNlNzQ2ZjA4ZTEyNjhjNDllN2UxOWRlMjQ=
+    MTA0MTE0NWFjMTViZjgyMmU1MWI0MGQyZTdiYmNkY2RhNTkxNTE2OWY5ZGM3
+    ZjU2M2FhYzg3ODQzYmExNzViMTI0Y2UwYjQzYjJlYmNiYmYyMmI3NDBjYTIy
+    OWRiYzdiM2M5MGFjZDRmOTkxNWQ2ZWNhMjhkN2ZhYjQ4M2VmOTc=
   data.tar.gz: !binary |-
-    OGU0YTdiMDY3ZGE5ZDI3MjQxNjJiNTFlZjgxMzcwZjc3OWExN2UyYzAwNTVl
-    NzM0NmM5ZWI0Y2EyZjVjMTliMDg3MjAxZDkxY2FhMDFkMzc0NTNhNjhkMTlh
-    MzcyNzVlMjdiZDU3ZmE4NDRhMjY5ZTZjZjAyZjBkYmNiOTg3OGQ=
+    YTA4NzMxODE4OTgzMDg2ZmZjN2I0NTE0MmM1NjZlOGQwZjRiMmJkNDhjMzg3
+    Yjc0ZTg3N2I5OWYwMjQwNGRkNDc1YzIxMjk4YmRmMjcxZjY4YWNjNGM0MzIx
+    ZmVhYjc2OGU5NGY0NzBjMWY2ZDdhODU5MzM3NDU0NzUyMjBjZDE=

data/lib/borrow_direct/error.rb

@@ -13,5 +13,11 @@ module BorrowDirect
   end
 
   class HttpError < Error ; end
-  class HttpTimeoutError < HttpError ; end
+  class HttpTimeoutError < HttpError
+    attr_reader :timeout
+    def initialize(msg, timeout=nil)
+      @timeout = timeout
+      super(msg)
+    end
+  end
 end

data/lib/borrow_direct/generate_query.rb

@@ -131,10 +131,10 @@ module BorrowDirect
       return "" if author.nil? || author.empty?
 
       author = author.downcase
-      # Just take everything before the comma if we have one --
+      # Just take everything before the comma/semicolon if we have one --
       # or before an "and", for stripping individuals out of 245c
       # multiples. 
-      if author =~ /\A(.*)(,|\sand\s)/
+      if author =~ /\A([^,;]*)(,|\sand\s|;)/
         author = $1
       end
 

data/lib/borrow_direct/request.rb

@@ -102,7 +102,7 @@ module BorrowDirect
       return response_hash
     rescue HTTPClient::ReceiveTimeoutError, HTTPClient::ConnectTimeoutError, HTTPClient::SendTimeoutError => e
       elapsed = Time.now - start_time
-      raise BorrowDirect::HttpTimeoutError.new("Timeout after #{elapsed.round(1)}s connecting to BorrowDirect server at #{@api_base}")
+      raise BorrowDirect::HttpTimeoutError.new("Timeout after #{elapsed.round(1)}s connecting to BorrowDirect server at #{@api_base}", self.timeout)
     end
 
     def http_client

data/lib/borrow_direct/version.rb

@@ -1,3 +1,3 @@
 module BorrowDirect
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/test/generate_query_test.rb

@@ -162,6 +162,9 @@ describe "GenerateQuery" do
       # Hmm, should we really be stripping those periods? Not sure, but seems
       # to do okay in searching. 
       assert_equal "h a shapiro", @generator.normalized_author("edited by H.A. Shapiro.")
+
+      assert_equal "john smith", @generator.normalized_author("john smith, editor, mike brown, editor")
+      assert_equal "john smith", @generator.normalized_author("by john smith; with help from mike brown")
     end
 
 

data/test/request_test.rb

@@ -93,16 +93,18 @@ describe "Request", :vcr => {:tag => :bd_request} do
     bd = BorrowDirect::Request.new("/dws/item/available")
     # tiny timeout, it'll def timeout, and on connect no less
     bd.timeout = 0.00001  
-    assert_raises(BorrowDirect::HttpTimeoutError) do 
+    timeout_error = assert_raises(BorrowDirect::HttpTimeoutError) do 
       response = bd.request( request )     
     end
+    assert_equal bd.timeout, timeout_error.timeout 
 
     # little bit longer to get maybe a receive timeout instead
     bd = BorrowDirect::Request.new("/dws/item/available")
     bd.timeout = 0.10
-    assert_raises(BorrowDirect::HttpTimeoutError) do 
+    timeout_error = assert_raises(BorrowDirect::HttpTimeoutError) do 
       response = bd.request( request )     
     end
+    assert_equal bd.timeout, timeout_error.timeout 
   end
 
   describe "with expected errors" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: borrow_direct
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient