peeping_tom 0.5 → 0.6

data/lib/peeping_tom.rb

@@ -1,6 +1,7 @@
 
 require File.join(File.dirname(__FILE__), "peeping_tom", "peeper")
 require File.join(File.dirname(__FILE__), "peeping_tom", "site")
+require File.join(File.dirname(__FILE__), "peeping_tom", "with_proxy")
 require File.join(File.dirname(__FILE__), "peeping_tom", "dsl")
 
 

data/lib/peeping_tom/dsl.rb

@@ -4,36 +4,38 @@ require 'uri'
 
 module PeepingTom
   module DSL
-    def ping(site, method = :head)
-			method = method.to_s.downcase
-			raise ArgumentError, "only accepts head or get" unless ['head', 'get'].include?(method)
-
-      Timeout::timeout(site.timeout) do
-        url = URI.parse(site.url)
-        res = Net::HTTP.start(url.host, url.port) do |http|
-          file = "/" + url.to_s.sub(/http:\/\/.*?\//, '')
-					http.send(method, file)
-        end
-        return res.code.to_i >= 200 && res.code.to_i < 400
-      end
-      return error!
-    rescue Timeout::Error, Errno::ECONNREFUSED, SocketError
-      return error!
-    end
 
     def channels
       @channels
     end
 
+		def ping(site)
+			@site.ping(*@site.with_args)
+		end
+
+		def verify(site)
+			@site.verify(*@site.with_args)
+		end
+
+		def with(*args)
+			args
+		end
+
     def watch(name)
+			alias :old_site :site
+			alias :site :proxy_site
+
       PeepingTom.peeper(name).sites.each_value do |site|
-        @error = false
-        yield site
-        if @error
-          $stdout.puts "#{site.name} is DOWN"
-          @channels.each {|c| c.notify!(site)}
+				@site = site
+        yield 
+        if site.error?
+					@errors = true
+          $stdout.puts "#{site.name} has an ERROR"
+          (@channels || []).each {|c| c.notify!(site)}
         end
       end
+			
+			alias :site :old_site
     end
 
     def errors
@@ -46,12 +48,6 @@ module PeepingTom
       yield
     end
 
-    def error!
-      @error = true
-      @errors = true
-      return false
-    end
-
     def group(name, &block)
       PeepingTom.set_peeper(name)
       yield
@@ -75,5 +71,9 @@ module PeepingTom
     def site(name, site, opts = {})
       PeepingTom.peeper.register(name, site, opts)
     end
+
+		def proxy_site(*args)
+			@site.with(*args)
+		end
   end
 end

data/lib/peeping_tom/site.rb

@@ -13,5 +13,58 @@ module PeepingTom
       @url = "http://#{@url}" unless @url =~ /^http:\/\//
       @url
     end
+
+		def verify(regex = //)
+      Timeout::timeout(self.timeout) do
+        url = URI.parse(self.url)
+        res = Net::HTTP.start(url.host, url.port) do |http|
+          file = "/" + url.to_s.sub(/http:\/\/.*?\//, '')
+					http.get(file)
+        end
+				if res.body =~ regex
+					return true
+				else
+					@error = true
+					return false
+				end
+      end
+			@error = true
+			return false
+    rescue Timeout::Error, Errno::ECONNREFUSED, SocketError
+			@error = true
+			return false
+		end
+    
+		def ping(method = :head)
+			method = method.to_s.downcase
+			method = 'head' if method == ''
+			raise ArgumentError, "only accepts head or get: #{method}" unless ['head', 'get'].include?(method)
+
+      Timeout::timeout(self.timeout) do
+        url = URI.parse(self.url)
+        res = Net::HTTP.start(url.host, url.port) do |http|
+          file = "/" + url.to_s.sub(/http:\/\/.*?\//, '')
+					http.send(method, file)
+        end
+        return res.code.to_i >= 200 && res.code.to_i < 400
+      end
+			@error = true
+			return false
+    rescue Timeout::Error, Errno::ECONNREFUSED, SocketError
+			@error = true
+			return false
+    end
+
+		def error?
+			@error
+		end
+
+		def with(*args)
+			@with = args
+		end
+
+		def with_args
+			@with
+		end
   end
-end
+end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  version: "0.5"
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Terry Heath