rack-jquery 1.0.2 → 1.0.3

data/CHANGES.md

@@ -1,5 +1,13 @@
 # CH CH CH CHANGES #
 
+## v1.0.3 ##
+
+Friday the 8th of March 2013
+
+* Using shared rack-jquery-helpers library to cut down on duplication.
+
+----
+
 ## v1.0.2 ##
 
 Tuesday the 5th of March 2013

data/lib/rack/jquery.rb

@@ -1,9 +1,11 @@
 require "rack/jquery/version"
+require "rack/jquery/helpers"
 
 module Rack
 
   # jQuery CDN script tags and fallback in one neat package.
   class JQuery
+    include Helpers
 
     JQUERY_FILE_NAME = "jquery-#{JQUERY_VERSION}.min.js"
 
@@ -25,10 +27,6 @@ module Rack
 </script>
 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  )
@@ -70,13 +68,7 @@ STR
       if request.path_info == @http_path_to_jquery
         response = Rack::Response.new
         # for caching
-        response.headers.merge!( {
-          "Last-Modified" => JQUERY_VERSION_DATE,
-          "Expires"    => Rack::Utils.rfc2109(Time.now + TEN_YEARS),
-          "Cache-Control" => "max-age=#{TEN_YEARS},public",
-          "Etag"          => "#{JQUERY_FILE_NAME}",
-          'Content-Type' =>'application/javascript; charset=utf-8'
-        })
+        response.headers.merge! caching_headers( JQUERY_FILE_NAME, JQUERY_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/version.rb

@@ -1,6 +1,6 @@
 module Rack
   class JQuery
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
     JQUERY_VERSION = "1.9.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.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
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-08 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 CDN script tags and fallback in one neat package. Current version
   is for jQuery v#{Rack::JQuery::JQUERY_VERSION}
 email: