umlaut 4.0.0.beta4 → 4.0.0.beta5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDcwZWM2OWQ1ZGRhYmYzNzNkZDQwMzFkMjRhMWY0MDQ5ZjZjMDJhNw==
+    Mzk2MTBjNThjOTVjZDUyYWJhYTQ1NmU2NGM4ZTg3NzJmNjE2MjYwZg==
   data.tar.gz: !binary |-
-    ZWI0ZmQ3NzBkN2ZjZjAyYWE2NWM1MjMwOGZkN2YzZDU5N2FlODcwMQ==
+    MDNkMThjODUzNmFlMTRkZTY0MTViMDkwNmYyNmY0NjNiMzliOTYwMg==
 SHA512:
   metadata.gz: !binary |-
-    NjM2NGU4MWZkN2NhMGQyOGVlNjk1YjE0ODg3ZDBmODA3ODk5OGE0YTg2Zjky
-    NWYzMmUzYzE5ZDI0YmI5YzUzY2VjYzcwMzU0YjMzYmQ2NTA5ZGZlODk5MTIz
-    ZWU1MWZmMDRmNDUwMWNmYzcxYWE1NDc0N2ZkMjAxZTllN2Q2MzE=
+    NmY0MWNiMDlmMjU0YWZjMmM2MTM2ZGI4M2Y4NzdlNDU4MDdjNTRkYjY1OWU4
+    Y2VlNmI0Zjg3MWJiM2M1ZDI3ZTM4NTc1NDMyNDc4NjM2MDA1YWJkMzhjOGRl
+    YmFlMmZlYzQxMmMyOWE5YTQyMmZjZTEwNzc4Mzc0NTIwYTc4MjM=
   data.tar.gz: !binary |-
-    YmRmNWYwMWVjZGEyNzZhMWVlZjkwODk5MzUwNjQwMDVlM2MyYTk4YzQyZDkw
-    OTI5MGIyZmM1ODdmYjlhMzc5MTQzMTNkZTMzZGM2MDM3Y2U5NTMzOWE1MmYy
-    YzAzNjFlZGQ0MjllZDExNDc2YjY0MTJkNjU3ZTVlNWFhY2FlYjM=
+    YjdlMGIwMmU5YTlkMjFmNTgwY2RkOTZlYWZhYjg2ZWUxMjkwY2VlYWMyYzYy
+    ZmI5NDVhOTIzNDJmYTRjMjAyMGJjNjRmNWNjMTc0ODEzN2U5NDdlMDJjYjg1
+    NmEyZGYwNzQ2ZDIzYWQ2NWQ1ZjAxYzQzYTkxNTRkMGI2NGY4NTg=

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

@@ -9,14 +9,14 @@ jQuery(document).ready(function($) {
     event.preventDefault();    
     return false;
   });
-  $(document).on("show", ".collapse", function(event) {
+  $(document).on("show.bs.collapse", ".collapse", function(event) {
       // Update the icon
       $(this).parent().find('.collapse-toggle i').removeClass("umlaut_icons-list-closed").addClass("umlaut_icons-list-open");
       // Update the action label
       $(this).parent().find(".expand_contract_action_label").text("Hide ");
 
   });
-  $(document).on("hide", ".collapse", function(event) {
+  $(document).on("hide.bs.collapse", ".collapse", function(event) {
       // Update the icon
       $(this).parent().find('.collapse-toggle i').removeClass("umlaut_icons-list-open").addClass("umlaut_icons-list-closed");
       // Update the action label

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

@@ -1,5 +1,11 @@
 // Bootstrap Variable over-rides can go here
 
+// We default the Bootstrap 2.x colors for links, they worked
+// well with our design, and the Bootstrap 3.x colors seem
+// too muted and hard to read in our design. 
+$link-color:           #08c !default;
+$link-hover-color:     darken($link-color, 15%) !default;
+
 
 @import "bootstrap-sprockets";
 @import "bootstrap";

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

@@ -16,8 +16,15 @@
   }
 }
 
-.collapsible .collapse {
-  margin-top:  $line-height-computed / 2; 
+.collapsible {
+  // Difficult to get space between the toggle and the expanded
+  // content, that's only there when content is expanded, without
+  // causing a jump on expand/contract. 
+  // We give up and provide the space even when collapsed. 
+  .collapse-toggle {
+    display: block;
+    margin-bottom:  $line-height-computed / 2; 
+  }
 }
 
 /* Google Scholar Link: 

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

@@ -1,5 +1,5 @@
 // See also, possible umlaut theme over-ride of default bootstrap
-// variables in umalut.scss
+// variables in umlaut.scss
 
 // Basic colors, all other colors by default are defined in terms of these
 // Overall Border and Background

data/app/controllers/resolve_controller.rb

@@ -3,11 +3,13 @@
 # parameter umlaut.request_id=[some id] to hook up to a pre-existing
 # umlaut request (that presumably was an OpenURL).
 class ResolveController < UmlautController
-  before_filter :init_processing
+  # These methods are meant as API called from other sites via Javascript
+  # with JS responses. We don't want Rails to keep it from happening. 
+  # http://api.rubyonrails.org/classes/ActionController/RequestForgeryProtection.html
+  skip_before_filter :verify_authenticity_token, only: [:index, :background_status, :partial_html_sections, :api]
 
-  # We need to NOT require a CSRF token on post to #index,
-  # to allow POSTed OpenURLs
-  protect_from_forgery :except => :index
+  before_filter :init_processing
+  
   # POST'ed OpenURLs are a mess, redirect them to GETs
   before_filter :post_to_get, :only => :index
 
@@ -142,7 +144,7 @@ class ResolveController < UmlautController
     # no end of problems later. We can't just refuse to process, sources
     # do send us bad bytes, I'm afraid.
     params.values.each do |v|
-      v.scrub!
+      v.scrub! if v.respond_to?(:'scrub!')
     end
     # Create an UmlautRequest object.
     options = {}

data/app/controllers/umlaut/controller_behavior.rb

@@ -74,7 +74,7 @@ module Umlaut::ControllerBehavior
   # See https://github.com/team-umlaut/umlaut/wiki/Alternate-service-groups
   def create_collection
     services = ServiceStore.global_service_store.determine_services( self.specified_service_groups.uniq )
-    return Collection.new(@user_request, services)
+    return Collection.new(@user_request, services, umlaut_config)
   end
   protected :create_collection
 

data/app/helpers/umlaut/url_generation.rb

@@ -15,8 +15,9 @@ module Umlaut::UrlGeneration
   def url_for(*arguments)
     url = super
     if @generate_urls_with_host && url.starts_with?("/")
-      #regex replace trailing slashes or trailing locale if present
-      url = root_url.gsub(/(\/$)?(\/\?.*)?/, '') + url
+      #regex take root url and get just scheme/port part, no path. 
+      # the path we want is in our own url we will add on. 
+      url = root_url.gsub(/\A(.*\/\/[^\/]+)\/.*\Z/, '\1') + url
     end
     return url
   end

data/app/models/collection.rb

@@ -16,7 +16,7 @@ class Collection
   attr_accessor :umlaut_request
   attr_accessor :logger
   # configs
-  attr_accessor :response_expire_interval, :response_expire_crontab_format, :background_service_timeout, :requeue_failedtemporary_services
+  attr_accessor :response_expire_interval, :response_expire_crontab_format, :background_service_timeout, :requeue_failedtemporary_services_in
 
   # generally only set to true in testing, can be set for the whole class
   # or for particular Collection instances. 
@@ -30,7 +30,7 @@ class Collection
   # config is a Confstruct::Configuration associated with the current controller,
   # has a few config options in it relevant to collection service exec; but
   # don't pass in, we'll use a blank one with default values, no prob.
-  def initialize(a_umlaut_request, service_hash, config = Confstruct::Configuration.new)
+  def initialize(a_umlaut_request, service_hash, config = Confstruct::Configuration.new) 
     self.umlaut_request = a_umlaut_request
 
     self.logger = Rails.logger
@@ -38,7 +38,7 @@ class Collection
     self.response_expire_interval = config.lookup!("response_expire_interval", 1.day)
     self.response_expire_crontab_format = config.lookup!("response_expire_crontab_format", nil)
     self.background_service_timeout =  config.lookup!("background_service_timeout", 30.seconds)
-    self.requeue_failedtemporary_services = config.lookup!("requeue_failedtemporary_services", 500.seconds)
+    self.requeue_failedtemporary_services_in = config.lookup!("requeue_failedtemporary_services_in", 500.seconds)
 
     # @service_definitions will be a two-level hash, pointing to an array.. Task is Standard, LinkOut, etc.
     # { [task] => { [priority_level] => [config1, config2, config3],
@@ -186,6 +186,8 @@ class Collection
                 logger.warn("Background service timed out, thread assumed dead. #{umlaut_request.id} / #{ds.service_id}")
            end
 
+
+
           # go through dispatched_services and delete:
           # 1) old completed dispatches, too old to use.
           # 2) failedtemporary dispatches that are older than our resurrection time
@@ -193,7 +195,7 @@ class Collection
           # After being deleted, they'll end up re-queued.
           if ( (ds.completed? && completed_dispatch_expired?(ds) ) ||
                (  ds.status == DispatchedService::FailedTemporary &&
-                 (Time.now - ds.updated_at) > self.requeue_failedtemporary_services
+                 (Time.now - ds.updated_at) > self.requeue_failedtemporary_services_in
                 )
               )
 

data/app/models/referent.rb

@@ -12,11 +12,15 @@ class Referent < ActiveRecord::Base
   # for shortcut metadata manipulations
   include MetadataHelper
   
-
   has_many :requests
   has_many :referent_values
   has_many :permalinks
 
+  # Make sure years get truncated to 4 chars
+  def year=(y)
+    super(y.slice(0,4))
+  end
+
   # Pass in :permalink => :force to force creation of a permalink, otherwise
   # no permalink is created by this method, one can be lazily created when
   # needed. 

data/app/models/request.rb

@@ -431,9 +431,31 @@ class Request < ActiveRecord::Base
     req.client_ip_is_simulated = true if req.client_ip_addr != a_rails_request.remote_ip()
 
     # Save selected http headers, keep some out to avoid being too long to
-    # serialize. 
+    # serialize. This is in retrospect not a great design to save http hash,
+    # should be individual columns of things we want to save. When we next make
+    # Umlaut schema changes maybe. 
+    #
+    # One problem we're running into is exceeding width of db column. 
+    # We'll only save REQUEST_URI AND HTTP_REFERER if they're not too long to try and avoid. 
+    #
+    # Also mark as "ISO-8859-1" to save space in the YAML encoding, current YAML uuencodes
+    # 'binary' taking up too much space. HTTP headers are usually ascii, theoretically
+    # can be ISO-8859-1, theoretically can but never are something else with proper marking,
+    # we won't worry about. 
     req.http_env = {}
-    a_rails_request.env.each {|k, v| req.http_env[k] = v if ((k.slice(0,5) == 'HTTP_' && k != 'HTTP_COOKIE') || k == 'REQUEST_URI' || k == 'SERVER_NAME') }
+    a_rails_request.env.each do |k, v| 
+      if ((k.slice(0,5) == 'HTTP_' && k != 'HTTP_COOKIE' ) || 
+        (k == 'REQUEST_URI') || 
+        k == 'SERVER_NAME')
+        k = k.dup.force_encoding("ISO-8859-1")
+        v.force_encoding("ISO-8859-1")
+        v.scrub!
+        req.http_env[k] = v.slice(0, 800) # only first 800 chars sorry
+      end
+    end
+    #["HTTP_X_FORWARDED_FOR", "SERVER_NAME", "HTTP_USER_AGENT", "HTTP_ACCEPT", 'HTTP_ACCEPT_LANGUAGE', 'HTTP_ACCEPT_CHARSET', 'HTTP_ACCEPT_ENCODING']
+
+
     
     req.save!
     return req

data/app/service_adaptors/blacklight.rb

@@ -97,7 +97,7 @@ class Blacklight < Service
         doc = Nokogiri::XML( http_fetch(url).body )
         # filter out matches whose titles don't really match at all, or
         # which have already been seen in identifier search. 
-        entries = filter_keyword_entries( doc.xpath("atom:feed/atom:entry", xml_ns) , :exclude_ids => ids_processed, :remove_subtitle => (! title_is_serial?(request.referent)) )
+        entries = filter_keyword_entries(request, doc.xpath("atom:feed/atom:entry", xml_ns) , :exclude_ids => ids_processed, :remove_subtitle => (! title_is_serial?(request.referent)) )
         
         
         marc_by_atom_id = {}
@@ -286,7 +286,7 @@ class Blacklight < Service
     return service_data.length
   end
 
-  def filter_keyword_entries(atom_entries, options = {})
+  def filter_keyword_entries(request, atom_entries, options = {})
     options[:exclude_ids] ||= []
     options[:remove_subtitle] ||= true
     

data/app/service_adaptors/google_book_search.rb

@@ -14,6 +14,11 @@
 # 
 # If a thumbnail_url is returned in the responses, a cover image is displayed.
 #
+# Can also enhances with an abstract, if available. -- off by default, set `abstract: true` to turn on.  
+#
+# And fleshes out bibliographic details from an identifier -- if all you had was an
+# ISBN, will fill in title, author, etc in referent from GBS response.  
+#
 # = Google API Key
 # 
 # Setting an api key in :api_key STRONGLY recommended, or you'll
@@ -50,13 +55,18 @@ class GoogleBookSearch < Service
   attr_reader :url, :display_name, :num_full_views 
   
   def service_types_generated
-    types= [
-      ServiceTypeValue[:fulltext], 
-      ServiceTypeValue[:cover_image],
-      ServiceTypeValue[:highlighted_link],
-      ServiceTypeValue[:search_inside],
-      ServiceTypeValue[:excerpts]]
+    types= []
+
+    if @web_links
+      types.push ServiceTypeValue[:highlighted_link]
+      types.push ServiceTypeValue[:excerpts]
+    end
+    types.push(ServiceTypeValue[:search_inside]) if @search_inside
+    types.push(ServiceTypeValue[:fulltext]) if @fulltext
+    types.push(ServiceTypeValue[:cover_image]) if @cover_image
     types.push(ServiceTypeValue[:referent_enhance]) if @referent_enhance
+    types.push(ServiceTypeValue[:abstract]) if @abstract
+
     return types
   end
   
@@ -64,10 +74,22 @@ class GoogleBookSearch < Service
     @url = 'https://www.googleapis.com/books/v1/volumes?q='
     
     @display_name = 'Google Books'
+    
     # number of full views to show
     @num_full_views = 1
+    
     # default on, to enhance our metadata with stuff from google
     @referent_enhance = true
+
+    # default OFF, add description/abstract from GBS
+    @abstract = false
+
+    # Other responses on by default but can be turned off
+    @cover_image   = true
+    @fulltext      = true
+    @search_inside = true
+    @web_links     = true # to partial view :excerpts or :fulltext
+
     # google api key strongly recommended, otherwise you'll
     # probably get rate limited. 
     @api_key = nil
@@ -101,21 +123,29 @@ class GoogleBookSearch < Service
     return request.dispatched(self, true) if data["totalItems"] == 0
     
     enhance_referent(request, data) if @referent_enhance
+
+    add_abstract(request, data) if @abstract
     
     #return full views first
-    full_views_shown = create_fulltext_service_response(request, data)
+    if @fulltext
+      full_views_shown = create_fulltext_service_response(request, data)
+    end
     
-    # Add search_inside link if appropriate
-    add_search_inside(request, data)
+    if @search_inside
+      # Add search_inside link if appropriate
+      add_search_inside(request, data)
+    end
     
     # only if no full view is shown, add links for partial view or noview
     unless full_views_shown
       do_web_links(request, data)
     end
     
-    thumbnail_url = find_thumbnail_url(data)
-    if thumbnail_url
-      add_cover_image(request, thumbnail_url)    
+    if @cover_image
+      thumbnail_url = find_thumbnail_url(data)
+      if thumbnail_url
+        add_cover_image(request, thumbnail_url)    
+      end
     end
 
     return request.dispatched(self, true)
@@ -139,7 +169,7 @@ class GoogleBookSearch < Service
       
       element_enhance(request, "tpages", volumeInfo["pageCount"])
       
-      if (date = volumeInfo["publishedDate"] && date =~ /^(\d\d\d\d)/)
+      if (date = volumeInfo["publishedDate"]) && date =~ /^(\d\d\d\d)/
         element_enhance(request, "date", $1)
       end
       
@@ -168,6 +198,21 @@ class GoogleBookSearch < Service
     end            
   end
 
+  def add_abstract(request, data)
+    info = data["items"].first.try {|h| h["volumeInfo"]}
+    if description = info["description"]
+
+      url = info["infoLink"]
+      request.add_service_response(
+          :service => self, 
+          :display_text => "Description from Google Books", 
+          :display_text_i18n => "description",
+          :url => remove_query_context(url),
+          :service_type_value =>  :abstract  
+      )
+    end
+  end
+
   # Will not over-write existing referent values. 
   def element_enhance(request, rft_key, value)
     if (value)

data/app/service_adaptors/sfx.rb

@@ -266,11 +266,8 @@ class Sfx < Service
         end
 
         if ( umlaut_service ) # Okay, it's in services or targets of interest
-          if (target/"./displayer")
-            source = "SFX/"+(target/"./displayer").inner_text
-          else
-            source = "SFX"+URI.parse(self.url).path
-          end
+
+          source = @display_name || "SFX"
 
           target_service_id = (target/"./target_service_id").inner_text
 

data/app/views/feedback/new.html.erb

@@ -1,32 +1,32 @@
 <h1>Contact Us <small>Send us questions, problems, or comments</small></h1>
 
-<%= form_tag(feedback_path(params[:request_id], :contact_id => params[:contact_id]) , :method => :post, :class => "feedback-form form-horizontal") do %>
+<%= form_tag(feedback_path(params[:request_id], :contact_id => params[:contact_id]) , :method => :post, :class => "feedback-form form-horizontal", :role => "form") do %>
     
     <div class="form-group">
-        <label class="control-label" for="name">Your Name</label>
-        <div class="controls">
-          <input type="text" id="name" name="name">
+        <label class="control-label col-sm-2" for="name">Your Name</label>
+        <div class="controls col-sm-10">
+          <input type="text" id="name" name="name" class="form-control">
         </div>
     </div>
 
     <div class="form-group">
-        <label class="control-label" for="email">Your Email</label>
-        <div class="controls">
-          <input type="text" id="email" name="email">
+        <label class="control-label col-sm-2" for="email">Your Email</label>
+        <div class="controls col-sm-10">
+          <input type="text" id="email" name="email" class="form-control">
         </div>
     </div>
 
     <div class="form-group">
-        <label class="control-label" for="feedback">Question or Comment</label>
-        <div class="controls">
-          <textarea id="feedback" name="feedback" class="input-xxlarge" rows=6></textarea>
+        <label class="control-label col-sm-2" for="feedback">Question or Comment</label>
+        <div class="controls col-sm-10">
+          <textarea id="feedback" name="feedback" class="form-control" rows=6></textarea>
         </div>
     </div>
 
 
     <div class="form-group">
-        <div class="controls">
-          <button type="submit" class="btn btn-default">Send</button>
+        <div class="controls col-sm-offset-2 col-sm-10">
+          <button type="submit" class="btn btn-primary">Send</button>
         </div>
     </div>
     

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

@@ -5,7 +5,7 @@
 
 <% if display_not_found_warning?(user_request) %>
     <div class="alert alert-danger">
-        <i class="umlaut_icons-famfamfam-error"/>
+        <i class="umlaut_icons-famfamfam-error"></i>
         <%= t("umlaut.resolve.not_found_warning", :app_name => umlaut_config.app_name, :resource_type => user_request.referent.container_type_of_thing.downcase) %>
     </div>
 <% end %>

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

@@ -3,7 +3,7 @@
     [:alert_success, :alert_info, :alert_error].each do |key|
         if flash[key]
             text = flash[key]
-            css_class = key.to_s.parameterize
+            css_class = key.to_s.dasherize
         end
     end
 -%>

data/config/locales/en.yml

@@ -157,6 +157,7 @@ en:
         notes_html: "This article <b>may</b> be available on the public web, look for links labelled <span class='gscholar_example'>[html]</span> or <span class='gscholar_example'>[pdf]</span>"
       google_book_search:
         book_information: "Book information"
+        description: "Description from Google Books"
       amazon:
         display_text: "Amazon's page"
         description: "Description from Amazon.com"

data/lib/generators/templates/umlaut_services.yml

@@ -31,28 +31,33 @@ default:
         base_url: YOUR_SFX_BASE_URL
         priority: 3
 
+      # We have GoogleBookSearch running early because it can take a bare ISBN
+      # and look up bibliographic metadata, which is useful to happen early. 
+      # By running at the same priority as SFX, 3, it will run concurrently
+      # and maximize fast response time. You could also have it run before SFX,
+      # if you needed SFX to have the enhanced metadata from GoogleBookSearch. 
+      #
+      # It can also find cover images, abstracts, and links to
+      # previews and search-inside-the-book. You can turn
+      # each of those off if you want. 
+      GoogleBookSearch:
+        type: GoogleBookSearch
+        disabled: true
+        priority: 3
+        api_key: 'YOUR_GBS_API_KEY'
+        referent_enhance: true
+        fulltext: true
+        cover_image: true
+        abstract: true
+        web_links: true
+
       # blind link to price comparison site AllBooks.com. 
       # just a blind link with no API pre-check, will be near
       # instantaneous to calculate. 
       AllBooksDotCom:
         type: AllBooksDotCom
         priority: 3
-      
-        
-      # First half of Amazon, run in foreground, get metadata and cover images.
-      Amazon:
-        disabled: true
-        display_name: Amazon.com
-        type: Amazon
-        url: http://webservices.amazon.com/onca/xml
-        api_key: "NEED_API_KEY"
-        secret_key: "NEED_SECRET_KEY"
-        associate_tag: "NEED_ASSOCIATE_ID"
-        priority: 3
-        service_types:
-          - abstract
-          - referent_enhance
-          - cover_image
+
           
       
       # Priority c  : Background          
@@ -61,20 +66,7 @@ default:
       # be put in the same bg wave, to increase perceived responsiveness
       # by ending the spinner in the fulltext area. 
       
-      # Second half of Amazon. It's Slow to lookup highlighted_link and search_inside
-      # availability, so we do it in a bg wave.  
-      Amazon_bg:
-        type: Amazon
-        disabled: true        
-        api_key: "NEED_API_KEY"
-        secret_key: "NEED_SECRET_KEY"
-        associate_tag: "NEED_ASSOCIATE_ID"
-        priority: c        
-        make_aws_call: false
-        service_types:
-          - highlighted_link
-          - search_inside
-          - excerpts          
+         
       
       CoverThing:
         type: CoverThing
@@ -93,12 +85,6 @@ default:
       UlrichsCover:
         type: UlrichsCover
         priority: c      
-          
-      GoogleBookSearch:
-        type: GoogleBookSearch
-        disabled: true
-        priority: c        
-        api_key: 'YOUR_GBS_API_KEY'                
         
       InternetArchive:
         display_name: the Internet Archive

data/lib/generators/umlaut/install_generator.rb

@@ -21,7 +21,7 @@ module Umlaut
 #{$1}# UMLAUT: Umlaut's use of threading makes Rails dev-mode class reloading tricky
 #{$1}# It seems to be be mostly okay with cache_classes=false AND eager_load=true
 #{$1}# but beware of editing files while background requests are running. 
-#{$1}config.eager_loading = true
+#{$1}config.eager_load = true
             EOS
         end
       end

data/lib/tasks/umlaut_asset_compile.rake

@@ -0,0 +1,50 @@
+# Rails4 doesn't create un-fingerprinted assets anymore, but we
+# need a couple for umlaut's API. Let's try to hook in and make
+# symlinks. 
+#
+# list of what file(globs) need non-digest-named copies is kept in
+#     Umlaut::Engine.config.non_digest_named_assets
+# defined in lib/umlaut.rb, but app can modify it if desired. 
+
+require 'umlaut'
+require 'pathname'
+
+
+# Every time assets:precompile is called, trigger umlaut:create_non_digest_assets afterwards. 
+Rake::Task["assets:precompile"].enhance do
+  Rake::Task["umlaut:create_non_digest_assets"].invoke
+end
+
+namespace :umlaut do 
+
+  # This seems to be basically how ordinary asset precompile
+  # is logging, ugh. 
+  logger = Logger.new($stderr)  
+
+  # Based on suggestion at https://github.com/rails/sprockets-rails/issues/49#issuecomment-20535134
+  # but limited to files in umlaut's namespaced asset directories. 
+  task :create_non_digest_assets => :"assets:environment"  do    
+    manifest_path = Dir.glob(File.join(Rails.root, 'public/assets/manifest-*.json')).first
+    manifest_data = JSON.load(File.new(manifest_path))
+        
+    manifest_data["assets"].each do |logical_path, digested_path|
+      logical_pathname = Pathname.new logical_path
+    
+      if Umlaut::Engine.config.non_digest_named_assets.any? {|testpath| logical_pathname.fnmatch?(testpath, File::FNM_PATHNAME) }
+        full_digested_path    = File.join(Rails.root, 'public/assets', digested_path)
+        full_nondigested_path = File.join(Rails.root, 'public/assets', logical_path)
+
+        logger.info "(Umlaut) Copying to #{full_nondigested_path}"
+
+        # Use FileUtils.copy_file with true third argument to copy
+        # file attributes (eg mtime) too, as opposed to FileUtils.cp
+        # Making symlnks with FileUtils.ln_s would be another option, not
+        # sure if it would have unexpected issues. 
+        FileUtils.copy_file full_digested_path, full_nondigested_path, true      
+      end
+    end
+
+  end
+end
+
+  

data/lib/umlaut.rb

@@ -8,6 +8,16 @@ require 'bootstrap-sass'
 module Umlaut
   class Engine < Rails::Engine
     engine_name "umlaut"
+
+    ## Umlaut patches assets:precompile rake task to make non-digest-named
+    # copies of files matching this config. LOGICAL names of assets. 
+    # These can be dirglobs if desired. 
+    #
+    # See lib/tasks/umlaut_asset_compile.rake
+    # 
+    # umlaut_ui.js and spinner.gif prob should have been put under umlaut/
+    # dir, but we didn't. 
+    config.non_digest_named_assets = ["umlaut/*.js", "umlaut_ui.js", "spinner.gif"]
     
     # We need the update_html.js script to be available as it's own
     # JS file too, not just compiled into application.js, so we can

data/lib/umlaut/routes.rb

@@ -98,7 +98,11 @@ module Umlaut
       
       def link_router
         add_routes do |options|
-          get 'link_router(/index)' => "link_router#index"
+          # legacy with the index, to keep old bookmarks working, needs to come first
+          get 'link_router/index(/:id)' => "link_router#index"
+
+          get 'link_router/:id'        => "link_router#index"
+
         end
       end
       

data/lib/umlaut/version.rb

@@ -1,5 +1,5 @@
 module Umlaut
-  VERSION = "4.0.0.beta4"
+  VERSION = "4.0.0.beta5"
 
   # 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta4
+  version: 4.0.0.beta5
 platform: ruby
 authors:
 - Jonathan Rochkind, et al
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -294,7 +294,6 @@ files:
 - active_record_patch/connection_pool.rb
 - app/assets/images/error.gif
 - app/assets/images/frame_remove.gif
-- app/assets/images/jhu_findit.gif
 - app/assets/images/spinner.gif
 - app/assets/images/umlaut_icons.png
 - app/assets/images/umlaut_icons/famfamfam-book-go.png
@@ -504,6 +503,7 @@ files:
 - lib/generators/umlaut/remove_turbolinks_generator.rb
 - lib/generators/umlaut_app_template.rb
 - lib/tasks/umlaut.rake
+- lib/tasks/umlaut_asset_compile.rake
 - lib/tasks/umlaut_migrate_permalinks.rake
 - lib/term_color.rb
 - lib/umlaut.rb