umlaut 3.1.0 → 3.1.1

data/test/fixtures/referent_values.yml

@@ -1,224 +1,206 @@
 # Referent_value fixtures
-
-referent_value_1:
+frankenstein1:
   normalized_value: info:oclcnum/33045872
   key_name: identifier
   metadata: false
-  id: 1
   value: info:oclcnum/33045872
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_2:
+frankenstein2:
   normalized_value: book
   key_name: format
   metadata: false
-  id: 2
   value: book
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_3:
+frankenstein3:
   normalized_value: "9780393964585"
   key_name: isbn
   metadata: true
-  id: 3
-  value: 9780393964585
-  referent_id: 1
+  value: "9780393964585"
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_4:
+frankenstein4:
   normalized_value: new york
   key_name: place
   metadata: true
-  id: 4
   value: New York
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_5:
+frankenstein5:
   normalized_value: ""
   key_name: atitle
   metadata: true
-  id: 5
   value: 
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_6:
+frankenstein6:
   normalized_value: ""
   key_name: aucorp
   metadata: true
-  id: 6
   value: 
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_7:
+frankenstein7:
   normalized_value: "1997"
   key_name: date
   metadata: true
-  id: 7
-  value: 1997
-  referent_id: 1
+  value: "1997"
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_8:
+frankenstein8:
   normalized_value: "frankenstein : the 1818 text, contexts, nineteenth-century responses, modern criticism"
   key_name: btitle
   metadata: true
-  id: 8
   value: 'Frankenstein : the 1818 text, contexts, nineteenth-century responses, modern criticism'
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_9:
+frankenstein9:
   normalized_value: ""
   key_name: series
   metadata: true
-  id: 9
   value: 
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_10:
+frankenstein10:
   normalized_value: w.w. norton
   key_name: pub
   metadata: true
-  id: 10
   value: W.W. Norton
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_11:
+frankenstein11:
   normalized_value: book
   key_name: genre
   metadata: true
-  id: 11
   value: book
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:27 -04:00
   private_data: false
 
-referent_value_12:
+frankenstein12:
   normalized_value: 1st ed.
   key_name: edition
   metadata: true
-  id: 12
   value: 1st ed.
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:28 -04:00
   private_data: false
 
-referent_value_13:
+frankenstein13:
   normalized_value: wollstonecraft
   key_name: auinitm
   metadata: true
-  id: 13
   value: Wollstonecraft
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:28 -04:00
   private_data: false
 
-referent_value_14:
+frankenstein14:
   normalized_value: ""
   key_name: tpages
   metadata: true
-  id: 14
   value: 
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:28 -04:00
   private_data: false
 
-referent_value_15:
+frankenstein15:
   normalized_value: mary
   key_name: aufirst
   metadata: true
-  id: 15
   value: Mary
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:28 -04:00
   private_data: false
 
-referent_value_16:
+frankenstein16:
   normalized_value: shelley
   key_name: aulast
   metadata: true
-  id: 16
   value: Shelley
-  referent_id: 1
+  referent: frankenstein
   created_at: 2008-06-28 16:15:28 -04:00
   private_data: false
 
-referent_value_17:
-  normalized_value: tag:gpc,2008-6-28:1
+frankenstein17:
+  normalized_value: "tag:gpc,2008-6-28:1"
   key_name: identifier
   metadata: false
-  id: 17
-  value: tag:gpc,2008-6-28:1
-  referent_id: 1
+  value: "tag:gpc,2008-6-28:1"
+  referent: frankenstein
   created_at: 2008-06-28 16:15:28 -04:00
   private_data: false
 
-nytimes_rv1:
+nytimes1:
   normalized_value: 0362-4331
   key_name: issn
   metadata: true
   value: 0362-4331
-  referent_id: 2
+  referent: nytimes
   private_data: false
 
-nytimes_rv2:
+nytimes2:
   normalized_value: The New York times
   key_name: jtitle
   metadata: true
   value: The New York times
-  referent_id: 2
+  referent: nytimes
   private_data: false
 
-nytimes_rv3:
+nytimes3:
   normalized_value: journal
   key_name: format
   metadata: false
   value: journal
-  referent_id: 2
+  referent: nytimes
   private_data: false
 
-simp_rv1:
- referent: simple_referent
+simple1:
+ referent: simple
  key_name: "format"
  value: "journal"
  normalized_value: "journal"
  metadata: false
  private_data: false
 
-simp_rv2:
- referent: simple_referent
+simple2:
+ referent: simple
  key_name: "genre"
  value: "journal"
  normalized_value: "journal"
  metadata: true
  private_data: false
 
-simp_rv3:
-  referent: simple_referent
+simple3:
+  referent: simple
   key_name: issn
   value: 0098-7484
   normalized_value: 0098-7484
   metadata: true
   private_data: false
 
-critical_inquiry_rv1:
+critical_inquiry1:
   referent: critical_inquiry_referent
   key_name: "issn"
   value: "0093-1896"
@@ -226,7 +208,7 @@ critical_inquiry_rv1:
   metadata: true
   private_data: false
 
-critical_inquiry_rv2:
+critical_inquiry2:
   referent: critical_inquiry_referent
   key_name: "title"
   value: "Critical inquiry"
@@ -234,7 +216,7 @@ critical_inquiry_rv2:
   metadata: true
   private_data: false
 
-critical_inquiry_rv3:
+critical_inquiry3:
   referent: critical_inquiry_referent
   key_name: "jtitle"
   value: "Critical inquiry"
@@ -242,7 +224,7 @@ critical_inquiry_rv3:
   metadata: true
   private_data: false
 
-critical_inquiry_rv4:
+critical_inquiry4:
   referent: critical_inquiry_referent
   key_name: "stitle"
   value: "CRIT INQUIRY"
@@ -250,7 +232,7 @@ critical_inquiry_rv4:
   metadata: true
   private_data: false
 
-critical_inquiry_rv5:
+critical_inquiry5:
   referent: critical_inquiry_referent
   key_name: "genre"
   value: "journal"
@@ -258,7 +240,7 @@ critical_inquiry_rv5:
   metadata: true
   private_data: false
 
-critical_inquiry_rv6:
+critical_inquiry6:
   referent: critical_inquiry_referent
   key_name: "aulast"
   value: "Ranciè"
@@ -266,7 +248,7 @@ critical_inquiry_rv6:
   metadata: true
   private_data: false
 
-critical_inquiry_rv7:
+critical_inquiry7:
   referent: critical_inquiry_referent
   key_name: "aufirst"
   value: "Ranci&"
@@ -274,7 +256,7 @@ critical_inquiry_rv7:
   metadata: true
   private_data: false
 
-critical_inquiry_rv8:
+critical_inquiry8:
   referent: critical_inquiry_referent
   key_name: "object_id"
   value: "954925463186"
@@ -282,7 +264,7 @@ critical_inquiry_rv8:
   metadata: true
   private_data: false
 
-critical_inquiry_rv9:
+critical_inquiry9:
   referent: critical_inquiry_referent
   key_name: "object_type"
   value: "JOURNAL"
@@ -290,7 +272,7 @@ critical_inquiry_rv9:
   metadata: true
   private_data: false
 
-critical_inquiry_rv10:
+critical_inquiry10:
   referent: critical_inquiry_referent
   key_name: "eissn"
   value: "1539-7858"
@@ -298,7 +280,7 @@ critical_inquiry_rv10:
   metadata: true
   private_data: false
 
-critical_inquiry_rv11:
+critical_inquiry11:
   referent: critical_inquiry_referent
   key_name: "atitle"
   value: "The Aesthetic Dimension: Aesthetics, Politics, Knowledge"
@@ -306,7 +288,7 @@ critical_inquiry_rv11:
   metadata: true
   private_data: false
 
-critical_inquiry_rv12:
+critical_inquiry12:
   referent: critical_inquiry_referent
   key_name: "format"
   value: "journal"
@@ -444,10 +426,10 @@ advocate1:
 
 advocate2:
   referent: advocate
-  normalized_value: 1832-9373
+  normalized_value: "1832-9373"
   key_name: issn
   metadata: true
-  value: 1832-9373
+  value: "1832-9373"
   private_data: false
 
 advocate3:
