borrow_direct 0.9.1 → 0.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTczYmU1OWU3ZWZkNzkwZTBhZTZmMTU0MWRjMTk1NGVhNTY3YzYxNA==
+    N2U0ZTMyZDhmZDA4ZTE3YWNjNDk0MTYwMDEzNTM4MTQ5MDY2NzQwOQ==
   data.tar.gz: !binary |-
-    OTAwNmQ5OWFhZDJmZTgzM2FiYTE4NzVjOTVhMDIzNDM3MzlmOWM1Yw==
+    YzQ0MDdjMGIyMjYzNmU1NmZkY2Q5MzRkNTcxNWRhNjkyZTE3ZDQ3ZA==
 SHA512:
   metadata.gz: !binary |-
-    ZWJhOTg3Nzk5ODY5ZWU1OGE5ZDIwMjhhYjc5OGYwNmZlODNhZmMxMDMxYTlm
-    ZmNiMGQxZTMxNTkzMDdhYWNiYTk2NDg0ODBmYTdkOTY3ZTQ4ZDcwMmQwYmUz
-    MzIxYzVmNDBhMGRmNGE3NWNmODkyNTlhYWQ1ZjYwYmJkOGNlZWQ=
+    MThiMzE1MWJmNmQ3YzZiNjczYTY5MjU0OGIxYmRlOWQ5MTc5ZmQ2NzM5OTY4
+    MjRmMWQ5M2RjYzEzNGFjZGVlYjkwOWU2N2M3ZWFjMTM5OTFkOTk1YjEzZGM2
+    ZjQ5M2MwMTM4YzFlZGNjOTdmMzBlZGZjM2IwOGNjNDg5NzJhMjA=
   data.tar.gz: !binary |-
-    YThjMDY3OWFkMzY3YWM4YTBhZGEyOTVhNzliOGM2NzgyY2VlZTMwOTZhM2M0
-    NzM5MzViNjk4Y2E0ZTc5NzU2Yzg3NmZhYjRhNmU4YjAxYjM2MzRkYjAzYzFk
-    MTRhNTFmMTI4Y2IzNzc4ODVkYjI4M2RlY2JmNjZmNDU2NjlkYmY=
+    MmZhNzUyNTk5ODhiYWI5ZjdiNjVhZThhZTdlMTgyZDM3MzdhODhlOThkZjE4
+    ZWNmNzg4NzkwYzFmNmQ1OTA4MDk5MTY5N2IyODAwNWJhYjg4ZDY5NjY1YzVl
+    NGQ1YjllODU3M2Q0M2E0MjczN2VlMzUxZTVhYmU2ZjJhODcxYTg=

data/README.md

@@ -110,17 +110,22 @@ BorrowDirect::GenerateQuery.new.query_url_with(
     :isbn => "1234435445")
 ~~~
 
-Sometimes you want to generate a search for a specific known item, and use
-an ISBN if available, otherwise an author/title search. That is one of our
-own main use cases for these deep links. The `#best_known_item_query_url_with`
-method is available to automatically use ISBN if available, otherwise author/title. 
+Or specify your own query passed as a string, possibly a complex one
+using BD's undocumented syntax that you figure out. Use `
+BorrowDirect::GenerateQuery.escape` to escape values, but don't CGI escape the input. 
 
-The GenerateQuery class can be enhanced if there is demand; to allow more
-flexible searches (instead of always phrase searches with boolean AND); to or allow
-sending barcode directly to BD instead of relying on a local authenticating redirect
-script. 
+~~~ruby
+query = %Q{isbn="#{BorrowDirect::GenerateQuery.escape('1212')}" and (ti="#{BorrowDirect::GenerateQuery.escape('foo')}" or ti="#{BorrowDirect::GenerateQuery.escape('bar')}")}
+BorrowDirect::GenerateQuery.new.query_url_with query
+~~~
 
+For the common case of doing an author-title keyword search, this gem has some suggested
+normalization it applies to author and title, to maximize chances of succesful hits.
+(limiting to 5 words in title, searching on main title only not subtitle, etc.)
 
+~~~ruby
+BorrowDirect::GenerateQuery.new.normalized_author_title_query(:title => some_title, :author => some_author)
+~~~
 
 ### Errors
 

data/bd_metrics/finditem_measure.rb

@@ -1,33 +1,106 @@
 #!/usr/bin/env ruby
 
+# Quick and dirty script to do some testing. 
+
 # ruby -Ilib:test ./bd_metrics/finditem_measure.rb
 
 require 'borrow_direct'
 require 'borrow_direct/find_item'
+require 'date'
+
+key = "isbn"
+sourcefile = ARGV[0] || File.expand_path("../isbn-bd-test-200.txt", __FILE__)
 
-key        = ARGV[0] || "isbn"
-sourcefile = ARGV[1] || File.expand_path("../#{key}.txt", __FILE__)
+# How long to wait n BD before giving up. 
+timeout = 20
 
-puts "#{key}: #{sourcefile}"
+# Range of how long to wait between requests, in seconds. Actual
+# delay each time randomly chosen from this range. 
+# wait one to 7 minutes. 
+delay = 60..420
 
-identifiers = File.readlines(sourcefile).shuffle
+puts "#{ENV['BD_LIBRARY_SYMBOL']}: #{key}: #{sourcefile}: #{Time.now.localtime}"
 
+identifiers = File.readlines(sourcefile)   #.shuffle
+ 
 puts "  #{identifiers.count} total input identifiers"
 
-times = []
-errors = []
-finder = BorrowDirect::FindItem.new(ENV["BD_FINDITEM_PATRON"], ENV["BD_LIBRARY_SYMBOL"])
+times     = []
+errors    = []
+timeouts  = []
+
+finder = BorrowDirect::FindItem.new(ENV["BD_PATRON"], ENV["BD_LIBRARY_SYMBOL"])
+finder.timeout = timeout
+
+i = 0
+
+stats = lambda do |times|
+  h = OpenStruct.new
+
+  h.min       = times[0]
+  h.tenth     = times[(times.count / 10) - 1]
+  h.median    = times[(times.count / 2) - 1]
+  h.seventyfifth = times[(times.count - (times.count / 4)) - 1]
+  h.ninetieth = times[(times.count - (times.count / 10)) - 1]
+  h.ninetyninth = times[(times.count - (times.count / 100)) - 1]
+  h.max       = times[times.count - 1]
+
+  # now without the ones that were timeouts
+  times1 = times.find_all {|t| t < timeout || (timeout - t) <= 0.01}
+  h1 = OpenStruct.new
+  h1.min       = times[0]
+  h1.tenth     = times[(times.count / 10) - 1]
+  h1.median    = times[(times.count / 2) - 1]
+  h1.seventyfifth = times[(times.count - (times.count / 4)) - 1]
+  h1.ninetieth = times[(times.count - (times.count / 10)) - 1]
+  h1.ninetyninth = times[(times.count - (times.count / 100)) - 1]
+  h1.max       = times[times.count - 1]
+
+  return [h, h1]
+end
+
+printresults = lambda do
+  times.sort!
+
+  (t, t1) = stats.call(times)
+
+  puts "\n"
+  puts "tested #{i} identifiers, with timeout #{timeout}s, delaying #{delay} seconds between FindItem api requests\n\n"
+  puts "timing distribution (inc. timeouts) min: #{t.min.round(1)}s; 10th %ile: #{t.tenth.round(1)}s; median: #{t.median.round(1)}s; 75th %ile: #{t.seventyfifth.round(1)}s; 90th %ile: #{t.ninetieth.round(1)}s; 99th %ile: #{t.ninetyninth.round(1)}s; max: #{t.max.round(1)}s\n\n"
+  puts "timing distribution (W/O timeouts) min: #{t1.min.round(1)}s; 10th %ile: #{t1.tenth.round(1)}s; median: #{t1.median.round(1)}s; 75th %ile: #{t1.seventyfifth.round(1)}s; 90th %ile: #{t1.ninetieth.round(1)}s; 99th %ile: #{t1.ninetyninth.round(1)}s; max: #{t1.max.round(1)}s\n\n"  
+  puts "    error count: #{errors.count}"
+  puts "    timeout count: #{timeouts.count}"
+  puts "\n"
+end
 
 
 at_exit do
-  puts "\n\nERRORS: "
+  puts "\n\n\n"
+
+  puts "Finished: #{ENV['BD_LIBRARY_SYMBOL']}: #{key}: #{sourcefile}: #{Time.now.localtime}"
+
+
+  puts "Finished at: #{Time.now.localtime}\n\n"
+
+  printresults.call
+
+
+  puts "\nAll errors: "
   errors.each do |arr|
     puts arr.inspect
   end
+
+  puts "\nAll timeouts: "
+  timeouts.each do |arr|
+    puts arr.inspect
+  end
+
+  puts "\n\n\n"
+
 end
 
-i = 0
 identifiers.each do |id|
+  print "."
   id = id.chomp
   i = i + 1
 
@@ -35,27 +108,21 @@ identifiers.each do |id|
 
   begin
     finder.find_item_request(key => id)
+  rescue BorrowDirect::HttpTimeoutError => e
+    timeouts << [key, id, e]
   rescue BorrowDirect::Error => e
     errors << [key, id, e]
   end
   elapsed = Time.now - start
 
   times << elapsed
-  times.sort!
 
   if i % 10 == 0
-    min       = times[0]
-    tenth     = times[(times.count / 10) - 1]
-    median    = times[(times.count / 2) - 1]
-    seventyfifth = times[(times.count - (times.count / 4)) - 1]
-    ninetieth = times[(times.count - (times.count / 10)) - 1]
-    ninetyninth = times[(times.count - (times.count / 100)) - 1]
-
-    max       = times[times.count - 1]
-
-    puts "i==#{i}; min: #{min}; 10th %ile: #{tenth}; median: #{median}; 75th %ile: #{seventyfifth}; 90th %ile: #{ninetieth}; 99th %ile: #{ninetyninth}; max: #{max}"
-    puts "    errors: #{errors.count}"
+    printresults.call
   end
 
+  print "w"
+  sleep rand(delay)
+
 end
 

data/bd_metrics/isbn-bd-test-200.txt

@@ -0,0 +1,200 @@
+9780585488363
+0140206221
+9780300070163
+9781594202919
+1904859208
+9780309255998
+9781555702212
+9781118559215
+9780898382600
+9788764300086
+0300070160
+9781435666504
+9780814725245
+9781442225459
+9780585147574
+9781118836583
+0520938038978
+0938692942
+3642034551
+9780060243913
+9781571686565
+9781604653212
+9780585048529
+9780783219097
+9780231520980
+9781886449350
+9780634090608
+9780062503404
+9781742980676
+160486270X
+9780309212861
+9783540737087
+0486122387
+9780671869229
+9783540644101
+9781563084812
+9780435270728
+9780721601892
+9780805015959
+074533086X
+9780415882293
+9780314190826
+9780781782029
+9780292759367
+9781593764944
+9780470873908
+187317683X
+9780375856525
+9781555841973
+9781933115603
+9780813506272
+9781420081886
+9780312331597
+9780790739250
+0853451753
+9780470740958
+9780840032980
+9781491900987
+9781605537665
+9780066211312
+9780585025117
+9780375830730
+9780316608459
+0333914554
+9780804717625
+1904859062
+9780817644222
+9780060234836
+9780333914557
+9780470578827
+9781401202019
+9781619426344
+0631165746
+9780977696611
+9786310335841
+9780470584330
+9781401213510
+0142002429
+9781118173091
+9781905222759
+9780517701010
+9782207261163
+9780226293516
+0271028890
+9781604860641
+0520938038
+9780670891573
+0521891574
+9780807084939
+3531050850
+1885923902
+0470019352
+2711823903
+9780804776714
+0195167643
+2902524412
+0300043910
+0231051964
+9789652351487
+0299158101
+0313221588
+9780881326727
+9781892127303
+0444820914
+0109578805
+9042918713
+9780415604017
+9783834936011
+9781420069129
+0825672783
+9789048139668
+9788896319109
+0582368863
+9780203833001
+0500018421
+0761920846
+9781455727551
+9781118418420
+9780132119856
+1741144485
+9781480328488
+9781443842273
+0882756702
+2070112713
+9789799101204
+9783770544974
+0205200095
+1560003383
+0205510701
+9789251053003
+9780415558938
+014004227X
+0766846822
+9780415197342
+0804737088
+1878822624
+9004104062
+41062001
+9788131775660
+1604246014
+9780801890048
+0195208846
+1884585388
+1555835589
+3540651160
+041505818X
+9287140553
+0394538579
+9780754628309
+1566706688
+3487072157
+0226323145
+9781559363303
+0801438136
+0787964344
+9780807834343
+0195300831
+0323081665
+9789814345477
+3900627002
+0393977757
+0801831008
+0844407291
+0582418666
+0863583016
+9786074620191
+0679750533
+1569730431
+1419551329
+1405116994
+080532402X
+8879890913
+9781616690106
+8187586370
+9789004255265
+0205482252
+0300049447
+8772884746
+0807824682
+9992790768
+9781598743036
+0754655334
+9783034312028
+185437124X
+9781439811283
+9781412984652
+9781579548896
+0131975412
+9781437720808
+9781409469056
+0816188734
+9781629142708
+027598169X
+9780801452581
+0596008678
+0521855764
+1934121320
+0721679048
+0824708709
+9781606230220

data/lib/borrow_direct/defaults.rb

@@ -14,7 +14,7 @@ module BorrowDirect
   #      BorrowDirect::Defaults.find_item_patron_barcode = "99999999999"
   class Defaults
     TEST_API_BASE         = "https://bdtest.relais-host.com/"
-    PRODUCTION_API_BASE   = "NOT_YET_AVAILABLE"
+    PRODUCTION_API_BASE   = "https://borrow-direct.relaisd2d.com/"
 
     TEST_HTML_BASE        = "https://bdtest.relaisd2d.com/service-proxy?command=query"
     PRODUCTION_HTML_BASE  = "https://borrow-direct.relaisd2d.com/service-proxy?command=query"

data/lib/borrow_direct/find_item.rb

@@ -118,15 +118,23 @@ module BorrowDirect
         end
 
        # Items that are available locally, and thus not requestable via BD, can
-       # only be found by looking at the RequestMessage, bah
-       h = response_hash["Item"]["RequestLink"]
-       if h && h["RequestMessage"] == "This item is available locally"
+       # only be found by looking at the RequestMessage, bah       
+       if locally_available?
          return false
        end
 
        return response_hash["Item"]["Available"].to_s == "true"
       end
 
+      # BD thinks the item is locally available at patron's home library,
+      # and it is not requestable for that reason. 
+      # Items that are available locally, and thus not requestable via BD, can
+      # only be found by looking at the RequestMessage, bah       
+      def locally_available?
+       h = response_hash["Item"]["RequestLink"]
+       return !! (h && h["RequestMessage"] == "This item is available locally")
+      end
+
       # Returns the AuthorizationID returned by FindItem API call,
       # or nil if none is available. Nil _can_ be returned, for
       # instance when BD returns a NotFound error instead of a good

data/lib/borrow_direct/generate_query.rb

@@ -20,7 +20,7 @@ module BorrowDirect
       self.url_base = (url_base || BorrowDirect::Defaults.html_base_url)
     end
 
-    # query_with(:title => "one two", :author => "three four")
+    # build_query_with(:title => "one two", :author => "three four")
     # valid keys are those supported by BD HTML interface:
     #     :title, :author, :isbn, :subject, :keyword, :isbn, :issn
     #
@@ -28,7 +28,7 @@ module BorrowDirect
     # fields are always 'and'd.  We may enhance/expand later. 
     #
     # Returns an un-escaped query, still needs to be put into a URL
-    def query_with(options)
+    def build_query_with(options)
       clauses = []
 
       options.each_pair do |field, value|
@@ -38,43 +38,98 @@ module BorrowDirect
 
         raise ArgumentError.new("Don't recognize field code `#{field}`") unless code
 
-        clauses << %Q{#{code}="#{escape_query_value value}"}
+        clauses << %Q{#{code}="#{escape value}"}
       end
 
       return clauses.join(" and ")
     end
 
-    # Pass in :title, :author, :isbn, etc -- if we have an isbn or issn,
-    # we'll use that alone, otherwise we'll use title and author
-    def best_known_item_query_with(options)
-      if options[:isbn]
-        return query_with(options.dup.delete_if {|k| k != :isbn})
-      elsif options[:issn]
-        return query_with(options.dup.delete_if {|k| k != :issn})
-      else
-        return query_with options
-      end
-    end
 
-    def query_url_with(options)
-      query = query_with(options)
 
+    def query_url_with(arg)
+      query = arg.kind_of?(Hash) ? build_query_with(arg) : arg.to_s
+      
       return add_query_param(self.url_base, "query", query).to_s
+    end
+
+    # Give it a :title and optionally an :author, we'll normalize
+    # them to our suggestion for a good BD author-title keyword
+    # search. Returns a hash suitable for passing to #query_url_with
+    #
+    # Additional option :max_title_words, default 5. 
+    def normalized_author_title_params(options)
+      raise ArgumentError.new("Need a Hash argument, got #{options.inspect}") unless options.kind_of?(Hash)
+
+      # Symbolize keys please
+      #options = options.inject({}){ |h, (k, v)| hash.merge( (k.respond_to?(:to_sym) ? k.to_sym : k) => v )  }
+
+      title           = options[:title].dup  if options[:title]
+      author          = options[:author].dup if options[:author]
+
+      # We don't do any normalization to author at present. 
+      title = normalized_title(title, :max_title_words => options[:max_title_words])
+
+      results = {}
+      results[:title] = title if title && ! title.empty?
+      results[:author] = author if author && ! author.empty?
+      
+      return results
+    end
 
+    # :title, :author and optionally :max_title_words. 
+    #
+    # Returns a query with a suggested normalized author and title
+    # for best BD search. May return just BD base URL if no author/title
+    # given. 
+    def normalized_author_title_query(options)
+      return self.query_url_with self.normalized_author_title_params(options)
     end
 
-    def best_known_item_query_url_with(options)
-      query = best_known_item_query_with(options)
+    def normalized_title(title, args = {})
+      return "" if title.nil? || title.empty?
 
-      return add_query_param(self.url_base, "query", query).to_s
+      max_title_words = args[:max_title_words] || 5
+ 
+      # Remove all things in parens at the END of the title, they tend
+      # to be weird addendums. 
+      title.gsub!(/\([^)]*\)\s*$/, '')
+
+      # Strip the subtitle or other weird titles, just keep the text
+      # before the first colon OR semi-colon
+      title.sub!(/[\:\;](.*)$/, '')
+
+      # remove any remaining non-alphanumeric, excepting apostrophe, replacing
+      # with space. The punctuation doesn't help our queries. 
+      title.gsub!(/[^[:alnum:][:space:]\']/, ' ')
+
+      # compress any remaining whitespace
+      title.strip!
+      title.gsub!(/\s+/, ' ')
+
+      # downcase
+      title.downcase!
+
+      # Limit to only first N words
+      if max_title_words && title.index(/((.+?[ ,.:\;]+){#{max_title_words}})/)
+        title = title.slice(0, $1.length).gsub(/[ ,.:\;]+$/, '')
+      end
+
+      return title
     end
 
+    
+
+    # Escape a query value. 
     # We don't really know how to escape, for now
     # we just remove double quotes and parens, and replace with spaces. 
     # those seem to cause problems, and that seems to work. 
-    def escape_query_value(str)
+    def self.escape(str)
       str.gsub(/[")()]/, ' ')
     end
+    # Instance method version for convenience. 
+    def escape(str)
+      self.class.escape(str)
+    end
 
     def add_query_param(uri, key, value)
       uri = URI.parse(uri) unless uri.kind_of? URI

data/lib/borrow_direct/request.rb

@@ -100,9 +100,9 @@ module BorrowDirect
       
 
       return response_hash
-    rescue HTTPClient::ReceiveTimeoutError => e
+    rescue HTTPClient::ReceiveTimeoutError, HTTPClient::ConnectTimeoutError, HTTPClient::SendTimeoutError => e
       elapsed = Time.now - start_time
-      raise BorrowDirect::HttpTimeoutError.new("Timeout after #{elapsed}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}")
     end
 
     def http_client

data/lib/borrow_direct/version.rb

@@ -1,3 +1,3 @@
 module BorrowDirect
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/test/find_item_test.rb

@@ -121,6 +121,10 @@ describe "FindItem", :vcr do
       assert_equal false, @find_item.find(:isbn => @locally_avail_item_isbn).requestable?
     end
 
+    it "knows locally_available?" do
+      assert_equal true, @find_item.find(:isbn => @locally_avail_item_isbn).locally_available?
+    end
+
     it "not requestable for item that does not exist in BD" do
       assert_equal false, @find_item.find(:isbn => "NO_SUCH_THING").requestable?
     end

data/test/generate_query_test.rb

@@ -1,3 +1,5 @@
+# Encoding: UTF-8
+
 require 'test_helper'
 require 'uri'
 require 'cgi'
@@ -61,66 +63,67 @@ describe "GenerateQuery" do
     end
   end
 
-  describe "best_known_item_query_url_with" do
-    it "uses only isbn when available" do
+  describe "with string arg" do
+    it "generates supplied query" do
       generate_query = BorrowDirect::GenerateQuery.new(@test_base)
 
-      url = generate_query.best_known_item_query_url_with(:isbn => "OUR_ISBN", :title => "This is a title", :author => "This is an author")
+      query = %Q{isbn="#{BorrowDirect::GenerateQuery.escape('1212')}" and (ti="#{BorrowDirect::GenerateQuery.escape('foo')}" or ti="#{BorrowDirect::GenerateQuery.escape('bar')}")}
 
-      assert url.start_with? @test_base
+      url = generate_query.query_url_with(query)
 
       parsed_url = URI.parse(url)
       url_query  = CGI.parse( parsed_url.query )
-
       assert_present url_query
-
       assert_length 1, url_query["query"]
 
-      query_text = url_query["query"].first
-
-      parts = query_text.split(" and ")
-
-      assert_length 1, parts
-
-      assert_include parts, 'isbn="OUR_ISBN"'      
+      assert_equal query, url_query["query"].first
     end
+  end
 
-    it "uses author and title when it has to" do
-      generate_query = BorrowDirect::GenerateQuery.new(@test_base)
-
-      url = generate_query.best_known_item_query_url_with(:title => "This is a title", :author => "This is an author")
-
-      assert url.start_with? @test_base
-
-      parsed_url = URI.parse(url)
-      url_query  = CGI.parse( parsed_url.query )
+  describe "#normalized_author_title_params" do
+    before do
+      @generator = BorrowDirect::GenerateQuery.new(@test_base)
+    end
+    it "raises without good arguments" do
+      assert_raises(ArgumentError) {@generator.normalized_author_title_params(nil)}
+    end
 
-      assert_present url_query
+    it "passes through simple author and title" do
+      author ="John Smith"
+      title = "Some Book"
+      assert_equal( {:title => "some book", :author => author}, @generator.normalized_author_title_params(:author => author, :title => title))
+    end
 
-      assert_length 1, url_query["query"]
+    it "works with just a title" do
+      title  = "Some Book"
+      expected = {:title => "some book"}
+      assert_equal expected, @generator.normalized_author_title_params(:title => title)
+      assert_equal expected, @generator.normalized_author_title_params(:title => title, :author => nil)
+      assert_equal expected, @generator.normalized_author_title_params(:title => title, :author => "")
+    end
 
-      query_text = url_query["query"].first
+    it "title remove trailing parens" do
+      title = "A Book (really bad one)"
 
-      parts = query_text.split(" and ")
+      assert_equal( {:title => "a book"}, @generator.normalized_author_title_params(:title => title))
+    end
 
-      assert_length 2, parts
+    it "title strip subtitles" do
+      assert_equal({:title => "a book"}, @generator.normalized_author_title_params(:title => "A Book: Subtitle"))
+      assert_equal({:title => "a book"}, @generator.normalized_author_title_params(:title => "A Book; and more"))
+    end
 
-      assert_include parts, 'ti="This is a title"'
-      assert_include parts, 'au="This is an author"'
+    it "limit to first 5 words" do
+      assert_equal({:title => "one two's three four five"}, @generator.normalized_author_title_params(:title => "One Two's Three Four Five Six Seven"))
     end
 
-    it "can handle nil arguments" do
-      url = BorrowDirect::GenerateQuery.new(@html_query_base_url).best_known_item_query_url_with(
-             :isbn   => nil,
-             :title  => 'the new international economic order',
-             :author => nil
-      )
+    it "okay with unicode, strip punct" do
+      assert_equal({:title => "el revolución"}, @generator.normalized_author_title_params(:title => "El   Revolución!: Cuban poster art"))
+    end
 
+    it "full normalized_author_title_query" do
+      url = @generator.normalized_author_title_query(:title => "A Book: Subtitle", :author => "Smith, John" )
       query = assert_bd_query_url(url)
-
-      parts = query.split(" and ")
-
-      assert_include parts, 'ti="the new international economic order"'
     end
 
   end

data/test/request_test.rb

@@ -76,6 +76,35 @@ describe "Request", :vcr => {:tag => :bd_request} do
     assert_equal 5, http_client.connect_timeout
   end
 
+  it "raises exception on timeout, live" do
+    request = {
+      "PartnershipId" => "BD",
+      "Credentials" => {
+          "LibrarySymbol" => VCRFilter[:bd_library_symbol],
+          "Barcode" => VCRFilter[:bd_patron]
+      },
+      "ExactSearch" => [
+          {
+              "Type" => "ISBN",
+              "Value" => @successful_item_isbn
+          }
+        ]
+      }
+    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 
+      response = bd.request( request )     
+    end
+
+    # 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 
+      response = bd.request( request )     
+    end
+  end
+
   describe "with expected errors" do
     it "still returns result" do
       request = {

data/test/support/assertions.rb

@@ -17,7 +17,7 @@ end
 def assert_include(collection, item, msg = nil)
   assert_respond_to(collection, :include?, "The collection must respond to :include?.")
     
-  msg ||= "#{collection.inspect.slice(0,10)} expected to include\#{item}"
+  msg ||= "#{collection.inspect} expected to include #{item.inspect}"
 
   assert collection.include?(item), msg
 end

data/test/vcr_cassettes/FindItem/find_with_Response/knows_locally_available_.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://bdtest.relais-host.com/dws/item/available
+    body:
+      encoding: UTF-8
+      string: ! '{"PartnershipId":"BD","Credentials":{"LibrarySymbol":"DUMMY_BD_LIBRARY_SYMBOL","Barcode":"DUMMY_BD_PATRON"},"ExactSearch":[{"Type":"ISBN","Value":"0745649890"}]}'
+    headers:
+      User-Agent:
+      - ruby borrow_direct gem 0.9.1 (HTTPClient 2.5.3.3) https://github.com/jrochkind/borrow_direct
+      Accept:
+      - ! '*/*'
+      Date:
+      - Wed, 17 Dec 2014 16:29:43 GMT
+      Content-Type:
+      - application/json
+      Accept-Language:
+      - en
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.4.1
+      Date:
+      - Wed, 17 Dec 2014 16:30:04 GMT
+      Content-Type:
+      - application/json;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"Item":{"Available":true,"SearchTerm":"isbn=0745649890","AuthorizationId":"OzHkQ_bUILh1Py-UdMtMRcbOnK0","RequestLink":{"RequestMessage":"This
+        item is available locally"},"PickupLocations":{"PickupLocation":["*Milton
+        S. Eisenhower Library","APL - EP STUDENTS - Ed Center","APL STAFF - Room 5-17","Arthur
+        Friedheim Library","Columbia Center","Harbor East","Harrison Medical Library-Bayview","Institute
+        of the History of Medicine","JH Medical Campus Office (faculty and staff)","JHMI
+        Pickup - Armstrong 306","JHMI Pickup - BSPH E4643","JHMI Pickup - Hampton
+        House 9th floor","JHMI Pickup - PCTB 115-116","JHMI Pickup - School of Nursing
+        313","JHU Homewood Office (faculty and grad students)","Montgomery Library
+        Resource Center","SAIS Library","Washington Library Resource Center","Welch
+        Medical Library","Wilmer Friedenwald Library"]}}}'
+    http_version: 
+  recorded_at: Wed, 17 Dec 2014 16:30:04 GMT
+recorded_with: VCR 2.9.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: borrow_direct
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -113,6 +113,7 @@ files:
 - README.md
 - Rakefile
 - bd_metrics/finditem_measure.rb
+- bd_metrics/isbn-bd-test-200.txt
 - bd_metrics/isbn.txt
 - bd_metrics/lccn.txt
 - bd_metrics/oclc.txt
@@ -155,6 +156,7 @@ files:
 - test/vcr_cassettes/FindItem/find_with_Response/has_nil_auth_id_when_BD_doesn_t_want_to_give_us_one.yml
 - test/vcr_cassettes/FindItem/find_with_Response/has_nil_pickup_locations_when_BD_doesn_t_want_to_give_us_them.yml
 - test/vcr_cassettes/FindItem/find_with_Response/has_pickup_locations.yml
+- test/vcr_cassettes/FindItem/find_with_Response/knows_locally_available_.yml
 - test/vcr_cassettes/FindItem/find_with_Response/not_requestable_for_item_that_BD_returns_PUBFI002.yml
 - test/vcr_cassettes/FindItem/find_with_Response/not_requestable_for_item_that_does_not_exist_in_BD.yml
 - test/vcr_cassettes/FindItem/find_with_Response/not_requestable_for_item_that_no_libraries_will_lend.yml
@@ -204,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Ruby tools for interacting with the Borrow Direct consortial services
@@ -236,6 +238,7 @@ test_files:
 - test/vcr_cassettes/FindItem/find_with_Response/has_nil_auth_id_when_BD_doesn_t_want_to_give_us_one.yml
 - test/vcr_cassettes/FindItem/find_with_Response/has_nil_pickup_locations_when_BD_doesn_t_want_to_give_us_them.yml
 - test/vcr_cassettes/FindItem/find_with_Response/has_pickup_locations.yml
+- test/vcr_cassettes/FindItem/find_with_Response/knows_locally_available_.yml
 - test/vcr_cassettes/FindItem/find_with_Response/not_requestable_for_item_that_BD_returns_PUBFI002.yml
 - test/vcr_cassettes/FindItem/find_with_Response/not_requestable_for_item_that_does_not_exist_in_BD.yml
 - test/vcr_cassettes/FindItem/find_with_Response/not_requestable_for_item_that_no_libraries_will_lend.yml