umlaut 3.1.0.pre2 → 3.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmJhZjg0NmE2MDAxZTZiODZkOWE3Yzg1YzczM2I2MDUxYzc0MzM5Nw==
+    NGI2MGIwNmNkODZjOGY4MGRiZmVkYTBiYTBkYjdhYjE0NGU4Y2MyNQ==
   data.tar.gz: !binary |-
-    OWU2MTA2NzMwMDE3NDFmZTBhZTZkMjk1NjhmYzczNmU3NmY0YThjYQ==
+    NjJhNWI0MDY3YjRkYTYwYTNiYzE4NDU0YTRhMGZkNmRmODE2YzMxYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjkxODY1ZGFjMjFkOTliN2RmYjU0OTUxN2MxOTQxYzY0OGExY2U5ODg3ZTc2
-    MDY2YmM5MmIxMDEyYTVjNjg5NDA4YjE4YmQ5NzI0ZDUzNDExYTkxMmMyNThh
-    ZTIzZmQ4YTgyMWIyYzcxYTM3ZDI3MDQxZGU5N2UwMjc2ODIyMDk=
+    NDAyY2I2NDE5NTY4ZDg3ZDlmNWYxNzc5MDQ1ZTgwM2E3NmM5OWI2NTNlMzEx
+    MmFhN2U3ZTI2YzhlZGI4MjI0OTc0YTUwYWRmNTJlOTQyZWM5MGViODgzYWYy
+    ODlhYjk5OTQwZDBhNWYwYmUzZmZmM2M1NGE2YWUyYjZhY2M4NWE=
   data.tar.gz: !binary |-
-    ZTg3NzMxZDlhMWY1Mjc0MjIyOGY4OGZiMTNjNGViMzQzZTdjMmNiMDNhYzA4
-    ZWJkNzU5ZDEyYWQ4MjU4Mjk1MTY0YWJlMzhkMGExMDEyNWU5Y2I0MGU2NmQ3
-    YjdjNTVkOGM0YzlkMWUxNmRmMzc2ZWY0OWYyZDc4NzBjYzUyZDg=
+    Y2MwZGE5MGU2NjJhMDQ1Y2NiNjRhODgwZWVkZTU4YWZiNDYwNjQ5YjgxOTE5
+    NDc4ZTgxMjY2OTAxNTc3NTZmYzNkYzZjNTE2NjRmOWE5NGI3MzM4YjdmOTk4
+    ODExOTdmNDBhZWFlYWQzNTRhZjY2MDRiY2U2ODg0Zjc1OTI4MmQ=

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

@@ -1,9 +1,10 @@
 /* expand_contract_toggle.js: Support for show more/hide more in lists of umlaut content.
+  
+  Expand/collapse elements are already controlled via Bootstrap toggle,
+  this just adds some additional behavior in hooks to change our labels
+  and disclosure icons appropriately, and prevent following non-js href links. 
 */
 jQuery(document).ready(function($) {
-  $(".collapse_toggle").each(function(){
-    $(this).collapse('toggle');
-  });
   $(document).on("click", ".collapse-toggle", function(event) {
     event.preventDefault();    
     return false;
@@ -23,3 +24,4 @@ jQuery(document).ready(function($) {
 
   });
 });
+

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

@@ -5,14 +5,14 @@ jQuery(document).ready(function($) {
 		event.preventDefault();
 
 		var originalLink   = $(this)
-		var valueContainer = $("#umlaut-permalink-value");
+		var valueContainer = $("#umlaut-permalink-container");
 
 		if (! valueContainer.data("loaded")) {
-			valueContainer.html('<i class="spinner"></i>').show();
+			valueContainer.html('<span class="umlaut-permalink-content"><i class="spinner"></i></span>').show();
 
 			$.getJSON( originalLink.attr('href'), function(data) {
 				var href = data.permalink;
-				var a = $("<a/>");
+				var a = $("<a class='umlaut-permalink-content'/>");
 				a.attr("href", href);
 				a.text(href);
 				valueContainer.html(a).data("loaded", true).show();
@@ -23,4 +23,4 @@ jQuery(document).ready(function($) {
 		}
 	});
 
-});
+});

data/app/assets/javascripts/umlaut_ui.js

@@ -6,10 +6,39 @@
    
    At present, only expand/contract toggle behavior is actually supported,
    others are non-applicable or hard to get working on an external site
-   due to cross-domain-origin stuff.   
-   
+   due to cross-domain-origin stuff.  
+
+   And even this has become VERY HACKY AND FRAGILE these days --
+   this whole concept may be nontenable.  
    
 *= require 'umlaut/expand_contract_toggle.js'   
-   
-   
+      
 */
+
+/* Normal umlaut uses bootstrap collapse, and expand_contract_toggle.js
+   assumes bootstrap collapse. For vended use as here, provide our own
+   simple kind of crappy replacement for bootstrap collapse, which
+   will combine with expand_contract_toggle.js above to completely implement. */
+
+jQuery(document).ready(function($) {
+	
+	// In ordinary umlaut bootstrap collapsible, it automatically hides
+	// .collapse, but not with display:none. For our replacement here,
+	// we need to make sure it's initially hidden with display:none, 
+	// we'll add a style to do so.
+	$('html > head').append($('<style> .collapse { display:none; }</style>'));
+
+
+  $(document).on("click", ".collapse-toggle", function(event) {  	
+  	content = $( $(this).attr('data-target') );
+
+  	if ( content.is(":visible") ) {
+  		content.slideUp();
+  		content.trigger("hide");
+  	}
+  	else {
+  		content.slideDown();
+  		content.trigger("show");
+  	}
+  });
+});

data/app/assets/stylesheets/umlaut/_expand_contract.scss

@@ -0,0 +1,10 @@
+.expand_contract_toggle {
+	display: inline-block;
+	margin-bottom: $baseLineHeight / 2;
+}
+
+.expand_contract_content {
+	ul {
+		margin: 0;
+	}	
+}

data/app/assets/stylesheets/umlaut/_layout.scss

@@ -38,6 +38,7 @@ body {
 
 .footer {
   @include umlaut-container();
+  @extend .muted;
   margin: {
     top: $baseLineHeight;
   }

data/app/assets/stylesheets/umlaut/_misc.scss

@@ -35,8 +35,18 @@
   margin-left: $umlautIndent;
 }
 
-.umlaut-permalink-value {
-  @include text-overflow;
+.umlaut-permalink-container {
+    color: $grayDark;
+    @include text-overflow;
+}
+.umlaut-permalink-content {  
+  background-color: $umlautBackgroundColor;
+  border-radius: $borderRadiusSmall;
+  border: 1px solid $btnBorder;
+  padding: 3px 6px;  
+  .spinner {
+    vertical-align: baseline;
+  }
 }
 
 .umlaut-load-permalink i {

data/app/assets/stylesheets/umlaut/_resolve.scss

@@ -65,6 +65,14 @@
     }
   }
 
+  &.related_items {
+    // Margin between the 'cited by' and 'similar' lists
+    .response_list + .response_list {
+      margin-top: $baseLineHeight * 1.5;
+    }
+
+  }
+
   &.holding {
     .response_item i {
       @extend .umlaut_icons-famfamfam-book;
@@ -88,11 +96,9 @@
       .item_status_row {
         min-height: 0;
       }  
-      .collection_str, .call-number, .holding-status, .holding-actions {
-        margin-left: 0;
-        @media (max-width: 767px) {
-          min-height: 0;
-        }
+      .collection-str, .call-number, .holding-status, .holding-actions {
+        margin-left: 0;        
+        min-height: 0;        
       }
       .call-number, .holding-status, .holding-actions {        
         padding-left: $umlautIndent;        
@@ -223,8 +229,7 @@
 
   .resource-type {    
     @extend .muted;
-    margin: 0;
-    font-weight: bold;
+    margin: 0;    
   }
   h2.title {  
     margin-top: 0;

data/app/assets/stylesheets/umlaut.css.scss

@@ -1,5 +1,8 @@
 // Bootstrap Variable over-rides can go here
 
+// We make lightGray used for .muted slightly darker than
+//default #999
+$grayLight: #888;
 
 @import "bootstrap";
 @import "bootstrap-responsive";

data/app/controllers/umlaut/error_handling.rb

@@ -1,4 +1,3 @@
-# A mix-in for Rails controllers with some standard error recovery
 # logic.
 module Umlaut::ErrorHandling
   extend ActiveSupport::Concern
@@ -13,11 +12,18 @@ module Umlaut::ErrorHandling
   end
 
   def handle_general_error(exception)
+
     log_error_with_context(exception)
     @page_title = "Error!"
     # Only render this if we haven't done anything else
-    # e.g. if some other gem may be handling its own errors
-    render "error", :status => 500 unless performed?
+    # e.g. if some other gem may be handling its own errors    
+    unless performed?  
+      if params[:format] == "html"
+        render "error", :status => 500  
+      else
+        render :text => "Unexpected fatal error, has been logged.", :status => 500
+      end
+    end
   end
   protected :handle_general_error
 
@@ -42,4 +48,4 @@ module Umlaut::ErrorHandling
     logger.send(severity, "#{message}\n\n")
   end
   protected :log_error_with_context
-end
+end

data/app/helpers/umlaut/footer_helper.rb

@@ -11,10 +11,6 @@ module Umlaut::FooterHelper
     if @collection
       content = "".html_safe
             
-      if umlaut_config.footer_credit
-        content << umlaut_config.footer_credit + " | "
-      end
-      
       content << "Powered by ".html_safe + link_to("Umlaut", "https://github.com/team-umlaut/umlaut") + ". ".html_safe
       
       credit_segments = []

data/app/helpers/umlaut/helper.rb

@@ -84,11 +84,13 @@ module Umlaut::Helper
   # and loaded with content AJAXy.
   def render_umlaut_permalink_content
     content_tag("div", 
-        :id => "umlaut-permalink-value",
-        :class=> "umlaut-permalink-value",  
+        :id => "umlaut-permalink-container",
+        :class=> "umlaut-permalink-container",  
         :style => "display: none;",
         :'data-loaded' => current_permalink_url.present? ) do
-      link_to(current_permalink_url, current_permalink_url) if current_permalink_url
+      content_tag("span", :class => "umlaut-permalink-content") do
+        link_to(current_permalink_url, current_permalink_url) if current_permalink_url
+      end
     end
   end
 

data/app/mixin_logic/umlaut_http.rb

@@ -91,7 +91,10 @@ module UmlautHttp
          
          return http_fetch(response['location'], options)
       else
-        response.value if options[:raise_on_http_error_code]        
+        if options[:raise_on_http_error_code] 
+          Rails.logger.warn("UmlautHttp#http_fetch: unexpected non-successful response: #{uri}: #{response}") unless response.is_a?(Net::HTTPSuccess)
+          response.value 
+        end
         return response
       end
   end

data/app/models/referent.rb

@@ -286,7 +286,7 @@ class Referent < ActiveRecord::Base
     # keep calling it. profiling shows it DOES make a difference. 
     my_metadata = self.metadata
 
-    if my_metadata['atitle'] && ! my_metadata['atitle'].blank?
+    if my_metadata['atitle'].present?
       citation[:title] = my_metadata['atitle']
       citation[:title_label], citation[:container_label] = 
         case my_metadata['genre']
@@ -382,7 +382,7 @@ class Referent < ActiveRecord::Base
     case self.metadata["genre"]
     when 'article'  then 'journal'
     when 'bookitem' then 'book'
-    else self.metadata['genre']
+    else self.metadata['genre'] || self.format
     end
   end
 

data/app/models/request.rb

@@ -162,17 +162,7 @@ class Request < ActiveRecord::Base
   end
 
 
-  # See can_dispatch below, you probably want that instead.
-  # This method checks to see if a particular service has been dispatched, and
-  # is succesful or in progress---that is, if this method returns false,
-  # you might want to dispatch the service (again). If it returns true though,
-  # don't, it's been done. 
-  def dispatched?(service)
-    ds= self.dispatched_services.find(:first, :conditions=>{:service_id => service.service_id})
-    # Return true if it exists and is any value but FailedTemporary.
-    # FailedTemporary, it's worth running again, the others we shouldn't. 
-    return (! ds.nil?) && (ds.status != DispatchedService::FailedTemporary)
-  end
+
   # Someone asks us if it's okay to dispatch this guy. Only if it's
   # marked as Queued, or Failed---otherwise it should be already working,
   # or done. 
@@ -182,6 +172,36 @@ class Request < ActiveRecord::Base
     return ds.nil? || (ds.status == DispatchedService::Queued) || (ds.status == DispatchedService::FailedTemporary)        
   end
 
+  # Sets a DispatchedService object attached to this Request, for given
+  # service, marked InProgress -- but only if existing DispatchedService object did
+  # not already exist,  or existed and was marked Queued or FailedTemporary.  
+  # Returns true if was able to register as InProgress for given service, 
+  # otherwise false. 
+  #
+  # Wrapped in a connection_pool.with_connection, safe for calling from threaded
+  # context. 
+  def register_in_progress(service)
+    ActiveRecord::Base.connection_pool.with_connection do
+      ds = self.find_dispatch_object( service )
+      if ds
+        # Already existed, need to update atomically, only if it's got
+        # a compatible existing status. 
+        updated_count = self.dispatched_services.where(:id => ds.id, 
+          :status => [DispatchedService::Queued || DispatchedService::FailedTemporary] ).
+          update_all(:status => DispatchedService::InProgress)
+        
+        return (updated_count > 0)
+      else
+        # create new one, if race condition happened in between `find` above and now,
+        # we might wind up with a constraint violation raised, sorry. 
+        ds= self.new_dispatch_object!(service, DispatchedService::InProgress)
+        ds.save!
+        return true
+      end          
+    
+    end
+  end
+
 
 
   # Create a ServiceResponse and it's associated ServiceType(s) object,

data/app/models/service_wave.rb

@@ -24,20 +24,8 @@ class ServiceWave
   
   # Safe to call in a thread. Returns true or false depending on
   # whether dispatch should proceed. 
-  def prepare_dispatch!(request, service, session_id)
-    can_dispatch = false
-    
-    Request.connection_pool.with_connection do
-      if request.can_dispatch?( service)
-        # Mark this service as in progress in the dispatch table.
-        request.dispatched( service, DispatchedService::InProgress )
-        # remember the rails session id. 
-        service.session_id = session_id
-        
-        can_dispatch = true      
-      end
-    end
-    return can_dispatch
+  def prepare_dispatch!(request, service)            
+    return request.register_in_progress(service)                    
   end
 
   def handle(request, session_id)
@@ -80,7 +68,7 @@ class ServiceWave
             end
             
   
-            if prepare_dispatch!(local_request, local_service, session_id)                          
+            if prepare_dispatch!(local_request, local_service)
               local_service.handle_wrapper(local_request)
             else
               Rails.logger.info("NOT launching service #{local_service.service_id},  level #{@priority_level}, request #{local_request.id}: not in runnable state") if @log_timing
@@ -97,7 +85,7 @@ class ServiceWave
             
             # Log it too, although experience shows it may never make it to the 
             # log for mysterious reasons. 
-            Rails.logger.error(TermColor.color("Umlaut: Threaded service raised exception.", :red, true) + " Service: #{service.service_id}, #{e.class} #{e.message}\n  #{clean_backtrace(e).join("\n  ")}")
+            Rails.logger.error(TermColor.color("Umlaut: Threaded service raised exception.", :red, true) + " Service: #{service.service_id}, #{e.class} #{e.message}. Backtrace:\n  #{e.backtrace.join("\n  ")}")
             
             # And stick it in a thread variable too
             Thread.current[:exception] = e                      
@@ -107,7 +95,7 @@ class ServiceWave
         end
       else # not threaded
         begin
-          if prepare_dispatch!(request, service, session_id)                          
+          if prepare_dispatch!(request, service)
               service.handle_wrapper(request)
           else
               Rails.logger.info("NOT launching service #{service.service_id},  level #{@priority_level}, request #{request.id}: not in runnable state") if @log_timing

data/app/service_adaptors/blacklight.rb

@@ -155,6 +155,7 @@ class Blacklight < Service
   # Send a CQL request for any identifiers present. 
   # Ask for for an atom response with embedded marc21 back. 
   def blacklight_precise_search_url(request, format = "marc")
+
     # Add search clauses for our identifiers, if we have them and have a configured search field for them. 
     clauses = []
     added = []
@@ -209,10 +210,8 @@ class Blacklight < Service
     # phrase search for title, just raw dismax for author
     # Embed quotes inside the quoted value, need to backslash-quote for CQL,
     # and backslash the backslashes for ruby literal. 
-    clauses.push("#{@bl_fields["title"]} = \"\\\"#{title}\\\"\"")    
-    clauses.push("#{@bl_fields["author"]} = \"#{author}\"") if author
-    
-
+    clauses.push("#{@bl_fields["title"]} = \"\\\"#{remove_quotes_for_phrase_value title}\\\"\"")    
+    clauses.push("#{@bl_fields["author"]} = \"#{remove_quotes_for_phrase_value author}\"") if author
     
     url = base_url + "?search_field=#{@cql_search_field}&content_format=#{options[:content_format]}&q=#{CGI.escape(clauses.join(" AND "))}"
 
@@ -224,6 +223,16 @@ class Blacklight < Service
     return url
   end
 
+  # We're putting a value inside of CQL double quotes. What if
+  # it has double quote literal in it already? Will be a CQL syntax
+  # error if we do nothing. Can we escape it somehow? CQL is really
+  # unclear, we're ALREADY backslash escaping the phrase quotes themselves!
+  # We just replace them with space, should work for our actual indexing. 
+  def remove_quotes_for_phrase_value(str)
+    str.gsub('"', " ")
+  end
+
+
   # Takes a url that will return atom response of dlf_expanded content.
   # Adds Umlaut "holding" ServiceResponses for dlf_expanded, as appropriate.
   # Returns number of holdings added.  

data/app/service_adaptors/internet_archive.rb

@@ -249,14 +249,14 @@ class InternetArchive < Service
     # commands even within quotes. 
     output = string.downcase
     
-    # Remove parens, semi-colons, brackets, hyphens -- they all mess
+    # Remove parens, semi-colons, brackets, hyphens, colons -- they all mess
     # up IA, which thinks they are special chars. Remove double quote,
     # special char, which sometimes we want to use ourselves. Replace
     # all with spaces to avoid accidentally conjoining words. 
     # (could be
     # escaping instead? Not worth it, we don't want to search
     # on these anyway. Remove ALL punctuation? Not sure.)
-    output.gsub!(/[)(\]\[;"\=\-]/, ' ')
+    output.gsub!(/[)(\]\[;"\=\-\:]/, ' ')
     
     return output
   end

data/app/service_adaptors/service.rb

@@ -33,7 +33,6 @@
 
 class Service
   attr_reader :priority, :service_id, :url, :task, :status, :name, :group
-  attr_writer :session_id
   attr_accessor :request
   @@required_params_for_subclass = {} # initialize class var
 
@@ -169,14 +168,7 @@ class Service
   end
 
 
-  def session_id
-    unless (@session_id)
-      raise Exception.new("This service has not been initialized with a request!") unless request
-      
-      @session_id = request.session_id
-    end
-    return @session_id
-  end
+
 
  # This method is called by Umlaut when user clicks on a service response. 
  # Default implementation here just returns response['url']. You can

data/app/views/layouts/umlaut.html.erb

@@ -17,13 +17,7 @@
         <%= yield %>
       </div>
 
-      <div id="footer" class="footer">
-        <%= render_service_credits %>
-        <!-- links to aid in debugging openurls gone wrong when in production -->
-        <%= link_to_test_resolve %>
-        <%= link_to_direct_sfx %>
-        <%= link_to_toggle_debug_info %> 
-      </div>
+      <%= render :partial => "umlaut/footer" %>
     </div>
   </body>
 </html>

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

@@ -17,7 +17,7 @@ all_responses = fulltxt + title_level_fulltxt %>
       if (index == fulltxt.length && !title_level_request?) %>
         </ul>
         <div class="section-subheading title-level-link-warning">
-          <h4><%= @user_request.referent.container_type_of_thing.titlecase %>-level Page Only</h4>
+          <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"><%
@@ -29,4 +29,4 @@ all_responses = fulltxt + title_level_fulltxt %>
     end %>
     <%= render( renderer.spinner_render_hash) if renderer.services_in_progress? %>
   </div>
-</div>
+</div>

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

@@ -61,8 +61,8 @@
     end %>
     <%= # Pages
     if ref_meta.has_key?("spage")
-      page = ref_meta["spage"]
-      page << " - #{ref_meta["epage"]}" if ref_meta.has_key?("epage")
+      pages = ref_meta["spage"]
+      pages = "#{pages} - #{ref_meta["epage"]}" if ref_meta.has_key?("epage")
       content_tag(:dt, "Page:", :class => "page") +
         content_tag(:dd, pages, :class => "page")
     end %>
@@ -70,4 +70,4 @@
   <div class="umlaut-citation-link span3">
     <%= resolver_link(@current_context_object, {:target => search_result_target_window}) %>
   </div>
-</div>
+</div>

data/app/views/umlaut/_footer.html.erb

@@ -0,0 +1,15 @@
+<%# local implementers may over-ride this partial for custom local header. 
+    This partial is called by default umlaut layout.  %>
+
+<div id="footer" class="footer">
+  <% if umlaut_config.footer_credit.present? %>
+    <%= umlaut_config.footer_credit %> | 
+  <% end %>
+
+  <%= render_service_credits %>
+  
+  <!-- links to aid in debugging openurls gone wrong when in production -->
+  <%= link_to_test_resolve %>
+  <%= link_to_direct_sfx %>
+  <%= link_to_toggle_debug_info %> 
+</div>

data/app/views/umlaut/error.html.erb

@@ -3,11 +3,9 @@
 <div class="error_section">
 
     <div class="heading">
-      <%= image_tag "error.gif" %>
-      <h1>Sorry, there was an error processing your request.</h1>
+      <h1>Sorry, something has gone wrong.</h1>
     </div>
-   
-    
+
     <h2>Please try one of the following options:</h2>
      <ol>       
           <li>If you entered this URL yourself, please check your URL for errors. </li>
@@ -42,4 +40,4 @@
       
       <br/>
     
-</div>
+</div>

data/lib/generators/templates/umlaut_services.yml

@@ -237,15 +237,3 @@ default:
         # list them in array here:
         #exclude: [ host.unversity.edu, otherhost.somewhere.com]
         
-        
-      # Use of SFX api means that SFX can no longer keep statistics on
-      # clickthroughs. This link out filter will attempt to fake SFX into
-      # thinking a direct click happened when user clicks on an SFX link
-      # via Umlaut.  This is VERY fragile logic, required reverse engineering
-      # SFX and faking it out, still doesn't work all the time. But works
-      # much of the time. 
-      SFX_backchannel_record:
-        disabled: true
-        type: SfxBackchannelRecord
-        task: link_out_filter
-        priority: 6

data/lib/generators/umlaut/asset_hooks_generator.rb

@@ -20,20 +20,6 @@ module Umlaut
  *= require 'umlaut'
  *}
         end
-        append_to_file("app/assets/stylesheets/application.css") do
-          %q{
-
-  /*  Umlaut needs a jquery-ui theme CSS. Here's an easy way to get one,
-   *  you can replace with another theme. 
-   *
-   *  Note, CSS @import needs to be the first line in a CSS file. This will
-   *  become so if 'require_self' is included above, as the FIRST sprockets
-   *  require, and this @import line is the first non-comment line in this
-   *  file.
-   */
-   @import url(//ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/ui-lightness/jquery-ui.css);
-          }
-        end
       else
         say_status("skipped", "Your application.css already references Umlaut", :yellow)
       end

data/lib/umlaut/routes.rb

@@ -76,7 +76,9 @@ module Umlaut
           # ResolveController still uses rails 2.0 style 'wildcard' routes, 
           # TODO tighten this up to only match what oughta be matched.           
           # Note: This route will make all actions in this controller accessible via GET requests.
-          
+          # We do make sure to prevent resolve/index/:id, should always be resolve/index?id=foo, 
+          # to keep OpenURLs good, and avoid errors with DOI's with slashes in em etc. 
+          match 'resolve(.:format)' => "resolve#index"
           match 'resolve(/:action(/:id(.:format)))' => "resolve"
         end
       end

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.1.0.pre2"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre2
+  version: 3.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind, et al
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -204,42 +204,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +318,7 @@ files:
 - app/assets/stylesheets/umlaut.css.scss
 - app/assets/stylesheets/umlaut/_modal.scss
 - app/assets/stylesheets/umlaut/_spinner.scss
+- app/assets/stylesheets/umlaut/_expand_contract.scss
 - app/assets/stylesheets/umlaut/_mixins.scss
 - app/assets/stylesheets/umlaut/_admin.scss
 - app/assets/stylesheets/umlaut/_misc.scss
@@ -438,6 +439,7 @@ files:
 - app/views/resolve/_manually_entered_warning.html.erb
 - app/views/resolve/_api_in_progress.xml.erb
 - app/views/testing/index.html.erb
+- app/views/umlaut/_footer.html.erb
 - app/views/umlaut/_header.html.erb
 - app/views/umlaut/error.html.erb
 - app/views/umlaut/README
@@ -713,9 +715,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.0.3