umlaut 3.0.0alpha6 → 3.0.0alpha7

data/app/models/request.rb

@@ -1,3 +1,5 @@
+require 'digest/md5'
+
 # An ActiveRecord which represents a parsed OpenURL resolve service request,
 # and other persistent state related to Umlaut's handling of that OpenURL 
 # request) should not be confused with the Rails ActionController::Request 
@@ -409,7 +411,11 @@ class Request < ActiveRecord::Base
   # Returns nil if there aren't any params to include in the fingerprint.
   def self.co_params_fingerprint(params)
     # Don't use ctx_time, consider two co's equal if they are equal but for ctx_tim. 
-    excluded_keys = ["action", "controller", "page",  "rft.action", "rft.controller", "ctx_tim"]
+    # exclude cache-busting "_" key that JQuery adds. Fine to bust HTTP cache, but
+    # don't want to it to force new Umlaut processing. 
+    # exclude umlaut.jsonp and umlaut.response_format, those shouldn't effect cache
+    # lookup. 
+    excluded_keys = ["action", "controller", "page",  "rft.action", "rft.controller", "ctx_tim", "_", "umlaut.jsonp", "umlaut.response_format", "format"]
     # "url_ctx_val", "request_xml"
     
     # Hash.sort will do a first run through of canonicalization for us
@@ -431,7 +437,9 @@ class Request < ActiveRecord::Base
           pair[1].sort! if (pair[1] && pair[1].respond_to?("sort!"))
       end
     end
+    
 
+    
     return nil if params.blank?
     
     # And YAML-ize for a serliazation
@@ -440,7 +448,6 @@ class Request < ActiveRecord::Base
     
     # And make an MD5 hash/digest. Why store the whole thing if all we need to
     # do is look it up? hash/digest works well for this.
-    require 'digest/md5'
     return Digest::MD5.hexdigest( serialized )    
   end
 

data/lib/generators/umlaut/asset_hooks_generator.rb

@@ -16,7 +16,7 @@ module Umlaut
           
   /* Umlaut needs a jquery-ui theme CSS. Here's an easy way to get one,
      you can replace with another theme. */
-  @import url(http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/ui-lightness/jquery-ui.css);
+  @import url(//ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/ui-lightness/jquery-ui.css);
           }
         end
       else

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.0alpha6"
+  VERSION = "3.0.0alpha7"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: umlaut
 version: !ruby/object:Gem::Version 
-  hash: -3702664400
+  hash: -3702664398
   prerelease: 5
   segments: 
   - 3
   - 0
   - 0
   - alpha
-  - 6
-  version: 3.0.0alpha6
+  - 7
+  version: 3.0.0alpha7
 platform: ruby
 authors: 
 - Jonathan Rochkind, et al
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -355,7 +355,6 @@ files:
 - lib/service_adaptors/opac.rb
 - lib/xml_schema_helper.rb
 - lib/metadata_helper.rb
-- lib/#Untitled-1#
 - lib/generators/templates/umlaut_services.yml
 - lib/generators/umlaut/install_generator.rb
 - lib/generators/umlaut/asset_hooks_generator.rb

data/lib/#Untitled-1#

@@ -1,14 +0,0 @@
-http://blacklight.mse.jhu.edu:3000/resolve/index?ctx_enc=info%3Aofi%2Fenc%3AUTF-8
-&ctx_id=
-&ctx_tim=2012-01-05T10%3A55%3A49-05%3A00
-&ctx_ver=Z39.88-2004
-&rfr_id=info%3Asid%3Alibrary.jhu.edu%2Fblacklight
-&rft.genre=journal
-&rft.issn=00987484
-&rft.jtitle=JAMA%3A+the+journal+of+the+American+Medical+Association
-&rft_id=https%3A%2F%2Fblacklight.mse.jhu.edu%2Fdemo%2Fcatalog%2Fbib_647591
-&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal
-&umlaut.request_id=6
-&umlaut_show_umlaut_fulltext=true
-&url_ctx_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Actx
-&url_ver=Z39.88-2004