varnish_sweeper 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/varnish.rb

@@ -13,9 +13,14 @@ module Varnish
   def sweep_cache_for(obj, options = {})
     return unless obj
     # cache_data is a frozen hash
-    if cache_data = Rails.cache.read( varnish_cache_key(obj) )
+    if (cache_data = Rails.cache.read( varnish_cache_key(obj))) || options[:urls]
       Rails.cache.delete( varnish_cache_key(obj) )
-      urls = cache_data[:urls] + options[:urls].to_a
+      if cache_data
+        urls = cache_data[:urls].to_a + options[:urls].to_a
+      else
+        urls = options[:urls].to_a
+      end
+      
       if options[:instant]
         SweeperJob.perform(urls)
       else

data/spec/varnish_sweeper/varnish_spec.rb

@@ -70,5 +70,28 @@ describe Varnish do
     end
 
   end
+  
+  describe :sweep_cache_for do
+
+    before do
+      @obj = mock('Model')
+      @controller.stub!(:varnish_cache_key).with(@obj).and_return("cache_key")
+    end
+    
+    context 'sweeping a defined urls (with option :urls => [url,url])' do
+      
+      it "should sweep normal cache + optional urls" do
+        SweeperJob.should_receive(:perform).with(["urla","urlb"])
+        @controller.sweep_cache_for(@obj, :instant => true, :urls => ["urla","urlb"])
+      end
+      
+      it "should sweep normal cache + optional urls" do
+        Resque.should_receive(:enqueue).with(SweeperJob, ["urla","urlb"])
+        @controller.sweep_cache_for(@obj, :instant => false, :urls => ["urla","urlb"])
+      end
+      
+    end
+
+  end
 
 end

data/varnish_sweeper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{varnish_sweeper}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Bornkessel", "Tim Bleck", "Helmut Ebritsch", "Christoph Grabo"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: varnish_sweeper
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Daniel Bornkessel