varnish_sweeper 0.0.6 → 0.1.0

data/Gemfile

@@ -8,7 +8,8 @@ source "http://rubygems.org"
 gem "resque"
 gem "resque-loner"
 gem "curb"
-#
+gem "activesupport", "2.3.10"
+
 group :development do
   gem "rspec", "~> 2.0.0"
   gem "yard", "~> 0.6.0"

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (2.3.10)
     curb (0.7.9)
     diff-lcs (1.1.2)
     git (1.2.5)
@@ -44,6 +45,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (= 2.3.10)
   bundler (~> 1.0.0)
   curb
   jeweler (~> 1.5.0.pre6)

data/Rakefile

@@ -13,12 +13,12 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "varnish_sweeper"
-  gem.homepage = "http://github.com/kesselborn/varnish_sweeper"
+  gem.homepage = "http://github.com/moviepilot/varnish_sweeper"
   gem.license = "MIT"
-  gem.summary = %Q{A few helper functions that help caching web pages}
-  gem.description = %Q{hihih}
-  gem.email = "daniel@moviepilot.com"
-  gem.authors = ["Daniel Bornkessel"]
+  gem.summary = %Q{A few helper functions that help caching and sweeping web pages using varnish}
+  gem.description = %Q{A few helper functions that help caching and sweeping web pages using varnish}
+  gem.email = "developers@moviepilot.com"
+  gem.authors = ["Daniel Bornkessel", "Tim Bleck"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.1.0

data/lib/varnish.rb

@@ -1,4 +1,5 @@
 module Varnish
+
   def make_cacheable(options = {})
     if should_be_cached?(options)
       headers['Cache-Control'] = cache_control_text(options)
@@ -9,15 +10,20 @@ module Varnish
     end
   end
 
-  def sweep_cache_for(obj)
+  def sweep_cache_for(obj, options = {})
     return unless obj
     if cache_data = Rails.cache.read( varnish_cache_key(obj) )
       Rails.cache.delete( varnish_cache_key(obj) )
-      Resque.enqueue(SweeperJob, cache_data[:urls])
+      if options[:instant]
+        SweeperJob.perform(cache_data[:urls])
+      else
+        Resque.enqueue(SweeperJob, cache_data[:urls])
+      end
     end
   end
 
-protected
+  protected
+
   def cache_control_text(options)
     return unless should_be_cached?(options)
 

data/spec/spec_helper.rb

@@ -1,21 +1,27 @@
+require 'rubygems'
+require 'rspec'
+require 'rack'
+require 'ostruct'
+require "active_support"
+require 'varnish_sweeper'
+
 class ApplicationController
-end
+  include Varnish
 
-module ActionController
-  module Caching
-    class Sweeper
-    end
+  def headers
+    @headers ||= {}
+  end
+
+  def request
+    @request ||= OpenStruct.new(:headers => {})
   end
-end
 
+end
 
-require 'varnish_sweeper'
-require 'rspec'
+class Rails
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+  def self.cache
+    @@cache ||= ActiveSupport::Cache::MemoryStore.new
+  end
 
-RSpec.configure do |config|
-  
-end
+end

data/spec/varnish_sweeper/varnish_spec.rb

@@ -0,0 +1,60 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Varnish do
+
+  before do
+    @controller = ApplicationController.new
+  end
+
+  describe :make_cachable do
+
+    before do
+      @controller.request.headers['X_VARNISH'] = 'Varnish'
+    end
+
+    it "should set the Cache-Control header to private if the option private is set" do
+      @controller.make_cacheable(:private => true, :s_max_age => 3600)
+      @controller.headers["Cache-Control"].should == 'private, s-maxage=3600'
+    end
+
+    it "should set the Cache-Control header to public including the given s_max_age" do
+      @controller.make_cacheable(:s_max_age => 3600)
+      @controller.headers["Cache-Control"].should == 'public, s-maxage=3600'
+    end
+
+    it "should set the Cache-Control header to public including the given max_age" do
+      @controller.make_cacheable(:max_age => 3600)
+      @controller.headers["Cache-Control"].should == 'public, max-age=3600'
+    end
+
+  end
+
+  describe :sweep_cache_for do
+
+    before do
+      @obj = mock('Model')
+      @controller.stub!(:varnish_cache_key).with(@obj).and_return("cache_key")
+      Rails.cache.write("cache_key", :urls => ["cached_url"])
+    end
+
+    context 'asynchronous sweeping (default)' do
+
+      it "should enqueue the sweeping job with resque" do
+        Resque.should_receive(:enqueue).with(SweeperJob, ["cached_url"])
+        @controller.sweep_cache_for(@obj)
+      end
+
+    end
+
+    context 'instant sweeping (with option :instant => true)' do
+
+      it "should sweep the cache instantly" do
+        SweeperJob.should_receive(:perform).with(["cached_url"])
+        @controller.sweep_cache_for(@obj, :instant => true)
+      end
+
+    end
+
+  end
+
+end

data/spec/{varnish_sweeper_spec.rb → varnish_sweeper/varnish_sweeper_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "VarnishSweeper" do
 #  it "should provide our functions to the ApplicationController" do

data/varnish_sweeper.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{varnish_sweeper}
-  s.version = "0.0.6"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Daniel Bornkessel"]
-  s.date = %q{2011-01-13}
-  s.description = %q{hihih}
-  s.email = %q{daniel@moviepilot.com}
+  s.authors = ["Daniel Bornkessel", "Tim Bleck"]
+  s.date = %q{2011-03-31}
+  s.description = %q{A few helper functions that help caching and sweeping web pages using varnish}
+  s.email = %q{developers@moviepilot.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -29,27 +29,29 @@ Gem::Specification.new do |s|
     "lib/varnish.rb",
     "lib/varnish_sweeper.rb",
     "spec/spec_helper.rb",
-    "spec/varnish_sweeper_spec.rb",
+    "spec/varnish_sweeper/varnish_spec.rb",
+    "spec/varnish_sweeper/varnish_sweeper_spec.rb",
     "varnish_sweeper.gemspec"
   ]
-  s.homepage = %q{http://github.com/kesselborn/varnish_sweeper}
+  s.homepage = %q{http://github.com/moviepilot/varnish_sweeper}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A few helper functions that help caching web pages}
+  s.rubygems_version = %q{1.5.2}
+  s.summary = %q{A few helper functions that help caching and sweeping web pages using varnish}
   s.test_files = [
     "spec/spec_helper.rb",
-    "spec/varnish_sweeper_spec.rb"
+    "spec/varnish_sweeper/varnish_spec.rb",
+    "spec/varnish_sweeper/varnish_sweeper_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<resque>, [">= 0"])
       s.add_runtime_dependency(%q<resque-loner>, [">= 0"])
       s.add_runtime_dependency(%q<curb>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.10"])
       s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -59,6 +61,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<resque>, [">= 0"])
       s.add_dependency(%q<resque-loner>, [">= 0"])
       s.add_dependency(%q<curb>, [">= 0"])
+      s.add_dependency(%q<activesupport>, ["= 2.3.10"])
       s.add_dependency(%q<rspec>, ["~> 2.0.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -69,6 +72,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<resque>, [">= 0"])
     s.add_dependency(%q<resque-loner>, [">= 0"])
     s.add_dependency(%q<curb>, [">= 0"])
+    s.add_dependency(%q<activesupport>, ["= 2.3.10"])
     s.add_dependency(%q<rspec>, ["~> 2.0.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -1,137 +1,164 @@
 --- !ruby/object:Gem::Specification 
 name: varnish_sweeper
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 6
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors: 
 - Daniel Bornkessel
+- Tim Bleck
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +01:00
+date: 2011-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: resque
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
   prerelease: false
-  version_requirements: *id001
+  type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: resque-loner
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
   prerelease: false
-  version_requirements: *id002
+  type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: curb
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 3
+        - 10
+        version: 2.3.10
   prerelease: false
-  version_requirements: *id003
+  type: :runtime
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
         version: 2.0.0
-  type: :development
   prerelease: false
-  version_requirements: *id004
+  type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
         - 0
         version: 0.6.0
-  type: :development
   prerelease: false
-  version_requirements: *id005
+  type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  type: :development
   prerelease: false
-  version_requirements: *id006
+  type: :development
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1923832021
         segments: 
         - 1
         - 5
         - 0
-        - pre6
+        - pre
+        - 6
         version: 1.5.0.pre6
-  type: :development
   prerelease: false
-  version_requirements: *id007
+  type: :development
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
   prerelease: false
-  version_requirements: *id008
-description: hihih
-email: daniel@moviepilot.com
+  type: :development
+  requirement: *id009
+description: A few helper functions that help caching and sweeping web pages using varnish
+email: developers@moviepilot.com
 executables: []
 
 extensions: []
@@ -152,10 +179,11 @@ files:
 - lib/varnish.rb
 - lib/varnish_sweeper.rb
 - spec/spec_helper.rb
-- spec/varnish_sweeper_spec.rb
+- spec/varnish_sweeper/varnish_spec.rb
+- spec/varnish_sweeper/varnish_sweeper_spec.rb
 - varnish_sweeper.gemspec
 has_rdoc: true
-homepage: http://github.com/kesselborn/varnish_sweeper
+homepage: http://github.com/moviepilot/varnish_sweeper
 licenses: 
 - MIT
 post_install_message: 
@@ -168,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1721035453808399085
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -177,16 +205,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: A few helper functions that help caching web pages
+summary: A few helper functions that help caching and sweeping web pages using varnish
 test_files: 
 - spec/spec_helper.rb
-- spec/varnish_sweeper_spec.rb
+- spec/varnish_sweeper/varnish_spec.rb
+- spec/varnish_sweeper/varnish_sweeper_spec.rb