lacquer 0.5.0.beta4 → 0.5.1

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem "activesupport", "~> 3.0"
+gem "activesupport", ">= 2.3"
 gem "i18n", "~> 0.4"
 gem "jeweler"
 gem "rake"

data/VERSION

@@ -1 +1 @@
-0.5.0.beta4
+0.5.1

data/lacquer.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{lacquer}
-  s.version = "0.5.0.beta4"
+  s.name = "lacquer"
+  s.version = "0.5.1"
 
-  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-06-01}
-  s.description = %q{Rails drop in for Varnish support.}
-  s.email = %q{russ@bashme.org}
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") 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\u{e5}kon Lerring"]
+  s.date = "2011-12-01"
+  s.description = "Rails drop in for Varnish support."
+  s.email = "russ@bashme.org"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -57,10 +57,10 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "tasks/lacquer.rake"
   ]
-  s.homepage = %q{http://github.com/russ/lacquer}
+  s.homepage = "http://github.com/russ/lacquer"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Rails drop in for Varnish support.}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Rails drop in for Varnish support."
   s.test_files = [
     "spec/lacquer/cache_control_spec.rb",
     "spec/lacquer/cache_utils_spec.rb",
@@ -75,14 +75,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
       s.add_runtime_dependency(%q<i18n>, ["~> 0.4"])
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<yard>, [">= 0"])
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, ["~> 3.0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3"])
       s.add_dependency(%q<i18n>, ["~> 0.4"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
@@ -90,7 +90,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<erubis>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 3.0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3"])
     s.add_dependency(%q<i18n>, ["~> 0.4"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])

data/lib/lacquer/cache_control.rb

@@ -37,7 +37,7 @@ module Lacquer
     
     def to_vcl_override_ttl_urls
       urls_grouped_by_expires.map do |expires_in, list|
-        <<-CODE.strip_heredoc
+        <<-CODE.gsub(/^[ \t]{4}*/, '')
         if(#{to_vcl_conditions(list)}) {
           unset beresp.http.Set-Cookie;
           set beresp.ttl = #{expires_in};
@@ -48,7 +48,7 @@ module Lacquer
     end
 
     def to_vcl_pass_urls
-      <<-CODE.strip_heredoc
+      <<-CODE.gsub(/^[ \t]{4}*/, '')
       if(#{to_vcl_conditions(urls_by(:pass))}) {
         return(pass);
       }
@@ -56,7 +56,7 @@ module Lacquer
     end
 
     def to_vcl_pipe_urls
-      <<-CODE.strip_heredoc
+      <<-CODE.gsub(/^[ \t]{4}*/, '')
       if(#{to_vcl_conditions(urls_by(:pipe))}) {
         return(pipe);
       }

data/lib/lacquer/configuration.rb

@@ -20,6 +20,9 @@ module Lacquer
     # Error handler
     attr_accessor :command_error_handler
 
+    # Purge Command
+    attr_accessor :purge_command
+
     def initialize
       @enable_cache = true
       @varnish_servers = []
@@ -27,6 +30,7 @@ module Lacquer
       @job_backend = :none
       @retries = 5
       @command_error_handler = nil
+      @purge_command = "url.purge"
     end
 
     # Returns a hash of all configurable options

data/lib/lacquer/varnish.rb

@@ -14,7 +14,7 @@ module Lacquer
     # Sends the command 'url.purge *path*'
     def purge(*paths)
       paths.all? do |path|
-        send_command('url.purge ' << path.gsub('\\', '\\\\\\')).all? do |result|
+        send_command(Lacquer.configuration.purge_command + " " + << path.gsub('\\', '\\\\\\')).all? do |result|
           result =~ /200/
         end
       end

metadata

@@ -1,97 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lacquer
-version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.5.0.beta4
+version: !ruby/object:Gem::Version
+  version: 0.5.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Russ Smith (russ@bashme.org)
 - Ryan Johns
 - Garry Tan (garry@posterous.com), Gabe da Silveira (gabe@websaviour.com)
-- "H\xC3\xA5kon Lerring"
+- Håkon Lerring
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-01 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70292607203680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70292607203680
+- !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70292607202560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70292607202560
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70292607271120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70292607271120
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70292607270560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70292607270560
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70292607269820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70292607269820
+- !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70292607269300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *70292607269300
 description: Rails drop in for Varnish support.
 email: russ@bashme.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .bundle/config
 - .document
 - Gemfile
@@ -131,38 +127,34 @@ files:
 - spec/lacquer/varnishd_spec.rb
 - spec/spec_helper.rb
 - tasks/lacquer.rake
-has_rdoc: true
 homepage: http://github.com/russ/lacquer
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -447822799593533696
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2845705992647388617
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rails drop in for Varnish support.
-test_files: 
+test_files:
 - spec/lacquer/cache_control_spec.rb
 - spec/lacquer/cache_utils_spec.rb
 - spec/lacquer/delayed_job_job_spec.rb