@@ -460,8 +442,48 @@ advocate3:
 
 advocate4:
   referent: advocate
-  normalized_value: 2670000000017711
+  normalized_value: "2670000000017711"
   key_name: object_id
   metadata: true
-  value: 2670000000017711
-  private_data: false
+  value: "2670000000017711"
+  private_data: false
+
+coffeemakers1:
+  referent: coffeemakers
+  key_name: format
+  value: journal
+  normalized_value: journal
+  metadata: false
+  private_data: false
+  
+coffeemakers2:
+  referent: coffeemakers
+  key_name: genre
+  value: article
+  normalized_value: article
+  metadata: true
+  private_data: false
+
+coffeemakers3:
+  referent: coffeemakers
+  key_name: atitle
+  value: "A blend of different tastes: the language of coffeemakers"
+  normalized_value: "a blend of different tastes: the language of coffeemakers"
+  metadata: true
+  private_data: false
+
+coffeemakers4:
+  referent: coffeemakers
+  key_name: issn
+  value: "0265-8135"
+  normalized_value: "0265-8135"
+  metadata: true
+  private_data: false
+
+coffeemakers5:
+  referent: coffeemakers
+  key_name: volume
+  value: "25"
+  normalized_value: "25"
+  metadata: true
+  private_data: false

data/test/fixtures/referents.yml

@@ -1,23 +1,17 @@
 # Referent fixtures
 frankenstein:
   isbn: "9780393964585"
-  atitle: ""
   title: "frankenstein : the 1818 text, contexts, nineteenth-century responses, modern criticism"
-  id: 1
-  issn: ""
   year: "1997"
-  volume: ""
-  created_at: 2008-06-28 16:15:27 -04:00
 
 nytimes:
-  id: 2
   issn: 0362-4331
   title: The New York times
 
-simple_request_referent:
+simple:
   issn: "0098-7484"
 
-critical_inquiry_referent:
+critical_inquiry:
   title: "Critical inquiry"
   issn: "0093-1896"
 
@@ -30,4 +24,11 @@ momo:
 
 advocate:
   title: Advocate
-  issn: 1832-9373
+  issn: 1832-9373
+
+coffeemakers:
+  atitle: "A blend of different tastes: the language of coffeemakers"
+  title: 'Environment and planning B, Planning and design'
+  issn: 0265-8135
+  year: 1998
+  volume: 25

data/test/fixtures/requests.yml

@@ -2,45 +2,41 @@
 frankenstein:
   client_ip_is_simulated:
   session_id: 9a9f27cb54d8ccf83e272d8bce87eeec
-  id: 19
   referrer_id: 1
   contextobj_fingerprint: ae44376f47a8636b3f99faad660222fb
-  referent_id: 1
+  referent: frankenstein
   client_ip_addr: 127.0.0.1
-  created_at: 2008-06-28 17:26:08 -04:00
 
 nytimes:
-  id: 80
-  referent_id: 2
+  referent: nytimes
   session_id: 06727b665a0594d926d91e49ef6ad8db
   contextobj_fingerprint: 07b546cc6a0899602c2b835d645dcb4a
 
-simple_request:
+simple:
   session_id: "f747f4273c1ecb12f1f764cc10c646d3"
