rack-jquery_ui-themes 1.0.0 → 2.0.0

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 .rspec
 vendor/assets/javascripts/jquery-*.min.js
 vendor/assets/javascripts/jquery-ui/*/jquery-ui.min.js
+downloads/

data/.travis.yml

@@ -3,7 +3,6 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ruby-head
 
 # whitelist
 branches:

data/CHANGES.md

@@ -1,4 +1,17 @@
-# CH CH CHANGES #
+# CH CH CH CHANGES #
+
+## Thursday the 18th of July 2013, v2.0.0 ##
+
+* The fallback wasn't working properly, fixed.
+* Got one of the jQuery team to clarify which parts of the themes download was needed, so updated that.
+* Added new option for selecting several themes.
+* Fixed some bad architectural choices with the code.
+* Downgraded to version 1.10.1 of jQuery UI to get this fixed, and the next release will bump it back up to 1.10.3.
+* Made Media Temple the default CDN, because Google and Microsoft have sided with Satan over all this PRISM/TEMPURA nonsense, and I don't feel like making it easier for them to track people around the web.
+* This is all breaking!!! so the major version has been bumped.
+
+----
+
 
 ## v1.0.0 ##
 

data/Gemfile

@@ -14,7 +14,7 @@ group :examples do
   gem "sinatra"
   gem "haml"
   gem "rack-jquery"
-  gem "rack-jquery_ui"
+  gem "rack-jquery_ui", "2.0.0" # for jQuery UI 1.10.1
 end
 
 group :development do

data/README.md

@@ -33,7 +33,7 @@ Have a look in the examples directory, but here's a snippet.
 
     <pre><code>
     %head
-      = Rack::JQueryUI::Themes.cdn :microsoft
+      = Rack::JQueryUI::Themes.cdn env, :organisation => :microsoft
     </code></pre>
 
 Now you have the script tags to Google's CDN in the head (you can also use Media Temple or Microsoft, see the docs).

data/Rakefile

@@ -37,3 +37,38 @@ namespace :spec do
   end
 
 end
+
+namespace :cdn do
+  require 'open3'
+  desc "An availability check, for sanity"
+  task :check do
+    require_relative './lib/rack/jquery_ui/themes.rb'
+    Rack::JQueryUI::Themes::CDN.constants.each do |const|
+      url = "#{Rack::JQueryUI::Themes::CDN.const_get(const)}"
+      url = "http:#{url}" unless url.start_with? "http"
+      Rack::JQueryUI::Themes::STANDARD_THEMES.each_with_object(url) do |theme,url|
+        cmd = "curl -I #{url.gsub(/\:THEME/, theme)}"
+        puts cmd
+        puts catch(:status) {
+          Open3.popen3(cmd) do |_,stdout,_|
+            line = stdout.gets
+            throw :status, "Nothing for #{const}" if line.nil?
+            puts line.match("HTTP/1.1 404 Not Found") ?
+                "FAILED: #{const}" :
+                "PASSED: #{const}"
+          end
+        }
+      end
+    end
+  end
+
+end
+
+# dir.entries.reject{|d| d.start_with?(".") || d == "base" }.each do |d|
+#   cmd = "mkdir -p #{File.join(File.dirname(__FILE__),  "rack-jquery_ui-themes/vendor/assets/javascripts/jquery-ui/1.10.1/themes/#{d})!
+#   system cmd
+# 
+#   cmd = %Q!cp -R #{File.join(dir.path, d)} #{File.join(File.dirname(__FILE__),  "rack-jquery_ui-themes/vendor/assets/javascripts/jquery-ui/1.10.1/themes/")!
+#   system cmd
+# end
+

data/examples/config.rb

@@ -27,7 +27,7 @@ class App < Sinatra::Base
     haml :index, :layout => :microsoft
   end
 
-  get "/themes" do
+  get "/themes/?" do
     haml :themes_list, :layout => :unspecified
   end
 end

data/examples/views/fallback_layout.haml

@@ -0,0 +1,10 @@
+!!!
+%html{:lang => "us"}
+  %head
+    %meta{:charset => "utf-8"}
+      %title jQuery UI Example Page
+    = Rack::JQuery.cdn()
+    = Rack::JQueryUI.cdn(env)
+    = haml :js_and_css_header
+  %body
+    = yield

data/examples/views/google.haml

@@ -1,6 +1,8 @@
+!!!
 %html
   %head
     = Rack::JQuery.cdn( :google )
     = Rack::JQueryUI.cdn( :google )
-    = Rack::JQueryUI::Themes.cdn(:google)
+    = Rack::JQueryUI::Themes.cdn(env, :organisation => :google)
+%body
   = yield

data/examples/views/index.haml

@@ -1,3 +1,6 @@
+%p
+  Click on a link and inspect the HEAD to see the different CDNs get used.
+
 %p
   %a{ href: "/google-cdn" }
     google-cdn
@@ -15,5 +18,14 @@
     unspecified
 
 %p
-  %a{ href: "/themes" }
-    Themes
+  See the different themes get used via a CDN.
+
+%p
+  %a{ href: "/themes/" }
+    Themes
+
+
+
+%p
+  %a{ href: "/fallback/" }
+    Fallback

data/examples/views/js_and_css_header.haml

@@ -0,0 +1,125 @@
+:javascript
+  $(function() {
+    $( "#accordion" ).accordion();
+
+    var availableTags = [
+      "ActionScript",
+      "AppleScript",
+      "Asp",
+      "BASIC",
+      "C",
+      "C++",
+      "Clojure",
+      "COBOL",
+      "ColdFusion",
+      "Erlang",
+      "Fortran",
+      "Groovy",
+      "Haskell",
+      "Java",
+      "JavaScript",
+      "Lisp",
+      "Perl",
+      "PHP",
+      "Python",
+      "Ruby",
+      "Scala",
+      "Scheme"
+    ];
+    $( "#autocomplete" ).autocomplete({
+      source: availableTags
+    });
+
+    $( "#button" ).button();
+    $( "#radioset" ).buttonset();
+
+    $( "#tabs" ).tabs();
+
+    $( "#dialog" ).dialog({
+      autoOpen: false,
+      width: 400,
+      buttons: [
+        {
+          text: "Ok",
+          click: function() {
+            $( this ).dialog( "close" );
+          }
+        },
+        {
+          text: "Cancel",
+          click: function() {
+            $( this ).dialog( "close" );
+          }
+        }
+      ]
+    });
+
+    // Link to open the dialog
+    $( "#dialog-link" ).click(function( event ) {
+      $( "#dialog" ).dialog( "open" );
+      event.preventDefault();
+    });
+
+    $( "#datepicker" ).datepicker({
+      inline: true
+    });
+
+    $( "#slider" ).slider({
+      range: true,
+      values: [ 17, 67 ]
+    });
+
+    $( "#progressbar" ).progressbar({
+      value: 20
+    });
+
+    // Hover states on the static widgets
+    $( "#dialog-link, #icons li" ).hover(
+      function() {
+        $( this ).addClass( "ui-state-hover" );
+      },
+      function() {
+        $( this ).removeClass( "ui-state-hover" );
+      }
+    );
+  });
+
+:css
+  body{
+    font: 62.5% "Trebuchet MS", sans-serif;
+    margin: 50px;
+  }
+  .demoHeaders {
+    margin-top: 2em;
+  }
+  #dialog-link {
+    padding: .4em 1em .4em 20px;
+    text-decoration: none;
+    position: relative;
+  }
+  #dialog-link span.ui-icon {
+    margin: 0 5px 0 0;
+    position: absolute;
+    left: .2em;
+    top: 50%;
+    margin-top: -8px;
+  }
+  #icons {
+    margin: 0;
+    padding: 0;
+  }
+  #icons li {
+    margin: 2px;
+    position: relative;
+    padding: 4px 0;
+    cursor: pointer;
+    float: left;
+    list-style: none;
+  }
+  #icons span.ui-icon {
+    float: left;
+    margin: 0 4px;
+  }
+  .fakewindowcontain .ui-widget-overlay {
+    position: absolute;
+  }

data/examples/views/layout_theme.haml

@@ -3,133 +3,13 @@
   %head
     %meta{:charset => "utf-8"}
       %title jQuery UI Example Page
+    // load jQuery
     = Rack::JQuery.cdn()
+    // load UI
     = Rack::JQueryUI.cdn()
-    = Rack::JQueryUI::Themes.cdn()
-    :javascript
-      $(function() {
-        $( "#accordion" ).accordion();
-
-        var availableTags = [
-          "ActionScript",
-          "AppleScript",
-          "Asp",
-          "BASIC",
-          "C",
-          "C++",
-          "Clojure",
-          "COBOL",
-          "ColdFusion",
-          "Erlang",
-          "Fortran",
-          "Groovy",
-          "Haskell",
-          "Java",
-          "JavaScript",
-          "Lisp",
-          "Perl",
-          "PHP",
-          "Python",
-          "Ruby",
-          "Scala",
-          "Scheme"
-        ];
-        $( "#autocomplete" ).autocomplete({
-          source: availableTags
-        });
-
-        $( "#button" ).button();
-        $( "#radioset" ).buttonset();
-
-        $( "#tabs" ).tabs();
-
-        $( "#dialog" ).dialog({
-          autoOpen: false,
-          width: 400,
-          buttons: [
-            {
-              text: "Ok",
-              click: function() {
-                $( this ).dialog( "close" );
-              }
-            },
-            {
-              text: "Cancel",
-              click: function() {
-                $( this ).dialog( "close" );
-              }
-            }
-          ]
-        });
-
-        // Link to open the dialog
-        $( "#dialog-link" ).click(function( event ) {
-          $( "#dialog" ).dialog( "open" );
-          event.preventDefault();
-        });
-
-        $( "#datepicker" ).datepicker({
-          inline: true
-        });
-
-        $( "#slider" ).slider({
-          range: true,
-          values: [ 17, 67 ]
-        });
-
-        $( "#progressbar" ).progressbar({
-          value: 20
-        });
-
-        // Hover states on the static widgets
-        $( "#dialog-link, #icons li" ).hover(
-          function() {
-            $( this ).addClass( "ui-state-hover" );
-          },
-          function() {
-            $( this ).removeClass( "ui-state-hover" );
-          }
-        );
-      });
-
-    :css
-      body{
-        font: 62.5% "Trebuchet MS", sans-serif;
-        margin: 50px;
-      }
-      .demoHeaders {
-        margin-top: 2em;
-      }
-      #dialog-link {
-        padding: .4em 1em .4em 20px;
-        text-decoration: none;
-        position: relative;
-      }
-      #dialog-link span.ui-icon {
-        margin: 0 5px 0 0;
-        position: absolute;
-        left: .2em;
-        top: 50%;
-        margin-top: -8px;
-      }
-      #icons {
-        margin: 0;
-        padding: 0;
-      }
-      #icons li {
-        margin: 2px;
-        position: relative;
-        padding: 4px 0;
-        cursor: pointer;
-        float: left;
-        list-style: none;
-      }
-      #icons span.ui-icon {
-        float: left;
-        margin: 0 4px;
-      }
-      .fakewindowcontain .ui-widget-overlay {
-        position: absolute;
-      }
+    // load themes
+    = Rack::JQueryUI::Themes.cdn(env)
+    // load js for widgets
+    = haml :js_and_css_header
   %body
     = yield

data/examples/views/mediatemple.haml

@@ -1,6 +1,8 @@
+!!!
 %html
   %head
     = Rack::JQuery.cdn( :media_temple )
     = Rack::JQueryUI.cdn( :media_temple )
-    = Rack::JQueryUI::Themes.cdn(:media_temple)
+    = Rack::JQueryUI::Themes.cdn(env, :organisation => :media_temple)
+%body
   = yield

data/examples/views/microsoft.haml

@@ -1,6 +1,8 @@
+!!!
 %html
   %head
     = Rack::JQuery.cdn( :microsoft )
     = Rack::JQueryUI.cdn( :microsoft )
-    = Rack::JQueryUI::Themes.cdn(:microsoft)
+    = Rack::JQueryUI::Themes.cdn(env, :organisation => :microsoft)
+%body
   = yield

data/examples/views/themes_list.haml

@@ -1,3 +1,3 @@
 - Rack::JQueryUI::Themes::STANDARD_THEMES.each do |theme|
   %p
-    %a{ href: "/themes/#{theme}" }= theme
+    %a{ href: "#{File.join '/', request.path_info, theme}" }= theme

data/examples/views/unspecified.haml

@@ -1,6 +1,8 @@
+!!!
 %html
   %head
     = Rack::JQuery.cdn()
     = Rack::JQueryUI.cdn()
-    = Rack::JQueryUI::Themes.cdn()
+    = Rack::JQueryUI::Themes.cdn(env)
+%body
   = yield