Merge pull request #15 from hojberg/cache_control

added cache control
hojberg · Mar 22, 2012 · d494969 · d494969
2 parents c1b334d + 45825e9
commit d494969
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/lib/rack/combobot.rb b/lib/rack/combobot.rb
@@ -18,9 +18,8 @@ class Combobot
     def initialize(app, options = {})
       @app = app
 
-      root = Pathname.new(options[:root] || Dir.pwd)
-      expires = options[:expires]
-      @config = Rack::Combobot::Config.new(root, expires)
+      options[:root] = Pathname.new(options[:root] || Dir.pwd)
+      @config = Rack::Combobot::Config.new(options)
     end
 
     # rack request handler
@@ -55,6 +54,10 @@ def create_headers(extension)
       if @config.expires
         headers['Expires'] = @config.expires.httpdate
       end
+
+      if @config.cache_control
+        headers['Cache-Control'] = @config.cache_control
+      end
 
       headers
     end

diff --git a/lib/rack/combobot/config.rb b/lib/rack/combobot/config.rb
@@ -1,11 +1,12 @@
 module Rack
   class Combobot
     class Config
-      attr_accessor :root, :expires
+      attr_accessor :root, :expires, :cache_control
 
-      def initialize(root, expires = nil)
-        @root = root
-        @expires = expires
+      def initialize(options)
+        @root           = options[:root]
+        @expires        = options[:expires]
+        @cache_control  = options[:cache_control]
       end
 
     end

diff --git a/rack-combobot.gemspec b/rack-combobot.gemspec
@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rack-combobot"
-  s.version     = "0.2.0"
+  s.version     = "0.2.1"
   s.authors     = ["Simon Højberg", "Christopher Meiklejohn"]
   s.email       = ["r.hackr@gmail.com", "christopher.meiklejohn@gmail.com"]
   s.homepage    = "https://github.com/hojberg/rack-combobot"

diff --git a/spec/lib/rack/combobot_spec.rb b/spec/lib/rack/combobot_spec.rb
@@ -21,6 +21,8 @@
   # response helpers
   let(:combobot_js_response)    { [200, {"Content-Type" => "text/javascript"}, ["function lorem() { return \"a\"; }\nfunction ipsum() { return \"b\"; }\n"]] }
   let(:expires_js_response)     { [200, {"Content-Type" => "text/javascript", 'Expires' => 'Wed, 01 Jan 2020 00:00:00 GMT'}, ["function lorem() { return \"a\"; }\nfunction ipsum() { return \"b\"; }\n"]] }
+  let(:cache_control_js_response) { [200, {"Content-Type" => "text/javascript", 'Cache-Control' => 'public'}, ["function lorem() { return \"a\"; }\nfunction ipsum() { return \"b\"; }\n"]] }
+  let(:expires_and_cache_control_js_response) { [200, {"Content-Type" => "text/javascript", 'Expires' => 'Wed, 01 Jan 2020 00:00:00 GMT', 'Cache-Control' => 'public'}, ["function lorem() { return \"a\"; }\nfunction ipsum() { return \"b\"; }\n"]] }
   let(:combobot_css_response)   { [200, {"Content-Type" => "text/css"}, [".lorem { background: blue; }\n#lipsum { border: 1px solid red }\n"]] }
   let(:combobot_404_response)   { [404, {'Content-Type' => 'text/html'}, ['File not found']] }
 
@@ -57,6 +59,17 @@
       @app.call(combobot_js_request).must_equal(expires_js_response)
     end
 
+    it 'adds cache control headers' do
+      @app.config.cache_control = 'public'
+      @app.call(combobot_js_request).must_equal(cache_control_js_response)
+    end
+
+    it 'adds both expires and cache control headers' do
+      @app.config.expires = Time.gm(2020)
+      @app.config.cache_control = 'public'
+      @app.call(combobot_js_request).must_equal(expires_and_cache_control_js_response)
+    end
+
     it 'allows for versioning' do
       @app.call(
         combobot_js_request.merge({ 'PATH_INFO' => '/combobot/CACHEBUSTINGSHA1'})