rack-jquery_ui 2.2.0 → 3.0.0

data/CHANGES.md

@@ -1,5 +1,30 @@
 # CH CH CHANGES #
 
+## Monday the 4th of November 2013, v3.0.0 ##
+
+* The `cdn` method now takes the Rack env as its first argument, which it should have always done, but at least now it does, so the defaults actually get passed on if set.
+
+----
+
+
+## Tuesday the 30th of July 2013 ##
+
+### v2.3.1 ###
+
+* Fixed some typos in the README.
+
+----
+
+
+### v2.3.0 ###
+
+* Added option to pass `false` to the `cdn` method, which then ignores the CDN's and uses the local fallback scripts.
+* Media Temple CDN wasn't using the minified version of the file by default, now it is.
+* Added a :debug option to the `cdn` method so that the unminified version of the file can be called. Doesn't work with the fallback script as the unminified versions aren't bundled with this library.
+
+----
+
+
 ## Friday the 19th of July 2013, v2.2.0 ##
 
 * Made Media Temple the default CDN as Google (and Microsoft) have sided with the Elzebub, otherwise known as the NSA and GCHQ, and there's no need to make tracking people around the net easier for them.

data/README.md

@@ -22,11 +22,13 @@ Have a look in the examples directory, but here's a snippet.
 
 
       %head
-        = Rack::JQueryUI.cdn
+        = Rack::JQueryUI.cdn env
+
+where `env` is the Rack env.
 
 Now you have the script tags to Media Temple's CDN in the head (you can also use Google or Microsoft, or Cloudflare, see the docs).
 
-It also adds in a bit of javascript that will load in a locally kept version of jQuery, just incase the CDN is unreachable. The script will use the "/js/jquery-ui/1.10.3/jquery-ui.min.js" path (or, instead of 1.10.3, whatever is in {Rack::JQuery::VERSION}). You can change the "/js" bit if you like (see the docs).
+It also adds in a bit of javascript that will load in a locally kept version of jQuery UI, just in case the CDN is unreachable. The script will use the "/js/jquery-ui/1.10.3/jquery-ui.min.js" path (or, instead of 1.10.3, whatever is in {Rack::JQueryUI::VERSION}). You can change the "/js" bit if you like (see the docs).
 
 That was easy.
 
@@ -41,9 +43,9 @@ I made a mistake and pushed out a version of the library where not all the CDNs
 To stop this happening again I've added more checks, but there's also a choice for the library user. If you've picked a CDN to use, something like this:
 
     %head
-      = Rack::JQueryUI.cdn :microsoft
+      = Rack::JQueryUI.cdn env, :organisation => :microsoft
 
-and it doesn't support the jQuery UI version, then it will silently use the default CDN (usually Google's, but it will change depending on who supports what).
+and it doesn't support the jQuery UI version, then it will silently use the default CDN (usually Media Temple's, but it will change depending on who supports what).
 
 If you'd prefer an exception to be raised you can either do this:
 
@@ -52,7 +54,7 @@ If you'd prefer an exception to be raised you can either do this:
 or
 
     %head
-      = Rack::JQueryUI.cdn :microsoft, :raise => true
+      = Rack::JQueryUI.cdn env, :organisation => :microsoft, :raise => true
 
 the second way will always override the first.
 

data/config.ru

@@ -0,0 +1,26 @@
+# require 'rack'
+
+require 'sinatra'
+
+class MyMiddleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    warn env.inspect
+    @app.call(env)
+  end
+end
+
+
+use Rack::Session::Cookie, key: '_dummy_session', secret: '...'
+use MyMiddleware
+app = Sinatra.new do
+  get("/") { 
+    session["blah"] = "more blah" 
+    "HEllo" 
+  }
+end
+
+run app

data/examples/config.rb

@@ -9,33 +9,51 @@ class App < Sinatra::Base
   use Rack::JQuery
   use Rack::JQueryUI
 
+  %w{google media_temple microsoft cloudflare unspecified}.each do |name|
+
+    get "/#{name}-cdn" do
+      haml :accordion, :layout => name.to_sym
+    end
+  end
+
   get "/" do
     haml :index, :layout => :unspecified
   end
 
-  get "/google-cdn" do
-    haml :accordion, :layout => :google
+  get "/fallback-only" do
+    haml :accordion, :layout => :fallback
   end
 
-  get "/media-temple-cdn" do
-    haml :accordion, :layout => :mediatemple
+  get "/ui/:plugin" do |plugin|
+    haml plugin.to_sym, :layout => :ui
   end
+end
 
-  get "/microsoft-cdn" do
-    haml :accordion, :layout => :microsoft
+class AppWithDefaults < Sinatra::Base
+
+  enable :inline_templates
+  use Rack::JQuery
+  use Rack::JQueryUI, :organisation => :cloudflare 
+
+  %w{google media_temple microsoft cloudflare unspecified}.each do |name|
+
+    get "/#{name}-cdn" do
+      haml :accordion, :layout => name.to_sym
+    end
   end
 
-  get "/cloudflare-cdn" do
-    haml :accordion, :layout => :cloudflare
+  get "/" do
+    haml :index, :layout => :unspecified
   end
 
-  get "/unspecified-cdn" do
-    haml :accordion, :layout => :unspecified
+  get "/fallback-only" do
+    haml :accordion, :layout => :fallback
   end
 
   get "/ui/:plugin" do |plugin|
     haml plugin.to_sym, :layout => :ui
   end
+
 end
 
 __END__
@@ -43,9 +61,9 @@ __END__
 @@google
 %html
   %head
-    = Rack::JQuery.cdn( :google )
-    = Rack::JQueryUI.cdn( :google )
-    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/base/jquery-ui.css", rel: "stylesheet"}
+    = Rack::JQuery.cdn( env, :organisation => :google )
+    = Rack::JQueryUI.cdn( env, :organisation => :google )
+    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/smoothness/jquery-ui.css", rel: "stylesheet"}
     :css
       body {
         font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
@@ -56,9 +74,9 @@ __END__
 @@microsoft
 %html
   %head
-    = Rack::JQuery.cdn( :microsoft )
-    = Rack::JQueryUI.cdn( :microsoft )
-    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/base/jquery-ui.css", rel: "stylesheet"}
+    = Rack::JQuery.cdn( env, :organisation => :microsoft )
+    = Rack::JQueryUI.cdn( env, :organisation => :microsoft )
+    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/smoothness/jquery-ui.css", rel: "stylesheet"}
     :css
       body {
         font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
@@ -69,9 +87,9 @@ __END__
 @@cloudflare
 %html
   %head
-    = Rack::JQuery.cdn( :cloudflare )
-    = Rack::JQueryUI.cdn( :cloudflare )
-    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/base/jquery-ui.css", rel: "stylesheet"}
+    = Rack::JQuery.cdn( env, :organisation => :cloudflare )
+    = Rack::JQueryUI.cdn( env, :organisation => :cloudflare )
+    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/smoothness/jquery-ui.css", rel: "stylesheet"}
     :css
       body {
         font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
@@ -79,12 +97,12 @@ __END__
       }
   = yield
 
-@@mediatemple
+@@media_temple
 %html
   %head
-    = Rack::JQuery.cdn( :media_temple )
-    = Rack::JQueryUI.cdn( :media_temple )
-    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/base/jquery-ui.css", rel: "stylesheet"}
+    = Rack::JQuery.cdn( env, :organisation => :media_temple )
+    = Rack::JQueryUI.cdn( env, :organisation => :media_temple )
+    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/smoothness/jquery-ui.css", rel: "stylesheet"}
     :css
       body {
         font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
@@ -95,9 +113,9 @@ __END__
 @@unspecified
 %html
   %head
-    = Rack::JQuery.cdn()
-    = Rack::JQueryUI.cdn()
-    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/base/jquery-ui.css", rel: "stylesheet"}
+    = Rack::JQuery.cdn(env)
+    = Rack::JQueryUI.cdn(env)
+    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/smoothness/jquery-ui.css", rel: "stylesheet"}
     :css
       body {
         font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
@@ -106,12 +124,25 @@ __END__
   %body
     = yield
 
+@@fallback
+%html
+  %head
+    = Rack::JQuery.cdn env
+    = Rack::JQueryUI.cdn( env, :organisation => false )
+    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/smoothness/jquery-ui.css", rel: "stylesheet"}
+    :css
+      body {
+        font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
+        font-size: 62.5%;
+      }
+  = yield
+
 @@ui
 %html
   %head
-    = Rack::JQuery.cdn()
-    = Rack::JQueryUI.cdn()
-    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/base/jquery-ui.css", rel: "stylesheet"}
+    = Rack::JQuery.cdn(env)
+    = Rack::JQueryUI.cdn(env)
+    %link{ href: "http://code.jquery.com/ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/themes/smoothness/jquery-ui.css", rel: "stylesheet"}
     :css
       body {
         font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
@@ -136,6 +167,9 @@ __END__
 %p
   %a{ href: "/unspecified-cdn" }
     unspecified-cdn
+%p
+  %a{ href: "/fallback-only" }
+    forced fallback
 %p
   %a{ href: "/ui/accordion" }
     accordion

data/examples/config.ru

@@ -3,4 +3,9 @@ require "bundler"
 Bundler.setup(:examples)
 require File.expand_path( '../config.rb', __FILE__)
 
+
+map "/defaults" do
+  run AppWithDefaults
+end
+
 run App

data/lib/rack/jquery_ui.rb

@@ -17,7 +17,7 @@ module Rack
     module CDNs
 
       # Script tags for the Media Temple CDN
-      MEDIA_TEMPLE = "http://code.jquery.com/ui/#{JQUERY_UI_VERSION}/jquery-ui.js"
+      MEDIA_TEMPLE = "http://code.jquery.com/ui/#{JQUERY_UI_VERSION}/jquery-ui.min.js"
 
       # Script tags for the Google CDN
       GOOGLE = "//ajax.googleapis.com/ajax/libs/jqueryui/#{JQUERY_UI_VERSION}/jquery-ui.min.js"
@@ -30,32 +30,72 @@ module Rack
       CLOUDFLARE = "//cdnjs.cloudflare.com/ajax/libs/jqueryui/#{JQUERY_UI_VERSION}/jquery-ui.min.js"
     end
 
+
+    # path to the fallback script
+    FALLBACK_PATH = "/js/jquery-ui/#{JQUERY_UI_VERSION}/#{JQUERY_UI_FILE_NAME}"
+
     # 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 minified jQuery.
     FALLBACK = <<STR
 <script type="text/javascript">
-  !window.jQuery.ui && document.write(unescape("%3Cscript src='/js/jquery-ui/#{JQUERY_UI_VERSION}/#{JQUERY_UI_FILE_NAME}' type='text/javascript'%3E%3C/script%3E"))
+  !window.jQuery.ui && document.write(unescape("%3Cscript src='#{FALLBACK_PATH}' type='text/javascript'%3E%3C/script%3E"))
 </script>
 STR
 
 
-    # @param [Symbol] organisation Choose which CDN to use, either :google, :microsoft or :media_temple, or :cloudflare
+    # @param [Hash] env The rack env hash.
+    # @param [Hash] options
+    # @option options [Symbol,false,nil] :organisation Choose which CDN to use, either :google, :microsoft or :media_temple, or :cloudflare. Pass in `false` to force use of the local jQuery script. `nil` will force choosing the default CDN.
+    # @option options [true, false] :debug If you need the unminified version from the CDN for debugging then pass this in. The unminified scripts aren't included via the fallback to keep the library light, so this won't change anything if fallback is used.
     # @return [String] The HTML script tags to get the CDN.
-    def self.cdn( organisation=:media_temple, options={} )
+    # @example
+    #   # in a Haml file… (but could be any type of template)
+    #   # For the default
+    #   Rack::JQueryUI.cdn env
+    #
+    #   # Choose the organisation
+    #   Rack::JQueryUI.cdn env, :organisation => :cloudflare
+    #
+    #   # Raise an error if the organisation doesn't
+    #   # support this version of jQuery UI
+    #   Rack::JQueryUI.cdn env, :raise => true
+    #
+    #   # Use the unminified version from the CDN
+    #   Rack::JQueryUI.cdn env, :debug => true
+    #
+    def self.cdn( env, options={} )
+      if env.nil? || env.has_key?(:organisation)
+        fail ArgumentError, "The Rack::JQueryUI.cdn method needs the Rack environment passed to it, or at the very least, an empty hash."
+      end
       raise = (opt = options[:raise]).nil? ?
-                raise? :
-                opt
-      script = if organisation === :media_temple         
-          CDNs::MEDIA_TEMPLE
-        elsif organisation === :microsoft
-          CDNs::MICROSOFT
-        elsif organisation === :cloudflare
-          CDNs::CLOUDFLARE
-        elsif organisation === :google
-          CDNs::GOOGLE
-        else
-          CDNs::MEDIA_TEMPLE
+                opt :
+                (env["rack.jquery_ui.raise"] || false)
+
+      organisation =  options[:organisation]
+      if organisation.nil? # because false is valid
+        organisation = env["rack.jquery_ui.organisation"] ||
+                        :media_temple
+      end
+
+      unless organisation == false
+        script_src = if organisation === :media_temple         
+            CDNs::MEDIA_TEMPLE
+          elsif organisation === :microsoft
+            CDNs::MICROSOFT
+          elsif organisation === :cloudflare
+            CDNs::CLOUDFLARE
+          elsif organisation === :google
+            CDNs::GOOGLE
+          else
+            CDNs::MEDIA_TEMPLE
+        end
+          
+        debug = options.fetch :debug, false
+  
+        script_src = "#{script_src[0..-7]}js" if debug
+        "<script src='#{script_src}'></script>\n#{FALLBACK}"
+      else
+        "<script src='#{FALLBACK_PATH}'></script>"
       end
-      "<script src='#{script}'></script>\n#{FALLBACK}"
     end
 
 
@@ -66,22 +106,6 @@ STR
     }
 
 
-    # Whether to raise an exception if the chosen CDN
-    # does not support the jQuery UI version this library is using
-    # @param [TrueClass] bool
-    def self.raise=( bool )
-      @raise = bool
-    end
-
-
-    # @see raise=
-    # @return [TrueClass]
-    def self.raise?
-      @raise = false if @raise.nil?
-      @raise
-    end
-
-
     # @param [#call] app
     # @param [Hash] options
     # @option options [String] :http_path If you wish the jQuery fallback route to be "/js/jquery-ui/1.10.1/jquery-ui.min.js" (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/jquery-ui.min.js" then pass in `:http_path => "/assets/javascripts/#{Rack::JQueryUI::JQUERY_UI_VERSION}".
@@ -95,7 +119,8 @@ STR
     def initialize( app, options={} )
       @app, @options  = app, DEFAULT_OPTIONS.merge(options)
       @http_path_to_jquery = ::File.join @options[:http_path], JQUERY_UI_FILE_NAME
-      self.class.raise = @options[:raise]
+      @raise = @options.fetch :raise, false
+      @organisation = options.fetch :organisation, :media_temple
     end
 
 
@@ -109,6 +134,8 @@ STR
     # @param (see #call)
     def _call( env )
       request = Rack::Request.new(env.dup)
+      env.merge! "rack.jquery_ui.organisation" => @organisation
+      env.merge! "rack.jquery_ui.raise" => @raise
       if request.path_info == @http_path_to_jquery
         response = Rack::Response.new
         # for caching

data/lib/rack/jquery_ui/version.rb

@@ -1,7 +1,7 @@
 module Rack
   class JQueryUI
     # library version
-    VERSION = "2.2.0"
+    VERSION = "3.0.0"
 
     # This is here in case another rack-jquery_ui library has already been loaded.
     jquery_ui_version = "1.10.3"

data/spec/rack_jquery_ui_spec.rb

@@ -4,115 +4,271 @@ require 'spec_helper'
 require_relative "../lib/rack/jquery_ui.rb"
 
 describe "The class methods" do
-  subject { Rack::JQueryUI.cdn organisation }
-  context "Given an argument" do
+  let(:env) { {} }
+  subject { Rack::JQueryUI.cdn env, :organisation => organisation }
+
+  context "Given the organisation option" do
+  subject { Rack::JQueryUI.cdn env, :organisation => organisation }
+    let(:expected) { "<script src='#{src}'></script>\n#{Rack::JQueryUI::FALLBACK}" }
     context "of nil (the default)" do
       let(:organisation) { nil }
-      it { should == "<script src='#{Rack::JQueryUI::CDNs::MEDIA_TEMPLE}'></script>\n#{Rack::JQueryUI::FALLBACK}" }
+      let(:src) { Rack::JQueryUI::CDNs::MEDIA_TEMPLE  }
+      it { should == expected }
+      context "and debug" do
+        let(:unminified) { "#{src[0..-7]}js" }
+        subject { Rack::JQueryUI.cdn env, :organisation => organisation, :debug => true }
+        it { should_not include expected }
+        it { should include unminified }
+      end
     end
     context "of :google" do
       let(:organisation) { :google }
-      it { should == "<script src='#{Rack::JQueryUI::CDNs::GOOGLE}'></script>\n#{Rack::JQueryUI::FALLBACK}" }
+      let(:src) { Rack::JQueryUI::CDNs::GOOGLE  }
+      it { should == expected }
+      context "and debug" do
+        let(:unminified) { "#{src[0..-7]}js" }
+        subject { Rack::JQueryUI.cdn env, :organisation => organisation, :debug => true }
+        it { should_not include expected }
+        it { should include unminified }
+      end
     end
     context "of :microsoft" do
       let(:organisation) { :microsoft }
-      it { should == "<script src='#{Rack::JQueryUI::CDNs::MICROSOFT}'></script>\n#{Rack::JQueryUI::FALLBACK}" }
+      let(:src) { Rack::JQueryUI::CDNs::MICROSOFT  }
+      it { should == expected }
+      context "and debug" do
+        let(:unminified) { "#{src[0..-7]}js" }
+        subject { Rack::JQueryUI.cdn env, :organisation => organisation, :debug => true }
+        it { should_not include expected }
+        it { should include unminified }
+      end
     end
     context "of :media_temple" do
       let(:organisation) { :media_temple }
-      it { should == "<script src='#{Rack::JQueryUI::CDNs::MEDIA_TEMPLE}'></script>\n#{Rack::JQueryUI::FALLBACK}" }
+      let(:src) { Rack::JQueryUI::CDNs::MEDIA_TEMPLE  }
+      it { should == expected }
+      context "and debug" do
+        let(:unminified) { "#{src[0..-7]}js" }
+        subject { Rack::JQueryUI.cdn env, :organisation => organisation, :debug => true }
+        it { should_not include expected }
+        it { should include unminified }
+      end
     end
     context "of :cloudflare" do
       let(:organisation) { :cloudflare }
-#       context "When raise is true" do
-#         subject { Rack::JQueryUI.cdn organisation, {raise: true} }
-#         it "should raise error as it's not supported for this version" do
-#           expect { subject }.to raise_error
-#         end
-#       end
-      it { should == "<script src='#{Rack::JQueryUI::CDNs::CLOUDFLARE}'></script>\n#{Rack::JQueryUI::FALLBACK}" }
+      let(:src) { Rack::JQueryUI::CDNs::CLOUDFLARE  }
+      it { should == expected }
+      context "and debug" do
+        let(:unminified) { "#{src[0..-7]}js" }
+        subject { Rack::JQueryUI.cdn env, :organisation => organisation, :debug => true }
+        it { should_not include expected }
+        it { should include unminified }
+      end
+    end
+    context "of false" do
+      let(:organisation) { false }
+      let(:expected) { "<script src='/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/#{Rack::JQueryUI::JQUERY_UI_FILE_NAME}'></script>"}
+      it { should == expected }
+    end
+  end
+
+  context "Given no Rack env argument" do
+    it "should fail and give a message" do
+      expect{ Rack::JQueryUI.cdn nil }.to raise_error(ArgumentError)
+    end
+    
+    context "and an organisation option" do
+      it "should fail and give a message" do
+        expect{ Rack::JQueryUI.cdn nil, {:organisation => :microsoft} }.to raise_error(ArgumentError)
+      end
     end
   end
 end
 
 describe "Inserting the CDN" do
-  include_context "All routes"
-  context "Check the examples run at all" do
-    before do
-      get "/"
+  context "When not given a default" do
+    include_context "All routes"
+    context "Check the examples run at all" do
+      before do
+        get "/"
+      end
+      it_should_behave_like "Any route"
     end
-    it_should_behave_like "Any route"
-  end
-  context "Google CDN" do
-    before do
-      get "/google-cdn"
+    context "Google CDN" do
+      before do
+        get "/google-cdn"
+      end
+      it_should_behave_like "Any route"
+      subject { last_response.body }
+      let(:expected) { Rack::JQueryUI::CDNs::GOOGLE }
+      it { should include expected }
+    end
+    context "Cloudflare CDN" do
+      before do
+        get "/cloudflare-cdn"
+      end
+      it_should_behave_like "Any route"
+      subject { last_response.body }
+      context "With :raise set to false" do
+        let(:expected) { Rack::JQueryUI::CDNs::CLOUDFLARE }
+        it { should include expected }
+      end
+      context "With :raise set to true" do
+        context "via `use`" do
+          let(:app) {
+            Sinatra.new do
+              use Rack::JQuery
+              use Rack::JQueryUI, :raise => true
+              get "/cloudflare-cdn" do
+                Rack::JQueryUI.cdn( env, :organisation => :cloudflare )
+              end
+            end
+          }
+  #         it "should raise error as it's not supported for this version" do
+  #           expect { subject }.to raise_error
+  #         end
+          it { should include "//cdnjs.cloudflare.com/ajax/libs/jqueryui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/jquery-ui.min.js" }
+        end
+        context "via the method options" do
+          let(:app) {
+            Sinatra.new do
+              use Rack::JQuery
+              use Rack::JQueryUI, :raise => false
+              get "/cloudflare-cdn" do
+                Rack::JQueryUI.cdn( env, :organisation => :cloudflare, :raise => true )
+              end
+            end
+          }
+  #         subject { get "/cloudflare-cdn" }
+  #         it "should raise error as it's not supported for this version" do
+  #           expect { subject }.to raise_error
+  #         end
+          it { should include "//cdnjs.cloudflare.com/ajax/libs/jqueryui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/jquery-ui.min.js" }
+        end
+      end
+    end
+    context "Media_temple CDN" do
+      before do
+        get "/media_temple-cdn"
+      end
+      it_should_behave_like "Any route"
+      subject { last_response.body }
+      let(:expected) { Rack::JQueryUI::CDNs::MEDIA_TEMPLE }
+      it { should include expected }
+    end
+    context "Unspecified CDN" do
+      before do
+        get "/unspecified-cdn"
+      end
+      it_should_behave_like "Any route"
+      subject { last_response.body }
+      let(:expected) { Rack::JQueryUI::CDNs::MEDIA_TEMPLE }
+      it { should include expected }
+    end
+    context "No CDN, force the fallback" do
+      before do
+        get "/fallback-only"
+      end
+      it_should_behave_like "Any route"
+      subject { last_response.body }
+      let(:expected) { "<script src='/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/#{Rack::JQueryUI::JQUERY_UI_FILE_NAME}'></script>" }
+      it { should include expected }
     end
-    it_should_behave_like "Any route"
-    subject { last_response.body }
-    let(:expected) { Rack::JQueryUI::CDNs::GOOGLE }
-    it { should include expected }
   end
-  context "Cloudflare CDN" do
-    before do
-      get "/cloudflare-cdn"
+
+  # These check the default is overriden
+  # when `cdn` is given a value
+  # but when not, the default is used.
+  context "When given a default" do
+    include_context "All routes" do
+      let(:app){ AppWithDefaults }
     end
-    it_should_behave_like "Any route"
-    subject { last_response.body }
-    context "With :raise set to false" do
-      let(:expected) { Rack::JQueryUI::CDNs::CLOUDFLARE }
+    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(:expected) { Rack::JQueryUI::CDNs::GOOGLE }
       it { should include expected }
     end
-    context "With :raise set to true" do
-      context "via `use`" do
-        let(:app) {
-          Sinatra.new do
-            use Rack::JQuery
-            use Rack::JQueryUI, :raise => true
-            get "/cloudflare-cdn" do
-              Rack::JQueryUI.cdn( :cloudflare )
+    context "Cloudflare CDN" do
+      before do
+        get "/cloudflare-cdn"
+      end
+      it_should_behave_like "Any route"
+      subject { last_response.body }
+      context "With :raise set to false" do
+        let(:expected) { Rack::JQueryUI::CDNs::CLOUDFLARE }
+        it { should include expected }
+      end
+      context "With :raise set to true" do
+        context "via `use`" do
+          let(:app) {
+            Sinatra.new do
+              use Rack::JQuery
+              use Rack::JQueryUI, :raise => true
+              get "/cloudflare-cdn" do
+                Rack::JQueryUI.cdn( env, :organisation => :cloudflare )
+              end
             end
-          end
-        }
-#         it "should raise error as it's not supported for this version" do
-#           expect { subject }.to raise_error
-#         end
-        it { should include "//cdnjs.cloudflare.com/ajax/libs/jqueryui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/jquery-ui.min.js" }
-      end
-      context "via the method options" do
-        let(:app) {
-          Sinatra.new do
-            use Rack::JQuery
-            use Rack::JQueryUI, :raise => false
-            get "/cloudflare-cdn" do
-              Rack::JQueryUI.cdn( :cloudflare, :raise => true )
+          }
+  #         it "should raise error as it's not supported for this version" do
+  #           expect { subject }.to raise_error
+  #         end
+          it { should include "//cdnjs.cloudflare.com/ajax/libs/jqueryui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/jquery-ui.min.js" }
+        end
+        context "via the method options" do
+          let(:app) {
+            Sinatra.new do
+              use Rack::JQuery
+              use Rack::JQueryUI, :raise => false
+              get "/cloudflare-cdn" do
+                Rack::JQueryUI.cdn( env, :organisation => :cloudflare, :raise => true )
+              end
             end
-          end
-        }
-#         subject { get "/cloudflare-cdn" }
-#         it "should raise error as it's not supported for this version" do
-#           expect { subject }.to raise_error
-#         end
-        it { should include "//cdnjs.cloudflare.com/ajax/libs/jqueryui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/jquery-ui.min.js" }
+          }
+  #         subject { get "/cloudflare-cdn" }
+  #         it "should raise error as it's not supported for this version" do
+  #           expect { subject }.to raise_error
+  #         end
+          it { should include "//cdnjs.cloudflare.com/ajax/libs/jqueryui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/jquery-ui.min.js" }
+        end
       end
     end
-  end
-  context "Media_temple CDN" do
-    before do
-      get "/media-temple-cdn"
+    context "Media_temple CDN" do
+      before do
+        get "/media_temple-cdn"
+      end
+      it_should_behave_like "Any route"
+      subject { last_response.body }
+      let(:expected) { Rack::JQueryUI::CDNs::MEDIA_TEMPLE }
+      it { should include expected }
     end
-    it_should_behave_like "Any route"
-    subject { last_response.body }
-    let(:expected) { Rack::JQueryUI::CDNs::MEDIA_TEMPLE }
-    it { should include expected }
-  end
-  context "Unspecified CDN" do
-    before do
-      get "/unspecified-cdn"
+    context "Unspecified CDN" do
+      before do
+        get "/unspecified-cdn"
+      end
+      it_should_behave_like "Any route"
+      subject { last_response.body }
+      let(:expected) { Rack::JQueryUI::CDNs::CLOUDFLARE }
+      it { should include expected }
+    end
+    context "No CDN, force the fallback" do
+      before do
+        get "/fallback-only"
+      end
+      it_should_behave_like "Any route"
+      subject { last_response.body }
+      let(:expected) { "<script src='/js/jquery-ui/#{Rack::JQueryUI::JQUERY_UI_VERSION}/#{Rack::JQueryUI::JQUERY_UI_FILE_NAME}'></script>" }
+      it { should include expected }
     end
-    it_should_behave_like "Any route"
-    subject { last_response.body }
-    let(:expected) { Rack::JQueryUI::CDNs::MEDIA_TEMPLE }
-    it { should include expected }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-jquery_ui
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - LICENCE.txt
 - README.md
 - Rakefile
+- config.ru
 - examples/config.rb
 - examples/config.ru
 - lib/rack/jquery_ui.rb