lacquer 0.5.0.beta1 → 0.5.0.beta2

data/.bundle/config

@@ -1,2 +1,2 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"
+--- {}
+

data/VERSION

@@ -1 +1 @@
-0.5.0.beta1
+0.5.0.beta2

data/lacquer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lacquer}
-  s.version = "0.5.0.beta1"
+  s.version = "0.5.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Russ Smith (russ@bashme.org)", "Ryan Johns", "Garry Tan (garry@posterous.com), Gabe da Silveira (gabe@websaviour.com)", "Håkon Lerring"]
-  s.date = %q{2011-04-25}
+  s.date = %q{2011-05-26}
   s.description = %q{Rails drop in for Varnish support.}
   s.email = %q{russ@bashme.org}
   s.extra_rdoc_files = [
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/russ/lacquer}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Rails drop in for Varnish support.}
   s.test_files = [
     "spec/lacquer/cache_control_spec.rb",

data/lib/lacquer/cache_control.rb

@@ -15,7 +15,7 @@ module Lacquer
     def register(group, options = {})
       options[:group]  = group
       options[:args]   = Array(options[:args]).compact
-      store           << options
+      store            << options
     end
   
     def configure
@@ -46,16 +46,23 @@ module Lacquer
         CODE
       end.join("\n")
     end
+
+    def to_vcl_pass_urls
+      <<-CODE.strip_heredoc
+      if(#{to_vcl_conditions(urls_by(:pass))}) {
+        return(pass);
+      }
+      CODE
+    end
     
-    protected
+  protected
     
     def urls_grouped_by_expires
       store.group_by { |opt| opt[:expires_in] }.select { |expires_in, list| expires_in }
     end
     
     def urls_by(group)
-      store.select   { |opt| opt[:group] == group }
+      store.select { |opt| opt[:group] == group }
     end
-  
   end  
 end

data/lib/lacquer/tasks.rb

@@ -1,37 +1,37 @@
-namespace :varnishd do
-  
-  desc "Start varnishd daemon using Lacquer's settings"
-  task :start => :environment do
-    Lacquer::Varnishd.new.start
-  end
-  
-  desc "Stop varnishd daemon using Lacquer's settings"
-  task :stop => :environment do
-    Lacquer::Varnishd.new.stop
-  end
-  
-  desc "Running status of varnishd daemon using Lacquer's settings"
-  task :status => :environment do
-    if Lacquer::Varnishd.new.running?
-      puts "Varnishd is running"
-    else
-      puts "Varnishd is not running"
+namespace :lacquer do
+  namespace :varnishd do
+    desc "Start varnishd daemon using Lacquer's settings"
+    task :start => :environment do
+      Lacquer::Varnishd.new.start
     end
-  end
-  
-  desc "Restart varnishd daemon using Lacquer's settings"
-  task :restart => :environment do
-    varnishd = Lacquer::Varnishd.new
-    if varnishd.running?
-      varnishd.stop
-      sleep(1)
+    
+    desc "Stop varnishd daemon using Lacquer's settings"
+    task :stop => :environment do
+      Lacquer::Varnishd.new.stop
     end
-    varnishd.start
-  end
-  
-  desc "Purge ALL urls from Varnish"
-  task :global_purge => :environment do
-    Lacquer::Varnish.new.purge('.*')
-  end
     
-end
+    desc "Running status of varnishd daemon using Lacquer's settings"
+    task :status => :environment do
+      if Lacquer::Varnishd.new.running?
+        puts "Varnishd is running"
+      else
+        puts "Varnishd is not running"
+      end
+    end
+    
+    desc "Restart varnishd daemon using Lacquer's settings"
+    task :restart => :environment do
+      varnishd = Lacquer::Varnishd.new
+      if varnishd.running?
+        varnishd.stop
+        sleep(1)
+      end
+      varnishd.start
+    end
+    
+    desc "Purge ALL urls from Varnish"
+    task :global_purge => :environment do
+      Lacquer::Varnish.new.purge('.*')
+    end
+  end
+end

data/spec/lacquer/cache_control_spec.rb

@@ -2,9 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
 require 'lacquer/cache_control'
 
 describe Lacquer::CacheControl do
-  
   describe "#register" do
-    
     it "persists cache settings for url" do
       cache_control = described_class.new
       cache_control.register :class_section, :url => "^/sv/class_sections/%s.*$", :args => "[0-9]+"
@@ -12,21 +10,17 @@ describe Lacquer::CacheControl do
       cache_control.store.first[:url].should    == "^/sv/class_sections/%s.*$"
       cache_control.store.first[:args].should   == ["[0-9]+"]
     end
-    
   end
   
   describe "#urls_for" do
-    
     it "returns urls to expire for object" do      
       cache_control = described_class.new
       cache_control.register :class_section, :url => "^/sv/class_sections/%s.*$", :args => "[0-9]+"
       cache_control.urls_for(:class_section, mock("ClassSection", :to_param => 1)).should == ["^/sv/class_sections/1.*$"]
     end
-    
   end
 
   context "vcl" do
-    
     it "returns all urls as vcl conditions" do
       cache_control = described_class.new
       cache_control.register :class_section, :url => "^/sv/class_sections/%s.*$", :args => "[0-9]+"
@@ -37,12 +31,14 @@ describe Lacquer::CacheControl do
       conditions.should include("||")
       conditions.should include("req.url ~ \"^/sv/info_screens/[0-9]+.*$\"")
     end
-    
-    # if (req.url ~ "^/images" || req.url ~ "^/stylesheets" || req.url ~ "^/javascripts") {
-    #  unset beresp.http.Set-Cookie;
-    #  set beresp.ttl = 7d;
-    #  return(deliver);
-    # }  
+
+    it "returns vcl for pass urls" do
+      cache_control = described_class.new
+      cache_control.register :pass, :url => "^/admin"
+      pass_urls = cache_control.to_vcl_pass_urls
+      pass_urls.should include('if(req.url ~ "^/admin")')
+      pass_urls.should include('return(pass)')
+    end
     
     it "returns vcl for override ttl on beresp" do
       cache_control = described_class.new
@@ -66,7 +62,5 @@ describe Lacquer::CacheControl do
       override_ttl.should include('set beresp.ttl = 2d')
       override_ttl.should_not include('info_screen')
     end
-    
   end
-  
 end

metadata

@@ -2,7 +2,7 @@
 name: lacquer
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.5.0.beta1
+  version: 0.5.0.beta2
 platform: ruby
 authors: 
 - Russ Smith (russ@bashme.org)
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -07:00
+date: 2011-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1714554342870495979
+      hash: -3766237804687005337
       segments: 
       - 0
       version: "0"
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rails drop in for Varnish support.