umlaut 3.0.0beta3 → 3.0.0beta4

data/app/controllers/store_controller.rb

@@ -16,9 +16,8 @@ class StoreController < UmlautController
       referent = perm.referent
     elsif (perm && perm.context_obj_serialized)
       stored_co = perm.restore_context_object
-
       # And a referrent, no referrer for now, we'll restore it later. 
-      referent = Referent.create_by_context_object( stored_co, nil, :permalink => false )
+      referent = Referent.create_by_context_object( stored_co, :permalink => false )
       perm.referent = referent
     end
 

data/app/controllers/umlaut_controller.rb

@@ -30,6 +30,11 @@ class UmlautController < ApplicationController
       # OR name of image asset in local app. 
       #link_img_url "http//something"
       
+      # string used in standard layout footer to identify your app.
+      # mark it html_safe if it includes html
+      # footer_credit "Find It service provided by <a href='http://www.university.edu/'>My University</a>".html_safe
+
+      
       # Sometimes Umlaut sends out email, what email addr should it be from?
       # from_email_addr 'no_reply@umlaut.example.com'
       

data/app/helpers/resolve_helper.rb

@@ -118,6 +118,19 @@ module ResolveHelper
     end         
   end
   
+  # If response has a :content key returns it -- and marks it html_safe
+  # if response has a :content_html_safe == true key. 
+  # returns false if no :content. 
+  def response_content(service_response)
+    content = service_response[:content]
+    return false unless content
+    
+    content = content.html_safe if service_response[:content_html_safe] == true
+    
+    return content
+  end
+    
+  
   
 
   # Code-generating helper to add a "More" link to a list, with a maximum
@@ -157,9 +170,8 @@ module ResolveHelper
             
 
     content = "".html_safe
-    
     content <<
-    content_tag(:ul, :class => ("" || options[:ul_class])) do        
+    content_tag(:ul, :class => options[:ul_class]) do        
       list.enum_for(:each_with_index).collect do |item, index|      
         capture(item, index, &block) unless  list.length > options[:limit] && index >= options[:limit]-2        
       end.join(" \n    ").html_safe

data/app/helpers/umlaut/footer_helper.rb

@@ -11,6 +11,10 @@ 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", "http://github.com/team_umlaut/umlaut") + ". ".html_safe
       
       credit_segments = []

data/app/models/service_response.rb

@@ -70,7 +70,13 @@ These are applicable only when the incoming OpenURL is an article-level citation
 == Abstracts/Tocs:
    Can be a link to, or actual content. Either way, should be set
    up to link to source of content if possible. Basic set, plus:
-   [:content]           actual content, if available. 
+   [:content]           actual content, if available.
+   [:content_html_safe] Set to true if content includes html which should be
+                        passed through un-escaped. Service is responsible
+                        for making sure the HTML is safe from injection
+                        attacks (injection attacks from vendor API's? Why not?).
+                        ActionView::Helpers::SanitizeHelper's #sanitize
+                        method can convenient. 
 
 =end
 class ServiceResponse < ActiveRecord::Base  

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

@@ -26,12 +26,12 @@
               {:id => "svctype_link_#{service_response.id}",                
               :target => "_blank",
               :class => "ajax_window"}) %>
-  <% elsif (view_data[:content] ) 
+  <% elsif (content = response_content(view_data )) 
      #collapsible content on page
   %>
     <%= expand_contract_section(view_data[:display_text], "svc_id_#{service_response.id}") do %>
       <div class="section_content_indent">
-        <%= view_data[:content] %>
+        <%= content %>
       </div>
     <% end %>
   

data/db/migrate/01_umlaut_init.rb

@@ -94,16 +94,7 @@ class UmlautInit < ActiveRecord::Migration
     end
   
     add_index "service_responses", ["service_id", "response_key", "value_string", "value_alt_string"], :name => "svc_resp_service_id"
-  
-    create_table "sessions" do |t|
-      t.string   "session_id"
-      t.text     "data"
-      t.datetime "updated_at"
-    end
-  
-    add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
-    add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
-  
+    
     create_table "sfx_urls" do |t|
       t.string "url"
     end

data/lib/service_adaptors/amazon.rb

@@ -39,6 +39,7 @@ class Amazon < Service
   
   
   include MetadataHelper
+  include ActionView::Helpers::SanitizeHelper
   
   required_config_params :url, :api_key, :associate_tag
   attr_reader :url
@@ -181,7 +182,6 @@ class Amazon < Service
     err = (aws.at("ItemLookupResponse/Items/Request/Errors/Error"))
     err = (aws.at("ItemLookupErrorResponse")) if err.blank?
     
-    debugger
     unless (err.blank?)
       if (err.at('Code').text == 'AWS.InvalidParameterValue')
         # Indicates an ISBN that Amazon doesn't know about, or that
@@ -227,9 +227,8 @@ class Amazon < Service
     if (  @service_types.include?("abstract") &&
          desc =
          (aws.at("ItemLookupResponse/Items/Item/EditorialReviews/EditorialReview/Content")))
-
-      # For some reason we need to un-escape the desc. Don't entirely get it.
-      desc_text = CGI.unescapeHTML( desc.inner_text )
+      
+      desc_text =  desc.inner_text
 
       unless ( desc_text.blank? )
         request.add_service_response(
@@ -238,7 +237,8 @@ class Amazon < Service
           :url => item_url, 
           :key=>'abstract', 
           :value_string=>asin, 
-          :content=>desc_text ,
+          :content=> sanitize(desc_text) ,
+          :content_html_safe => true,
           :service_type_value => 'abstract')
       end
     end

data/lib/tasks/umlaut.rake

@@ -1,6 +1,6 @@
 namespace :umlaut do
     desc "Perform nightly maintenance. Set up in cron."
-    task :nightly_maintenance => [:load_sfx_urls, :expire_sessions, :expire_old_data]
+    task :nightly_maintenance => [:load_sfx_urls, :expire_old_data]
   
   
 
@@ -47,44 +47,38 @@ namespace :umlaut do
       end
     end
 
-    desc "Expire sessions older than config.app_config.session_expire_seconds"
-    task :expire_sessions => :environment do
-      # Assume sessions are in db. 
-      # Don't know good way to get the connection associated with sessions,
-      # since there is no model. Assume Request is in the same db.
-      expire_seconds = UmlautController.umlaut_config.lookup!("session_expire_seconds", 1.day)
-      puts "Expiring sessions older than #{expire_seconds} seconds (set with config session_expire_seconds)."
-      Request.connection.execute("delete from sessions where now() - updated_at > #{expire_seconds}")
-    end
 
 
     desc "Cleanup of database for old data associated with expired sessions etc."
     task :expire_old_data => :environment do
       # There are requests, responses, and dispatched_service entries
       # hanging around for things that may be way old and no longer
-      # need to hang around. How do we know if they're too old?
-      # If they are no longer associated with any session, mainly.
+      # need to hang around. 
 
       # Deleting things as aggressively as we're doing here doesn't leave
       # us much for statistics, but we aren't currently gathering any
       # statistics anyway. If statistics are needed, more exploration
       # is needed of performance vs. leaving things around for statistics. 
 
-      # For efficiency, we delete with direct DB calls, so don't count
-      # on Rails business logic being triggered! Was just WAY too slow
-      # otherwise. Also, sorry, doing all this in a db efficient way (one db
-      # query) requires some tricky SQL, which be MySQL specific. 
-
-      # Current Umlaut never re-uses a request different between sessions, so
-      # if the session is dead, we can purge the Requests too. Permalink
-      # architecture has been fixed to not rely on requests or referents,
-      # permalinks (post new architecture) store their own context object.
+      # Current Umlaut never re-uses a request different between sessions, 
+      # and never uses Referents between requests. 
+      # Permalink architecture has been fixed to not rely on requests or 
+      # referents, permalinks (post new architecture) store their own context
+      # object.
+      
+      # To make efficient SQL queries to delete 'orphaned' records whose
+      # foreign keys are neccesary... is tricky, with or without AR, and
+      # may vary in different dbs -- this works for MySQL, it's possible
+      # it will have a problem with Postgres, hasn't been tested. 
 
-      puts "Deleting Requests no longer associated with a session."
       begin_time = Time.now
-      work_clause = " FROM requests LEFT OUTER JOIN sessions ON requests.session_id = sessions.session_id WHERE sessions.id is null "
-      count = Request.count_by_sql("SELECT count(*) " + work_clause)
-      Request.connection.execute("DELETE requests " + work_clause)
+      
+      rdelete_time = Time.now - UmlautController.umlaut_config.lookup!("nightly_maintenance.request_expire_seconds", 1.day)
+      puts "Deleting Requests older than #{rdelete_time}"
+      rdelete = Request.where("created_at < ?", rdelete_time) 
+                  
+      count = rdelete.count
+      rdelete.delete_all
       puts "  Deleted #{count} Requests in #{Time.now - begin_time}"
 
     
@@ -96,38 +90,63 @@ namespace :umlaut do
        
       puts "Deleting orphaned ServiceResponses...."
       begin_time = Time.now
-        work_clause = " FROM service_responses WHERE NOT EXISTS (SELECT * FROM requests WHERE service_responses.request_id =  requests.id)"
-      count = ServiceResponse.count_by_sql("SELECT count(*) " + work_clause)
-      ServiceResponse.connection.execute("DELETE " + work_clause)  
+      #  DELETE FROM `service_responses` WHERE (NOT (EXISTS (SELECT `requests`.* FROM `requests` WHERE (service_responses.request_id = requests.id))))
+      sr_delete = ServiceResponse.where(
+        Request.where("#{ServiceResponse.arel_table.name}.request_id = requests.id").exists.not 
+       )
+          
+      count = sr_delete.count
+      sr_delete.delete_all  
       puts "  Deleted #{count} ServiceResponses in #{Time.now - begin_time}"
 
       
       # And get rid of DispatchedServices for 'dead' requests too. Don't
       # need em.
       puts "Deleting DispatchedServices for dead Requests..."
+      keep_failed = UmlautController.umlaut_config.lookup!("nightly_maintenance.failed_dispatch_expire_seconds", 4.weeks)
       begin_time = Time.now
-      # Sorry, may be MySQL only. 
-      work_clause = " FROM (dispatched_services LEFT OUTER JOIN requests ON dispatched_services.request_id = requests.id)  WHERE requests.id IS NULL  "
-      count = DispatchedService.count_by_sql("SELECT count(*) " + work_clause)
-      DispatchedService.connection.execute("DELETE dispatched_services " + work_clause)
+      # DELETE FROM `dispatched_services` WHERE (NOT (EXISTS (SELECT `requests`.* FROM `requests` WHERE (dispatched_services.request_id = requests.id))))       
+      ds_delete  = DispatchedService.where("status NOT IN (?) OR updated_at < ?", 
+        [DispatchedService::FailedFatal, DispatchedService::FailedTemporary], Time.now - keep_failed
+      ).where(
+        Request.where("dispatched_services.request_id =  requests.id").exists.not 
+      )        
+      count = ds_delete.count
+      ds_delete.delete_all
       puts "  Deleted #{count} DispatchedServices in #{Time.now - begin_time}"
       
 
-      # Turns out we need to get rid of old referents and referentvalues
-      # too. There are just too many. Permalinks have been updated to
-      # store their own info and not depend on Referent existing. 
-      referent_expire = Time.now - UmlautController.umlaut_config.lookup!("referent_expire_seconds", 20.days)
-      puts "Deleting Referents/ReferentValues older than #{referent_expire.inspect}"
+
+
+      puts "Deleting orphaned Referents"
       begin_time = Time.now
-      # May be MySQL dependent. 
-      Referent.connection.execute("DELETE referents, referent_values FROM referents, referent_values where referents.id = referent_values.referent_id AND referents.created_at < '#{referent_expire.to_formatted_s(:db)}'" )
-      puts "  Deleted Referents in #{Time.now - begin_time}"
+      #  DELETE FROM `referents` WHERE (NOT (EXISTS (SELECT `requests`.* FROM `requests` WHERE (referents.id = requests.referent_id))))
+      ref_delete = Referent.where(
+        Request.where("referents.id = requests.referent_id").exists.not
+       )        
+      count = ref_delete.count
+      ref_delete.delete_all
+      puts "  Deleted #{count} Referents in #{Time.now - begin_time}"
+      
+      
+      puts "Deleting orphaned ReferentValues"
+      begin_time = Time.now
+      # DELETE FROM `referent_values` WHERE (NOT (EXISTS (SELECT `referents`.* FROM `referents` WHERE (referents.id = referent_values.referent_id))))
+      rv_delete = ReferentValue.where(
+        Referent.where("referents.id = referent_values.referent_id").exists.not
+       )               
+      
+      
+      
+      count = rv_delete.count
+      rv_delete.delete_all
+      puts "  Deleted #{count} ReferentValues in #{Time.now - begin_time}"
+      
       
       # And turns out we have all Clickthroughs being stored for no apparent
       # reason, let's just delete any older than 3 months ago. 
-      Clickthrough.destroy_all(['created_at < ?', 3.months.ago])
-      puts "Deleted Clickthroughs older than 3 months"
-              
+      Clickthrough.delete_all(['created_at < ?', 3.months.ago])
+      puts "Deleted Clickthroughs older than 3 months"              
     end
     
 end

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.0beta3"
+  VERSION = "3.0.0beta4"
 end

data/lib/umlaut_configurable.rb

@@ -29,6 +29,10 @@ module UmlautConfigurable
       # URL to image to use for link resolver, OR name of image asset in local app. 
       #link_img_url "http//something"
       
+      # string used in standard layout footer to identify your app.
+      # mark it html_safe if it includes html
+      # footer_credit "Find It service provided by <a href='http://www.university.edu/'>My University</a>".html_safe
+      
       # Sometimes Umlaut sends out email, what email addr should it be from?
       from_email_addr 'no_reply@umlaut.example.com'
           
@@ -134,24 +138,13 @@ module UmlautConfigurable
       entry_not_in_kb_warning true
           
       nightly_maintenance do
-         # When nightly_maintenance will expire sessions. Default to
-         # 1 day. Over-ride locally if desired, but
-         # probably no reason to.
-        session_expire_seconds  1.day           
-        referent_expire_seconds deferred! {|c| c.session_expire_seconds }
-        
+        # How old does a request have to be to be deleted by nightly_maintenance?
+        # requests are only re-used within a session. Probably no reason to
+        # change this.          
+        request_expire_seconds 1.day
         
-        # Expire service responses. Service responses are only re-used by the same
-        # session that generated them. But sometimes even that's too much, we
-        # want to expire them eventually, say every 24 hours. 
-        # You can do this in two ways.
-        #
-        # A Number of seconds in an interval, eg:
-        response_expire_interval  1.day
-        #
-        # Or, sometimes it's convenient to synchronize this with some other
-        # process that runs on crontab. Say, expire at midnight every night:
-        # response_expire_crontab_format  "00 00 * * *"
+        # How long to keep FAILED DispatchServices, for viewing problems/troubleshooting
+        failed_dispatch_expire_seconds 4.weeks
   
       end
       

data/test/dummy/db/migrate/{20120229192032_umlaut_init.umlaut.rb → 20120402191628_umlaut_init.umlaut.rb}

@@ -95,16 +95,7 @@ class UmlautInit < ActiveRecord::Migration
     end
   
     add_index "service_responses", ["service_id", "response_key", "value_string", "value_alt_string"], :name => "svc_resp_service_id"
-  
-    create_table "sessions" do |t|
-      t.string   "session_id"
-      t.text     "data"
-      t.datetime "updated_at"
-    end
-  
-    add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
-    add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
-  
+    
     create_table "sfx_urls" do |t|
       t.string "url"
     end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120229192032) do
+ActiveRecord::Schema.define(:version => 20120402191628) do
 
   create_table "clickthroughs", :force => true do |t|
     t.integer  "request_id",          :default => 0, :null => false
@@ -108,15 +108,6 @@ ActiveRecord::Schema.define(:version => 20120229192032) do
 
   add_index "service_responses", ["service_id", "response_key", "value_string", "value_alt_string"], :name => "svc_resp_service_id"
 
-  create_table "sessions", :force => true do |t|
-    t.string   "session_id"
-    t.text     "data"
-    t.datetime "updated_at"
-  end
-
-  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
-  add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
-
   create_table "sfx_urls", :force => true do |t|
     t.string "url"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 3.0.0beta3
+  version: 3.0.0beta4
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &131198600 !ruby/object:Gem::Requirement
+  requirement: &223216140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *131198600
+  version_requirements: *223216140
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &131198180 !ruby/object:Gem::Requirement
+  requirement: &223215720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *131198180
+  version_requirements: *223215720
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &131197620 !ruby/object:Gem::Requirement
+  requirement: &224032220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *131197620
+  version_requirements: *224032220
 - !ruby/object:Gem::Dependency
   name: openurl
-  requirement: &131197120 !ruby/object:Gem::Requirement
+  requirement: &224031720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *131197120
+  version_requirements: *224031720
 - !ruby/object:Gem::Dependency
   name: marc
-  requirement: &131196640 !ruby/object:Gem::Requirement
+  requirement: &224031240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *131196640
+  version_requirements: *224031240
 - !ruby/object:Gem::Dependency
   name: isbn
-  requirement: &131196260 !ruby/object:Gem::Requirement
+  requirement: &224030800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *131196260
+  version_requirements: *224030800
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &131195800 !ruby/object:Gem::Requirement
+  requirement: &224030200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *131195800
+  version_requirements: *224030200
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &133072740 !ruby/object:Gem::Requirement
+  requirement: &224029580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *133072740
+  version_requirements: *224029580
 - !ruby/object:Gem::Dependency
   name: confstruct
-  requirement: &133072240 !ruby/object:Gem::Requirement
+  requirement: &224028780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,21 +109,21 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *133072240
+  version_requirements: *224028780
 - !ruby/object:Gem::Dependency
   name: exlibris-primo
-  requirement: &133071820 !ruby/object:Gem::Requirement
+  requirement: &224028280 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *133071820
+  version_requirements: *224028280
 - !ruby/object:Gem::Dependency
   name: single_test
-  requirement: &133071280 !ruby/object:Gem::Requirement
+  requirement: &224027780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *133071280
+  version_requirements: *224027780
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &133070860 !ruby/object:Gem::Requirement
+  requirement: &224027200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *133070860
+  version_requirements: *224027200
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &133070400 !ruby/object:Gem::Requirement
+  requirement: &224026480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *133070400
+  version_requirements: *224026480
 - !ruby/object:Gem::Dependency
   name: ruby-prof
-  requirement: &133069980 !ruby/object:Gem::Requirement
+  requirement: &224025900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *133069980
+  version_requirements: *224025900
 description: 
 email:
 - umlaut-general@rubyforge.org
@@ -375,6 +375,36 @@ files:
 - ./test/integration/request_test.rb
 - ./test/integration/request_reuse_test.rb
 - ./test/integration/permalinks_test.rb
+- ./test/dummy/tmp/cache/assets/D16/F90/sprockets%2F5fe3c021048c6f9a6086bed7736d87b1
+- ./test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8
+- ./test/dummy/tmp/cache/assets/CD1/F20/sprockets%2F385e5fb31cf27e262480d1174be1d500
+- ./test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
+- ./test/dummy/tmp/cache/assets/D94/FF0/sprockets%2F3b56a1aa77de0d570c38a4a9d5f4b1d6
+- ./test/dummy/tmp/cache/assets/CBD/730/sprockets%2F034c1086748b981c36672d5a56e7fed6
+- ./test/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
+- ./test/dummy/tmp/cache/assets/E5F/960/sprockets%2Fdc007b6cad5c7ef08e33ec28cfff0ef6
+- ./test/dummy/tmp/cache/assets/D24/360/sprockets%2F6987b047a96dc685ba3cf39b31477f6d
+- ./test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
+- ./test/dummy/tmp/cache/assets/CFE/080/sprockets%2F37fe9f4255baddbd549a659914929398
+- ./test/dummy/tmp/cache/assets/DFD/300/sprockets%2Fabac9489cf7f1db8ef00d72a1571ee1e
+- ./test/dummy/tmp/cache/assets/CF7/2B0/sprockets%2F25a7c73655bd3598173b39d9f98bcd46
+- ./test/dummy/tmp/cache/assets/D43/0D0/sprockets%2F682843a8d0795a5fbcfeb2f0c81727d0
+- ./test/dummy/tmp/cache/assets/C80/980/sprockets%2Fc94807409c1523d43e18d25f35d93c41
+- ./test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
+- ./test/dummy/tmp/cache/assets/D6C/7D0/sprockets%2F8a05d6981ec0d38c51739bef0b3a9c2b
+- ./test/dummy/tmp/cache/assets/D37/2B0/sprockets%2F40834fb07d7318c1fddd5003bd9e04f6
+- ./test/dummy/tmp/cache/assets/DFC/040/sprockets%2F15ea81cf915c0cb1dfc9cc04c9fef364
+- ./test/dummy/tmp/cache/assets/DF7/960/sprockets%2F99ac6db10b44a64fbba4ee847b35ba8b
+- ./test/dummy/tmp/cache/assets/CBF/B60/sprockets%2F08ca89671549936265dcb673bf02e36f
+- ./test/dummy/tmp/cache/assets/D97/6B0/sprockets%2Fb070e8c799d1a4ad5e62e0a1ae3b83e6
+- ./test/dummy/tmp/cache/assets/CC9/9F0/sprockets%2F306166316e2cafd13c15e62b51a2339d
+- ./test/dummy/tmp/cache/assets/C70/4D0/sprockets%2F034ad2036e623081bd352800786dfe80
+- ./test/dummy/tmp/cache/assets/DCF/7B0/sprockets%2Ffaa6a4d1af3261fca7b6ddc987386b90
+- ./test/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
+- ./test/dummy/tmp/cache/assets/C45/A30/sprockets%2F39494895e462697b478d3d0c79298a26
+- ./test/dummy/tmp/cache/assets/DC0/D20/sprockets%2F1ccf7405cd252dcec4bf23af82e2563a
+- ./test/dummy/tmp/cache/assets/DD2/D80/sprockets%2Fc66d103807d0f971fbbcf9aa8b8b27ee
+- ./test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - ./test/dummy/tmp/performance/ProfilerTest#test_puts_foo_process_time_graph.html
 - ./test/dummy/tmp/performance/BenchmarkerTest#test_puts_foo_gc_time.csv
 - ./test/dummy/tmp/performance/minus.png
@@ -419,7 +449,7 @@ files:
 - ./test/dummy/script/rails
 - ./test/dummy/config.ru
 - ./test/dummy/db/schema.rb
-- ./test/dummy/db/migrate/20120229192032_umlaut_init.umlaut.rb
+- ./test/dummy/db/migrate/20120402191628_umlaut_init.umlaut.rb
 - ./test/performance/browsing_test.rb
 - ./test/unit/aws_product_sign_test.rb
 - ./test/unit/service_test.rb
@@ -451,7 +481,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 907568800525957015
+      hash: -556718949677620916
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -469,6 +499,36 @@ test_files:
 - ./test/integration/request_test.rb
 - ./test/integration/request_reuse_test.rb
 - ./test/integration/permalinks_test.rb
+- ./test/dummy/tmp/cache/assets/D16/F90/sprockets%2F5fe3c021048c6f9a6086bed7736d87b1
+- ./test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8
+- ./test/dummy/tmp/cache/assets/CD1/F20/sprockets%2F385e5fb31cf27e262480d1174be1d500
+- ./test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
+- ./test/dummy/tmp/cache/assets/D94/FF0/sprockets%2F3b56a1aa77de0d570c38a4a9d5f4b1d6
+- ./test/dummy/tmp/cache/assets/CBD/730/sprockets%2F034c1086748b981c36672d5a56e7fed6
+- ./test/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
+- ./test/dummy/tmp/cache/assets/E5F/960/sprockets%2Fdc007b6cad5c7ef08e33ec28cfff0ef6
+- ./test/dummy/tmp/cache/assets/D24/360/sprockets%2F6987b047a96dc685ba3cf39b31477f6d
+- ./test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
+- ./test/dummy/tmp/cache/assets/CFE/080/sprockets%2F37fe9f4255baddbd549a659914929398
+- ./test/dummy/tmp/cache/assets/DFD/300/sprockets%2Fabac9489cf7f1db8ef00d72a1571ee1e
+- ./test/dummy/tmp/cache/assets/CF7/2B0/sprockets%2F25a7c73655bd3598173b39d9f98bcd46
+- ./test/dummy/tmp/cache/assets/D43/0D0/sprockets%2F682843a8d0795a5fbcfeb2f0c81727d0
+- ./test/dummy/tmp/cache/assets/C80/980/sprockets%2Fc94807409c1523d43e18d25f35d93c41
+- ./test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
+- ./test/dummy/tmp/cache/assets/D6C/7D0/sprockets%2F8a05d6981ec0d38c51739bef0b3a9c2b
+- ./test/dummy/tmp/cache/assets/D37/2B0/sprockets%2F40834fb07d7318c1fddd5003bd9e04f6
+- ./test/dummy/tmp/cache/assets/DFC/040/sprockets%2F15ea81cf915c0cb1dfc9cc04c9fef364
+- ./test/dummy/tmp/cache/assets/DF7/960/sprockets%2F99ac6db10b44a64fbba4ee847b35ba8b
+- ./test/dummy/tmp/cache/assets/CBF/B60/sprockets%2F08ca89671549936265dcb673bf02e36f
+- ./test/dummy/tmp/cache/assets/D97/6B0/sprockets%2Fb070e8c799d1a4ad5e62e0a1ae3b83e6
+- ./test/dummy/tmp/cache/assets/CC9/9F0/sprockets%2F306166316e2cafd13c15e62b51a2339d
+- ./test/dummy/tmp/cache/assets/C70/4D0/sprockets%2F034ad2036e623081bd352800786dfe80
+- ./test/dummy/tmp/cache/assets/DCF/7B0/sprockets%2Ffaa6a4d1af3261fca7b6ddc987386b90
+- ./test/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
+- ./test/dummy/tmp/cache/assets/C45/A30/sprockets%2F39494895e462697b478d3d0c79298a26
+- ./test/dummy/tmp/cache/assets/DC0/D20/sprockets%2F1ccf7405cd252dcec4bf23af82e2563a
+- ./test/dummy/tmp/cache/assets/DD2/D80/sprockets%2Fc66d103807d0f971fbbcf9aa8b8b27ee
+- ./test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - ./test/dummy/tmp/performance/ProfilerTest#test_puts_foo_process_time_graph.html
 - ./test/dummy/tmp/performance/BenchmarkerTest#test_puts_foo_gc_time.csv
 - ./test/dummy/tmp/performance/minus.png
@@ -513,7 +573,7 @@ test_files:
 - ./test/dummy/script/rails
 - ./test/dummy/config.ru
 - ./test/dummy/db/schema.rb
-- ./test/dummy/db/migrate/20120229192032_umlaut_init.umlaut.rb
+- ./test/dummy/db/migrate/20120402191628_umlaut_init.umlaut.rb
 - ./test/performance/browsing_test.rb
 - ./test/unit/aws_product_sign_test.rb
 - ./test/unit/service_test.rb