umlaut 4.1.0.pre.alpha.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbf3ca9cc7766fb7cf897a6da4e127686516c412
-  data.tar.gz: b33c2a561baabf93c5cf69b6ee6bb10fe870087f
+  metadata.gz: 10ee00671d4ada36a612ab886c0dba3169b0c5f5
+  data.tar.gz: c13eccc534870dbcd6b35335adb3ab6edd3d8acd
 SHA512:
-  metadata.gz: 362c88e0352990f39cfde7a7055880f950b52a65504e4d52a8164641f9ef58c203aa6e7c9c40b720aaa3c496a9750f5e2f38ca589a3196b76fd8f9fb78a8270c
-  data.tar.gz: b4328ca50474c88d2fb0561ca171b2912d2e29644c3de54e1a68c368dd26ffd53c6cf895fc1755e805bce5fbf3418ded11a110006ac3978230292aba31ce4fac
+  metadata.gz: bd230f38e80c13e192e0c91001bc38a3628c9908eef08b9c5d035883c5f911d910f147a679283ed3c6bfac9db5a6bb4fa59e616ff6de7b66189030313d339c18
+  data.tar.gz: df56e4a11ea2955b53463d9902c7a889b4a6860c7dd33a49dda259338e87c9d88dd83c328b51ef6ed1cbdbd2c407ce07aebfd6d974db63967361bb7a9a74ebdd

data/README.md

@@ -63,6 +63,7 @@ in your application's Gemfile in order to get the described functionality.
 | Add on | Description |
 |:---|:---|
 | [`umlaut-primo`](https://github.com/team-umlaut/umlaut-primo) | Umlaut services to provide full text service responses, holdings, etc. from the Primo discovery solution. |
+| [`umlaut_borrow_direct`](https://github.com/team-umlaut/umlaut_borrow_direct/tree/master) | Links and embedded availability from BorrowDirect consortial borrowing service |
 
 
 ## Developing

data/Rakefile

@@ -20,7 +20,8 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
@@ -33,7 +34,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-require 'single_test'
-SingleTest.load_tasks
-
 task :default => :test

data/app/assets/javascripts/umlaut/update_html.js

@@ -1,4 +1,12 @@
-/* update_html.js:  Provide functions to update content on page with background responses from Umlaut. Used by Umlaut itself, as well as by third party callers.*/
+/* update_html.js:
+ *     Provide functions to update content on page with background responses from Umlaut.
+ *     Used by Umlaut itself, as well as by third party callers.
+ *
+ *     This is compiled into a standalone top-level JS file, for src'ing by third
+ *     party callers.
+ *
+ *     More information on use at https://github.com/team-umlaut/umlaut/wiki/JQuery-Content-Utility
+ */
 (function($) {
    
     function SectionTarget(config) {
@@ -6,11 +14,14 @@
        $.extend(this, config);
        
        //Defaults
-       if (this.selector == undefined)
+       if (typeof(this.selector) == 'undefined')
          this.selector = "#" + this.umlaut_section_id;
-       if (this.position == undefined)
+       if (typeof(this.position) == 'undefined')
          this.position = "html";
-              
+       // Container must be a JQuery object, if it's not
+       // passed in, use $(document)
+       if (typeof(this.container) == 'undefined')
+         this.container = $(document); // default container is document
     }
     //Callback default to no-op function please.    
     var noop = function() {};
@@ -19,53 +30,100 @@
     SectionTarget.prototype.complete = noop;
     
     SectionTarget.prototype.ensure_placement_destination = function() {
-        if ( this.selector == undefined) {
+        if ( typeof(this.selector) == 'undefined') {
           return null; 
         }
         
         //Already have it cached?
         if ( this.host_div_element ) {
           return this.host_div_element;
-        }                        
+        }
         
-        var new_div = $('<div class="umlaut" style="display:none"></div>');        
+        // Create an empty div to hold our content
+        var new_div = $('<div class="umlaut" style="display:none"></div>');
+
         // Find the first thing matched by selector, and call the
-        // method specified in "action" string on it, giving it our
+        // method specified in "position" string on it, giving it our
         // HTML to replace. This works because our actions are
         // all arguments that will take one method: html, before, after, append,
         // prepend.                       
-        $(this.selector).eq(0)[ this.position  ]( new_div );
+        this.container.find(this.selector).eq(0)[ this.position  ]( new_div );
         
         //Cache for later
         this.host_div_element = new_div;
         return this.host_div_element;
       };
-    
 
   // Define an object constructor on the global window object
   // For our UmlautHtmlUpdater object. 
   //
-  // Third 'locale' arg is optional locale string eg 'en', 'de'
+  // You need to pass the Umlaut Base URL, as well as an OpenURL kev context
+  // object.  There are additional optional parameters. 
+  //
+  // There are two argument formats you can call `new HTMLUpdater` with.
+  // Positional allows you to pass umlaut base and OpenURL:
+  //     var updater = new Umlaut.HtmlUpdater("http://umlaut.example.edu", "au=Smith&ti=Book")
+  //
+  // Or named argument style allows you to pass additional parameters,
+  // including locale and container. 
+  //
+  //     var updater = new Umlaut.HtmlUpdater({
+  //        umlaut_base: "http://umlaut.example.edu",
+  //        context_object:     "au=Smith&ti=Book",
+  //        locale:      "de",
+  //        container:  "#selector"
+  //     });
+  //
+  //  
+  //
+  // The optional 'locale' arg is a locale string eg 'en', 'de'
+  //
+  // The optional 'container' argument is a selector, DOM element, OR
+  // jQuery object. The container limits the updater's content
+  // replacements (controlled by selectors on individual sections) to within
+  // the container given. 
   //
   // Note this object is used by external sites as part of the JQuery updater
   // javascript API. This is API, which has to be callable by non-Umlaut sites.
   // Try not to change the method signature in incompatible ways. 
-  function HtmlUpdater(umlaut_base, context_object, locale) {
-    if (context_object == undefined)
-      context_object = "";
+  function HtmlUpdater(first_arg, second_arg, third_arg) {
+    if (typeof(first_arg) == "object") {
+      // Simply merge arguments object as properties on ourselves. 
+     $.extend(this, first_arg);
+    } else {
+      // positional args
+      this.umlaut_base    = first_arg;
+      this.context_object = second_arg;
+      this.locale         = third_arg;
+    }
+
+    // Argument checking
+    if (typeof(this.umlaut_base) == "undefined") {
+      throw new Error("new Umlaut.HtmlUpdater: missing umlaut_base (String) argument");
+    }
+    if (typeof(this.context_object) == "undefined") {
+      throw new Error("new Umlaut.HtmlUpdater: missing context_object (String) argument");
+    }
+
+
 
     // Remove query string (if present)
-    umlaut_base = umlaut_base.replace(/\?.*$/, '')
+    this.umlaut_base = this.umlaut_base.replace(/\?.*$/, '')
     // Remove trailing slash
-    umlaut_base = umlaut_base.replace(/\/$/,'');
-    this.umlaut_uri =  umlaut_base + '/resolve/partial_html_sections?umlaut.response_format=json&' + context_object;
-    if (locale)
-      this.umlaut_uri += "&umlaut.locale=" + locale;
+    this.umlaut_base = this.umlaut_base.replace(/\/$/,'');
+    this.umlaut_uri =  this.umlaut_base + '/resolve/partial_html_sections?umlaut.response_format=json&' + this.context_object;
+    if (this.locale)
+      this.umlaut_uri += "&umlaut.locale=" + this.locale;
 
     this.section_targets = [];
            
     this.add_section_target = function(config) {
-      this.section_targets.push( new SectionTarget(config) ); 
+      var target = new SectionTarget(config);
+      if (typeof(this.container) !== "undefined") {
+        // Turn it into a JQuery object if it wasn't already. 
+        target.container = $(this.container);
+      }
+      this.section_targets.push( target ); 
     };
     
     //default no-op call-backs
@@ -99,11 +157,11 @@
                  
                   var umlaut_html_section = myself.find_umlaut_response_section(umlaut_response, section_target.umlaut_section_id);
                                     
-                  if (umlaut_html_section == undefined) {
+                  if (typeof(umlaut_html_section) == 'undefined') {
                     continue;
                   }                  
                   var count = null;
-                  if (typeof umlaut_html_section.response_count != "undefined") { 
+                  if (typeof(umlaut_html_section.response_count) != "undefined") {
                     count = parseInt(umlaut_html_section.response_count.value);
                   }
                   var existing_element = section_target.ensure_placement_destination();
@@ -162,7 +220,7 @@
   };
   
   //Put it in a global object, leave space for other things in "Umlaut" later.
-  if (window.Umlaut == undefined)
+  if (typeof(window.Umlaut) == 'undefined')
     window.Umlaut = new Object();
   window.Umlaut.HtmlUpdater = HtmlUpdater; 
   

data/app/controllers/search_controller.rb

@@ -98,11 +98,13 @@ class SearchController < UmlautController
       # If we narrowed down to one result redirect
       # to resolve action.
       redirect_to( url_for_with_co({:controller => 'resolve'}, @display_results[0]) )
-    elsif (@display_results.length == 0)
-      # 0 hits, do it too.
+    elsif (@display_results.length == 0) && (umlaut_config.lookup!("search.display_zero_hit_results") != true)
+      # If we have 0 hits, also redirect to resolve, unless config tells
+      # us not to.
       redirect_to(  url_for_with_co({:controller => 'resolve'}, @search_context_object) )
     end
-    @page_title = 'Journal titles that '
+
+    @page_title = @display_results.length > 0 ? 'Journal titles that ' : 'No journal titles found that '
     @page_title +=
       (params["umlaut.title_search_type"] == "begins") ?
         'begin with ' : 'contain '

data/app/controllers/umlaut_configurable.rb

@@ -15,7 +15,68 @@ module UmlautConfigurable
     helper_method :umlaut_config
     self.umlaut_config = Confstruct::Configuration.new
   end
-   
+
+  # Used for `resolve_sections` config, like an Array but
+  # we add a some custom methods into the resolve_sections array, 
+  # insert_section, remove_section. With a sub-class. 
+  class ResolveSectionsArray < Array
+    # Deprecated. This was a silly confusing way to do this. 
+    # See #remove and #insert below instead. 
+    def ensure_order!(first, second)
+      $stderr.puts "resolve_sections.ensure_order! is deprecated, please see resolve_sections.remove and resolve_sections.insert"
+
+      list = self
+  
+      index1 = list.index {|s| s[:div_id].to_s == first.to_s}
+      index2 = list.index {|s| s[:div_id].to_s == second.to_s}
+  
+      (list[index1], list[index2] = list[index2], list[index1]) if index1 && index2 && (index1 > index2)
+  
+      list
+    end
+
+    # Insert a section_config hash before or after an existing
+    # section, by the existing section's div_id
+    #
+    #      resolve_sections.insert_section({:div_id => "new"}, :after => "fulltext")
+    #      resolve_sections.insert_section(  resolve_sections.remove_section("document_deliver"), :before => "fulltext")
+    def insert_section(section_config, options = {})
+      list = self
+
+      if options[:before]
+        i = (list.find_index {|s| s[:div_id].to_s == options[:before].to_s}) || 0
+        list.insert(i, section_config)
+      elsif options[:after]
+        i = (list.find_index {|s| s[:div_id].to_s == options[:after].to_s}) || (list.length - 1)
+        list.insert(i + 1, section_config)
+      else
+        # just add at end of list
+        list << section_config
+      end
+    end
+
+    # Remove a configuration block with a certain div_id from the configuration entirely, 
+    # returning the removed configuration block (or nil if none exists). 
+    # You can re-insert it with #insert if you like. 
+    def remove_section(div_id)
+      list = self
+      i = list.find_index {|s| s[:div_id].to_s == div_id.to_s}
+      return list.delete_at(i) if i
+    end
+
+    # Make deep_dup work
+    def deep_dup
+      self.class.new.concat super
+    end
+
+    # Make map work returning same class, to avoid breaking Hashie::Mash. 
+    # Bah, this is a mess, yep. 
+    def map(*args, &block)
+      self.class.new.concat super
+    end
+    alias_method :collect, :map
+
+  end   
 
 
   
@@ -111,12 +172,12 @@ module UmlautConfigurable
       
       # How many seconds between updates of the background updater for background
       # services?
-      poll_wait_seconds 2.2
+      poll_wait_seconds 2.0
       # The FIRST AJAX callback for bg tasks should be much quicker. So we
       # get any bg tasks that executed nearly instantaneously, and on page
       # refresh when bg is really all loaded on back-end, but still needs JS to 
       # fetch it. 
-      initial_poll_wait_seconds 0.300
+      initial_poll_wait_seconds 0.250
       
       # if a background service hasn't returned in this many seconds, consider
       # it failed. (May actually be slow, more likely raised an exception and
@@ -229,59 +290,11 @@ module UmlautConfigurable
       #
       # Look in comments at top of SectionRenderer class for what the keys
       # in each entry mean. 
-      
-      
-      # We add a custom method into the resolve_sections array, 
-      # ensure_order!. 
-      resolve_sections [].extend Module.new do         
-
-        # Deprecated. This was a silly confusing way to do this. 
-        # See #remove and #insert below instead. 
-        def self.ensure_order!(first, second)
-          $stderr.puts "resolve_sections.ensure_order! is deprecated, please see resolve_sections.remove and resolve_sections.insert"
-
-          list = self
-      
-          index1 = list.index {|s| s[:div_id].to_s == first.to_s}
-          index2 = list.index {|s| s[:div_id].to_s == second.to_s}
-      
-          (list[index1], list[index2] = list[index2], list[index1]) if index1 && index2 && (index1 > index2)
-      
-          list
-        end
-
-        # Insert a section_config hash before or after an existing
-        # section, by the existing section's div_id
-        #
-        #      resolve_sections.insert_section({:div_id => "new"}, :after => "fulltext")
-        #      resolve_sections.insert_section(  resolve_sections.remove_section("document_deliver"), :before => "fulltext")
-        def self.insert_section(section_config, options = {})
-          list = self
-
-          if options[:before]
-            i = (list.find_index {|s| s[:div_id].to_s == options[:before].to_s}) || 0
-            list.insert(i, section_config)
-          elsif options[:after]
-            i = (list.find_index {|s| s[:div_id].to_s == options[:after].to_s}) || (list.length - 1)
-            list.insert(i + 1, section_config)
-          else
-            # just add at end of list
-            list << section_config
-          end
-        end
-
-        # Remove a configuration block with a certain div_id from the configuration entirely, 
-        # returning the removed configuration block (or nil if none exists). 
-        # You can re-insert it with #insert if you like. 
-        def self.remove_section(div_id)
-          list = self
-          i = list.find_index {|s| s[:div_id].to_s == div_id.to_s}
-          return list.delete_at(i) if i
-        end
-
-      end
-
-
+          
+      # ResolveSectionsArray is like an Array, but with
+      # some additional methods making it easier to do common
+      # configuration tasks. 
+      resolve_sections ResolveSectionsArray.new
 
       ##########
       #
@@ -412,6 +425,7 @@ module UmlautConfigurable
       end
       
     end
+    
   end
   
   

data/app/controllers/umlaut_controller.rb

@@ -90,6 +90,12 @@ class UmlautController < ApplicationController
 
         # can set to "_blank" etc.
         # result_link_target nil
+
+        # On 0 hits from search screen, ordinarily we redirect to resolve
+        # screen becuase Resolve might be able to provide other useful
+        # services such as ILL or backed by other KB's. But to instead
+        # display a "no results" page, set:
+        # display_zero_hit_results true
       end
 
       # config only relevant to SFX use

data/app/helpers/resolve_helper.rb

@@ -229,11 +229,11 @@ module ResolveHelper
   # action. 
   def config_resolve_sections
     unless defined? @_config_resolve_sections
-      @_config_resolve_sections = umlaut_config.lookup!("resolve_sections", [])
+      @_config_resolve_sections = umlaut_config.lookup!("resolve_sections", UmlautConfigurable::ResolveSectionsArray.new)
       
       umlaut_config.lookup!("resolve_sections_filter", []).each do |reorder_proc|
-        # clone it, so we aren't reordering the original
-        @_config_resolve_sections = @_config_resolve_sections.clone
+        # deep dup it, so we aren't reordering the original
+        @_config_resolve_sections = @_config_resolve_sections.deep_dup
         reorder_proc.call(@user_request, @_config_resolve_sections)
       end
     end

data/app/mixin_logic/metadata_helper.rb

@@ -251,7 +251,7 @@ module MetadataHelper
   # and such.
   def get_isbn(rft)
     isbn = get_identifier(:urn, "isbn", rft)
-    isbn = isbn.gsub(/[^\dX-]/, '') if isbn
+    isbn = isbn.gsub(/[^\dX]/, '') if isbn
     return nil if isbn.blank?
     return isbn
   end

data/app/models/referent.rb

@@ -151,7 +151,11 @@ class Referent < ActiveRecord::Base
     
     rft.metadata.each { | key, value |
       next unless value.present?
-      build_referent_value( key, value)      
+      # Sometimes value is an array, for DC for instance. Do the best we
+      # can. 
+      Array(value).each do |v|
+        build_referent_value( key, v)
+      end
     }    
   end
 

data/app/service_adaptors/blacklight.rb

@@ -202,9 +202,12 @@ class Blacklight < Service
     
     # Also need to use appropriate 'container' title if avail, not
     # article title. 
-    title = request.referent['jtitle']     
-    title = request.referent['btitle'] if title.blank?
-    title = request.referent['title'] if title.blank?
+    metadata = request.referent.metadata
+    title = metadata['jtitle']     
+    title = metadata['btitle'] if title.blank?
+    title = metadata['title'] if title.blank?
+    # remove sub-title for better search
+    title.gsub!(/\:.*\Z/, '') if title
 
     author = get_top_level_creator(request.referent)
     return nil unless title && (author || (@bl_fields["serials_limit_clause"] && title_is_serial?(request.referent)))

data/app/service_adaptors/sfx.rb

@@ -36,12 +36,21 @@
 #     relationships, set to empty array [] to eliminate defaults.
 # sfx_timeout: in seconds, for both open/read timeout value for SFX connection.
 #          Defaults to 8.
+# boost_targets: ARRAY of STRINGS containing SFX target names in the form of
+#      "HIGHWIRE_PRESS_JOURNALS". Any target names listed here will be floated to 
+#      the top of the full-text results list. You can end your boosted target
+#      in a "*" to wildcard: "EBSCOHOST_*". 
+# sink_targets: ARRAY of STRINGS containing SFX target names in the form of
+#      "HIGHWIRE_PRESS_JOURNALS". Any target names listed here will be floated to 
+#      the bottom of the full-text results list. You an end your sunk target
+#      in a "*" to wildcard: "EBSCOHOST_*". 
 # roll_up_prefixes: ARRAY of STRINGs, prefixes like "EBSCOHOST_". If multiple
 #      targets sharing one of the specified prefixes are supplied from SFX,
 #      they will be "rolled up" and collapsed, just the first one included
 #      in response. For TITLE-LEVEL (rather than article-level) requests,
 #      the roll-up algorithm is sensitive to COVERAGES, and will only suppress
 #      targets that have coverages included in remaining non-suppressed targets.
+#      
 class Sfx < Service
   require 'uri'
   require 'htmlentities'
@@ -232,6 +241,7 @@ class Sfx < Service
 
       # For each target delivered by SFX
       sfx_obj.search("./ctx_obj_targets/target").each_with_index do|target, target_index|
+        
         response_data = {}
 
         # First check @extra_targets_of_interest
@@ -311,7 +321,7 @@ class Sfx < Service
               next
             end
 
-            related_note = "This version provided from related title:  <em>" + CGI.unescapeHTML( title ) + "</em>.\n"
+            related_note = "May be available under related title:  <em>" + CGI.unescapeHTML( title ) + "</em>.\n"
           end
 
           if ( sfx_service_type == 'getDocumentDelivery' )
@@ -377,6 +387,8 @@ class Sfx < Service
     end
 
     if response_queue["fulltext"].present?
+      response_queue["fulltext"] = sort_sunk_responses(response_queue["fulltext"])
+      response_queue["fulltext"] = sort_boosted_responses(response_queue["fulltext"])
       response_queue["fulltext"] = roll_up_responses(response_queue["fulltext"], :coverage_sensitive => request.title_level_citation? )
     end
 
@@ -517,6 +529,45 @@ class Sfx < Service
     return list
   end
 
+  def sort_boosted_responses(list)
+    return list unless @boost_targets.present?
+
+    preferred = []
+    other_targets = list
+
+    @boost_targets.each do |spec|
+      (picked, other_targets) = other_targets.partition do |a| 
+        if spec.end_with?("*")
+          a[:sfx_target_name] && a[:sfx_target_name].start_with?(spec[0..-2])
+        else
+          spec == a[:sfx_target_name] 
+        end
+      end
+
+      preferred.concat picked
+    end
+            
+    return preferred + other_targets
+  end
+
+  def sort_sunk_responses(list)
+    return list unless @sink_targets.present?
+    
+    sunk = []
+    other_targets = list
+    @sink_targets.each do |spec|
+      (picked, other_targets) = other_targets.partition do |a| 
+        if spec.end_with?("*")
+          a[:sfx_target_name] && a[:sfx_target_name].start_with?(spec[0..-2])
+        else
+          spec == a[:sfx_target_name] 
+        end
+      end
+      sunk.concat picked
+    end
+            
+    return other_targets + sunk
+  end
 
   def sfx_click_passthrough
     # From config, or default to false.
@@ -699,12 +750,27 @@ class Sfx < Service
       end
 
 
+
+      # Don't overwrite a title with a btitle
+      unless (metadata['btitle'].present? || metadata['title'].present?)
+        request.referent.enhance_referent("title", sfx_metadata["title"]) if sfx_metadata["title"].present?
+        request.referent.enhance_referent("btitle", sfx_metadata["btitle"]) if sfx_metadata["btitle"].present?
+      end
+
+
+
       # The rest,  we write only if blank, we don't over-write
       sfx_metadata.each do |key, value|
-        if (metadata[key].blank?)
+        next if value.blank?
 
-          # watch out for SFX's weird array values.
-            request.referent.enhance_referent(key, value)
+        # Skip certain internal SFX stuff we don't want to add
+        if %w{title btitle isbn_10 isbn_13 eisbn_10 eisbn_13 object_type}.include? key
+          next
+        end
+
+        # Don't overwrite a currently existing one
+        if (metadata[key].blank?)
+          request.referent.enhance_referent(key, value)
         end
       end
     end
@@ -726,5 +792,4 @@ class Sfx < Service
     return display
   end
 
-  end
-
+end

data/app/views/search/journal_search.html.erb

@@ -34,7 +34,7 @@
 <% unless @hits == 0%>
   <h3><%= t( 'umlaut.search.showing_results', start: @start_result_num, until:  @end_result_num, total: @hits) %></h3>
 <% end %>
-<% if params["rft.jtitle"] %>
+<% if params["rft.jtitle"] && (@display_results.size > 0) %>
   <div class="note"><em><strong><%= t 'umlaut.search.note' %>:</strong> <%= t 'umlaut.search.other_titles_might' %> </em></div>
 <% end %>
 <div class='umlaut-pagination pagination'>

data/lib/umlaut/version.rb

@@ -1,5 +1,5 @@
 module Umlaut
-  VERSION = "4.1.0-alpha.1"
+  VERSION = "4.1.0"
 
   # This is used in Umlaut's .gemspec for generating the gem,
   # and is also used in the umlaut app generator to make sure

metadata

@@ -1,286 +1,278 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 4.1.0.pre.alpha.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind, et al
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.12
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 4.3.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.12
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 4.3.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.3
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.3
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: openurl
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: httpclient
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: marc
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: isbn
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.9
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.9
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: htmlentities
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.9
+- !ruby/object:Gem::Dependency
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: multi_json
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: confstruct
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: confstruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-  prerelease: false
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: scrub_rb
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - <
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: scrub_rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: sass-rails
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.5
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: single_test
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
-  prerelease: false
-  type: :development
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: uglifier
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: vcr
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: webmock
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.18'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.18'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: minitest
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
-description:
+description: 
 email:
 - umlaut-general@rubyforge.org
 executables:
@@ -288,6 +280,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
+- active_record_patch/connection_pool.rb
 - app/assets/images/error.gif
 - app/assets/images/frame_remove.gif
 - app/assets/images/spinner.gif
@@ -310,13 +306,13 @@ files:
 - app/assets/images/umlaut_icons/list-open.png
 - app/assets/javascripts/bootstrap3-typeahead.js
 - app/assets/javascripts/umlaut.js
-- app/assets/javascripts/umlaut_ui.js
 - app/assets/javascripts/umlaut/ajax_windows.js
 - app/assets/javascripts/umlaut/ensure_window_size.js.erb
 - app/assets/javascripts/umlaut/expand_contract_toggle.js
 - app/assets/javascripts/umlaut/load_permalink.js
 - app/assets/javascripts/umlaut/search_autocomplete.js
 - app/assets/javascripts/umlaut/update_html.js
+- app/assets/javascripts/umlaut_ui.js
 - app/assets/stylesheets/umlaut.css.scss
 - app/assets/stylesheets/umlaut/_admin.scss
 - app/assets/stylesheets/umlaut/_az.scss
@@ -331,6 +327,7 @@ files:
 - app/assets/stylesheets/umlaut/_search.scss
 - app/assets/stylesheets/umlaut/_spinner.scss
 - app/assets/stylesheets/umlaut/_variables.scss
+- app/controllers/admin/service_errors_controller.rb
 - app/controllers/export_email_controller.rb
 - app/controllers/feedback_controller.rb
 - app/controllers/js_helper_controller.rb
@@ -339,16 +336,15 @@ files:
 - app/controllers/resolve_controller.rb
 - app/controllers/resource_controller.rb
 - app/controllers/search_controller.rb
-- app/controllers/store_controller.rb
-- app/controllers/umlaut_configurable.rb
-- app/controllers/umlaut_controller.rb
-- app/controllers/admin/service_errors_controller.rb
 - app/controllers/search_methods/README.md
 - app/controllers/search_methods/sfx4.rb
 - app/controllers/search_methods/sfx_api.rb
+- app/controllers/store_controller.rb
 - app/controllers/umlaut/controller_behavior.rb
 - app/controllers/umlaut/controller_logic.rb
 - app/controllers/umlaut/error_handling.rb
+- app/controllers/umlaut_configurable.rb
+- app/controllers/umlaut_controller.rb
 - app/helpers/emailer_helper.rb
 - app/helpers/export_email_helper.rb
 - app/helpers/open_search_helper.rb
@@ -369,14 +365,6 @@ files:
 - app/models/collection.rb
 - app/models/crossref_lookup.rb
 - app/models/dispatched_service.rb
-- app/models/permalink.rb
-- app/models/referent.rb
-- app/models/referent_value.rb
-- app/models/request.rb
-- app/models/service_response.rb
-- app/models/service_store.rb
-- app/models/service_wave.rb
-- app/models/sfx_url.rb
 - app/models/hip3/bib.rb
 - app/models/hip3/bib_searcher.rb
 - app/models/hip3/custom_field_lookup.rb
@@ -384,17 +372,25 @@ files:
 - app/models/hip3/item.rb
 - app/models/hip3/receipt.rb
 - app/models/hip3/serial_copy.rb
+- app/models/permalink.rb
+- app/models/referent.rb
+- app/models/referent_value.rb
+- app/models/request.rb
+- app/models/service_response.rb
+- app/models/service_store.rb
+- app/models/service_wave.rb
+- app/models/sfx4/abstract/README.md
 - app/models/sfx4/abstract/az_extra_info.rb
 - app/models/sfx4/abstract/az_letter_group.rb
 - app/models/sfx4/abstract/az_title.rb
 - app/models/sfx4/abstract/az_title_search.rb
 - app/models/sfx4/abstract/base.rb
-- app/models/sfx4/abstract/README.md
 - app/models/sfx4/local/az_extra_info.rb
 - app/models/sfx4/local/az_letter_group.rb
 - app/models/sfx4/local/az_title.rb
 - app/models/sfx4/local/az_title_search.rb
 - app/models/sfx4/local/base.rb
+- app/models/sfx_url.rb
 - app/presentation/section_renderer.rb
 - app/referent_filters/dissertation_catch.rb
 - app/referent_filters/referent_filter.rb
@@ -480,60 +476,57 @@ files:
 - app/views/search/journal_search.html.erb
 - app/views/search/journals.html.erb
 - app/views/testing/index.html.erb
+- app/views/umlaut/README
 - app/views/umlaut/_alerts.html.erb
 - app/views/umlaut/_footer.html.erb
 - app/views/umlaut/_header.html.erb
 - app/views/umlaut/error.html.erb
-- app/views/umlaut/README
+- bin/umlaut
 - config/locales/en.yml
-- db/seeds.rb
 - db/migrate/01_umlaut_init.rb
 - db/migrate/02_umlaut_add_service_response_index.rb
 - db/orig_fixed_data/service_type_values.yml
+- db/seeds.rb
 - lib/aws_product_sign.rb
 - lib/cron_tab.rb
-- lib/service_type_value.rb
-- lib/term_color.rb
-- lib/truncate_to_db_limit.rb
-- lib/umlaut.rb
-- lib/generators/umlaut_app_template.rb
 - lib/generators/templates/umlaut_services.yml
 - lib/generators/umlaut/asset_hooks_generator.rb
 - lib/generators/umlaut/install_generator.rb
 - lib/generators/umlaut/remove_turbolinks_generator.rb
+- lib/generators/umlaut_app_template.rb
+- lib/service_type_value.rb
 - lib/tasks/umlaut.rake
 - lib/tasks/umlaut_asset_compile.rake
 - lib/tasks/umlaut_migrate_permalinks.rake
+- lib/term_color.rb
+- lib/truncate_to_db_limit.rb
+- lib/umlaut.rb
 - lib/umlaut/routes.rb
 - lib/umlaut/test_help.rb
 - lib/umlaut/util.rb
 - lib/umlaut/version.rb
-- active_record_patch/connection_pool.rb
-- LICENSE
-- Rakefile
-- README.md
-- bin/umlaut
 homepage: https://github.com/team-umlaut/umlaut
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5
+signing_key: 
 specification_version: 4
-summary: For Libraries, a just-in-time last-mile service aggregator, taking OpenURL input
+summary: For Libraries, a just-in-time last-mile service aggregator, taking OpenURL
+  input
 test_files: []