umlaut 3.1.1 → 3.2.0

data/README.md

@@ -88,5 +88,5 @@ https://github.com/team-umlaut/umlaut/
 ## Listserv
 
 You can join the umlaut listserv at:
-http://rubyforge.org/mail/?group_id=4382
+https://groups.google.com/forum/#!forum/umlaut-software
 

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

@@ -48,6 +48,9 @@
     if (context_object == undefined)
       context_object = "";      
     
+    // Remove query string (if present)
+    umlaut_base = 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;
         

data/app/controllers/link_router_controller.rb

@@ -25,6 +25,8 @@ class LinkRouterController < UmlautController
     redirect_to calculate_url_for_response(svc_response)
   end
 
+  protected
+
   # Used to calculate a destination/target url for an Umlaut response item.
   #
   # Pass in a ServiceType join object (not actually a ServiceResponse, sorry)
@@ -39,6 +41,8 @@ class LinkRouterController < UmlautController
     svc = ServiceStore.instantiate_service!(svc_response.service_id, nil)
     destination =  svc.response_url(svc_response, params)
 
+    raise_missing_url!(svc_response) if destination.blank?
+
     # if response_url returned a string, it's an external url and we're
     # done. If it's something else, usually a hash, then pass it to
     # url_for to generate a url.
@@ -59,4 +63,15 @@ class LinkRouterController < UmlautController
     end
   end
   protected :calculate_url_for_response
-end
+end
+
+def raise_missing_url!(service_response)
+  svc_rsp_id  = service_response.try(:id)
+  service_id  = service_response.try(:service_id)
+  type        = service_response.try(:service_type_value_name)
+  text        = service_response.try(:display_text)
+  request_id  = service_response.try(:request).try(:id)
+  request_url = service_response.try(:request).try(:http_env).try {|h| h["REQUEST_URI"] }
+
+  raise ArgumentError.new("LinkRouterController#index missing URL to redirect to for ServiceResponse:#{svc_rsp_id} (#{service_id}/#{type}/#{text}) from original request url: #{request_url}")
+end

data/app/controllers/umlaut_configurable.rb

@@ -321,6 +321,7 @@ module UmlautConfigurable
       
       add_resolve_sections! do
         div_id "help"
+        section_title "Question? Problem? Contact:"
         html_area :sidebar
         bg_update false
         partial "help"

data/app/mixin_logic/marc_helper.rb

@@ -3,37 +3,37 @@
 module MarcHelper
 
   # Takes an array of ruby MARC objects, adds ServiceResponses
-  # for the 856 links contained. 
+  # for the 856 links contained.
   # Returns a hash of arrays of ServiceResponse objects added, keyed
-  # by service type value string. 
+  # by service type value string.
   def add_856_links(request, marc_records, options = {})
     options[:default_service_type] ||= "fulltext"
     options[:match_reliability] ||= ServiceResponse::MatchExact
 
     responses_added = Hash.new
-    
+
     # Keep track of urls to avoid putting the exact same url in twice
     urls_seen = Array.new
-    
+
     marc_records.each do |marc_xml|
-    
+
       marc_xml.find_all {|f| '856' === f.tag}.each do |field|
         # Might have more than one $u, in which case we want to
         # possibly add each of them. Might have 0 $u in which case
-        # we skip. 
-        field.subfields.find_all {|sf| sf.code == 'u'}.each do |sf|        
-          url = sf.value 
-          
+        # we skip.
+        field.subfields.find_all {|sf| sf.code == 'u'}.each do |sf|
+          url = sf.value
+
           # Already got it from another catalog record?
           next if urls_seen.include?(url)
-  
-          # Trying to avoid duplicates with SFX/link resolver. 
+
+          # Trying to avoid duplicates with SFX/link resolver.
            skip = should_skip_856_link?(request, marc_xml, url)
            next if skip
-          
+
           urls_seen.push(url)
-          
-          
+
+
           display_name = nil
           if field['y']
             display_name = field['y']
@@ -50,46 +50,46 @@ module MarcHelper
           # But if we've got a $3, the closest MARC comes to a field
           # that explains what this actually IS, use that too please.
           display_name = field['3'] + ' from ' + display_name if field['3']
-  
-          # Build the response. 
-          
+
+          # Build the response.
+
           response_params = {:service=>self, :display_text=>display_name, :url=>url}
-          # get all those $z subfields and put em in notes.      
+          # get all those $z subfields and put em in notes.
           response_params[:url] = url
-    
+
           # subfield 3 is being used for OCA records loaded in our catalog.
           response_params[:notes] =
           field.subfields.collect {|f| f.value if (f.code == 'z') }.compact.join('; ')
-  
+
           is_journal = (marc_xml.leader[7,1] == 's')
-          unless ( field['3'] || ! is_journal ) # subfield 3 is in fact some kind of coverage note, usually 
-            response_params[:notes] += "; " unless response_params[:notes].blank? 
+          unless ( field['3'] || ! is_journal ) # subfield 3 is in fact some kind of coverage note, usually
+            response_params[:notes] += "; " unless response_params[:notes].blank?
             response_params[:notes] += "Dates of coverage unknown."
           end
-  
-          
+
+
           unless ( options[:match_reliability] == ServiceResponse::MatchExact )
             response_params[:match_reliability] = options[:match_reliability]
-  
+
             response_params[:edition_str] = edition_statement(marc_xml)
           end
-  
+
           # Figure out the right service type value for this, fulltext, ToC,
           # whatever.
-          response_params[:service_type_value] = service_type_for_856( field, options ) 
-  
+          response_params[:service_type_value] = service_type_for_856( field, options )
+
           # fulltext urls from MARC are always marked as specially stupid.
           response_params[:coverage_checked] = false
           response_params[:can_link_to_article] = false
-  
+
           # Some debugging info, add the 001 bibID if we have one.
-          
+
           response_params[:debug_info] = "BibID: #{marc_xml['001'].value}" if marc_xml['001']
-  
-          
+
+
           # Add the response
           response = request.add_service_response(response_params)
-          
+
           responses_added[response_params[:service_type_value]] ||= Array.new
           responses_added[response_params[:service_type_value]].push(response)
         end
@@ -118,17 +118,17 @@ module MarcHelper
   # SFX. We use MARC leader byte 7 to tell if it's a journal. Confusing enough?
   # Not yet!  Even if it is a journal, if this isn't an article-level
   # cite and there are no other full text already provided, we
-  # still include. 
+  # still include.
   def should_skip_856_link?(request, marc_record, url)
      is_journal = (marc_record.leader[7,1] == 's')
-     
+
      sfx_controlled = SfxUrl.sfx_controls_url?(url)
-     
+
      # Do NOT skip if it's a title-level citation with no
-     # existing full text entries. 
-     not_title_level_empty = !(  request.title_level_citation? &&     
-                    request.get_service_type("fulltext").length == 0  
-                 ) 
+     # existing full text entries.
+     not_title_level_empty = !(  request.title_level_citation? &&
+                    request.get_service_type("fulltext").length == 0
+                 )
 
      result = ( is_journal && sfx_controlled  && not_title_level_empty )
      return result
@@ -137,43 +137,47 @@ module MarcHelper
   # Take a ruby Marc Field object representing an 856 field,
   # decide what umlaut service type value to map it to. Fulltext, ToC, etc.
   # This is neccesarily a heuristic guess, Marc doesn't have enough granularity
-  # to really let us know for sure. 
+  # to really let us know for sure --
+  # although if indicator2 is '2' for 'related resource', we decide it is
+  # NOT fulltext.
   def service_type_for_856(field, options)
     options[:default_service_type] ||= "fulltext_title_level"
 
     # LC records here at hopkins have "Table of contents only" in the 856$3
-      # Think that's a convention from LC? 
-      if (field['3'] && field['3'].downcase =~ /table of contents( only)?/)
-        return "table_of_contents"
-      elsif (field['3'] && field['3'].downcase =~ /description/)
-        # If it contains the word 'description', it's probably an abstract.
-        # That's the best we can do, sadly. 
-        return "abstract"
-      elsif (field['3'] && field['3'].downcase == 'sample text')
-        # LC records often include these links. 
-        return "excerpts"
-      elsif ( field['u'] =~ /www\.loc\.gov/ )
-        # Any other loc.gov link, we know it's not full text, don't put
-        # it in full text field, put it as "see also". 
-        return "highlighted_link"
-      else
-        return options[:default_service_type]
-      end
+    # Think that's a convention from LC?
+    if (field['3'] && field['3'].downcase =~ /table of contents( only)?/)
+      return "table_of_contents"
+    elsif (field['3'] && field['3'].downcase =~ /description/)
+      # If it contains the word 'description', it's probably an abstract.
+      # That's the best we can do, sadly.
+      return "abstract"
+    elsif (field['3'] && field['3'].downcase == 'sample text')
+      # LC records often include these links.
+      return "excerpts"
+    elsif ( field['u'] =~ /www\.loc\.gov/ )
+      # Any other loc.gov link, we know it's not full text, don't put
+      # it in full text field, put it as "see also".
+      return "highlighted_link"
+    elsif field.indicator2 == '2' # 'related resource'
+      return "highlighted_link"
+    else
+      return options[:default_service_type]
+    end
   end
 
   # A MARC record has two dates in it, date1 and date2. Exactly
   # what they represent is something of an esoteric mystery.
-  # But this will return them both, in an array. 
+  # But this will return them both, in an array.
   def get_years(marc)
     array = []
-    
-    # no marc 008? Weird, but okay. 
-    return array unless marc['008'] 
-    
+
+    # no marc 008? Weird, but okay.
+    return array unless marc['008']
+
     date1 = marc['008'].value[7,4]
     date1.strip! if date1
     array.push(date1) unless date1.blank?
-    
+
     date2 = marc['008'].value[11,4]
     date2.strip! if date2
     array.push(date2) unless date2.blank?
@@ -186,9 +190,9 @@ module MarcHelper
     marc['245'].find_all {|sf| sf.code == "a" || sf.code == "b" || sf.code == "k"}.collect {|sf| sf.text}.join(" ").sub(/\s*[;:\/.,]\s*$/)
   end
 
-  
+
   # From a marc record, get a string useful to display for identifying
-  # which edition/version of a work this represents. 
+  # which edition/version of a work this represents.
   def edition_statement(marc, options = {})
     options[:include_repro_info] ||= true
     options[:exclude_533_fields] = ['7','f','b', 'e']
@@ -196,7 +200,7 @@ module MarcHelper
     parts = Array.new
 
     return "" unless marc
-    
+
     #245$h GMD
     unless ( marc['245'].blank? || marc['245']['h'].blank? )
       parts.push('(' + marc['245']['h'].gsub(/[^\w\s]/, '').strip.titlecase + ')')
@@ -207,7 +211,7 @@ module MarcHelper
       parts.push( marc['250']['a'] ) unless marc['250']['a'].blank?
       parts.push( marc['250']['b'] ) unless marc['250']['b'].blank?
     end
-    
+
     # 260
     if ( marc['260'])
       if (marc['260']['b'] =~ /s\.n\./)
@@ -217,18 +221,18 @@ module MarcHelper
       end
       parts.push( marc['260']['c'] ) unless marc['260']['c'].blank?
     end
-      
+
     # 533
     if options[:include_repro_info] && marc['533']
       marc['533'].subfields.each do |s|
         if ( s.code == 'a' )
-          parts.push(s.value.gsub(/[^\w\s]/, '') + ':'  )  
+          parts.push(s.value.gsub(/[^\w\s]/, '') + ':'  )
         elsif (! options[:exclude_533_fields].include?( s.code ))
           parts.push(s.value)
-        end       
+        end
       end
     end
-      
+
     return nil if parts.length == 0
 
     return parts.join(' ')
@@ -236,24 +240,24 @@ module MarcHelper
 
   # AACR2 "General Material Designation" . While these are (I think?)
   # controlled, it's actually really hard to find the list. Maybe they're
-  # only semi-controlled. 
+  # only semi-controlled.
   # ONE list can be found here: http://www.oclc.org/bibformats/en/onlinecataloging/default.shtm#BCGFECEG
   def gmd_values
-    # 'computer file' is an old one that may still be found in data. 
-    return ['activity card', 
+    # 'computer file' is an old one that may still be found in data.
+    return ['activity card',
 'art original','art reproduction','braille','chart','diorama','electronic resource','computer file', 'filmstrip','flash card','game','globe','kit','manuscript','map','microform','microscope slides','model','motion picture','music','picture','realia','slide','sound recording','technical drawing','text','toy','transparency','videorecording']
   end
 
   # removes something that looks like an AACR2 GMD in square brackets from
-  # the string. Pretty kludgey. 
+  # the string. Pretty kludgey.
   def strip_gmd(arg_string, options = {})
     options[:replacement] ||= ':'
-    
+
     gmd_values.each do |gmd_val|
       arg_string = arg_string.sub(/\[#{gmd_val}( \((tactile|braile|large print)\))?\]/, options[:replacement])
     end
     return arg_string
   end
 
-  
+
 end

data/app/referent_filters/dissertation_catch.rb

@@ -25,14 +25,14 @@ class DissertationCatch < ReferentFilter
 
 
    
-  # input: ropenurl ContextObject
+  # input: Umlaut Referent object
   # Is this a citation to a Dissertation Abstracts
   # issn, or do we otherwise think it's a dissertation citation? Then change
   # it to a dissertation citation. 
   def filter(referent)
     issn = get_identifier(:urn, "issn", referent)
-
     return unless issn
+
     
     # normalize removing hyphen
     issn.gsub!('-', '')
@@ -43,10 +43,16 @@ class DissertationCatch < ReferentFilter
       referent.enhance_referent("genre", "dissertation")
   
       metadata = referent.metadata
+
       # Reset it's title to the dissertation title
-      title = metadata['atitle'] || metadata['title']
-      referent.enhance_referent("btitle", title)
-      referent.enhance_referent("title", title, true, false, :overwrite => true)
+      title = if metadata['atitle'].present?
+        metadata['atitle']
+      elsif metadata['title'].present?
+        metadata['title']
+      end
+      referent.enhance_referent("btitle", title) if title.present?
+      referent.enhance_referent("title", title, true, false, :overwrite => true) if title.present?
+
       # Now erase titles that do not apply 
       referent.remove_value("atitle")
       referent.remove_value("jtitle")

data/app/views/resolve/_background_updater.html.erb

@@ -1,25 +1,27 @@
-<%- 
+<%-
 # Include this partial to put the background updater device on your page.
 # This actually just sets up the Umlaut JQuery background updater, for
-# unobtrusive adding of background html content to menu page.  
--%><%
-# only include if we have any background services. We could check to make
+# unobtrusive adding of background html content to menu page.
+
+# Only include if we have any background services. We could check to make
 # sure we only have background services we care about, but it's more work--
 # the updater will only run ONCE at most wrongly, then the
-# background_update action will stop it. 
-if (any_services_in_progress?) %>
+# background_update action will stop it.
+-%>
+<% if (any_services_in_progress?) %>
   <script type="text/javascript">
     //<![CDATA[
-    jQuery(document).ready(function($) {
-      var updater = new Umlaut.HtmlUpdater("<%= root_url %>",  "umlaut.request_id=<%= @user_request.id %>");<%
-      bg_update_sections.collect do |section| %>
-        updater.add_section_target({ umlaut_section_id: "<%= section[:div_id]  %>"  });<%
-      end
-      # Wait the designated number of seconds before kicking off the first bg 
-      # update request. Future requests will be automatically made with delay. 
-%>
-      setTimeout(function() { updater.update(); }, <%= umlaut_config.lookup!("initial_poll_wait_seconds", 4)*1000 %>);
+    jQuery(document).ready(function ($) {
+      var updater = new Umlaut.HtmlUpdater("<%= root_url %>", "umlaut.request_id=<%= user_request.id %>");
+      <% bg_update_sections.collect do |section| %>
+        updater.add_section_target({ umlaut_section_id: "<%= section[:div_id] %>" });
+      <% end %>
+      <%-
+        # Wait the designated number of seconds before kicking off the first bg
+        # update request. Future requests will be automatically made with delay.
+      -%>
+      setTimeout(function () { updater.update(); }, <%= umlaut_config.lookup!("initial_poll_wait_seconds", 4)*1000 %>);
     });
     //]]>
-  </script><% 
-end %>
+  </script>
+<% end %>

data/app/views/resolve/_citation.html.erb

@@ -1,49 +1,40 @@
 <%
-cite = @user_request.referent.to_citation
+# Get the citation from the user request
+cite = user_request.referent.to_citation
+# Set the page title to the citation's title
 @page_title = cite[:title] %>
-
-<% if @user_request.referent.type_of_thing.present? %>
-  <p class="resource-type"><%=@user_request.referent.type_of_thing.titlecase %></p>
+<% if user_request.referent.type_of_thing.present? %>
+  <p class="resource-type"><%= user_request.referent.type_of_thing.titlecase %></p>
 <% end %>
-
 <h2 class="title"><%= cite[:title] %></h2>
-
 <% if cite[:author].present? || cite[:date].present? %>
   <p class="author-and-date">
     <% if cite[:author].present? %>
       <span class="author"><%= cite[:author] %></span>
     <% end %>
-
     <% if cite[:author].present? && cite[:date].present? %>
       <span class="sep">•</span>
     <% end %>
-
     <% if cite[:date].present? %>
       <span class="date"><%= date_format(cite[:date]) %></span>
     <% end %>
   </p>
 <% end %>
-
 <p class="published_in">
   <% if [:container_title, :volume, :issue, :page].find {|k| cite[k].present? } %>
-
-    <span class="published-label">Published in <%= cite[:container_label] %></span> <span class="container-title">
-      <%= cite[:container_title] %></span>. 
+    <span class="published-label">Published in <%= cite[:container_label] %></span>
+    <span class="container-title"><%= cite[:container_title] %></span>. 
   <% end %>
-
   <% if cite[:volume].present? %>
-      <span class="volume">Volume <%= cite[:volume] %></span>.
+    <span class="volume">Volume <%= cite[:volume] %></span>.
   <% end %>
-
   <% if cite[:issue].present? %>
-      <span class="issue">Issue <%= cite[:issue] %></span>.
+    <span class="issue">Issue <%= cite[:issue] %></span>.
   <% end %>
-
   <% if cite[:page].present? %>
-      <span class="page">Page <%= cite[:page] %></span>.
+    <span class="page">Page <%= cite[:page] %></span>.
   <% end %>
 </p>
-
 <dl class="citation-info">
   <%= if cite[:pub].present? 
     content_tag(:dt, "Publisher:", :class => "publisher") +
@@ -57,7 +48,5 @@ cite = @user_request.referent.to_citation
     content_tag(:dt, "ISBN:", :class => "isbn") +
       content_tag(:dd, cite[:isbn], :class => "isbn")
   end %>
-
   <%# todo, doi %>
-
-</dl>
+</dl>

data/app/views/resolve/_fulltext.html.erb

@@ -1,32 +1,34 @@
 <%
 all_responses = fulltext
-(title_level_fulltxt, fulltxt) = 
-  all_responses.partition {|i| i.view_data[:coverage_checked] == false || i.view_data[:can_link_to_article] == false}      
+(title_level_fulltxt, fulltxt) = all_responses.partition do |i| 
+  i.view_data[:coverage_checked] == false || i.view_data[:can_link_to_article] == false
+end
 # order em with full fulltxt before title_level_fulltxt
-all_responses = fulltxt + title_level_fulltxt %>
+all_responses = fulltxt + title_level_fulltxt
+%>
 <div class="<%= section_css_classes(@user_request, "fulltext", all_responses).join(" ") %>">
-
-  <%= render :partial => 'section_heading', :locals => {:presenter => renderer, :force_render => true} %>
-  
-  <div class="umlaut_section_content"><%=
-    list_with_limit('umlaut_fulltext', all_responses, 
-      :ul_class => "response_list", :limit => renderer.list_visible_limit ) do |item, index | %><%
-      # Display special warnign header if it's title-level only,
-      # and it's an article or issue level link. Are we
-      # at the beginning of title level display?
-      if (index == fulltxt.length && !title_level_request?) %>
+  <%= render 'section_heading', :presenter => renderer, :force_render => true %>
+  <div class="umlaut_section_content">
+    <%= list_with_limit('umlaut_fulltext', all_responses,
+      :ul_class => "response_list", :limit => renderer.list_visible_limit ) do |item, index | %>
+      <%-
+        # Display special warning header if it's title-level only,
+        # and it's an article or issue level link. Are we
+        # at the beginning of title level display?
+      -%>
+      <% if (index == fulltxt.length && !title_level_request?) %>
         </ul>
         <div class="section-subheading title-level-link-warning">
           <h4><%= (@user_request.referent.container_type_of_thing || "Container").titlecase %>-level Page Only</h4>
           <p><span class="notice">Can not link directly to citation. Dates or extent of coverage may be unknown.</span></p>
         </div>
-        <ul class="response_list"><%
-      end %>    
-      <%= render(:partial => "standard_response_item", :object=> item) %><%
-    end
-    if (fulltxt.empty? && title_level_fulltxt.empty? && !service_type_in_progress?('fulltext')) %>
-      <p class="umlaut-unavailable umlaut-content-indent">Not Available</p><%
-    end %>
-    <%= render( renderer.spinner_render_hash) if renderer.services_in_progress? %>
+        <ul class="response_list">
+      <% end %>
+      <%= render :partial => "standard_response_item", :object => item %>
+    <% end %>
+    <% if (fulltxt.empty? && title_level_fulltxt.empty? && !service_type_in_progress?('fulltext')) %>
+      <p class="umlaut-unavailable umlaut-content-indent">Not Available</p>
+    <% end %>
+    <%= render renderer.spinner_render_hash if renderer.services_in_progress? %>
   </div>
 </div>

data/app/views/resolve/_help.html.erb

@@ -1,20 +1,13 @@
-	<div class="help-text-icon">?</div>
-
-	<div class="section_heading">
-		<h3>
-			Question? Problem? Contact:
-		</h3>
-	</div>
-
-	<ul class="response_list umlaut-help-list">
-		<% help.each do |help|
-		  value_hash = help.view_data %>
-		  <li><%= link_to value_hash[:display_text], {:controller=>'link_router', :id=>help.id}, 'target'=>"_blank" %>
-		  <% unless value_hash[:note].blank? %> 
-		    <br />
-		    <%= value_hash[:note] %>
-		  <% end %>
-		  </li>    
-		<% end %>
-	</ul>
-
+  <div class="help-text-icon">?</div>
+  <%= render 'section_heading', :presenter => renderer, :force_render => true %>
+  <ul class="response_list umlaut-help-list">
+    <% help.each do |help|
+      value_hash = help.view_data %>
+      <li><%= link_to value_hash[:display_text], {:controller=>'link_router', :id=>help.id}, 'target'=>"_blank" %>
+      <% unless value_hash[:note].blank? %> 
+        <br />
+        <%= value_hash[:note] %>
+      <% end %>
+      </li>    
+    <% end %>
+  </ul>

data/app/views/resolve/_manually_entered_warning.html.erb

@@ -3,5 +3,5 @@
   # SFX recognized it as an actually existing journal. If not, then it
   # might be a typo. If it came from a manually entered citation, warn them.
   content_tag(:div, content_tag(:i, "", :class => "umlaut_icons-famfamfam-error") +
-    " Warning: #{umlaut_config.app_name} does not know about a #{@user_request.referent.format.downcase} with this name. Please check your entry.",
-      :class=>"alert alert-error") if display_not_found_warning?(@user_request) %>
+    " Warning: #{umlaut_config.app_name} does not know about a #{user_request.referent.format.downcase} with this name. Please check your entry.",
+      :class=>"alert alert-error") if display_not_found_warning?(user_request) %>

data/app/views/resolve/_modal.html.erb

@@ -16,4 +16,4 @@
     <span class="content"></span>
     <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
   </div>
-</div>
+</div>

data/app/views/resolve/_search_inside.html.erb

@@ -12,7 +12,7 @@
     <div class="umlaut_section_content">
       <%= content_tag("form", :target => "_blank", :action => url_for(:controller=>'link_router', :action=>'index')) do %>
 
-        <div class="source input-prepend input-append">
+        <div class="search-inside-source input-prepend input-append">
           <span class="add-on"> via </span> 
 
           <% if search_providers.length > 1 %>
@@ -24,7 +24,7 @@
           <% end %>
 
         </div>
-        <div class="source input-append">
+        <div class="search-inside-query input-append">
           <input name="query" type="text" /> 
           <input value="search" type="submit" class="btn add-on">
         </div>     

data/app/views/resolve/_section_display.html.erb

@@ -1,37 +1,35 @@
-<% 
+<%-
 # You generally shoudln't call this partial directly, it's called through
 # the render_section helper method in resolve_helper.rb
-if presenter.visible?
-  unless presenter.show_partial_only? %>
+-%>
+<% if presenter.visible? %>
+  <% unless presenter.show_partial_only? %>
     <div class="<%= section_css_classes(@user_request, presenter.div_id, []).join(" ") %>">
-<% end %>
-
-  <%= render :partial => 'section_heading', :locals => {:presenter => presenter} %>
-
-  <%  unless presenter.show_partial_only? %>
-  <div class="umlaut_section_content"><%
-  end
-  if presenter.custom_partial? %><%= 
-    render(presenter.content_render_hash) %><%
-  elsif presenter.list_visible_limit %><%= 
-    list_with_limit("#{presenter.div_id}_list_with_limit", presenter.responses_list, 
-      :limit => presenter.list_visible_limit, :ul_class => "response_list #{presenter.div_id}") do |item, index| %><%= 
-        render(presenter.item_render_hash(item)) %><% 
-      end 
-  elsif presenter.responses_list.length == 0 && ! presenter.services_in_progress?%>
+  <% end %>
+  <%= render 'section_heading', :presenter => presenter %>
+  <% unless presenter.show_partial_only? %>
+    <div class="umlaut_section_content">
+  <% end %>
+  <% if presenter.custom_partial? %>
+    <%= render presenter.content_render_hash %>
+  <% elsif presenter.list_visible_limit %>
+    <%= list_with_limit("#{presenter.div_id}_list_with_limit", presenter.responses_list,
+        :limit => presenter.list_visible_limit, :ul_class => "response_list #{presenter.div_id}") do |item, index|
+          render presenter.item_render_hash(item)
+        end %>
+  <% elsif presenter.responses_list.length == 0 && ! presenter.services_in_progress? %>
     <ul class="response_list">
       <li>None available.</li>
-    </ul><%
-  else %>
-    <ul class="response_list <%= presenter.div_id %>"><%= 
-      render( presenter.content_render_hash ) %>
-    </ul><%
-  end 
-  if presenter.show_spinner? %><%= 
-    render(presenter.spinner_render_hash) %><%
-  end 
-  unless presenter.show_partial_only? %>
-    </div>
-</div><% 
-  end
-end %>
+    </ul>
+  <% else %>
+    <ul class="response_list <%= presenter.div_id %>">
+      <%= render presenter.content_render_hash %>
+    </ul>
+  <% end %>
+  <% if presenter.show_spinner? %>
+    <%= render presenter.spinner_render_hash %>
+  <% end %>
+  <% unless presenter.show_partial_only? %>
+    </div></div>
+  <% end %>
+<% end %>

data/app/views/resolve/_section_heading.html.erb

@@ -1,17 +1,14 @@
-<%# requires local :presenter with a SectionRenderer 
-    optional local :force_render=> true to ignore presentation logic. legacy. %>
-
-<% if presenter.show_heading? || local_assigns[:force_render] == true %>
-
-    <div class="section_heading">
-      <% if presenter.section_title %>
-        <h3><%= presenter.section_title %></h3>
-        <% if presenter.section_prompt %>
-          <p class="section_prompt">
-            <%= presenter.section_prompt %>
-          </p>
-        <% end %>
-      <% end %>
-    </div>
-
-<% end  %>
+<%# requires local :presenter with a SectionRenderer 
+    optional local :force_render=> true to ignore presentation logic. legacy. %>
+<% if presenter.show_heading? || local_assigns[:force_render] == true %>
+  <div class="section_heading">
+    <% if presenter.section_title %>
+      <h3><%= presenter.section_title %></h3>
+      <% if presenter.section_prompt %>
+        <p class="section_prompt">
+          <%= presenter.section_prompt %>
+        </p>
+      <% end %>
+    <% end %>
+  </div>
+<% end  %>

data/app/views/resolve/index.html.erb

@@ -1,27 +1,21 @@
-<%= render :partial=>'background_updater' %>
+<%= render 'background_updater', :user_request => @user_request %>
 <div class="row-fluid">
-
   <div class="span8 umlaut-main"> 
-    
     <div class="umlaut-resource-info">
-          <div class="resource_info_sections">
-            <%= render :partial=> "manually_entered_warning" %>
-
-            <%= render :partial=>'citation' %>
-            <% html_sections(:resource_info).each do |section| %>
-              <%= content_tag "div", :id => section[:div_id] do %>
-                <%= render_section(section) %>
-              <% end %>
-            <% end %>
-          </div>
-          
-          <%# need a div here for ajax bg loader to put bg loaded cover into %>
-          <div id="cover_image">
-            <%= render_section(html_section_by_div_id("cover_image")) %>
-          </div>
-
+      <div class="resource_info_sections">
+        <%= render 'manually_entered_warning', :user_request => @user_request %>
+        <%= render 'citation', :user_request => @user_request %>
+        <% html_sections(:resource_info).each do |section| %>
+          <%= content_tag "div", :id => section[:div_id] do %>
+            <%= render_section(section) %>
+          <% end %>
+        <% end %>
+      </div>
+      <%# need a div here for ajax bg loader to put bg loaded cover into %>
+      <div id="cover_image">
+        <%= render_section(html_section_by_div_id("cover_image")) %>
+      </div>
     </div>
-
     <div class="main_response_list">
       <% html_sections(:main).each do |section| %>
         <%= content_tag "div", :id => section[:div_id] do %>
@@ -29,8 +23,7 @@
         <% end %>
       <% end %>
     </div>
-</div>
-
+  </div>
   <div class="span4 umlaut-sidebar">
     <% html_sections(:sidebar).each do |section| %>
       <%= content_tag "div", :id => section[:div_id] do %>
@@ -43,5 +36,5 @@
       <% end %>
     </div>
   </div>
-  <%= render :partial=>"modal" %>
-</div>
+  <%= render 'modal' %>
+</div>

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.1.1"
+  VERSION = "3.2.0"
 end

data/test/fixtures/referent_values.yml

@@ -487,3 +487,36 @@ coffeemakers5:
   normalized_value: "25"
   metadata: true
   private_data: false
+
+manually_entered1:
+  referent: manually_entered
+  normalized_value: ""
+  key_name: object_id
+  metadata: true
+  value: ""
+  private_data: false
+
+manually_entered2:
+  referent: manually_entered
+  normalized_value: journal
+  key_name: format
+  metadata: false
+  value: journal
+  private_data: false
+
+manually_entered3:
+  referent: manually_entered
+  key_name: genre
+  value: article
+  normalized_value: article
+  metadata: true
+  private_data: false
+
+manually_entered4:
+  referent: manually_entered
+  normalized_value: entry manual
+  key_name: jtitle
+  metadata: true
+  value: Entry Manual
+  private_data: false
+

data/test/fixtures/referents.yml

@@ -32,3 +32,6 @@ coffeemakers:
   issn: 0265-8135
   year: 1998
   volume: 25
+
+manually_entered:
+  title: Entry Manual

data/test/fixtures/requests.yml

@@ -40,3 +40,7 @@ advocate:
 
 coffeemakers:
   referent: coffeemakers
+
+manually_entered:
+  referent: manually_entered
+  referrer_id: info:sid/sfxit.com:citation

data/test/fixtures/service_responses.yml

@@ -167,3 +167,15 @@ service_response10:
     :citation_issue: 
     :citation_spage: 
     :debug_info: ! ' Target: GALEGROUP_IT_NEWSSTAND ; SFX object ID: 2670000000017711'
+
+service_response11:
+  service_id: SFX
+  display_text: Ask a Librarian
+  url: "http://library.edu/ask"
+  notes: 
+  request: nytimes
+  service_type_value_name: help
+  service_data: |
+    --- 
+    :display_text: Ask a Librarian
+    :url: http://library.edu/ask

data/test/functional/resolve_controller_test.rb

@@ -7,19 +7,28 @@ require 'rack/utils'
 class ResolveControllerTest < ActionController::TestCase
   extend TestWithCassette
   fixtures :requests, :referents, :referent_values, :dispatched_services, :service_responses
-  
+
   setup do
     @controller = ResolveController.new
   end
-  
+
   test_with_cassette("nytimes by issn", :resolve, :match_requests_on => [:method, :uri_without_ctx_tim]) do
     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"
+    # Resource title assertion
     assert_select "h2.title", "The New York times"
-
+    # Background updater assertions
+    assert_select ".umlaut-resolve-container > script" do |scripts|
+      assert_equal 1, scripts.size
+      # Make sure we have an HtmlUpdater in our script
+      scripts.each do |script|
+        assert_match /var updater = new Umlaut.HtmlUpdater\("http:\/\/test\.host\/", "umlaut\.request_id=#{umlaut_request.id}"\);/, script.to_s
+      end
+    end
+    # Citation section assertions
     assert_select ".umlaut-main .umlaut-resource-info dl.citation-info" do |dls|
       assert_equal 1, dls.size
       dls.each do |dl|
@@ -33,16 +42,18 @@ class ResolveControllerTest < ActionController::TestCase
         end
       end
     end
-    # puts @response.body
+    # Fulltext section assertions
     assert_select ".umlaut-main .umlaut-section.fulltext" do |sections|
       assert_equal 1, sections.size
       sections.each do |section|
         assert_select section, ".response_list", 1
         assert_select section, ".response_list" do |response_lists|
+          assert_select section, ".section_heading h3", { :count => 1, :text => "Online Access" }
           assert_select section, "li.response_item", 4
         end
       end
     end
+    # Holding section assertions
     assert_select ".umlaut-main .umlaut-section.holding" do |sections|
       assert_equal 1, sections.size
       sections.each do |section|
@@ -62,18 +73,39 @@ class ResolveControllerTest < ActionController::TestCase
         end
       end
     end
+    # Export citation section assertions
     assert_select ".umlaut-sidebar .umlaut-section.export_citation" do |sections|
       assert_equal 1, sections.size
       sections.each do |section|
+        assert_select section, ".section_heading h3", { :count => 1, :text => "Export tool" }
         assert_select section, ".response_list", 1
       end
     end
+    # Highlighted link section assertions
     assert_select ".umlaut-sidebar .umlaut-section.highlighted_link" do |sections|
       assert_equal 1, sections.size
       sections.each do |section|
+        assert_select section, ".section_heading h3", { :count => 1, :text => "See also" }
+        assert_select section, ".response_list", 1
+      end
+    end
+    # Help section assertions
+    assert_select ".umlaut-sidebar .umlaut-section.help" do |sections|
+      assert_equal 1, sections.size
+      sections.each do |section|
+        assert_select section, ".section_heading h3", { :count => 1, :text => "Question? Problem? Contact:" }
         assert_select section, ".response_list", 1
       end
     end
+    # Modal assertions
+    assert_select ".modal" do |modals|
+      assert_equal 1, modals.size
+      modals.each do |modal|
+        assert_select modal, ".modal-header", { :count => 1 }
+        assert_select modal, ".modal-body", { :count => 1 }
+        assert_select modal, ".modal-footer", { :count => 1 }
+      end
+    end
   end
 
   test_with_cassette("POSTed OpenURL redirects to GET", :resolve, :match_requests_on => [:method, :uri_without_ctx_tim]) do
@@ -85,10 +117,10 @@ class ResolveControllerTest < ActionController::TestCase
 
     redirect_uri = URI.parse(@response.redirect_url)
 
-    assert_equal "/resolve", redirect_uri.path    
+    assert_equal "/resolve", redirect_uri.path
 
     # Redirected params is a subset of pparams, pparams can have extra
-    # stuff maybe, we don't care. 
+    # 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
@@ -109,7 +141,7 @@ class ResolveControllerTest < ActionController::TestCase
 
   test_with_cassette("no holdings", :resolve, :match_requests_on => [:method, :uri_without_ctx_tim]) do
     umlaut_request = requests(:advocate)
-    get(:index, {'umlaut.request_id' => umlaut_request.id, "umlaut.institution" => "NYU"})
+    get(:index, {'umlaut.request_id' => umlaut_request.id})
     assert_response :success
     assert_select 'div#fulltext ul.response_list li.response_item' do |elements|
       assert_equal(1, elements.size)
@@ -121,4 +153,17 @@ class ResolveControllerTest < ActionController::TestCase
     # Assert no holdings
     assert_select 'div#holding div.umlaut-holdings', :count => 0
   end
-end
+
+  test_with_cassette("manually entered", :resolve, :match_requests_on => [:method, :uri_without_ctx_tim]) do
+    umlaut_request = requests(:manually_entered)
+    get(:index, {'umlaut.request_id' => umlaut_request.id})
+    assert_response :success
+    assert_select('.resource_info_sections > div.alert.alert-error',
+      {:text => "Warning: Find It does not know about a journal with this name. Please check your entry."}) do |error_divs|
+      assert_equal 1, error_divs.size, "More than one error div"
+      error_divs.each do |error_div|
+        assert_select error_div, 'i.umlaut_icons-famfamfam-error', 1
+      end
+    end
+  end
+end

data/test/unit/dissertation_catch_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+require 'referent'
+require 'dissertation_catch'
+
+
+class DissertationCatchTest <  ActiveSupport::TestCase
+  # this was a regression
+  def test_blank_atitle
+    context_object = OpenURL::ContextObject.new_from_kev("atitle=&title=Between+Us+and+Artistic+Appreciation%3a+Nabokov+and+the+Problem+of+Distortion&issn=04194209")
+
+    # Not sure how we get a blank atitle in there, but we want DissertationCatch to handle it
+    referent       = Referent.new
+    referent.set_values_from_context_object(context_object)
+    referent.ensure_value!("atitle", "")
+    referent.referent_values(true) # reload
+
+    DissertationCatch.new.filter(referent)
+
+    assert_equal "Between Us and Artistic Appreciation: Nabokov and the Problem of Distortion", referent.metadata['title']    
+  end
+end

data/test/vcr_cassettes/resolve/manually_entered.yml

@@ -0,0 +1,84 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://worldcat.org/identities/search/PersonalIdentities?maximumRecords=1&query=local.Name%20all%20%22Michael%20Ende%22&sortKeys=holdingscount
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - text/xml
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Thu, 09 Jan 2014 15:32:33 GMT
+      Server:
+      - Apache
+      Content-Length:
+      - '1582'
+      Content-Type:
+      - text/xml
+    body:
+      encoding: US-ASCII
+      string: ! "<?xml version=\"1.0\"  encoding=\"UTF-8\"?> \n<?xml-stylesheet type=\"text/xsl\"
+        href=\"/identities/NameFinderResponse.xsl\"?>\n<searchRetrieveResponse xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
+        xsi:schemaLocation=\"http://www.loc.gov/zing/srw/ http://www.loc.gov/standards/sru/sru1-1archive/xml-files/srw-types.xsd\"
+        xmlns=\"http://www.loc.gov/zing/srw/\"><version xsi:type=\"xsd:string\">1.1</version><numberOfRecords
+        xsi:type=\"xsd:nonNegativeInteger\">0</numberOfRecords><echoedSearchRetrieveRequest
+        xsi:type=\"ns1:echoedSearchRetrieveRequestType\" xmlns:ns1=\"http://www.loc.gov/zing/srw/\"><version
+        xsi:type=\"xsd:string\">1.1</version><query xsi:type=\"xsd:string\">local.Name
+        all &quot;Michael Ende&quot;</query><xQuery><ns2:searchClause xsi:type=\"ns2:searchClauseType\"
+        xmlns:ns2=\"http://www.loc.gov/zing/cql/xcql/\"><ns2:index xsi:type=\"xsd:string\">local.Name</ns2:index><ns2:relation
+        xsi:type=\"ns2:relationType\"><ns2:value xsi:type=\"xsd:string\">all</ns2:value></ns2:relation><ns2:term
+        xsi:type=\"xsd:string\">Michael Ende</ns2:term></ns2:searchClause></xQuery><maximumRecords
+        xsi:type=\"xsd:nonNegativeInteger\">1</maximumRecords><recordSchema xsi:type=\"xsd:string\">default</recordSchema><sortKeys
+        xsi:type=\"xsd:string\">holdingscount</sortKeys></echoedSearchRetrieveRequest><extraResponseData
+        xsi:type=\"ns3:extraDataType\" xmlns:ns3=\"http://www.loc.gov/zing/srw/\"><ns4:extraData
+        xmlns=\"http://oclc.org/srw/extraData\" xmlns:ns4=\"http://oclc.org/srw/extraData\"><ns4:databaseTitle>WorldCat
+        Personal Identity Records</ns4:databaseTitle></ns4:extraData></extraResponseData></searchRetrieveResponse>"
+    http_version: 
+  recorded_at: Thu, 09 Jan 2014 15:32:33 GMT
+- request:
+    method: get
+    uri: http://catalog.hathitrust.org/api/volumes/brief/json/isbn:038519093X
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Thu, 09 Jan 2014 15:32:33 GMT
+      Server:
+      - Apache/2.2.22 (Debian) mod_fastcgi/mod_fastcgi-SNAP-0910052141 PHP/5.4.4-14+deb7u5
+      X-Powered-By:
+      - PHP/5.4.4-14+deb7u5
+      Content-Length:
+      - '495'
+      Content-Type:
+      - application/json; charset=UTF-8
+      Set-Cookie:
+      - NSC_mchspvq-iu=ffffffff854c63df45525d5f4f58455e445a4a423660;expires=Thu, 09-Jan-2014
+        15:42:33 GMT;path=/;httponly
+    body:
+      encoding: US-ASCII
+      string: ! '{"isbn:038519093X":{"records":{"000346062":{"recordURL":"http:\/\/catalog.hathitrust.org\/Record\/000346062","titles":["Momo
+        \/"],"isbns":["9780385190930"],"issns":[],"oclcs":["10779071"],"lccns":["84010157"],"publishDates":["1985"]}},"items":[{"orig":"University
+        of Michigan","fromRecord":"000346062","htid":"mdp.39015054080638","itemURL":"http:\/\/hdl.handle.net\/2027\/mdp.39015054080638","rightsCode":"ic","lastUpdate":"20130802","enumcron":false,"usRightsString":"Limited
+        (search-only)"}]}}'
+    http_version: 
+  recorded_at: Thu, 09 Jan 2014 15:32:33 GMT
+recorded_with: VCR 2.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -672,6 +672,7 @@ files:
 - ./test/unit/bx_test.rb
 - ./test/unit/collection_test.rb
 - ./test/unit/determine_services_test.rb
+- ./test/unit/dissertation_catch_test.rb
 - ./test/unit/google_book_search_test.rb
 - ./test/unit/google_scholar_link_test.rb
 - ./test/unit/internet_archive_test.rb
@@ -689,6 +690,7 @@ files:
 - ./test/vcr_cassettes/google_book_search/frankenstein_by_OCLC_number.yml
 - ./test/vcr_cassettes/internet_archive/momo_by_title_author.yml
 - ./test/vcr_cassettes/resolve/fulltext_with_edition_warning.yml
+- ./test/vcr_cassettes/resolve/manually_entered.yml
 - ./test/vcr_cassettes/resolve/no_holdings.yml
 - ./test/vcr_cassettes/resolve/nytimes_by_issn.yml
 - ./test/vcr_cassettes/sfx/nytimes_by_issn.yml
@@ -711,7 +713,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 337207309997432952
+      hash: -3449280870636764014
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -720,7 +722,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 337207309997432952
+      hash: -3449280870636764014
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -891,6 +893,7 @@ test_files:
 - ./test/unit/bx_test.rb
 - ./test/unit/collection_test.rb
 - ./test/unit/determine_services_test.rb
+- ./test/unit/dissertation_catch_test.rb
 - ./test/unit/google_book_search_test.rb
 - ./test/unit/google_scholar_link_test.rb
 - ./test/unit/internet_archive_test.rb
@@ -908,6 +911,7 @@ test_files:
 - ./test/vcr_cassettes/google_book_search/frankenstein_by_OCLC_number.yml
 - ./test/vcr_cassettes/internet_archive/momo_by_title_author.yml
 - ./test/vcr_cassettes/resolve/fulltext_with_edition_warning.yml
+- ./test/vcr_cassettes/resolve/manually_entered.yml
 - ./test/vcr_cassettes/resolve/no_holdings.yml
 - ./test/vcr_cassettes/resolve/nytimes_by_issn.yml
 - ./test/vcr_cassettes/sfx/nytimes_by_issn.yml