borrow_direct 1.1.0 → 1.2.0.pre1

data/test/authentication_test.rb

@@ -6,14 +6,15 @@ require 'httpclient'
 describe "Authentication", :vcr => {:tag => :bd_auth} do
   describe "raw request to verify HTTP api" do
     it "works" do
-      uri = BorrowDirect::Defaults.api_base.chomp("/") + "/portal-service/user/authentication/patron"
+      uri = BorrowDirect::Defaults.api_base.chomp("/") + "/portal-service/user/authentication"
 
 
       request_hash = {
-        "AuthenticationInformation" => {
-          "LibrarySymbol" => VCRFilter[:bd_library_symbol],
-          "PatronId" => VCRFilter[:bd_patron]
-        }
+        "ApiKey"        => VCRFilter[:bd_api_key],
+        "PartnershipId" => BorrowDirect::Defaults.partnership_id,
+        "UserGroup"     => "patron",
+        "LibrarySymbol" => VCRFilter[:bd_library_symbol],
+        "PatronId"      => VCRFilter[:bd_patron]
       } 
 
       http = HTTPClient.new
@@ -26,47 +27,74 @@ describe "Authentication", :vcr => {:tag => :bd_auth} do
 
       assert_present response_hash
 
-      assert_present response_hash["Authentication"]["AuthnUserInfo"]["AId"]
+      assert_present response_hash["AuthorizationId"]
     end
   end
 
   it "Makes a request succesfully" do
-    bd = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol])
+    bd = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol], VCRFilter[:bd_api_key])
     response = bd.authentication_request
 
     assert_present response
-    assert_present response["Authentication"]["AuthnUserInfo"]["AId"]
+    assert_present response["AuthorizationId"]
   end
 
+
+
   it "Raises for bad library symbol" do
-    bd = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , "BAD_SYMBOL")
+    bd = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , "BAD_SYMBOL", VCRFilter[:bd_api_key])
     assert_raises(BorrowDirect::Error) do
       bd.authentication_request
     end
   end
 
   it "Raises for bad patron barcode" do
-    bd = BorrowDirect::Authentication.new("BAD_BARCODE", VCRFilter[:bd_library_symbol])
+    bd = BorrowDirect::Authentication.new("BAD_BARCODE", VCRFilter[:bd_library_symbol], VCRFilter[:bd_api_key])
     assert_raises(BorrowDirect::Error) do
       bd.authentication_request
     end
   end
 
+  it "Raises with no api_key" do
+    begin
+      orig_api_key = BorrowDirect::Defaults.api_key 
+      BorrowDirect::Defaults.api_key = nil
+
+      assert_raises(ArgumentError) do
+        bd = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol])
+      end
+    ensure
+      BorrowDirect::Defaults.api_key = orig_api_key      
+    end
+  end
+
+
   describe "get_auth_id" do
     it "returns an auth_id for a good request" do
+      bd = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol], VCRFilter[:bd_api_key])
+      assert_present bd.get_auth_id
+    end
+
+    it "returns auth_id with API key from defaults" do
       bd = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol])
       assert_present bd.get_auth_id
     end
 
+    it "Raises for bad api_key" do
+      assert_raises(BorrowDirect::Error) do
+        bd = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol], "BAD_API_KEY").get_auth_id
+      end
+    end
+
     it "raises for a bad library symbol" do
-      bd = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , "BAD_SYMBOL")
+      bd = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , "BAD_SYMBOL", VCRFilter[:bd_api_key])
       assert_raises(BorrowDirect::Error) do
         bd.get_auth_id
       end
     end
 
     it "raises for a bad patron barcode" do
-      bd = BorrowDirect::Authentication.new("BAD_BARCODE", VCRFilter[:bd_library_symbol])
+      bd = BorrowDirect::Authentication.new("BAD_BARCODE", VCRFilter[:bd_library_symbol], VCRFilter[:bd_api_key])
       assert_raises(BorrowDirect::Error) do
         bd.get_auth_id
       end

data/test/encryption_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+require 'borrow_direct/encryption'
+
+describe "Relais Encryption" do
+  before do
+    @sample_private_key = <<-EOS
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp
+wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5
+1s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh
+3tx4VgMtrQ+WEgCjhoTwo23KMBAuJGSYnRmoBZM3lMfTKevIkAidPExvYCdm5dYq3XToLkkLv5L2
+pIIVOFMDG+KESnAFV7l2c+cnzRMW0+b6f8mR1CJzZuxVLL6Q02fvLi55/mbSYxECQQDeAw6fiIQX
+GukBI4eMZZt4nscy2o12KyYner3VpoeE+Np2q+Z3pvAMd/aNzQ/W9WaI+NRfcxUJrmfPwIGm63il
+AkEAxCL5HQb2bQr4ByorcMWm/hEP2MZzROV73yF41hPsRC9m66KrheO9HPTJuo3/9s5p+sqGxOlF
+L0NDt4SkosjgGwJAFklyR1uZ/wPJjj611cdBcztlPdqoxssQGnh85BzCj/u3WqBpE2vjvyyvyI5k
+X6zk7S0ljKtt2jny2+00VsBerQJBAJGC1Mg5Oydo5NwD6BiROrPxGo2bpTbu/fhrT8ebHkTz2epl
+U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
+37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=
+-----END RSA PRIVATE KEY-----
+EOS
+  
+    @sample_public_key = <<-EOS
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0
+FPqri0cb2JZfXJ/DgYSF6vUpwmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/
+3j+skZ6UtW+5u09lHNsj6tQ51s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQAB
+-----END PUBLIC KEY-----
+EOS
+  end
+
+  describe "timestamp" do
+    it "creates in GMT" do
+      timestamp = BorrowDirect::Encryption.new(@sample_public_key).now_timestamp
+
+      utc_date = Time.now.utc.to_date
+      
+      assert timestamp =~ /(\d{4})(\d{2})(\d{2}) \d{6}/
+
+      assert_equal utc_date.year.to_s, $1
+      assert_equal "%02d" % utc_date.month, $2
+      assert_equal "%02d" % utc_date.day, $3
+    end
+  end
+
+  describe "encrypted value" do
+    it "is encrypted with datestamp properly" do
+      original_value  = "$$VALUE$$"
+      encrypted       = BorrowDirect::Encryption.new(@sample_public_key).encode_with_ts(original_value)
+      encrypted       = Base64.decode64(encrypted)
+
+      # Let's decrypt it and see
+      private_key     = OpenSSL::PKey::RSA.new(@sample_private_key)
+      payload         = private_key.private_decrypt(encrypted)
+
+      assert payload =~ /#{original_value}|\d{8} \d{6}/
+    end
+  end
+end

data/test/find_item_test.rb

@@ -4,12 +4,13 @@ require 'borrow_direct/find_item'
 
 
 
-describe "FindItem", :vcr do
+describe "FindItem", :vcr => {:tag => :bd_finditem }do
   before do
     @requestable_item_isbn     = "9810743734" # item is in BD, and can be requested
     @locally_avail_item_isbn   = "0745649890"  # item is in BD, but is avail locally so not BD-requestable
-    @not_requestable_item_isbn = "1441190090" # in BD, and we don't have it, but no libraries let us borrow (in this case, it's an ebook)
+    @not_requestable_item_isbn = "1444367072" # in BD, and we don't have it, but no libraries let us borrow (in this case, it's an ebook)
     @returns_PUBFI002_ISBN     = "0109836413" # BD returns an error PUBFI002 for this one, which we want to treat as simply not available. 
+    @not_in_BD_at_all_isbn     = "1898989898" # Not in BD at all, made up ISBN, invalid. 
   end
   
 
@@ -39,9 +40,12 @@ describe "FindItem", :vcr do
       finder = BorrowDirect::FindItem.new("barcodeX", "libraryX")
       hash   = finder.send(:exact_search_request_hash, :isbn, "2")
 
