umlaut 3.0.0alpha5 → 3.0.0alpha6

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

@@ -148,5 +148,26 @@
     window.Umlaut = new Object();
   window.Umlaut.HtmlUpdater = HtmlUpdater; 
   
+  /* LEGACY Loader was recommended for loading Umlaut JS behaviors
+     in an external page, for JQuery Content Utility. 
+     
+     var loader = new Umlaut.Loader();
+     loader.load();
+     
+     We will provide just enough code to keep that from
+     error'ing (and halting js execution), although at present it does not 
+     actually load the JS behaviors using new style, app wont' have
+     JS behaviors. */
+        
+    window.Umlaut.Loader = function() {
+      this.load = function(option_list) {
+        // log problem in browsers that support it. 
+        if (typeof console != "undefined" && typeof console.log != "undefined") {
+          console.log("WARN: Umlaut.Loader no longer supported in Umlaut 3.x, you have not loaded Umlaut JS Behaviors. See Umlaut documentation for new way.");            
+        }                 
+      }
+    }
+  
+  
 })(jQuery);
 

data/app/assets/javascripts/umlaut_ui.js

@@ -0,0 +1,15 @@
+/* This JS file can be referenced by external apps to add Umlaut JS UI behaviors
+   to a page that has had Umlaut content added to it via partial html snippets. 
+   
+   This is a sprockets manifest file requiring individual js behavior
+   files applicable. 
+   
+   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.   
+   
+   
+*= require 'umlaut/expand_contract_toggle.js'   
+   
+   
+*/

data/app/helpers/resolve_helper.rb

@@ -77,7 +77,7 @@ module ResolveHelper
   #  <% expand_contract_section("My Content", "div_id_to_use") do %>
   #      this will be hidden and shown
   #  <% end %>
-  def expand_contract_section(arg_heading, id, options={}, &block)         
+  def expand_contract_section(arg_heading, id, options={}, &block)      
     expanded = (params["umlaut.show_#{id}"] == "true") || options[:initial_expand] || false
     
     icon = image_tag( ( expanded ? "list_open.png" : "list_closed.png"),
@@ -86,9 +86,20 @@ module ResolveHelper
                        :border => "0")
     heading = content_tag(:span,( expanded ? "Hide " : "Show "), :class=>'expand_contract_action_label') + arg_heading
 
-    
     link_params = params.merge('umlaut.request_id' => @user_request.id,
-      "umlaut_show_#{id}" => (! expanded).to_s )
+      "umlaut.show_#{id}" => (! expanded).to_s ,
+      
+      # Need to zero out format-related params for when we're coming
+      # from a partial html api request, so the link we generate
+      # is not to format json/xml/etc.       
+      :format => nil, 
+      'umlaut.response_format' => nil,
+      'umlaut.jsonp'=>nil,
+      
+      # In Rails3, an :anchor param will actually be used for #fragmentIdentifier
+      # on end of url
+      :anchor => "#{id}_toggle_link"
+      )
       
     # Make sure a self-referencing link from partial_html_sections
     # really goes to full HTML view.
@@ -98,7 +109,6 @@ module ResolveHelper
     
     return content_tag(:div, :class => "expand_contract_section") do
       link_to( icon + heading, link_params, 
-            :anchor =>  "#{id}_toggle_link", 
             :id => "#{id}_toggle_link", 
             :class => "expand_contract_toggle" ) + "\n" +
         content_tag(:div, :id => id, 

data/app/views/resolve/api.xml.builder

@@ -46,21 +46,17 @@ xml.umlaut do
             ["display_text", "url", "notes"].each do |att|
               xml.tag!(att, response.attributes[att])
             end
-            response.service_data.keys.each do |key|
-              
-              xml.tag!(key) do
-                value = nil
-                # try calling to_xml, for instance for hashes
-                begin
-                  value = response.service_data[key].to_xml(:root => "records", :skip_instruct => true)
-                  xml<< value
-                rescue
-                  # oh well, no to_xml in there
-                  value = response.service_data[key]
-                  xml.text!(value.to_s) unless value.blank?
+            
+            response.service_data.keys.each do |key|       
+              value = response.service_data[key]
+              # If it's a complex obj with a :to_xml, like a hash, use it. 
+              if value.respond_to?(:to_xml)
+                xml.tag!(key) do
+                  xml << value.to_xml(:root => "records", :skip_instruct => true)
                 end
-                
-              end
+              else
+                xml.tag!(key, value.to_s.strip)
+              end              
             end
             
             xml.umlaut_passthrough_url(url_for(:controller=>'link_router', :action => "index", :id=>response.id, :only_path => false))                          

data/lib/#Untitled-1#

@@ -0,0 +1,14 @@
+http://blacklight.mse.jhu.edu:3000/resolve/index?ctx_enc=info%3Aofi%2Fenc%3AUTF-8
+&ctx_id=
+&ctx_tim=2012-01-05T10%3A55%3A49-05%3A00
+&ctx_ver=Z39.88-2004
+&rfr_id=info%3Asid%3Alibrary.jhu.edu%2Fblacklight
+&rft.genre=journal
+&rft.issn=00987484
+&rft.jtitle=JAMA%3A+the+journal+of+the+American+Medical+Association
+&rft_id=https%3A%2F%2Fblacklight.mse.jhu.edu%2Fdemo%2Fcatalog%2Fbib_647591
+&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal
+&umlaut.request_id=6
+&umlaut_show_umlaut_fulltext=true
+&url_ctx_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Actx
+&url_ver=Z39.88-2004

data/lib/umlaut/routes.rb

@@ -30,7 +30,7 @@ module Umlaut
     end
 
     def default_route_sets
-      [:root, :permalinks, :a_z, :resolve, :open_search, :link_router, :export_email, :resources, :search]
+      [:root, :permalinks, :a_z, :resolve, :open_search, :link_router, :export_email, :resources, :search, :javascript]
     end
 
     module RouteSets
@@ -129,6 +129,19 @@ module Umlaut
           match 'search(/:action(/:id(.:format)))' => "search"
         end
       end
+      
+      def javascript
+        add_routes do |options|
+          # Legacy location for update_html.js used by JQuery Content Utility
+          # to embed JS on external sites. Redirect to new location. 
+          # Intentionally non-fingerprinted, most efficient thing
+          # we can do in this case is let the web server take care
+          # of Last-modified-by etc headers. 
+          match 'javascripts/jquery/umlaut/update_html.js' => redirect("/assets/umlaut/update_html.js", :status => 301)
+          
+          match 'images/spinner.gif' => redirect("/assets/spinner.gif")
+        end
+      end
    
     end
     include RouteSets

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.0alpha5"
+  VERSION = "3.0.0alpha6"
 end

data/lib/umlaut.rb

@@ -25,14 +25,17 @@ module Umlaut
     # I don't entirely understand what's going on. 
     #config.eager_load_paths << File.join(self.root, "lib")
     
-    # This makes our rake tasks visible. NOT NEEDED, tasks in lib/tasks
-    # are avail by default, this ends up doing a double load. 
-    #rake_tasks do
-    #  Dir.chdir(File.expand_path(File.join(File.dirname(__FILE__), '..'))) do
-    #    Dir.glob(File.join('lib', 'tasks', '*.rake')).each do |railtie|
-    #      load railtie
-    #    end
-    #  end
-    #end
+    # 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
+    # deliver it to external apps using it (JQuery Content Utility).
+    # It will now be available from path /assets/umlaut/update_html.js
+    # in production mode with precompiled assets, also in dev mode, 
+    # whatevers.     
+    initializer "#{engine_name}.asset_pipeline" do |app|
+      app.config.assets.precompile << 'umlaut/update_html.js'
+      app.config.assets.precompile << "umlaut_ui.js"
+    end
+    
+    
   end
 end

data/test/dummy/tmp/cache/assets/CBB/9C0/sprockets%2F706f28923fb754cad04b9107c89986a1

@@ -0,0 +1,31 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1325695618.004611:@value{	I"length:EFi{I"digest;
+F"%169a41ce2d19740e03908cf9124200d3I"source;
+FI"{/* expand_contract_toggle.js: Support for show more/hide more in lists of umlaut content. */
+
+jQuery(document).ready(function($) {
+   
+    $(".expand_contract_toggle").live("click", function() {
+        var content = $(this).next(".expand_contract_content");
+        var icon = $(this).parent().find('img.toggle_icon');
+        
+        if (content.is(":visible")) {                    
+          icon.attr("src", icon.attr("src").replace("list_open.png", "list_closed.png"));
+          $(this).find(".expand_contract_action_label").text("Show ");
+          
+          content.hide();
+          
+        }
+        else {                    
+          icon.attr("src", icon.attr("src").replace("list_closed.png", "list_open.png"));
+          $(this).find(".expand_contract_action_label").text("Hide ");
+          content.show();
+        }
+        
+        return false;
+    });
+    
+    
+});
+;
+FI"
+F"%742ae9e3db24ddeb5c807914bde33141