-  referent: simple_request_referent
+  referent: simple
   client_ip_addr: "128.220.205.186"
   contextobj_fingerprint: "b75283f6fb365d5901fbdc6726301370"
   http_env: { SERVER_NAME : "app01.mse.jhu.edu", "HTTP_ACCEPT_ENCODING" : "gzip,deflate", "HTTP_USER_AGENT" : "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)", "HTTP_ACCEPT_LANGUAGE" : "en-us,en;q=0.5", "HTTP_HOST" : "app01.mse.jhu.edu:3000", "HTTP_KEEP_ALIVE" : "300", "HTTP_ACCEPT_CHARSET" : "ISO-8859-1,utf-8;q=0.7,*;q=0.7", "HTTP_VERSION" : "HTTP/1.1", "REQUEST_URI" : "/resolve?url_ver=Z39.88-2004&url_ctx_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Actx&ctx_enc=info%3Aofi%2Fenc%3AUTF-8&rft.issn=0098-7484&rft.genre=journal&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal", "HTTP_ACCEPT" : "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "HTTP_CONNECTION" : "keep-alive" }
 
-critical_inquiry_request:
-  id: 55
-  referent: critical_inquiry_referent
+critical_inquiry:
+  referent: critical_inquiry
   session_id: "f747f4273c1ecb12f1f764cc10c646d7"
   client_ip_addr: "127.0.0.1"
   contextobj_fingerprint: "b75283f6fb365d5901fbdc6726301377"
 
 sfx_multi_obj_request_no_fulltext_request:
-  id: 57
   referent: sfx_multi_obj_request_no_fulltext_referent
   session_id: "f747f4273c1ecb12f1f764cc10c646d7"
   client_ip_addr: "127.0.0.1"
   contextobj_fingerprint: "b75283f6fb365d5901fbdc6726301377"
   
 momo:
-  id: 81
   referent: momo
 
 advocate:
-  id: 82
   referent: advocate
-  referrer_id: info:sid/sfxit.com:citation
+  referrer_id: info:sid/sfxit.com:citation
+
+coffeemakers:
+  referent: coffeemakers

data/test/fixtures/service_responses.yml

@@ -2,7 +2,7 @@ service_response1:
   service_id: Worldcat
   display_text: Find in other libraries
   url: http://www.worldcat.org/issn/03624331
-  request_id: 80
+  request: nytimes
   service_type_value_name: highlighted_link
   service_data: --- {}
 
@@ -10,7 +10,7 @@ service_response2:
   service_id: SFX
   display_text: EBSCOhost Business Abstracts with Full Text
   url: https://ezproxy.library.edu/login?url=http://search.ebscohost.com/direct.asp?db=bft&jn=3RAH&scope=site
-  request_id: 80
+  request: nytimes
   service_type_value_name: fulltext
   service_data: |
     --- 
@@ -31,7 +31,7 @@ service_response2:
 service_response3:
   service_id: EmailExport
   display_text: Email
-  request_id: 80
+  request: nytimes
   service_type_value_name: export_citation
   service_data: |
     ---
@@ -40,7 +40,7 @@ service_response3:
 service_response9:
   service_id: TxtHoldingExport
   display_text: Send to phone
-  request_id: 80
+  request: nytimes
   service_type_value_name: export_citation
   service_data: |
     ---
@@ -50,7 +50,7 @@ service_response4:
   service_id: SFX
   display_text: EBSCOhost Newspaper Source Plus
   url: http://search.ebscohost.com/login.aspx?direct=true&db=n5h&scope=site&jn=New+York+Times
-  request_id: 80
+  request: nytimes
   service_type_value_name: fulltext
   service_data: |
     --- 
@@ -72,7 +72,7 @@ service_response5:
   service_id: SFX
   display_text: Proquest
   url: http://proquest.umi.com/pqdweb?RQT=318&VName=PQD&clientid=9269&pmid=7818
-  request_id: 80
+  request: nytimes
   service_type_value_name: fulltext
   service_data: |
     --- 
@@ -83,7 +83,7 @@ service_response6:
   service_id: Ulrichs
   display_text: Periodical information
   url: https://ulrichsweb.serialssolutions.com/api/openurl?issn=0362-4331
-  request_id: 80
+  request: nytimes
   service_type_value_name: highlighted_link
   service_data: --- {}
 
@@ -91,7 +91,7 @@ service_response7:
   service_id: SFX
   display_text: EBSCOhost Business Abstracts with Full Text
   url: http://search.ebscohost.com/direct.asp?db=bft&jn=3RAH&scope=site
-  request_id: 80
+  request: nytimes
   service_type_value_name: fulltext
   service_data: |
     --- 
@@ -114,7 +114,7 @@ service_response8:
   display_text: Library holding
   url: http://holding.library.edu/DOCID
   notes: Some notes.
-  request_id: 80
+  request: nytimes
   service_type_value_name: holding
   service_data: |
     --- 
@@ -137,7 +137,7 @@ service_response9:
   display_text: "the Internet Archive: Open Source Book"
   url: "http://archive.org/details/MomoOvveroLarcanaStoriaDeiLadriDiTempoEDellaBambinaCheRestitu"
   notes: 
-  request_id: 81
+  request: momo
   service_type_value_name: fulltext
   service_data: |
     ---
@@ -150,7 +150,7 @@ service_response10:
   display_text: Gale Cengage Newsstand
   url: "http://find.galegroup.com/openurl/openurl?res_id=info%3Asid%2Fgale%3ASTND&rft.issn=1832-9373&req_dat=info%3Asid%2Fgale%3Augnid%3Anysl_me_newyorku&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&url_ctx_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Actx&ctx_enc=info%3Aofi%3Aenc%3AUTF-8&url_ver=Z39.88-2004&rft.jtitle=Advocate+(Western+Australia,+Australia)"
   notes: 
-  request_id: 82
+  request: advocate
   service_type_value_name: fulltext
   service_data: |
     ---
@@ -166,4 +166,4 @@ service_response10:
     :citation_volume: 
     :citation_issue: 
     :citation_spage: 
-    :debug_info: ! ' Target: GALEGROUP_IT_NEWSSTAND ; SFX object ID: 2670000000017711'
+    :debug_info: ! ' Target: GALEGROUP_IT_NEWSSTAND ; SFX object ID: 2670000000017711'

data/test/functional/resolve_controller_test.rb

@@ -1,5 +1,9 @@
 # encoding: UTF-8
 require 'test_helper'
+
+require 'uri'
+require 'rack/utils'
+
 class ResolveControllerTest < ActionController::TestCase
   extend TestWithCassette
   fixtures :requests, :referents, :referent_values, :dispatched_services, :service_responses
@@ -9,7 +13,8 @@ class ResolveControllerTest < ActionController::TestCase
   end
   
   test_with_cassette("nytimes by issn", :resolve, :match_requests_on => [:method, :uri_without_ctx_tim]) do
-    get :index, "umlaut.request_id" => 80
+    umlaut_request = requests(:nytimes)
+    get :index, "umlaut.request_id" => umlaut_request.id
     assert_response :success
     assert_select "title", "Find It | The New York times"
     assert_select "h1", "Find It"
@@ -71,6 +76,23 @@ class ResolveControllerTest < ActionController::TestCase
     end
   end
 
+  test_with_cassette("POSTed OpenURL redirects to GET", :resolve, :match_requests_on => [:method, :uri_without_ctx_tim]) do
+    # an actual post request Gale GREENr was sending us
+    pparams = {"genre"=>"article", "sid"=>"gale:GRNR", "__char_set"=>"utf8", "spage"=>"138", "issn"=>"0016-7398", "issue"=>"2", "pid"=>"info:sid/gale:ugnid:balt85423", "date"=>"2010", "aulast"=>"Hedley, Peter J.", "au"=>"Hedley, Peter J.", "atitle"=>"Evolution of the Irrawaddy delta region since 1850.(Report)", "title"=>"The Geographical Journal", "aufirst"=>"Hedley, Peter J.", "volume"=>"176"}
+    post(:index, pparams)
+
+    assert_response :redirect
+
+    redirect_uri = URI.parse(@response.redirect_url)
+
+    assert_equal "/resolve", redirect_uri.path    
+
+    # Redirected params is a subset of pparams, pparams can have extra
+    # stuff maybe, we don't care. 
+    redirected_params = Rack::Utils.parse_nested_query redirect_uri.query
+    assert  (redirected_params.to_a - pparams.to_a).empty?, "Redirected params include all of original POSTed params"
+  end
+
   test_with_cassette("fulltext with edition warning", :resolve, :match_requests_on => [:method, :uri_without_ctx_tim]) do
     umlaut_request = requests(:momo)
     get(:index, {'umlaut.request_id' => umlaut_request.id})

data/test/test_helper.rb

@@ -78,6 +78,7 @@ VCR.configure do |c|
   c.hook_into :webmock 
   c.register_request_matcher(:uri_without_ctx_tim, &without_ctx_tim)
   # c.debug_logger = $stderr
+  c.filter_sensitive_data("BX_TOKEN") { ENV['BX_TOKEN'] } unless ENV['BX_TOKEN'].blank?
 end
 
 # Silly way to not have to rewrite all our tests if we