+
       assert_equal BorrowDirect::Defaults.partnership_id, hash["PartnershipId"]
-      assert_equal "barcodeX", hash["Credentials"]["Barcode"]
-      assert_equal "libraryX", hash["Credentials"]["LibrarySymbol"]
+      
+      # These aren't there anymore. 
+      #assert_equal "barcodeX", hash["Credentials"]["Barcode"]
+      #assert_equal "libraryX", hash["Credentials"]["LibrarySymbol"]
 
       assert_equal "ISBN", hash["ExactSearch"].first["Type"]
       assert_equal "2", hash["ExactSearch"].first["Value"]
@@ -80,11 +84,42 @@ describe "FindItem", :vcr do
       end
     end
 
+    it "raises proper error on bad AID" do
+      e = assert_raises(BorrowDirect::InvalidAidError) do
+        BorrowDirect::FindItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).with_auth_id("bad_expired_aid").find_item_request(:isbn => @requestable_item_isbn)  
+      end
+      assert_present e.message
+      assert_present e.bd_code
+      assert_present e.aid
+    end
+
+    it "Raises with bad api_key" do
+      begin
+        orig_api_key = BorrowDirect::Defaults.api_key 
+        BorrowDirect::Defaults.api_key = "BADAPIKEY"
+
+        assert_raises(BorrowDirect::Error) do
+          BorrowDirect::FindItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).find_item_request(:isbn => @requestable_item_isbn)  
+        end
+      ensure
+        BorrowDirect::Defaults.api_key = orig_api_key      
+      end
+    end
+
 
     it "finds a requestable item" do
       assert_present BorrowDirect::FindItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).find_item_request(:isbn => @requestable_item_isbn)    
     end
 
+    it "uses manually set auth_id" do
+      auth_id     = BorrowDirect::Authentication.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).get_auth_id  
+      bd          = BorrowDirect::FindItem.new("bad_patron" , "bad_symbol").with_auth_id(auth_id)
+      resp        = bd.find_item_request(:isbn => @requestable_item_isbn)
+
+      assert_present resp
+      assert_equal true, resp["Available"]
+    end
+
     it "finds a locally available item" do
       assert_present BorrowDirect::FindItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).find_item_request(:isbn => @locally_avail_item_isbn)    
     end
@@ -113,8 +148,10 @@ describe "FindItem", :vcr do
       assert_equal true, @find_item.find(:isbn => @requestable_item_isbn).requestable?
     end
 
+
+
     it "requestable with multiple items if at least one is requestable" do
-      assert_equal true, @find_item.find(:isbn => [@requestable_item_isbn, "NO_SUCH_ISBN"]).requestable?
+      assert_equal true, @find_item.find(:isbn => [@requestable_item_isbn, @not_in_BD_at_all_isbn]).requestable?
     end
 
     it "not requestable for locally available item" do
@@ -126,7 +163,7 @@ describe "FindItem", :vcr do
     end
 
     it "not requestable for item that does not exist in BD" do
-      assert_equal false, @find_item.find(:isbn => "NO_SUCH_THING").requestable?
+      assert_equal false, @find_item.find(:isbn => @not_in_BD_at_all_isbn).requestable?
     end
 
     it "not requestable for item that no libraries will lend" do
@@ -138,18 +175,36 @@ describe "FindItem", :vcr do
     end
 
     it "has an auth_id" do
+      assert @find_item.auth_id.nil?
       assert_present @find_item.find(:isbn => @requestable_item_isbn).auth_id
-    end
-
-    it "has nil auth_id when BD doesn't want to give us one" do
-      assert_nil @find_item.find(:isbn => @returns_PUBFI002_ISBN).auth_id
-    end
+      assert_present @find_item.auth_id
+    end    
 
     it "has pickup locations" do
       pickup_locations = @find_item.find(:isbn => @requestable_item_isbn).pickup_locations
 
       assert_present pickup_locations
       assert_kind_of Array, pickup_locations
+      pickup_locations.each do |location|
+        assert_kind_of String, location
+      end
+    end
+
+    describe "#pickup_location_data" do
+      it "returns array of PickupLocations" do
+        pickup_locations = @find_item.find(:isbn => @requestable_item_isbn).pickup_location_data
+
+        assert_present pickup_locations
+        assert_kind_of Array, pickup_locations
+        pickup_locations.each do |location|
+          assert_kind_of BorrowDirect::PickupLocation, location
+          assert_present location.code
+          assert_present location.description
+
+          assert_equal [location.description, location.code], location.to_a
+          assert_equal( {"PickupLocationCode" => location.code, "PickupLocationDescription" => location.description}, location.to_h )
+        end
+      end
     end
 
     it "has nil pickup locations when BD doesn't want to give us them" do

data/test/request_item_test.rb

@@ -13,8 +13,38 @@ describe "RequestItem", :vcr => {:tag => :bd_requestitem } do
     @requestable_item_isbn     = "9797994864" # item is in BD, and can be requested
     @locally_avail_item_isbn   = "0745649890"  # item is in BD, but is avail locally so not BD-requestable
     @not_requestable_item_isbn = "1441190090" # in BD, and we don't have it, but no libraries let us borrow (in this case, it's an ebook)
-    @returns_PUBRI004_ISBN     = "0109836413" # BD returns an error PUBRI004 for this one, which we want to treat as simply not available. 
+    @returns_PUBRI003_ISBN     = "0109836413" # BD returns an error PUBRI004 for this one, which we want to treat as simply not available. 
     @pickup_location           = "Some location" # BD seems to allow anything, which is disturbing
+    @pickup_location_obj       = BorrowDirect::PickupLocation.new({"PickupLocationCode" => "a", "PickupLocationDescription" => @pickup_location})
+  end
+
+  it "raw RequestItem sanity check" do
+    findable = BorrowDirect::FindItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).find(:isbn => @requestable_item_isbn)
+
+    assert findable.requestable?
+
+    pickup = findable.pickup_locations.first
+    aid    = findable.auth_id
+
+    uri = BorrowDirect::Defaults.api_base.chomp("/") + "/dws/item/add?aid=#{CGI.escape aid}"
+
+    request_hash = {
+      "PartnershipId" => BorrowDirect::Defaults.partnership_id,
+      "PickupLocation" => pickup,
+      "ExactSearch" => [
+        {"Type" => "ISBN","Value" => @requestable_item_isbn}
+      ]
+    } 
+
+    http = HTTPClient.new
+    response = http.post uri, JSON.generate(request_hash), BorrowDirect::Request.new('').request_headers
+
+    assert_equal 200, response.code
+    assert_present response.body
+
+    response_hash = JSON.parse response.body
+
+    assert_present response_hash
   end
 
 
@@ -43,7 +73,8 @@ describe "RequestItem", :vcr => {:tag => :bd_requestitem } do
     resp = BorrowDirect::RequestItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).request_item_request(nil, :isbn => @not_requestable_item_isbn)
 
     assert_present resp
-    assert_present resp["Request"]
+
+    assert_present resp["RequestLink"]
   end
 
   it "uses manually set auth_id" do
@@ -52,7 +83,17 @@ describe "RequestItem", :vcr => {:tag => :bd_requestitem } do
     resp        = bd.request_item_request(nil, :isbn => @requestable_item_isbn)
 
     assert_present resp
-    assert_present resp["Request"]
+
+    assert_present resp["RequestNumber"], "Was not able to succesfully make a request: #{resp}"
+  end
+
+  it "raises proper error on bad AID" do
+    e = assert_raises(BorrowDirect::InvalidAidError) do
+      BorrowDirect::RequestItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).with_auth_id("bad_expired_aid").make_request(nil, :isbn => @requestable_item_isbn)
+    end
+    assert_present e.message
+    assert_present e.bd_code
+    assert_present e.aid
   end
 
   describe "make_request" do
@@ -62,6 +103,15 @@ describe "RequestItem", :vcr => {:tag => :bd_requestitem } do
       assert_present request_id    
     end
 
+    it "sets an auth_id" do
+      requester = BorrowDirect::RequestItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol])
+
+      assert requester.auth_id.nil?
+
+      requester.make_request(nil, :isbn => @requestable_item_isbn)
+      assert_present requester.auth_id
+    end
+
     it "make_request for an unrequestable item" do
       resp = BorrowDirect::RequestItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).make_request(nil, :isbn => @not_requestable_item_isbn)
 
@@ -74,18 +124,25 @@ describe "RequestItem", :vcr => {:tag => :bd_requestitem } do
       assert_nil resp
     end
 
-    it "says no for item that BD returns PUBRI004" do
-      assert_nil BorrowDirect::RequestItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).make_request(nil, :isbn => @returns_PUBRI004_ISBN)
+    it "says no for item that BD returns PUBRI003" do
+      assert_nil BorrowDirect::RequestItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).make_request(nil, :isbn => @returns_PUBRI003_ISBN)
     end
 
   end
 
-  describe "with pickup location and requestable item" do
-    it "still works" do
+  describe "with pickup location and requestable item"  do
+    it "works with String pickup_location" do
       request_id = BorrowDirect::RequestItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).make_request(@pickup_location, :isbn => @requestable_item_isbn)
 
-      assert_present request_id    
+      assert_present request_id, "Was not able to succesfully make a request"
+    end
+
+    it "works with structured PickupLocation" do
+      request_id = BorrowDirect::RequestItem.new(VCRFilter[:bd_patron] , VCRFilter[:bd_library_symbol]).make_request(@pickup_location_obj, :isbn => @requestable_item_isbn)
+
+      assert_present request_id, "Was not able to succesfully make a request"
     end
+
   end
 
   describe "make_request!" do

data/test/request_query_test.rb

@@ -12,35 +12,22 @@ describe "RequestQuery", :vcr => {:tag => :bd_request_query} do
   it "raw request to verify the BD HTTP API" do
 
     # Get the auth code
-
-    auth_uri = BorrowDirect::Defaults.api_base.chomp("/") + "/portal-service/user/authentication/patron"
-    auth_hash = {
-        "AuthenticationInformation" => {
-          "LibrarySymbol" => VCRFilter[:bd_library_symbol],
-          "PatronId" => VCRFilter[:bd_patron]
-        }
-      } 
-
-    headers = { "Content-Type" => "application/json", 
-        "User-Agent" => "ruby borrow_direct gem #{BorrowDirect::VERSION} (HTTPClient #{HTTPClient::VERSION}) https://github.com/jrochkind/borrow_direct", 
-        "Accept-Language" => "en"
-      }
-    http = HTTPClient.new
-    response = http.post auth_uri, JSON.generate(auth_hash), headers
-    response_hash = JSON.parse response.body
-    auth_id = response_hash["Authentication"]["AuthnUserInfo"]["AId"]
-
+    auth_id = BorrowDirect::Authentication.new(VCRFilter[:bd_patron], VCRFilter[:bd_library_symbol]).get_auth_id
     
     # Now use it to make a RequestQuery request. Note, BD API requires
     # you to use the same User-Agent you used to receive the auth id. 
 
-
       query = {
         "aid" => auth_id,
         "type" => "open",
         "fullRecord" => "0"
       }
 
+      headers = { "Content-Type" => "application/json",
+        "User-Agent" => "ruby borrow_direct gem #{BorrowDirect::VERSION} (HTTPClient #{HTTPClient::VERSION}) https://github.com/jrochkind/borrow_direct",
+        "Accept-Language" => "en"
+      }
+
       uri = BorrowDirect::Defaults.api_base.chomp("/") + "/portal-service/request/query/my"            
 
       http = HTTPClient.new
@@ -52,8 +39,15 @@ describe "RequestQuery", :vcr => {:tag => :bd_request_query} do
       response_hash = JSON.parse http_response.body
 
       assert_present response_hash
-      assert_present response_hash["QueryResult"]
-      assert_kind_of Array, response_hash["QueryResult"]["MyRequestRecords"]      
+      assert_kind_of Array, response_hash["MyRequestRecords"]
+  end
+
+  it "raises proper error on bad AID" do
+    e = assert_raises(BorrowDirect::InvalidAidError) do
+      BorrowDirect::RequestQuery.new(VCRFilter[:bd_patron]).with_auth_id("bad_expired_id").request_query_request
+    end
+    assert_present e.message
+    assert_present e.aid
   end
 
   describe "raw request_query_request" do
@@ -63,8 +57,8 @@ describe "RequestQuery", :vcr => {:tag => :bd_request_query} do
 
       assert_present response      
       assert_kind_of Hash, response
-      assert_present response["QueryResult"]["MyRequestRecords"]
-      assert_kind_of Array, response["QueryResult"]["MyRequestRecords"]
+      assert_present response["MyRequestRecords"]
+      assert_kind_of Array, response["MyRequestRecords"]
     end
   end
 
@@ -85,10 +79,12 @@ describe "RequestQuery", :vcr => {:tag => :bd_request_query} do
         assert_includes [true, false], item.send(key)
       end
 
-      [:request_status_date, :date_submitted].each do |key|
-        assert_present item.send(key)
-        assert_kind_of DateTime, item.send(key)
-      end
+      # Huh, records don't seem to reliably have these, so we
+      # can't test for them, bah. 
+      #[:request_status_date, :date_submitted].each do |key|
+      #  assert_present item.send(key)
+      #  assert_kind_of DateTime, item.send(key)
+      #end
     end
 
     it "fetches full records" do

data/test/request_test.rb

@@ -4,9 +4,11 @@ require 'borrow_direct/request'
 
 
 
-describe "Request", :vcr => {:tag => :bd_request} do
+describe "Request", :vcr => {:tag => :bd_request } do
   before do
     @successful_item_isbn = "9810743734"
+
+    @aid = BorrowDirect::Authentication.new(VCRFilter[:bd_patron], VCRFilter[:bd_library_symbol]).get_auth_id
   end
 
 
@@ -17,8 +19,8 @@ describe "Request", :vcr => {:tag => :bd_request} do
   end
 
   it "raises on bad request hash" do
-    assert_raises(BorrowDirect::HttpError) do
-      response = BorrowDirect::Request.new("/dws/item/available").request( "foo" => "bar" )
+    assert_raises(BorrowDirect::Error) do
+      response = BorrowDirect::Request.new("/dws/item/available").request( {"foo" => "bar"},  @aid )
     end
   end
 
@@ -46,13 +48,28 @@ describe "Request", :vcr => {:tag => :bd_request} do
     refute_nil e.bd_code
   end
 
-  it "can make a succesful request" do
+  it "gets BD error info from a bad AID" do
+    request = {
+        "PartnershipId" => "BD",
+        "ExactSearch" => [
+            {
+                "Type" => "ISBN",
+                "Value" => @successful_item_isbn
+            }
+        ]
+    }
+
+    e = assert_raises(BorrowDirect::InvalidAidError) do
+      response = BorrowDirect::Request.new("/dws/item/available").request( request, "bad_aid" )      
+    end
+
+    refute_nil e
+    assert_equal "PUBFI003", e.bd_code
+  end
+
+  it "can make a succesful request with AID" do
       request = {
           "PartnershipId" => "BD",
-          "Credentials" => {
-              "LibrarySymbol" => VCRFilter[:bd_library_symbol],
-              "Barcode" => VCRFilter[:bd_patron]
-          },
           "ExactSearch" => [
               {
                   "Type" => "ISBN",
@@ -62,7 +79,7 @@ describe "Request", :vcr => {:tag => :bd_request} do
       }
 
       
-    response = BorrowDirect::Request.new("/dws/item/available").request( request )      
+    response = BorrowDirect::Request.new("/dws/item/available").request( request, @aid )      
   end
 
   it "uses timeout for HttpClient" do
@@ -76,13 +93,12 @@ describe "Request", :vcr => {:tag => :bd_request} do
     assert_equal 5, http_client.connect_timeout
   end
 
+  
   it "raises exception on timeout, live" do
+    skip "Can't get this to work with VCR and new API"
+
     request = {
       "PartnershipId" => "BD",
-      "Credentials" => {
-          "LibrarySymbol" => VCRFilter[:bd_library_symbol],
-          "Barcode" => VCRFilter[:bd_patron]
-      },
       "ExactSearch" => [
           {
               "Type" => "ISBN",
@@ -90,19 +106,20 @@ describe "Request", :vcr => {:tag => :bd_request} do
           }
         ]
       }
-    bd = BorrowDirect::Request.new("/dws/item/available")
+    # Using a Bad URI here keeps VCR from interfering with us too much. 
+    bd = BorrowDirect::Request.new("/dws/item/available_bad_uri")
     # tiny timeout, it'll def timeout, and on connect no less
-    bd.timeout = 0.00001  
+    bd.timeout = 0.00000001
     timeout_error = assert_raises(BorrowDirect::HttpTimeoutError) do 
-      response = bd.request( request )     
+      response = bd.request( request, @aid )     
     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 = BorrowDirect::Request.new("/dws/item/available_bad_uri")
     bd.timeout = 0.10
     timeout_error = assert_raises(BorrowDirect::HttpTimeoutError) do 
-      response = bd.request( request )     
+      response = bd.request( request, @aid )     
     end
     assert_equal bd.timeout, timeout_error.timeout 
   end
@@ -110,22 +127,18 @@ describe "Request", :vcr => {:tag => :bd_request} do
   describe "with expected errors" do
     it "still returns result" do
       request = {
-          "PartnershipId" => "BAD_ID",
-          "Credentials" => {
-              "LibrarySymbol" => "librarySymbol",
-              "Barcode" => "barcode/patronId"
-          },
+          "PartnershipId" => "BD",
           "ExactSearch" => [
               {
-                  "Type" => "type",
-                  "Value" => "value"
+                  "Type" => "BADBAD",
+                  "Value" => "2292389283928392382938"
               }
           ]
       }
 
       bd = BorrowDirect::Request.new("/dws/item/available")
-      bd.expected_error_codes << "PUBFI003"
-      response = bd.request( request )      
+      bd.expected_error_codes << "PRIFI001"
+      response = bd.request( request, @aid )      
 
       assert_present response
     

data/test/test_helper.rb

@@ -9,6 +9,12 @@ require 'minitest-vcr'
 
 require 'borrow_direct'
 
+# Want to run tests against PRODUCTION BD? It WILL result in real requests being
+# made to BD production system, so you probably don't -- but if you're not sure
+# if production API is really behaving like test, you might want to anyway. 
+if ENV["RAILS_ENV"] == "production"
+  BorrowDirect::Defaults.api_base = BorrowDirect::Defaults::PRODUCTION_API_BASE
+end
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
@@ -19,13 +25,16 @@ VCR.configure do |c|
 
   # BD API requests tend to have their distinguishing
   # features in a POSTed JSON request body
-  c.default_cassette_options = { :match_requests_on => [:method, :uri, :body] }
+  c.default_cassette_options = { :match_requests_on => [:method, VCR.request_matchers.uri_without_param(:aid), :body] }
 end
 
 MinitestVcr::Spec.configure!
 
 VCRFilter.sensitive_data! :bd_library_symbol
 VCRFilter.sensitive_data! :bd_patron
+VCRFilter.sensitive_data! :bd_api_key
+
+BorrowDirect::Defaults.api_key = VCRFilter[:bd_api_key]
 
 # Silly way to not have to rewrite all our tests if we
 # temporarily disable VCR, make VCR.use_cassette a no-op