klarlack 0.0.4 → 0.0.5

data/README.rdoc

@@ -40,4 +40,4 @@ http://dict.leo.org/?search=klarlack
 
 === Copyright
 
-Copyright (c) 2009 Max Schöfmann. Distributed under the MIT-License
+Copyright (c) 2009-2010 Max Schöfmann. Distributed under the MIT-License

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 4
+:patch: 5
 :major: 0

data/lib/klarlack.rb

@@ -3,5 +3,5 @@ require 'varnish/socket_factory'
 require 'varnish/client'
 
 module Varnish
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/varnish/client.rb

@@ -117,13 +117,17 @@ module Varnish
 
     # Purge objects from the cache or show the purge queue.
     #
+    # Takes one or two arguments:
+    #
+    # 1.
     #  .purge :url, <regexp>
     #  .purge :hash, <regexp>
-    #  .purge :list
-    #  .purge <costum-field> <args>
     #
-    # +op+:: :url, :hash, :list or a custom field
-    # +regexp+:: a string containing a varnish compatible regexp
+    # <regexp> is a string containing a varnish compatible regexp
+    #
+    # 2.
+    #  .purge <costum-purge-conditions>
+    #  .purge :list
     #
     # Returns true for purging, returns an array containing the purge queue
     # for :list
@@ -132,14 +136,17 @@ module Varnish
     #   v = Varnish::Client.new
     #   v.purge :url, '.*'
     #
+    #   v.purge "req.http.host ~ www.foo.com && req.http.url ~ images"
+    #
     #   v.purge :list
     #   #=> [[1, "req.url ~ .*"]]
     #
-    def purge(op, *regexp_or_args)
-      c = [:url, :hash, :list].include?(op) ? "purge.#{op}" : "purge #{op}"
-      response = cmd(c, *regexp_or_args)
-      case op
-      when :list
+    def purge(*args)
+      c = 'purge'
+      c << ".#{args.shift}" if [:url, :hash, :list].include?(args.first)
+      response = cmd(c, *args)
+      case c
+      when 'purge.list'
         response.split("\n").map do |line|
           a = line.split("\t")
           [a[0].to_i, a[1]]

data/spec/klarlack_spec.rb

@@ -82,6 +82,7 @@ describe Varnish::Client do
       @varnish.purge(:url, '^/articles/.*').should be_true
       @varnish.purge(:hash, 12345).should be_true
       @varnish.purge("req.http.host", "~", "www.example.com").should be_true
+      @varnish.purge("req.http.host ~ www.example.com").should be_true
     end
 
     it '#purge with :list should return an array with queued purges' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: klarlack
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - "Max Sch\xC3\xB6fmann"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 +01:00
+date: 2010-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: []