rack-combobot 0.2.0 → 0.2.1

data/lib/rack/combobot.rb

@@ -18,9 +18,8 @@ module Rack
     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 @@ module Rack
       if @config.expires
         headers['Expires'] = @config.expires.httpdate
       end
+      
+      if @config.cache_control
+        headers['Cache-Control'] = @config.cache_control
+      end
 
       headers
     end

data/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

data/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"

data/spec/lib/rack/combobot_spec.rb

@@ -21,6 +21,8 @@ describe Rack::Combobot do
   # 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 @@ describe Rack::Combobot do
       @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'})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-combobot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156803500 !ruby/object:Gem::Requirement
+  requirement: &2168961680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156803500
+  version_requirements: *2168961680
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2156803060 !ruby/object:Gem::Requirement
+  requirement: &2168961240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156803060
+  version_requirements: *2168961240
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156802640 !ruby/object:Gem::Requirement
+  requirement: &2168960820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156802640
+  version_requirements: *2168960820
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2156802220 !ruby/object:Gem::Requirement
+  requirement: &2168960400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156802220
+  version_requirements: *2168960400
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2156801800 !ruby/object:Gem::Requirement
+  requirement: &2168959980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156801800
+  version_requirements: *2168959980
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2156801380 !ruby/object:Gem::Requirement
+  requirement: &2168959560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156801380
+  version_requirements: *2168959560
 description: combines assets to server 1 file
 email:
 - r.hackr@gmail.com