umlaut 3.0.0alpha3 → 3.0.0alpha4

data/README.md

@@ -13,6 +13,7 @@ knowledge base. But it's actually quite a bit more than that.
 It could also be described as: a just-in-time aggregator of  "last mile" 
 specific-citation services, taking input as OpenURL, and providing both an 
 HTML UI and an api suite for embedding Umlaut services in other products. 
+[What do you mean by this?](https://github.com/team-umlaut/umlaut/wiki/What-is-Umlaut-anyway)
 
 Umlaut is distributed as a ruby Rails engine gem. It's a very heavyweight engine,
 the point of distro'ing as a gem is to make it easy to keep local 

data/app/assets/stylesheets/umlaut.css

@@ -105,10 +105,11 @@ h4 {
   border: 1px solid #FCF1D4;
 }
 
-.headerStatusBar {
+.permalink_bar {
   border-bottom: 1px solid #eeb211;
   background-color: #FCF1D4;
-  padding: .25em; 
+  padding: .25em;
+  text-align: right;
 }
 .header {
   background-color: #FFFDEA;

data/app/controllers/resolve_controller.rb

@@ -48,7 +48,7 @@ class ResolveController < UmlautController
     # to view actual response. 
     headers["x-umlaut-request_id"] = @user_request.id
     headers["x-umlaut-resolve_url"] = url_for( :controller => 'resolve', 'umlaut.request_id'.to_sym => @user_request.id )
-    headers["x-umlaut-permalink_url"] = permalink_url( request, @user_request )
+    headers["x-umlaut-permalink_url"] = current_permalink_url()
 
     # Return empty body. Once we have the xml response done,
     # this really ought to return an xml response, but with

data/app/controllers/umlaut/controller_logic.rb

@@ -6,7 +6,7 @@ module Umlaut::ControllerLogic
   extend ActiveSupport::Concern
   
   included do
-      helper_method :escape_xml, :url_for_with_co, :permalink_url, :with_format
+    helper_method :escape_xml, :url_for_with_co, :current_permalink_url, :with_format
   end
   
   protected
@@ -62,7 +62,7 @@ module Umlaut::ControllerLogic
   # helper method we need available in controllers too
   # Absolute URL for permalink for given request.
   # Have to supply rails request and umlaut request.  
-  def permalink_url(rails_request, umlaut_request, options = {})
+  def current_permalink_url(rails_request=request, umlaut_request=@user_request, options = {})
     # if we don't have everything, we can't make a permalink. 
     unless (umlaut_request && umlaut_request.referent &&
             umlaut_request.referent.permalinks &&

data/app/helpers/resolve_helper.rb

@@ -170,11 +170,7 @@ module ResolveHelper
   end
 
 
-  def link_to_toggle_debug_info(name = "[D]", options = {})
-    javascript = " jQuery('.debug_info').toggle();"  
-  
-    return link_to_function(name, javascript, options)  
-  end
+
     
   ## 
   # Methods to grab SectionRenderer definitions from config. Caching in

data/app/helpers/umlaut/footer_helper.rb

@@ -48,7 +48,7 @@ module Umlaut::FooterHelper
       url += @user_request.to_context_object.kev
       url += "&sfx.ignore_date_threshold=1" if respond_to?(:title_level_request) && title_level_request?
       
-      link_to "[S]", url
+      link_to "[S]", url, :title => "View in SFX"
     end
   end
   
@@ -57,8 +57,17 @@ module Umlaut::FooterHelper
   # debugging. 
   def link_to_test_resolve
     if (test_base = umlaut_config.lookup!("test_resolve_base")) && @user_request
-      link_to "[T]", test_base.chomp("?") + "?" + @user_request.to_context_object.kev
+      link_to "[T]", test_base.chomp("?") + "?" + @user_request.to_context_object.kev, :title => "View in Test #{umlaut_config.app_name}"
     end
   end
+  
+  def link_to_toggle_debug_info(options = {})
+    options = {:text => "[D]", :title => "Toggle on-screen debug info"}.merge(options)
+    
+    text = options.delete(:text)
+    javascript = " jQuery('.debug_info').toggle();"  
+  
+    return link_to_function(text, javascript, options)  
+  end
 
 end

data/app/helpers/umlaut/html_head_helper.rb

@@ -34,4 +34,9 @@ module Umlaut::HtmlHeadHelper
     render_opensearch_link + render_meta_refresh
   end
   
+  # String meant for use in <title>
+  def umlaut_title_text
+    umlaut_config.app_name + (@page_title ? " | #{@page_title}" : "")
+  end
+  
 end

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

@@ -9,7 +9,7 @@
   <%= javascript_include_tag 'application' %>
 
   <title>
-    <%= umlaut_config.app_name %> <%= "| #{@page_title}" if @page_title %>    
+    <%= umlaut_title_text %>    
   </title>
   
   <%= render_umlaut_head_content %>
@@ -19,18 +19,15 @@
 
   <div class="umlaut container">
   
-     <div class="header">
+     <div id="header" class="header">
         <h1><%= umlaut_config.app_name %></h1>
      </div>
   
   
-    <% if @user_request %>
-         <div class="headerStatusBar">
-          <div align="right"  class="largeText">URL: 
-            <% url = permalink_url(request, @user_request) %>
-            <%= link_to url, url %>
-          </div>
-         </div>
+     <% if permalink = current_permalink_url() %>
+       <div class="permalink_bar">
+         URL: <%= link_to current_permalink_url, current_permalink_url %>          
+       </div>
      <% end %>
   
   

data/lib/section_renderer.rb

@@ -422,34 +422,6 @@ class SectionRenderer
   end
 
 
-  # Convenience method for re-ordering sections in local resolve_views
-  # initializer.
-  # Swaps elements if necessary to ensure they are in the specified order.
-  # For example, make sure holding comes before document_delivery:
-  # SectionRenderer.ensureOrder("holding", "document_delivery")
-  # Maybe in the future we'll expand this to take variable arguments. 
-  def self.swap_if_needed!(first, second)
-
-    list = AppConfig.param("resolve_sections")
-    return unless list
-
-    index1 = find_index(list) {|s| s[:div_id] == first}
-    index2 = find_index(list) {|s| s[:div_id] == second}
-
-    (list[index1], list[index2] = list[index2], list[index1]) if index1 && index2 && (index1 > index2)
-
-    list
-  end
-
-  # helper for swap_if_needed! and ensure_order!
-  def self.find_index(array, &block)
-    array.each_with_index do |value, index|
-      return index if block.call(value)
-    end
-    return nil
-  end
-  
-
   protected
 
   def construct_options(arguments)

data/lib/tasks/umlaut.rake

@@ -1,4 +1,3 @@
-
 namespace :umlaut do
     desc "Perform nightly maintenance. Set up in cron."
     task :nightly_maintenance => [:load_sfx_urls, :expire_sessions, :expire_old_data]
@@ -44,7 +43,7 @@ namespace :umlaut do
           hosts.each {|h| SfxUrl.new({:url => h}).save! unless ignore_urls.find {|ignore| ignore === h }}      
         end
       else
-        puts "Skipping load of SFXURLs via direct access to SFX db. No direct access is configured. Configure in config/umlaut_config/database.yml"
+        puts "Skipping load of SFXURLs via direct access to SFX db. No direct access is configured. Configure in config/database.yml sfx_db"
       end
     end
 

data/lib/tasks/umlaut_migrate_permalinks.rake

@@ -12,8 +12,8 @@ namespace :umlaut do
       end
       
       # Turn off all caching we can think of with AR, cause it's gonna
-      # take too much memory!
-      IdentityMap.enabled = false
+      # take too much memory! I _think_ this will do that. 
+      ActiveRecord::IdentityMap.enabled = false
       
       
       unless ActiveRecord::Base.configurations[old_connection_name]
@@ -55,37 +55,39 @@ namespace :umlaut do
       }
       bulk_queue = []
       i = 0
-      OldPermalink.find_each(:batch_size => 20000) do |old_p|
-        i += 1
-        
-        if old_p.context_obj_serialized.blank?
-          could_not_migrate[:count] += 1
-          count_not_migrate[:highest_id] = [count_not_migrate[:highest_id], old_p.id].max
-          could_not_migrate[:latest_date] = [could_not_migrate[:latest_date], old_p.created_on].max
-        else        
-          new_p = Permalink.new
-          new_p.id = old_p.id # keep the id the same!
-          new_p.created_on = old_p.created_on # why not keep it the same?
-          new_p.orig_rfr_id = old_p.orig_rfr_id # why not
+      ActiveRecord::Base.uncached do 
+        OldPermalink.find_each(:batch_size => 20000) do |old_p|
+          i += 1
           
-          # the important thing to be able to actually resolve it
-          new_p.context_obj_serialized = old_p.context_obj_serialized
+          if old_p.context_obj_serialized.blank?
+            could_not_migrate[:count] += 1
+            count_not_migrate[:highest_id] = [count_not_migrate[:highest_id], old_p.id].max
+            could_not_migrate[:latest_date] = [could_not_migrate[:latest_date], old_p.created_on].max
+          else        
+            new_p = Permalink.new
+            new_p.id = old_p.id # keep the id the same!
+            new_p.created_on = old_p.created_on # why not keep it the same?
+            new_p.orig_rfr_id = old_p.orig_rfr_id # why not
+            
+            # the important thing to be able to actually resolve it
+            new_p.context_obj_serialized = old_p.context_obj_serialized
+            
+            if ar_import
+              bulk_queue << new_p
+            else
+              new_p.save!
+            end
+          end
+  
+          print(".") if i % 1000 == 0        
           
-          if ar_import
-            bulk_queue << new_p
-          else
-            new_p.save!
+          if ar_import && i % 10000 == 0
+            print "+"
+            Permalink.import(bulk_queue, :validate => false, :timestamps => false)
+            bulk_queue.clear
           end
+          
         end
-
-        print(".") if i % 1000 == 0        
-        
-        if ar_import && i % 10000 == 0
-          print "+"
-          Permalink.import(bulk_queue, :validate => false, :timestamps => false)
-          bulk_queue.clear
-        end
-        
       end
       
       unless bulk_queue.empty?

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.0alpha3"
+  VERSION = "3.0.0alpha4"
 end

data/lib/umlaut_configurable.rb

@@ -14,9 +14,12 @@ module UmlautConfigurable
     class_attribute :umlaut_config
     helper_method :umlaut_config
     self.umlaut_config = Confstruct::Configuration.new
+        
+    
   end
    
-  
+
+
   
   # Call as UmlautConfigurable.set_default_configuration!(confstruct_obj)
   # to initialize
@@ -211,6 +214,29 @@ module UmlautConfigurable
       #
       # Look in comments at top of SectionRenderer class for what the keys
       # in each entry mean. 
+      
+      
+      # We add a custom method into the resolve_sections array, 
+      # ensure_order!. 
+      resolve_sections [].extend Module.new do         
+        # Convenience method for re-ordering sections 
+        # Swaps elements if necessary to ensure they are in the specified order.
+        # For example, make sure holding comes before document_delivery:
+        # resolve_sections.ensure_order!("holding", "document_delivery")
+        # Maybe in the future we'll expand this to take variable arguments. 
+        def self.ensure_order!(first, second)
+      
+          list = self
+      
+          index1 = list.index {|s| s[:div_id].to_s == first.to_s}
+          index2 = list.index {|s| s[:div_id].to_s == second.to_s}
+      
+          (list[index1], list[index2] = list[index2], list[index1]) if index1 && index2 && (index1 > index2)
+      
+          list
+        end
+      end
+      
       add_resolve_sections! do
         div_id "cover_image"
         partial "cover_image"
@@ -250,7 +276,7 @@ module UmlautConfigurable
       end
       
       add_resolve_sections! do
-        div_id :holding
+        div_id "holding"
         section_title ServiceTypeValue[:holding].display_name_pluralize
         html_area :main
         partial 'holding'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: umlaut
 version: !ruby/object:Gem::Version 
-  hash: -3702664390
+  hash: -3702664396
   prerelease: 5
   segments: 
   - 3
   - 0
   - 0
   - alpha
-  - 3
-  version: 3.0.0alpha3
+  - 4
+  version: 3.0.0alpha4
 platform: ruby
 authors: 
 - Jonathan Rochkind, et al
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 Z
+date: 2012-01-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -176,7 +176,6 @@ files:
 - app/controllers/umlaut/controller_behavior.rb
 - app/controllers/resource_controller.rb
 - app/controllers/resolve_controller.rb
-- app/controllers/application_controller.rb
 - app/controllers/umlaut_controller.rb
 - app/controllers/search_controller.rb
 - app/assets/images/jhu_findit.gif
@@ -278,7 +277,6 @@ files:
 - app/views/umlaut/README
 - app/views/layouts/umlaut.html.erb
 - app/helpers/emailer_helper.rb
-- app/helpers/application_helper.rb
 - app/helpers/export_email_helper.rb
 - app/helpers/umlaut/html_head_helper.rb
 - app/helpers/umlaut/footer_helper.rb
@@ -399,7 +397,6 @@ files:
 - ./test/dummy/db/schema.rb
 - ./test/dummy/db/migrate/20111228211210_umlaut_init.rb
 - ./test/dummy/log/production.log
-- ./test/dummy/log/development.log
 - ./test/performance/browsing_test.rb
 - ./test/unit/aleph_record_benchmarks.rb
 - ./test/unit/aws_product_sign_test.rb
@@ -490,7 +487,6 @@ test_files:
 - ./test/dummy/db/schema.rb
 - ./test/dummy/db/migrate/20111228211210_umlaut_init.rb
 - ./test/dummy/log/production.log
-- ./test/dummy/log/development.log
 - ./test/performance/browsing_test.rb
 - ./test/unit/aleph_record_benchmarks.rb
 - ./test/unit/aws_product_sign_test.rb

data/app/controllers/application_controller.rb

@@ -1,14 +0,0 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
-class ApplicationController < ActionController::Base  
-  
-
-  protect_from_forgery
-  
-   
-  
-     
-end
-
- 

data/app/helpers/application_helper.rb

@@ -1,4 +0,0 @@
-# Methods added to this helper will be available to all templates in the application.
-module ApplicationHelper
-  
-end