varnisher 1.0.beta.4 → 1.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6970ca63d063e52913d7fb4cb1f62379a2f6a9e7
-  data.tar.gz: 8fca00dbbc319f4109290f84e3d9045ce21082be
+  metadata.gz: c0b5fd6898bd69ebb046e5b5ca5459ca0fd66ebb
+  data.tar.gz: cef950689b3c66b79ec4095b5508080ec2cc7ccf
 SHA512:
-  metadata.gz: 8d67b7a793177c73ec0dd40f04114aff19fc6482944463eba56b7ae97e1a0250011fbd5e8889398da734668db136c7446281e283dadd7f5462d27ca6cebaa9c7
-  data.tar.gz: 0f378591b1d15b1f9b6afb66dbb330b6a38a89b87e1a2505d3cf6ce8f1fb022652504f6c2cfcfda21bc46110ff6bada757bcce869c420084ffaedab4913e63cd
+  metadata.gz: b8068e477b2d6dc4bebaa2d908595c4728ad104447ea979ed829fd560ef8b700e4e605ebabadfcfae9bb3eba5044786a7aedff14ba8bc0788f140fa5dabdac8d
+  data.tar.gz: ce25a130d9709f8a6304e73e6e26bdbf69433992ed768c824be10b815f07ed74817d5b049b6f60b9939d13b9cdb67fe91504077c2d3dea593868dcbe09105437

data/README.md

@@ -1,5 +1,7 @@
 # varnisher
 
+[![Build Status](https://travis-ci.org/robmiller/varnisher.png?branch=master)](https://travis-ci.org/robmiller/varnisher)
+
 Administering Varnish is generally a breeze, but sometimes you want to
 do one of the few things that aren't painless out of the box. Hopefully,
 that's where this toolbox comes in.

data/bin/varnisher

@@ -59,7 +59,8 @@ Main {
         purger.purge
       # If target is a hostname, assume we want to purge an entire domain.
       elsif target =~ /^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$/
-        Varnisher::DomainPurger.new target
+        purger = Varnisher::DomainPurger.new target
+        purger.purge
 
         if params['reindex'].given?
           spider = Varnisher::Spider.new "http://#{target}/"

data/lib/varnisher.rb

@@ -1,3 +1,5 @@
+require 'net/http'
+
 require_relative 'varnisher/spider'
 require_relative 'varnisher/purger'
 require_relative 'varnisher/domainpurger'
@@ -30,7 +32,7 @@ module Varnisher
   end
 
   def self.options=(options)
-    @options = options
+    @options = @options.merge(options)
 
     if options['hostname'].nil? && options['target']
       uri = URI.parse(options['target'])

data/lib/varnisher/domainpurger.rb

@@ -12,16 +12,27 @@ module Varnisher
   #       }
   #     }
   class DomainPurger
-    # Executes the purge request.
+    # Initialises the purger
     #
     # @param domain [String] The hostname to purge
     def initialize(domain)
-      purged = Varnisher.purge(domain, :domain)
+      @domain = domain
+    end
+
+    # Executes the purge request
+    #
+    # @return [True, False] True of the purge was successful, false if
+    #   it wasn't
+    def purge
+      purged = Varnisher.purge(@domain, :domain)
+
       if purged
-        Varnisher.log.info "Purged #{domain}"
+        Varnisher.log.info "Purged #{@domain}"
       else
-        Varnisher.log.info "Failed to purge #{domain}"
+        Varnisher.log.info "Failed to purge #{@domain}"
       end
+
+      purged
     end
   end
 end

data/lib/varnisher/pagepurger.rb

@@ -6,8 +6,10 @@ require 'parallel'
 module Varnisher
   # Purges an individual URL from Varnish.
   class PagePurger
+    attr_reader :urls
+
     # A bash at an abstract representation of resources. All you need
-    # is an XPath, and what attribute to select from the matched
+    # is a selector, and what attribute to select from the matched
     # elements.
     Resource = Struct.new :name, :selector, :attribute
     def self.resources

data/lib/varnisher/purger.rb

@@ -1,3 +1,23 @@
+# Adds the custom verb "PURGE" to the Net::HTTP library, allowing calls
+# to:
+#
+#     Net::HTTP.new(host, port).request(Purge.new(uri))
+class Purge < Net::HTTPRequest
+  METHOD = "PURGE"
+  REQUEST_HAS_BODY = false
+  RESPONSE_HAS_BODY = false
+end
+
+# Adds the custom verb "DOMAINPURGE" to the Net::HTTP library, allowing
+# calls to:
+#
+#     Net::HTTP.new(host, port).request(DomainPurge.new(uri))
+class DomainPurge < Net::HTTPRequest
+  METHOD = "DOMAINPURGE"
+  REQUEST_HAS_BODY = false
+  RESPONSE_HAS_BODY = false
+end
+
 module Varnisher
   # Sends a purge request to the Varnish server
   #
@@ -34,7 +54,7 @@ module Varnisher
     #   use "/"
     # @param host [String] The hostname of the URL being purged
     def initialize(method, path, host)
-      @method = method
+      @request_method = method == "PURGE" ? Purge : DomainPurge
       @path = path
       @host = host
     end
@@ -50,13 +70,17 @@ module Varnisher
     end
 
     def send
-      hostname = Varnisher.options['hostname']
+      hostname = Varnisher.options['hostname'] || @host
       port = Varnisher.options['port']
 
-      TCPSocket.open(hostname, port) do |s|
-        s.print("#{@method} #{@path} HTTP/1.1\r\nHost: #{@host}\r\n\r\n")
-        !!s.read.match(/HTTP\/1\.1 200 Purged\./)
+      begin
+        http = Net::HTTP.new(hostname, port)
+        response = http.request(@request_method.new(@path))
+      rescue Timeout::Error
+        return false
       end
+
+      response.code == "200"
     end
   end
 end

data/lib/varnisher/spider.rb

@@ -21,6 +21,7 @@ module Varnisher
   #
   #
   class Spider
+    attr_reader :to_visit, :visited
 
     # Starts a new spider instance.
     #

data/lib/varnisher/version.rb

@@ -1,3 +1,3 @@
 module Varnisher
-  VERSION = '1.0.beta.4'
+  VERSION = '1.0.beta.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: varnisher
 version: !ruby/object:Gem::Version
-  version: 1.0.beta.4
+  version: 1.0.beta.5
 platform: ruby
 authors:
 - Rob Miller
@@ -52,6 +52,62 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.6
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+- !ruby/object:Gem::Dependency
+  name: letters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: Some tools that make working with the Varnish HTTP cache easier, including
   things like doing mass purges of entire domains.
 email: rob@bigfish.co.uk
@@ -95,3 +151,4 @@ signing_key:
 specification_version: 4
 summary: Helpful tools for working with Varnish caches
 test_files: []
+has_rdoc: