umlaut 3.0.0alpha7 → 3.0.0alpha8

data/app/controllers/resolve_controller.rb

@@ -20,7 +20,7 @@ class ResolveController < UmlautController
   def index
     self.service_dispatch()
 
-    # check for menu skipping configuration. link is a ServiceType object
+    # check for menu skipping configuration. link is a ServiceResponse
     link = should_skip_menu
     if ( ! link.nil? )                   
       

data/app/controllers/resource_controller.rb

@@ -15,8 +15,8 @@ class ResourceController < UmlautController
   # the whole image in memory for a second while it delivers it, oh well.
   # doesn't seem to effect speed much, even though it's not optimal. 
   def proxy
-    svc_type = ServiceType.find(params[:id])      
-    url_str =  svc_type.view_data[:url]
+    svc_resp = ServiceResponse.find(params[:id])      
+    url_str =  svc_resp.view_data[:url]
     uri = nil
     begin
       uri = URI(url_str)
@@ -27,9 +27,11 @@ class ResourceController < UmlautController
     proxied_headers = proxy_headers( request, uri.host )
     remote_response = open(uri, 'rb', proxied_headers)
 
-    # copy certain headers to our proxied response
-    ["content-type", "cache-control", "expires", "content-length", "last-modified", "etag", "date"].each do |key|
-      response.headers[key] = remote_response.meta[key]
+    # copy certain headers to our proxied response    
+    ["Content-Type", "Cache-Control", "Expires", "Content-Length", "Last-Modified", "Etag", "Date"].each do |key|
+      value = remote_response.meta[key.downcase] # for some reason open-uri lowercases em
+      # rack doens't like it if we set a nil value here. 
+      response.headers[key] = value unless value.blank?
     end
     response.headers["X-Original-Url"] = url_str
     

data/lib/generators/umlaut/asset_hooks_generator.rb

@@ -4,19 +4,34 @@ module Umlaut
   class AssetHooks < Rails::Generators::Base
     
     def add_to_stylesheet_manifest
-      unless IO.read("app/assets/stylesheets/application.css").include?('Umlaut')
-        insert_into_file "app/assets/stylesheets/application.css", :after => "/*" do
+      existing = IO.read("app/assets/stylesheets/application.css")
+      unless existing.include?('Umlaut')
+        after = 
+          if existing.include?("require_self")
+            "require_self"
+          else
+            "/*"
+          end
+          
+        insert_into_file "app/assets/stylesheets/application.css", :after => after do
           %q{ 
+ *         
  * The base Umlaut styles:
- *= require '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. */
-  @import url(//ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/ui-lightness/jquery-ui.css);
+  /*  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

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.0alpha7"
+  VERSION = "3.0.0alpha8"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: umlaut
 version: !ruby/object:Gem::Version 
-  hash: -3702664398
+  hash: -3702664404
   prerelease: 5
   segments: 
   - 3
   - 0
   - 0
   - alpha
-  - 7
-  version: 3.0.0alpha7
+  - 8
+  version: 3.0.0alpha8
 platform: ruby
 authors: 
 - Jonathan Rochkind, et al