rack-gist 1.0.7 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.1.0

data/lib/rack/gist.rb

@@ -6,7 +6,9 @@ module Rack
     def initialize(app, options = {})
       @app = app
       @options = {
-        :jquery => true
+        :jquery => true,
+        :cache_time => 3600,
+        :http_cache_time => 3600
       }.merge(options)
     end
 
@@ -55,15 +57,18 @@ module Rack
     def serve_gist(env)
       gist_id, file = path(env).match(regex)[1,2]
       cache = @options[:cache]
-      gist = (cache ? cache.fetch(cache_key(gist_id, file), :expires_in => 3600) { get_gist(gist_id, file) } : get_gist(gist_id, file)).to_s
-      [
-        200,
-        {
-          'Content-Type' => 'application/javascript',
-          'Content-Length' => Rack::Utils.bytesize(gist).to_s
-        },
-        [gist]
-      ]
+      gist = (cache ? cache.fetch(cache_key(gist_id, file), :expires_in => @options[:cache_time]) { get_gist(gist_id, file) } : get_gist(gist_id, file)).to_s
+      headers = {
+        'Content-Type' => 'application/javascript',
+        'Content-Length' => Rack::Utils.bytesize(gist).to_s,
+        'Vary' => 'Accept-Encoding'
+      }
+
+      if @options[:http_cache_time]
+        headers['Cache-Control'] = "public, must-revalidate, max-age=#{@options[:http_cache_time]}"
+      end
+
+      [200, headers, [gist]]
     end
 
     def get_gist(gist_id, file)

data/rack-gist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-gist}
-  s.version = "1.0.7"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Huckstep"]
-  s.date = %q{2010-08-24}
+  s.date = %q{2010-09-02}
   s.description = %q{Load gists in the background. KTHXBYE!}
   s.email = %q{darkhelmet@darkhelmetlive.com}
   s.extra_rdoc_files = [

data/spec/rack-gist_spec.rb

@@ -143,7 +143,24 @@ describe "Rack::Gist" do
       headers['Content-Type'].should == 'application/javascript'
 
       RestClient.should_not_receive(:get)
-      cache.should_receive(:fetch).once.with("rack-gist:#{@gist_id}:example.pig", :expires_in => 3600).and_return(body) # !.hour
+      cache.should_receive(:fetch).once.with("rack-gist:#{@gist_id}:example.pig", :expires_in => 3600).and_return(body) # 1.hour
+
+      status, headers, body2 = a.call(mock_env("/gist.github.com/#{@gist_id}/example.pig.js"))
+      status.should == 200
+      headers['Content-Type'].should == 'application/javascript'
+      body.should == body2
+    end
+  end
+
+  it 'should cache things for a different time if given cache_time' do
+    cache = ActiveSupport::Cache::MemoryStore.new
+    middleware(:cache => cache, :cache_time => 60).tap do |a|
+      status, headers, body = a.call(mock_env("/gist.github.com/#{@gist_id}/example.pig.js"))
+      status.should == 200
+      headers['Content-Type'].should == 'application/javascript'
+
+      RestClient.should_not_receive(:get)
+      cache.should_receive(:fetch).once.with("rack-gist:#{@gist_id}:example.pig", :expires_in => 60).and_return(body) # 1.hour
 
       status, headers, body2 = a.call(mock_env("/gist.github.com/#{@gist_id}/example.pig.js"))
       status.should == 200
@@ -158,4 +175,28 @@ describe "Rack::Gist" do
       status.should == 404
     end
   end
+
+  it 'should set http caching headers by default' do
+    middleware.tap do |a|
+      status, headers, body = a.call(mock_env("/gist.github.com/#{@gist_id}/example.pig.js"))
+      headers['Vary'].should == 'Accept-Encoding'
+      headers['Cache-Control'].should == 'public, must-revalidate, max-age=3600' # 1.hour
+    end
+  end
+
+  it 'should be able to configure cache time' do
+    middleware(:http_cache_time => 60).tap do |a|
+      status, headers, body = a.call(mock_env("/gist.github.com/#{@gist_id}/example.pig.js"))
+      headers['Vary'].should == 'Accept-Encoding'
+      headers['Cache-Control'].should == 'public, must-revalidate, max-age=60' # 1.hour
+    end
+  end
+
+  it 'should be able to disable caching by setting http_cache_time to nil' do
+    middleware(:http_cache_time => nil).tap do |a|
+      status, headers, body = a.call(mock_env("/gist.github.com/#{@gist_id}/example.pig.js"))
+      headers['Vary'].should == 'Accept-Encoding'
+      headers['Cache-Control'].should be_nil
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-gist
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 7
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -06:00
+date: 2010-09-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency