rack-jquery_ui 0.0.3 → 0.0.4

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CH CH CHANGES #
 
+## v0.0.4 ##
+
+* Using the rack-jquery-helpers library now, to help cut down on duplicated code.
+* Cleaned up the examples a bit.
+
 ## v0.0.3 ##
 
 Wednesday the 5th of March 2013

data/examples/config.rb

@@ -10,23 +10,27 @@ class App < Sinatra::Base
   use Rack::JQueryUI
 
   get "/" do
-    "RUNNING"
+    haml :index, :layout => :unspecified
   end
 
   get "/google-cdn" do
-    haml :index, :layout => :google
+    haml :accordion, :layout => :google
   end
 
   get "/media-temple-cdn" do
-    haml :index, :layout => :mediatemple
+    haml :accordion, :layout => :mediatemple
   end
 
   get "/microsoft-cdn" do
-    haml :index, :layout => :microsoft
+    haml :accordion, :layout => :microsoft
   end
 
   get "/unspecified-cdn" do
-    haml :index, :layout => :unspecified
+    haml :accordion, :layout => :unspecified
+  end
+
+  get "/ui/:plugin" do |plugin|
+    haml plugin.to_sym, :layout => :ui
   end
 end
 
@@ -37,6 +41,12 @@ __END__
   %head
     = Rack::JQuery.cdn( :google )
     = Rack::JQueryUI.cdn( :google )
+    %link{ href: "http://code.jquery.com/ui/1.10.1/themes/base/jquery-ui.css", rel: "stylesheet"}
+    :css
+      body {
+        font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
+        font-size: 62.5%;
+      }
   = yield
 
 @@microsoft
@@ -44,6 +54,12 @@ __END__
   %head
     = Rack::JQuery.cdn( :microsoft )
     = Rack::JQueryUI.cdn( :microsoft )
+    %link{ href: "http://code.jquery.com/ui/1.10.1/themes/base/jquery-ui.css", rel: "stylesheet"}
+    :css
+      body {
+        font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
+        font-size: 62.5%;
+      }
   = yield
 
 @@mediatemple
@@ -51,6 +67,12 @@ __END__
   %head
     = Rack::JQuery.cdn( :media_temple )
     = Rack::JQueryUI.cdn( :media_temple )
+    %link{ href: "http://code.jquery.com/ui/1.10.1/themes/base/jquery-ui.css", rel: "stylesheet"}
+    :css
+      body {
+        font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
+        font-size: 62.5%;
+      }
   = yield
 
 @@unspecified
@@ -58,21 +80,92 @@ __END__
   %head
     = Rack::JQuery.cdn()
     = Rack::JQueryUI.cdn()
-  = yield
+    %link{ href: "http://code.jquery.com/ui/1.10.1/themes/base/jquery-ui.css", rel: "stylesheet"}
+    :css
+      body {
+        font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
+        font-size: 62.5%;
+      }
+  %body
+    = yield
+
+@@ui
+%html
+  %head
+    = Rack::JQuery.cdn()
+    = Rack::JQueryUI.cdn()
+    %link{ href: "http://code.jquery.com/ui/1.10.1/themes/base/jquery-ui.css", rel: "stylesheet"}
+    :css
+      body {
+        font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
+        font-size: 62.5%;
+      }
+  %body
+    = yield
 
 @@index
+%p
+  %a{ href: "/google-cdn" }
+    google-cdn
+%p
+  %a{ href: "/media-temple-cdn" }
+    media-temple
+%p
+  %a{ href: "/microsoft-cdn" }
+    microsoft-cdn
+%p
+  %a{ href: "/unspecified-cdn" }
+    unspecified-cdn
+%p
+  %a{ href: "/ui/accordion" }
+    accordion
 
-%p.aclass
-  "NOTHING TO SEE HERE… "
-%p.aclass
-  "MOVE ALONG… "
-%p.aclass
-  "MOVE ALONG… "
-#placeholder
+@@accordion
 :javascript
-  all_text = $('.aclass').text();
-  $('#placeholder').text(all_text + " (draggable!)").mouseover(function() {
-    $(this).css({ 'color': 'red', 'font-size': '150%' });    
-  }).mouseout(function() {
-    $(this).css({ 'color': 'blue', 'font-size': '100%' });
-  }).draggable();
+  $(function() {
+    $( "#accordion" ).accordion();
+  });
+#accordion
+  %h3
+    Section 1
+  %div
+    %p
+      Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
+      ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit
+      amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut
+      odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
+  %h3
+    Section 2
+  %div
+    %p
+      Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
+      purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor
+      velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In
+      suscipit faucibus urna.
+  %h3
+    Section 3
+  %div
+    %p
+      Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
+      Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero
+      ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis
+      lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui.
+    %ul
+      %li
+        List item one
+      %li
+        List item two
+      %li
+        List item three
+  %h3
+    Section 4
+  %div
+    %p
+      Cras dictum. Pellentesque habitant morbi tristique senectus et netus
+      et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in
+      faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia
+      mauris vel est.
+    %p
+      Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus.
+      Class aptent taciti sociosqu ad litora torquent per conubia nostra, per
+      inceptos himenaeos.

data/lib/rack/jquery_ui.rb

@@ -1,9 +1,11 @@
 require "rack/jquery_ui/version"
+require "rack/jquery/helpers"
 
 module Rack
 
   # jQuery CDN script tags and fallback in one neat package.
   class JQueryUI
+    include JQuery::Helpers
 
     JQUERY_UI_FILE_NAME = "jquery-ui.min.js"
 
@@ -24,10 +26,6 @@ module Rack
 STR
 
 
-    # Ten years in seconds.
-    TEN_YEARS  = 60 * 60 * 24 * 365 * 10
-
-
     # @param [Symbol] organisation Choose which CDN to use, either :google, :microsoft or :media_temple
     # @return [String] The HTML script tags to get the CDN.
     def self.cdn( organisation=:google )
@@ -67,13 +65,7 @@ STR
       if request.path_info == @http_path_to_jquery
         response = Rack::Response.new
         # for caching
-        response.headers.merge!( {
-          "Last-Modified" => JQUERY_UI_VERSION_DATE,
-          "Expires"    => Rack::Utils.rfc2109(Time.now + TEN_YEARS),
-          "Cache-Control" => "max-age=#{TEN_YEARS},public",
-          "Etag"          => "#{JQUERY_UI_FILE_NAME}-#{JQUERY_UI_VERSION}",
-          'Content-Type' =>'application/javascript; charset=utf-8'
-        })
+        response.headers.merge! caching_headers( "#{JQUERY_UI_FILE_NAME}-#{JQUERY_UI_VERSION}", 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.
         if request.env['HTTP_IF_MODIFIED_SINCE']

data/lib/rack/jquery_ui/version.rb

@@ -1,6 +1,6 @@
 module Rack
   class JQueryUI
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
     JQUERY_UI_VERSION = "1.10.1"
 
     # This is the release date of the jQuery file, it makes an easy "Last-Modified" date for setting the headers around caching.

data/rack-jquery_ui.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.2"
   spec.add_development_dependency "rake"
   spec.add_dependency("rack")
+  spec.add_dependency("rack-jquery-helpers")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-jquery_ui
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-jquery-helpers
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: jQuery-UI CDN script tags and fallback in one neat package. Current version
   is for jQuery-UI v1.10.1
 email: