rack-jquery_ui-themes 1.0.0 → 2.0.0

data/lib/rack/jquery_ui/themes.rb

@@ -10,41 +10,57 @@ module Rack
     # jQuery-UI themes' CDN script tags and fallback in one neat package.
     class Themes
       include JQuery::Helpers
-  
+
       # The standard CSS file.
       JQUERY_UI_THEME_FILE = "jquery-ui.min.css"
+
+
+      # Namespaced for convenience, to help with checking
+      # which CDN supports what.
+      module CDN
   
-      # Script tags for the Media Temple CDN
-      MEDIA_TEMPLE = "<link rel='stylesheet' href='http://code.jquery.com/ui/#{JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/jquery-ui.css' type='text/css' />"
-  
-      # Script tags for the Google CDN
-      GOOGLE = "<link rel='stylesheet' href='//ajax.googleapis.com/ajax/libs/jqueryui/#{JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/jquery-ui.css' type='text/css' />"
-  
-      # Script tags for the Microsoft CDN
-      MICROSOFT = "<link rel='stylesheet' href='//ajax.microsoft.com/ajax/jquery.ui/#{JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/jquery-ui.css' type='text/css' />"
-  
-      # This javascript checks if the jQuery-UI object has loaded. If not, that most likely means the CDN is unreachable, so it uses the local jQuery-UI theme.
+        # URL for the Media Temple CDN
+        MEDIA_TEMPLE = "http://code.jquery.com/ui/#{JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/jquery-ui.min.css"
+    
+        # URL for the Google CDN
+        GOOGLE = "//ajax.googleapis.com/ajax/libs/jqueryui/#{JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/jquery-ui.min.css"
+    
+        # URL for the Microsoft CDN
+        MICROSOFT = "//ajax.microsoft.com/ajax/jquery.ui/#{JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/jquery-ui.min.css"
+
+      end
+
+
+      # This javascript checks if the jQuery-UI object has loaded by issuing a head request to the CDN. If it doesn't get a successful status, that most likely means the CDN is unreachable, so it uses the local jQuery-UI theme.
       FALLBACK = <<STR
 <script type="text/javascript">
-$.each(document.styleSheets, function(i,sheet){
-  if(sheet.href=='http://code.jquery.com/mobile/1.0b3/jquery.mobile-1.0b3.min.css') {
-    var rules = sheet.rules ? sheet.rules : sheet.cssRules;
-    if (rules.length == 0) {
-      $('<link rel="stylesheet" type="text/css" href="/js/jquery-ui/#{JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/#{JQUERY_UI_THEME_FILE}" />').appendTo('head');
+  $.ajax({
+    type: "HEAD",
+    url: ':CDNURL',
+    success: function(css,status) {
+      // do nothing
+    },
+    error: function(xhr,status,error) {
+      console.log("error");
+      var link = document.createElement("link");
+      link.rel = "stylesheet";     
+      link.href = ':FALLBACK_URL';
+      document.getElementsByTagName("head")[0].appendChild(link); 
     }
- }
-})
+  });
 </script>
 STR
+
   
       # List of the standard themes provided by jQuery UI.
-      STANDARD_THEMES = %w{base black-tie blitzer cupertino dark-hive dot-luv eggplant excite-bike flick hot-sneaks humanity le-frog mint-choc overcast pepper-grinder redmond smoothness south-street start sunny swanky-purse trontastic ui-darkness ui-lightness vader}
+      STANDARD_THEMES = %w{black-tie blitzer cupertino dark-hive dot-luv eggplant excite-bike flick hot-sneaks humanity le-frog mint-choc overcast pepper-grinder redmond smoothness south-street start sunny swanky-purse trontastic ui-darkness ui-lightness vader}
   
 
       # The chosen theme name.
       # @return [String]
+      # @see http://blog.jqueryui.com/2013/03/jquery-ui-1-10-2/ for why the default theme was changed to 'smoothness'.
       def self.theme
-        @theme ||= "base"
+        @theme ||= "smoothness"
       end
   
 
@@ -52,26 +68,75 @@ STR
       # @param [String] name Name of the theme.
       # @return [String]
       def self.theme=( name )
+        name = name.to_s
         fail ArgumentError, "That theme (#{name}) is unknown for this version of the rack-jquery_ui-themes library." unless STANDARD_THEMES.include? name
         @theme = name
       end
-  
-  
-      # @param [Symbol] :organisation Choose which CDN to use, either :google, :microsoft or :media_temple
+
+
+      # Set the themes to use.
+      # @param [Array<String>] themes
+      # @return [Array<String>]
+      # @example
+      #   self.class.themes = ["smoothness", "swanky-purse"]
+      def self.themes=( themes )
+        themes = themes.pop if themes.first.respond_to? :each
+        @themes = themes.map! &:to_s
+      end
+
+      # Get the selected themes
+      # @return [Array<String>]
+      def self.themes
+        @themes ||= Array(self.theme)
+      end
+
+
+      # @param [Hash] env The rack env hash.
       # @param [Hash] opts
-      # @option opts [#to_s] :theme
-      # @return [String] The HTML script tags to get the CDN.
+      # @option opts [#to_sym] organisation Choose which CDN to use, either :media_temple, :microsoft, or :media_temple.
+      # @option opts [#to_s] :theme Theme to use. Won't set any routes or permanent settings, see note.
+      # @return [String] The HTML script tags to get the CDN, with a JQuery function that will be called if the CDN fails and sets the fallback path.
       # @example
-      #   Rack::JQueryUI::Themes.cdn :google, theme: "dot-luv"
-      def self.cdn( organisation=:google, opts={} )
-        theme = opts.fetch :theme, self.theme
-        fail ArgumentError, "That theme (#{theme}) is unknown for this version of the rack-jquery_ui-themes library." unless STANDARD_THEMES.include? theme
-        script = case organisation
-          when :media_temple then MEDIA_TEMPLE
-          when :microsoft then MICROSOFT
-          else GOOGLE
+      #   # The easiest, use the defaults:
+      #   Rack::JQueryUI::Themes.cdn env
+      #
+      #   # Choose a CDN to favour:
+      #   Rack::JQueryUI::Themes.cdn env, :organisation => :media_temple
+      #
+      #   # Choose a theme to use:
+      #   Rack::JQueryUI::Themes.cdn env, :organisation => :media_temple, theme: "dot-luv"
+      #
+      # @note
+      #   The :theme option can override those given when
+      #   setting up the middleware (see {#initialize}), but if the theme given here
+      #   is not in the themes already set up, then there'll be
+      #   no URL paths for it, so use this option to pick which
+      #   theme is favoured *from the already given set*.
+      def self.cdn( env, opts={} )
+        organisation = opts[:organisation] || :media_temple
+        themes = env.fetch "rack.jquery_ui-themes", themes()
+        theme, themes = sort_out_options opts.merge :themes => themes
+
+        # Get the CDN URL for the given organisation.
+        url = case organisation.to_sym
+          when :google then CDN::GOOGLE
+          when :microsoft then CDN::MICROSOFT
+          when :media_temple then CDN::MEDIA_TEMPLE
+          else CDN::MEDIA_TEMPLE
         end
-        [script,FALLBACK].map{|x| x.sub(/\:THEME/, theme) }.join("\n")
+
+        script_name = env.fetch("SCRIPT_NAME","/")
+
+        fallback_url = ::File.join script_name, "/js/jquery-ui/#{JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/#{JQUERY_UI_THEME_FILE}"
+
+        fallback_script = FALLBACK.gsub(/\:CDNURL/, url)
+                                  .sub /\:FALLBACK_URL/, fallback_url
+
+        script    = "<link rel='stylesheet' href='#{url}' type='text/css' />"
+        [script,fallback_script].map{|x|
+          x.gsub(/\:THEME/, theme)
+        }.join("\n")
+        #fallback_script.gsub(/\:THEME/, theme)
       end
   
   
@@ -79,40 +144,94 @@ STR
       DEFAULT_APP_OPTIONS = {
         :http_path => "/js/jquery-ui/#{JQueryUI::JQUERY_UI_VERSION}/themes/"
       }
-  
-  
+
+
+      # @private
+      # Used internally to find the vendored files.
+      Path_to_vendor = ::File.join(
+        "../../../",
+        "vendor/assets/javascripts/jquery-ui"
+      )
+
+
+      def self.sort_out_options( options={} )
+        theme = options[:theme]
+        themes = options[:themes]
+
+        if theme
+          t = Array(theme).map(&:to_s).uniq # put in an array
+          themes = themes ?
+            (t + themes).uniq :
+            t
+        else
+          themes = self.themes if themes.nil? || themes.empty?
+          theme = themes.first
+        end
+        
+        unless (ts = themes - STANDARD_THEMES).empty?
+          fail ArgumentError, %Q!The themes given (#{ts.join(" ")}) are unknown for this version of the rack-jquery_ui-themes library. Choose from #{STANDARD_THEMES}!
+        end
+
+        [theme,themes]
+      end
+
+
       # @param [#call] app
       # @param [Hash] options
-      # @option options [String] theme The theme to use. The default is "base".
-      # @option options [String] :http_path If you wish the jQuery CSS fallback route to be "/js/jquery-ui/1.10.1/base/jquery-ui.min.css" (or whichever version this is at) then do nothing, that's the default. If you want the path to be "/assets/javascripts/jquery-ui/1.10.1/base…" then pass in `:http_path => "/assets/javascripts/#{Rack::JQueryUI::JQUERY_UI_VERSION}".
-      # @note ***Don't leave out the version number!***. The scripts provided by jQuery don't contain the version in the filename like the jQuery scripts do, which means that organising them and sending the right headers back is bound to go wrong unless you put the version number somewhere in the route. You have been warned!
+      # @option options [#to_s] theme The theme to use. The default is "smoothness".
+      # @option options [Array<#to_s>] themes List of themes to allow. If the option for theme is set then this will be a backup set. If the option for theme is not set then the first theme listed will become the main theme.
+      # @option options [String] :http_path If you wish the jQuery CSS fallback route to be "/js/jquery-ui/1.10.1/smoothness/jquery-ui.min.css" (or whichever version this is at) then do nothing, that's the default. If you want the path to be "/assets/javascripts/jquery-ui/1.10.1/smoothness…" then pass in `:http_path => "/assets/javascripts/#{Rack::JQueryUI::JQUERY_UI_VERSION}".
+      # @note ***Don't leave out the version number when using the :http_path option!***. The scripts provided by jQuery don't contain the version in the filename like the jQuery scripts do, which means that organising them and sending the right headers back is bound to go wrong unless you put the version number somewhere in the route. You have been warned!
       # @example
       #   # The default:
       #   use Rack::JQueryUI::Themes
+      #
+      #   # With a default theme other than smoothness:
+      #   use Rack::JQueryUI::Themes, :theme => "dot-luv"
+      #
+      #   # With a several themes, the main one being dot-luv:
+      #   use Rack::JQueryUI::Themes, :themes => %w{dot-luv blitzer eggplant trontastic}
+      #
+      #   # Another way to do the same thing
+      #   use Rack::JQueryUI::Themes, :theme => "dot-luv", :themes => %w{blitzer eggplant trontastic}
       def initialize( app, options={} )
         @app, @options  = app, DEFAULT_APP_OPTIONS.merge(options)
-        self.class.theme = options[:theme] unless options[:theme].nil?
-        @http_path_to_jquery_css = ::File.join(
-          @options[:http_path],        
-          self.class.theme,
-          JQUERY_UI_THEME_FILE
-        )
-        @http_path_to_jquery_images = ::File.join(
-          @options[:http_path],        
-          self.class.theme,
-          "images"
-        )
-  
+        theme, @themes = self.class.sort_out_options @options
+
+        @http_base_path = @options[:http_path]
+
         # set the path to all the assets
-        rel_path_to_vendor = "../../../../"
-        path_to_themes = "vendor/assets/javascripts/jquery-ui"
-        version_and_theme = "#{JQueryUI::JQUERY_UI_VERSION}/themes/#{self.class.theme}"
-        @path_to_theme = ::File.expand_path( ::File.join( rel_path_to_vendor, path_to_themes, version_and_theme ), __FILE__)
-        @path_to_images = ::File.join @path_to_theme, "images"
-        d = Dir.new(@path_to_images)
-        @images = d.entries.delete_if{|f| f =~ /^\./ }.select{|f| 
-          Rack::Mime.mime_type(::File.extname(f), "text/css" ).start_with? "image" 
-        }
+        @paths = @themes.each_with_object({}) do |theme,paths|
+          version_and_theme = ::File.join( 
+            JQueryUI::JQUERY_UI_VERSION, "themes", theme
+          )
+
+          theme_url = ::File.join @http_base_path, theme
+          theme_dir  = ::File.expand_path( ::File.join( Path_to_vendor, version_and_theme ), ::File.dirname(__FILE__) )
+
+          # Store the HTTP path to the CSS as the key
+          # with the file path to the CSS file as the value
+          paths.store(
+            ::File.join( theme_url, JQUERY_UI_THEME_FILE ),
+            ::File.join( theme_dir, JQUERY_UI_THEME_FILE)
+          )
+
+          images_dir = ::File.join theme_dir, "images"
+
+          Dir.new(images_dir)
+              .entries
+              .delete_if{|f| f =~ /^\./ }
+              .select{|f| 
+                Rack::Mime.mime_type(
+                  ::File.extname(f), "text/css" # fallback is a false
+                ).start_with? "image"           # here
+              }.each do |img|
+                paths.store(
+                  ::File.join( theme_url, "images", img ), # url
+                  ::File.join( images_dir, img )           # file
+                )
+              end
+        end
       end
 
 
@@ -125,28 +244,28 @@ STR
       # For thread safety
       # @param (see #call)
       def _call( env )
+        env.merge! "rack.jquery_ui-themes" => @themes
         request = Rack::Request.new(env.dup)
-  
-        # TODO path for images
-  
+
         # path for CSS
-        if request.path_info.start_with? @options[:http_path]
+        # TODO benchmark this condition
+        # start_with? vs has_key vs regex
+        if @paths.has_key? request.path_info
           response = Rack::Response.new
-          if request.path_info.end_with? ::File.join(self.class.theme,JQUERY_UI_THEME_FILE)
-            # serve CSS
-            # for caching
+          if request.path_info.end_with? JQUERY_UI_THEME_FILE # CSS.
+            # For caching:
             response.headers.merge! caching_headers("#{JQUERY_UI_THEME_FILE}-#{self.class.theme}-#{JQueryUI::JQUERY_UI_VERSION}", JQueryUI::JQUERY_UI_VERSION_DATE)
             # There's no need to test if the IF_MODIFIED_SINCE against the release date because the header will only be passed if the file was previously accessed by the requester, and the file is never updated. If it is updated then it is accessed by a different path.
-            requested_file = open(::File.join(@path_to_theme, JQUERY_UI_THEME_FILE ), "r")
-          elsif request.path_info =~ /images/ && 
-                (fin = request.path_info.split("/").last)
-                (img = @images.find{|img| img == fin })
+            requested_file = open @paths[request.path_info], "r"
+          elsif request.path_info =~ /images/
             # serve images
-            requested_file = open ::File.join( @path_to_images, img), "rb"
+            requested_file = open @paths[request.path_info], "rb"
           else # bad route
             response.status = 404
             return response.finish # finish early, 404
           end
+
+          # set status and read the requested file
           if request.env['HTTP_IF_MODIFIED_SINCE']
             response.status = 304
           else

data/lib/rack/jquery_ui/themes/version.rb

@@ -2,7 +2,7 @@ module Rack
   class JQueryUI
 
     # This is here in case another rack-jquery_ui library has already been loaded.
-    jquery_ui_version = "1.10.3"
+    jquery_ui_version = "1.10.1"
     if defined? JQUERY_UI_VERSION
       warn "JQUERY_UI_VERSION was already defined."
       unless JQUERY_UI_VERSION == jquery_ui_version
@@ -14,12 +14,12 @@ module Rack
 
       # This is the release date of the jQuery file, it makes an easy "Last-Modified" date for setting the headers around caching.
       # @todo remember to change Last-Modified with each release!
-      JQUERY_UI_VERSION_DATE = "Fri, 03 May 2013 00:00:00 GMT"
+      JQUERY_UI_VERSION_DATE = "Fri, 15 Feb 2013 00:00:00 GMT"
     end
 
     class Themes
       # version of this library
-      VERSION = "1.0.0"
+      VERSION = "2.0.0"
     end
   end
 end

data/rack-jquery_ui-themes.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/yb66/rack-jquery_ui-themes"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($/).reject{|x| x.start_with?("vendor") && !x.include?(Rack::JQueryUI::JQUERY_UI_VERSION) }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/spec/spec_helper.rb

@@ -21,7 +21,21 @@ ENV["EXPECT_WITH"] ||= "racktest"
 Dir[ File.join( Spec_dir, "/support/**/*.rb")].each do |f|
   require f
 end
+                                  
+
+module RackJQueryUIThemesHelpers
+  def subber( s, opts={} )
+    script_name = opts.fetch("SCRIPT_NAME","/")
+    fallback_url = ::File.join script_name, "/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/#{Rack::JQueryUI::Themes::JQUERY_UI_THEME_FILE}"
+    theme = opts.fetch :theme, "smoothness"
+    cdn = opts[:cdn]
+    s = s.gsub(/\:CDNURL/, cdn) if cdn
+    s.sub! /\:FALLBACK_URL/, fallback_url
+    s.gsub(/\:THEME/, theme)
+  end
+end
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.include RackJQueryUIThemesHelpers
 end

data/spec/themes_spec.rb

@@ -3,99 +3,150 @@
 require 'spec_helper'
 require_relative "../lib/rack/jquery_ui/themes.rb"
 
-def subber( s, replacement={} )
-  replacement[:theme] ||= "base"
-  s.sub(/:THEME/,replacement[:theme])
-end
-
 shared_examples "Given an organisation and a theme" do
-  it { should == "#{subber cdn, theme}\n#{subber Rack::JQueryUI::Themes::FALLBACK, theme}" }
+  let(:link) { "<link rel='stylesheet' href='#{cdn}' type='text/css' />" }
+  let(:expected) { "#{subber link, opts}\n#{subber Rack::JQueryUI::Themes::FALLBACK, opts}" }
+  it { should == expected }
 end
 
 shared_context "Calling the CDN" do
-  subject { Rack::JQueryUI::Themes.cdn organisation, theme }
+  subject { Rack::JQueryUI::Themes.cdn env, opts }
 end
 
 
 describe "The class methods" do
-  let(:opts) { theme.delete_if{|k,v| v.nil?} }  
-  let(:theme) { {:theme => nil} }
-  subject { Rack::JQueryUI::Themes.cdn organisation, opts }
   context "Given an organisation" do
+    subject { Rack::JQueryUI::Themes.cdn env, opts }
+    let(:theme) { "smoothness" }
+    let(:opts) {
+      {:theme => theme, :cdn => cdn, :organisation => organisation}
+    }
+    let(:env) {
+      {}
+    }
     context "of nil (the default)" do
       let(:organisation) { nil }
-      let(:theme) { {:theme => nil} }
-      let(:cdn) { Rack::JQueryUI::Themes::GOOGLE }
+      let(:cdn) { Rack::JQueryUI::Themes::CDN::MEDIA_TEMPLE }
       include_examples "Given an organisation and a theme"
-      context "Given a theme" do
-        let(:theme) { { :theme => Rack::JQueryUI::Themes::STANDARD_THEMES.sample } }
-        include_context "Calling the CDN"
-        include_examples "Given an organisation and a theme"
+      context "and given a theme" do
+        context "That is valid" do
+          let(:theme) { Rack::JQueryUI::Themes::STANDARD_THEMES.sample}
+          include_context "Calling the CDN"
+          include_examples "Given an organisation and a theme"
+        end
+        context "That is not valid" do
+          context "Because it's not in the standard themes" do
+            let(:theme) { "breakfastsupercharger" }
+            it "should fail" do
+              expect{ Rack::JQueryUI::Themes.cdn organisation, opts }.to raise_error
+            end
+          end
+          context "Because different themes were chosen at set up" do
+            let(:app) {
+              Sinatra.new do
+                use Rack::JQuery
+                use Rack::JQueryUI
+                use Rack::JQueryUI::Themes, :themes => %w{pepper-grinder swanky-purse trontastic}
+                get('/') { Rack::JQueryUI::Themes.cdn organisation, opts }
+              end
+            }
+            let(:theme) { "overcast" }
+            it "should fail" do
+              expect{ get "/" }.to raise_error
+            end
+          end
+        end
       end
     end
     context "of :google" do
       let(:organisation) { :google }
-      let(:cdn) { Rack::JQueryUI::Themes::GOOGLE }
+      let(:cdn) { Rack::JQueryUI::Themes::CDN::GOOGLE }
       include_examples "Given an organisation and a theme"
     end
     context "of :microsoft" do
       let(:organisation) { :microsoft }
-      let(:cdn) { Rack::JQueryUI::Themes::MICROSOFT }
+      let(:cdn) { Rack::JQueryUI::Themes::CDN::MICROSOFT }
       include_examples "Given an organisation and a theme"
     end
     context "of :media_temple" do
       let(:organisation) { :media_temple }
-      let(:cdn) { Rack::JQueryUI::Themes::MEDIA_TEMPLE }
+      let(:cdn) { Rack::JQueryUI::Themes::CDN::MEDIA_TEMPLE }
       include_examples "Given an organisation and a theme"
     end
   end
 end
 
+# Bit of internal checking, for sanity.
+describe "Path_to_vendor" do
+  subject { Rack::JQueryUI::Themes::Path_to_vendor }
+  it { should == "../../../vendor/assets/javascripts/jquery-ui" }
+end
+
 describe "Inserting the CDN" do
-  let(:theme) { {:theme => "vader"} }
-  let(:expected) { subber cdn, theme  }
   include_context "All routes"
+  let(:opts) {
+    {:theme => theme, :url => cdn}.delete_if{|k,v| v.nil?}
+  }
+  let(:expected) { subber cdn, opts  }
   context "Check the examples run at all" do
     before do
       get "/"
     end
     it_should_behave_like "Any route"
   end
-  context "Google CDN" do
-    before do
-      get "/google-cdn"
-    end
-    it_should_behave_like "Any route"
-    subject { last_response.body }
-    let(:cdn) { Rack::JQueryUI::Themes::GOOGLE }
-    it { should include expected }
-  end
-  context "Microsoft CDN" do
-    before do
-      get "/microsoft-cdn"
-    end
-    it_should_behave_like "Any route"
-    subject { last_response.body }
-    let(:cdn) { Rack::JQueryUI::Themes::MICROSOFT }
-    it { should include expected }
-  end
-  context "Media_temple CDN" do
-    before do
-      get "/media-temple-cdn"
+  context "Given a theme" do
+    context "That is valid" do
+      let(:theme) { "vader" }
+      context "Google CDN" do
+        let(:cdn) { Rack::JQueryUI::Themes::CDN::GOOGLE }
+        before do
+          get "/google-cdn"
+        end
+        it_should_behave_like "Any route"
+        subject { last_response.body }
+        it { should include expected }
+      end
+      context "Microsoft CDN" do
+        before do
+          get "/microsoft-cdn"
+        end
+        it_should_behave_like "Any route"
+        subject { last_response.body }
+        let(:cdn) { Rack::JQueryUI::Themes::CDN::MICROSOFT }
+        it { should include expected }
+      end
+      context "Media_temple CDN" do
+        before do
+          get "/media-temple-cdn"
+        end
+        it_should_behave_like "Any route"
+        subject { last_response.body }
+        let(:cdn) { Rack::JQueryUI::Themes::CDN::MEDIA_TEMPLE }
+        it { should include expected }
+      end
+      context "Unspecified CDN" do
+        before do
+          get "/"
+        end
+        it_should_behave_like "Any route"
+        subject { last_response.body }
+        let(:cdn) { Rack::JQueryUI::Themes::CDN::MEDIA_TEMPLE }
+        it { should include expected }
+      end
     end
-    it_should_behave_like "Any route"
-    subject { last_response.body }
-    let(:cdn) { Rack::JQueryUI::Themes::MEDIA_TEMPLE }
-    it { should include expected }
-  end
-  context "Unspecified CDN" do
-    before do
-      get "/"
+    context "that is not valid" do
+      let(:app) {
+        Sinatra.new do
+          use Rack::JQuery
+          use Rack::JQueryUI
+          use Rack::JQueryUI::Themes, :theme => "breakfastsupercharger"
+          get('/') { "Shouldn't reach this" }
+        end
+      }
+      it "should fail" do
+        expect{ get "/" }.to raise_error
+      end
     end
-    it_should_behave_like "Any route"
-    subject { last_response.body }
-    let(:cdn) { Rack::JQueryUI::Themes::GOOGLE }
-    it { should include expected }
   end
 end
 
@@ -106,6 +157,8 @@ require 'time'
 describe "Serving the fallback jquery" do
   include_context "All routes"
   let(:theme) { {:theme => "vader"} }
+  let(:cdn) { Rack::JQueryUI::Themes::CDN::MEDIA_TEMPLE }
+  let(:opts) { theme.merge( :cdn => cdn ) }
   context "Single request" do
     context "for route that doesn't exist" do
       let(:url) { "/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/blah/#{Rack::JQueryUI::Themes::JQUERY_UI_THEME_FILE}"}
@@ -116,7 +169,7 @@ describe "Serving the fallback jquery" do
       it { should == 404 }
     end
     context "for CSS" do
-      let(:url) { subber "/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/#{Rack::JQueryUI::Themes::JQUERY_UI_THEME_FILE}", theme }
+      let(:url) { subber "/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/#{Rack::JQueryUI::Themes::JQUERY_UI_THEME_FILE}", opts }
       before do
         get url
       end
@@ -125,9 +178,9 @@ describe "Serving the fallback jquery" do
       it { should start_with "/*! jQuery UI - v#{Rack::JQueryUI::JQUERY_UI_VERSION}" }
     end
     context "for an image" do
-      ex_path = File.expand_path "../../vendor/assets/javascripts/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/base/images", __FILE__
+      ex_path = File.expand_path "../../vendor/assets/javascripts/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/vader/images", __FILE__
       img = Dir.new( ex_path ).entries.find{|f| f =~ /\.png$/ }
-      let(:url) {  "/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/base/images/#{img}" }
+      let(:url) {  "/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/vader/images/#{img}" }
       before do
         get url
       end
@@ -146,13 +199,13 @@ describe "Serving the fallback jquery" do
     end
     subject { last_response }
     context "for CSS" do
-      let(:url) { subber "/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/#{Rack::JQueryUI::Themes::JQUERY_UI_THEME_FILE}", theme }
+      let(:url) { subber "/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/:THEME/#{Rack::JQueryUI::Themes::JQUERY_UI_THEME_FILE}", opts }
       its(:status) { should == 304 }
     end
     context "for an image" do
-      ex_path = File.expand_path "../../vendor/assets/javascripts/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/base/images", __FILE__
+      ex_path = File.expand_path "../../vendor/assets/javascripts/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/vader/images", __FILE__
       img = Dir.new( ex_path ).entries.find{|f| f =~ /\.png$/ }
-      let(:url) {  "/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/base/images/#{img}" }
+      let(:url) {  "/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/vader/images/#{img}" }
       its(:status) { should == 304 }
     end
   end