umlaut 3.3.1 → 4.0.0.beta1

data/test/unit/service_test.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ServiceTest < ActiveSupport::TestCase
-  fixtures :requests
-
   # A service that does nothing!
   class DummyService < Service
     def handle(request)
@@ -13,7 +11,7 @@ class ServiceTest < ActiveSupport::TestCase
   # A preempted by service that does nothing!
   class PreemptedByDummyService < Service
     def initialize(config)
-      @preempted_by = ["existing_service" => "DummyService"]
+      @preempted_by = ["existing_service" => "MyDummyService"]
       super(config)
     end
 
@@ -23,12 +21,44 @@ class ServiceTest < ActiveSupport::TestCase
   end
 
   def setup
-    @dummy_config =  {"priority" => 1, "service_id" => "DummyService"}
-    @umlaut_request = requests(:simple)
+    I18n.reload! 
+    @dummy_config =  {"priority" => 1, "service_id" => "MyDummyService", "type" => "DummyService"}
+    @umlaut_request = fake_umlaut_request("/resolve?genre=journal&issn=0098-7484")
   end
 
   test "preempted by wildcard other type" do
     DummyService.new(@dummy_config).handle(@umlaut_request)
     assert(PreemptedByDummyService.new(@dummy_config).preempted_by(@umlaut_request))
   end
+
+  test "Service#translate" do
+    I18n.with_locale(:en) do
+      I18n.backend.store_translations("en", 
+        {"umlaut" => 
+          {"services" => 
+            { "service_test/dummy_service" => 
+                {"class_key" => "class_key_value"},
+              "my_dummy_service" =>
+                {"service_id_key" => "service_id_key_value"}
+            }
+          }
+        }
+      )
+      # Just make sure we set our test i18n translations right
+      assert_equal "class_key_value", I18n.t("umlaut.services.service_test/dummy_service.class_key")
+      assert_equal "service_id_key_value", I18n.t("umlaut.services.my_dummy_service.service_id_key")
+
+      # Now actually test translate
+      service = DummyService.new(@dummy_config)
+
+      assert_equal "service_id_key_value", service.translate("service_id_key")
+      assert_equal "class_key_value", service.translate("class_key")
+
+      assert_equal "default_value", service.translate("missing_key", :default => "default_value")
+    end
+  end
+
+  test "#display_name" do
+
+  end
 end

data/test/unit/service_type_value_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+# Only tests a few things at present
+class ServiceTypeValueTest < ActiveSupport::TestCase
+
+  def test_display_name
+    I18n.locale = :en
+
+    st = ServiceTypeValue.find("fulltext")
+
+    assert_equal I18n.t("umlaut.service_type_names.fulltext", :count => 1), st.display_name
+    assert_equal I18n.t("umlaut.service_type_names.fulltext", :count => 10), st.display_name_pluralize
+
+  end
+
+  def test_display_name_uses_default_when_missing
+    I18n.locale = :en
+
+    st = ServiceTypeValue.new(:id => 100000, :name => "made_up_thing")
+
+    assert_equal I18n.t("umlaut.service_type_names.default", :count => 1), st.display_name
+    assert_equal I18n.t("umlaut.service_type_names.default", :count => 10), st.display_name_pluralize
+  end
+
+end

data/test/unit/sfx4_search_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 class Sfx4SearchTest < ActiveSupport::TestCase
   attr_reader :params, :context_object_from_params, :title_query_param, :search_type_param, :sfx_az_profile, :batch_size, :page
   include SearchMethods::Sfx4
-  sfx4_fixtures :kb_objects, :az_title_search, :az_letter_group, :az_titles, :az_extra_info
+  sfx4_fixtures :az_title_search, :az_letter_group, :az_title, :az_extra_info
   
   setup do
     @params = {}

data/test/unit/sfx_test.rb

@@ -4,7 +4,6 @@
 require 'test_helper'
 class SfxTest < ActiveSupport::TestCase
   extend TestWithCassette
-  fixtures :requests, :referents, :dispatched_services, :service_responses
   
   def setup    
     @sfx_default = ServiceStore.instantiate_service!("SFX", nil)
@@ -19,7 +18,10 @@ class SfxTest < ActiveSupport::TestCase
   # Ignore ctx_time in the URL for VCR matching purposes
   # TODO: Check more of the response
   test_with_cassette("nytimes by issn", :sfx, :match_requests_on => [:method, :uri_without_ctx_tim]) do
-    nytimes_request = requests(:nytimes)
+    #nytimes_request = requests(:nytimes)
+
+    nytimes_request = fake_umlaut_request("/resolve?format=journal&genre=journal&jtitle=The+New+York+times&issn=0362-4331")
+
     # Clear request
     nytimes_request.service_responses.each do |service_response|
       service_response.destroy

data/test/unit/worldcat_test.rb

@@ -1,7 +1,5 @@
 require 'test_helper'
-class WorldCatTest < ActiveSupport::TestCase  
-  fixtures :requests, :referents
-  
+class WorldCatTest < ActiveSupport::TestCase    
   def setup    
   end
 end

data/test/vcr_cassettes/collection/live_dispatch.yml

@@ -0,0 +1,311 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: http://www.extranet.elsevier.com/inca_covers_store/issn/22138587.gif
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - Microsoft-IIS/5.0
+      X-Powered-By:
+      - ASP.NET
+      Date:
+      - Thu, 17 Jul 2014 14:52:32 GMT
+      Content-Type:
+      - image/gif
+      Accept-Ranges:
+      - bytes
+      Last-Modified:
+      - Thu, 17 Jan 2013 22:11:40 GMT
+      Etag:
+      - ! '"8018fe9ffff4cd1:e38"'
+      Content-Length:
+      - '9029'
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 17 Jul 2014 14:52:32 GMT
+- request:
+    method: get
+    uri: http://www.scopus.com/scsearchapi/search.url?callback=findit_callback&devId=YOUR_SCOPUS_API_KEY&fields=title,doctype,citedbycount,inwardurl,sourcetitle,issn,vol,issue,page,pubdate,eid,scp,doi,firstAuth,authlist,affiliations,abstract&search=DOI(%2210.1016/S2213-8587(13)70218-3%22)
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 301
+      message: Moved Permanently
+    headers:
+      Date:
+      - Thu, 17 Jul 2014 14:52:32 GMT
+      Server:
+      - www.scopus.com  700
+      Location:
+      - http://searchapi.scopus.com/search.url?devId=YOUR_SCOPUS_API_KEY&search=DOI%28%2210.1016%2FS2213-8587%2813%2970218-3%22%29&callback=findit_callback&fields=title,doctype,citedbycount,inwardurl,sourcetitle,issn,vol,issue,page,pubdate,eid,scp,doi,firstAuth,authlist,affiliations,abstract
+      Cache-Control:
+      - max-age=1
+      Expires:
+      - Thu, 17 Jul 2014 14:52:33 GMT
+      Vary:
+      - Accept-Encoding, User-Agent
+      Content-Length:
+      - '504'
+      Content-Type:
+      - text/html; charset=iso-8859-1
+      X-Re-Ref:
+      - 1 -899026141
+      P3p:
+      - CP="IDC DSP LAW ADM DEV TAI PSA PSD IVA IVD CON HIS TEL OUR DEL SAM OTR IND
+        OTC"
+    body:
+      encoding: US-ASCII
+      string: ! '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+
+        <html><head>
+
+        <title>301 Moved Permanently</title>
+
+        </head><body>
+
+        <h1>Moved Permanently</h1>
+
+        <p>The document has moved <a href="http://searchapi.scopus.com/search.url?devId=YOUR_SCOPUS_API_KEY&amp;search=DOI%28%2210.1016%2FS2213-8587%2813%2970218-3%22%29&amp;callback=findit_callback&amp;fields=title,doctype,citedbycount,inwardurl,sourcetitle,issn,vol,issue,page,pubdate,eid,scp,doi,firstAuth,authlist,affiliations,abstract">here</a>.</p>
+
+        </body></html>
+
+'
+    http_version: 
+  recorded_at: Thu, 17 Jul 2014 14:52:32 GMT
+- request:
+    method: get
+    uri: http://searchapi.scopus.com/search.url?callback=findit_callback&devId=YOUR_SCOPUS_API_KEY&fields=title,doctype,citedbycount,inwardurl,sourcetitle,issn,vol,issue,page,pubdate,eid,scp,doi,firstAuth,authlist,affiliations,abstract&search=DOI(%2210.1016/S2213-8587(13)70218-3%22)
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Thu, 17 Jul 2014 14:52:33 GMT
+      Server:
+      - searchapi.scopus.com  9999
+      Content-Length:
+      - '130'
+      Content-Type:
+      - application/json;charset=UTF-8
+      X-Re-Ref:
+      - 1 -898946800
+      P3p:
+      - CP="IDC DSP LAW ADM DEV TAI PSA PSD IVA IVD CON HIS TEL OUR DEL SAM OTR IND
+        OTC"
+    body:
+      encoding: US-ASCII
+      string: findit_callback({"ERROR":{"Errors":["You have entered an invalid developer
+        ID.\n Please check the developer ID and try again."]}})
+    http_version: 
+  recorded_at: Thu, 17 Jul 2014 14:52:33 GMT
+- request:
+    method: head
+    uri: http://images.serialssolutions.com/ulrichs/22138587.gif
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Length:
+      - '9420'
+      Content-Type:
+      - image/gif
+      Last-Modified:
+      - Fri, 06 Dec 2013 16:32:51 GMT
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - ! '"4c5aecea0f2ce1:1db9"'
+      Server:
+      - Microsoft-IIS/6.0
+      X-Powered-By:
+      - ASP.NET
+      Date:
+      - Thu, 17 Jul 2014 14:52:33 GMT
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 17 Jul 2014 14:52:33 GMT
+- request:
+    method: post
+    uri: https://ws.isiknowledge.com/cps/xrpc
+    body:
+      encoding: UTF-8
+      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<request xmlns=\"http://www.isinet.com/xrpc41\"
+        src=\"app.id=Umlaut\">\n  <fn name=\"LinksAMR.retrieve\">\n    <list>\n      <map/>\n
+        \     <map>\n        <list name=\"WOS\">\n          <val>timesCited</val>\n
+        \         <val>ut</val>\n          <val>doi</val>\n          <val>sourceURL</val>\n
+        \         <val>citingArticlesURL</val>\n          <val>relatedRecordsURL</val>\n
+        \       </list>\n      </map>\n      <map>\n        <map name=\"cite_id\">\n
+        \         <val name=\"doi\">10.1016/S2213-8587(13)70218-3</val>\n          <val
+        name=\"stitle\">The Lancet Diabetes &amp; Endocrinology</val>\n          <val
+        name=\"issn\">2213-8587</val>\n          <val name=\"atitle\">Mechanisms of
+        changes in glucose metabolism and bodyweight after bariatric surgery</val>\n
+        \         <val name=\"year\">2014</val>\n          <val name=\"vol\">2</val>\n
+        \         <val name=\"issue\">2</val>\n          <val name=\"spage \">152</val>\n
+        \       </map>\n      </map>\n    </list>\n  </fn>\n</request>\n"
+    headers:
+      Content-Type:
+      - application/xml
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Thu, 17 Jul 2014 14:52:33 GMT
+      Server:
+      - Apache/2.0.63 (Unix) mod_ssl/2.0.63 OpenSSL/0.9.8h ESTI-Router/4.8.0.4
+      Content-Length:
+      - '273'
+      Content-Type:
+      - text/xml;charset=UTF-8
+    body:
+      encoding: US-ASCII
+      string: ! '<?xml version="1.0" encoding="UTF-8" ?>
+
+        <response xmlns="http://www.isinet.com/xrpc41" src="app.id=Umlaut">
+
+        <fn name="LinksAMR.retrieve" rc="Server.authentication">
+
+        <error code="Server.authentication">No Links AMR entitlement found for IP
+        Address</error>
+
+        </fn>
+
+        </response>
+
+'
+    http_version: 
+  recorded_at: Thu, 17 Jul 2014 14:52:33 GMT
+- request:
+    method: post
+    uri: https://ws.isiknowledge.com/cps/xrpc
+    body:
+      encoding: UTF-8
+      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<request xmlns=\"http://www.isinet.com/xrpc41\"
+        src=\"app.id=Umlaut\">\n  <fn name=\"LinksAMR.retrieve\">\n    <list>\n      <map/>\n
+        \     <map>\n        <list name=\"JCR\">\n          <val>impactGraphURL</val>\n
+        \       </list>\n      </map>\n      <map>\n        <map name=\"cite_id\">\n
+        \         <val name=\"issn\">2213-8587</val>\n          <val name=\"stitle\">The
+        Lancet Diabetes &amp; Endocrinology</val>\n        </map>\n      </map>\n
+        \   </list>\n  </fn>\n</request>\n"
+    headers:
+      Content-Type:
+      - application/xml
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Thu, 17 Jul 2014 14:52:33 GMT
+      Server:
+      - Apache/2.0.63 (Unix) mod_ssl/2.0.63 OpenSSL/0.9.8h ESTI-Router/4.8.0.4
+      Content-Length:
+      - '273'
+      Content-Type:
+      - text/xml;charset=UTF-8
+    body:
+      encoding: US-ASCII
+      string: ! '<?xml version="1.0" encoding="UTF-8" ?>
+
+        <response xmlns="http://www.isinet.com/xrpc41" src="app.id=Umlaut">
+
+        <fn name="LinksAMR.retrieve" rc="Server.authentication">
+
+        <error code="Server.authentication">No Links AMR entitlement found for IP
+        Address</error>
+
+        </fn>
+
+        </response>
+
+'
+    http_version: 
+  recorded_at: Thu, 17 Jul 2014 14:52:33 GMT
+- request:
+    method: get
+    uri: http://recommender.service.exlibrisgroup.com/service/recommender/openurl?ctx_enc=info:ofi/enc:UTF-8&ctx_id=&ctx_tim=2014-09-10T16:44:10-04:00&ctx_ver=Z39.88-2004&req.ip=0.0.0.0&res_dat=format=rss%26source=global%26token=fake%26maxRecords=5%26threshold=50%26baseUrl=/resolve&rfr_id=info:sid/google&rft.atitle=Mechanisms%20of%20changes%20in%20glucose%20metabolism%20and%20bodyweight%20after%20bariatric%20surgery&rft.auinit=S&rft.aulast=Madsbad&rft.date=2014&rft.issn=2213-8587&rft.issue=2&rft.spage=152&rft.title=The%20Lancet%20Diabetes%20%26%20Endocrinology&rft.volume=2&rft_id=info:doi/10.1016/S2213-8587(13)70218-3&rft_val_fmt=info:ofi/fmt:kev:mtx:journal&url_ctx_fmt=info:ofi/fmt:kev:mtx:ctx&url_ver=Z39.88-2004
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 401
+      message: invalid token value
+    headers:
+      Set-Cookie:
+      - JSESSIONID=7AE7898C983AC2DC161A7B79E7DC4205; Path=/
+      Content-Type:
+      - text/html;charset=ISO-8859-1
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 10 Sep 2014 20:44:10 GMT
+      Server:
+      - bX recommender
+    body:
+      encoding: US-ASCII
+      string: ! "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"
+        \"http://www.w3.org/TR/html4/loose.dtd\">\n<html>\n<head>\n<meta http-equiv=\"Content-Type\"
+        content=\"text/html; charset=UTF-8\">\n<title>Error 401</title>\n<link href=\"/service/css/error.css\"
+        rel=\"stylesheet\" type=\"text/css\" />\n</head>\n<body>\n<div id=\"topbarContainer\">\n\t<div
+        id=\"topbar\">\n\t\t<div id=\"logo\" class=\"logo\">\n\t\t\t<a href=\"/service/images/logo.gif\"><img
+        src=\"/service/images/logo.gif\" alt=\"ExLibris Logo\" /></a>\n\t\t</div>\n\t</div>\n</div>\n<br></br><br></br><br></br><br></br><br></br>\n<center><p
+        style=\"padding: 0px 15px 0px 15px\">bX recommender HTTP Error 401 Unauthorized\n</p></center>\n</body>\n</html>"
+    http_version: 
+  recorded_at: Wed, 10 Sep 2014 20:44:11 GMT
+recorded_with: VCR 2.5.0

data/test/vcr_cassettes/sfx/nytimes_by_issn.yml

@@ -2,7 +2,7 @@
 http_interactions: 
   - request: 
       method: get
-      uri: http://sfx.library.edu/local?ctx_enc=info:ofi/enc:UTF-8&ctx_id=&ctx_tim=2012-11-29T12:35:22-05:00&ctx_ver=Z39.88-2004&rft.coden=NYTIAO&rft.eissn=1553-8095&rft.genre=journal&rft.issn=0362-4331&rft.jtitle=The%20New%20York%20times&rft.language=eng&rft.lccn=sn%2078004456%20&rft.object_id=110975413976006&rft.object_type=NEWSPAPER&rft.place=New-York%20%5BN.Y.%5D&rft.pub=%5BH.J.%20Raymond%20%26%20Co.%5D&rft.stitle=NEW%20YORK%20TIMES&rft.title=The%20New%20York%20times&rft_val_fmt=info:ofi/fmt:kev:mtx:journal&sfx.ignore_date_threshold=1&sfx.response_type=multi_obj_xml&sfx.show_availability=1&url_ctx_fmt=info:ofi/fmt:kev:mtx:ctx&url_ver=Z39.88-2004
+      uri: http://sfx.library.edu/local?ctx_enc=info:ofi/enc:UTF-8&ctx_id=&ctx_tim=2014-08-28T14:18:32-04:00&ctx_ver=Z39.88-2004&req.ip=0.0.0.0&rft.genre=journal&rft.issn=03624331&rft.jtitle=The%20New%20York%20times&rft_val_fmt=info:ofi/fmt:kev:mtx:journal&sfx.ignore_date_threshold=1&sfx.response_type=multi_obj_xml&sfx.show_availability=1&url_ctx_fmt=info:ofi/fmt:kev:mtx:ctx&url_ver=Z39.88-2004
       body: 
         string: ""
       headers: