net-ping 1.5.1 → 1.5.2

data/CHANGES

@@ -1,3 +1,12 @@
+== 1.5.2 - 4-Nov-2011
+* The Net::Ping::HTTP class now defaults to using HEAD instead of GET
+  for its ping test. You can alter this via the get_request accessor.
+  Thanks got to Balazs Kutil for the patch.
+* Added the ssl_verify_mode accessor to the Net::Ping::HTTP class, which
+  defaults to VERIFY_NONE. This fixes possible warnings resulting from
+  missing SSL certificates when using https. Thanks go to Balazs Kutil
+  for the patch.
+
 == 1.5.1 - 15-Sep-2011
 * Use RbConfig on Ruby 1.9 and later. Thanks go to Torsten Schönebaum
   for the patch.

data/lib/net/ping/http.rb

@@ -27,12 +27,20 @@ module Net
     # The user agent used for the HTTP request. The default is nil.
     attr_accessor :user_agent
 
+    # OpenSSL certificate verification mode. The default is VERIFY_NONE.
+    attr_accessor :ssl_verify_mode
+
+    # Use GET request instead HEAD. The default is false.
+    attr_accessor :get_request
+
     # Creates and returns a new Ping::HTTP object. The default port is the
     # port associated with the URI. The default timeout is 5 seconds.
     #
     def initialize(uri=nil, port=nil, timeout=5)
       @follow_redirect = true
       @redirect_limit  = 5
+      @ssl_verify_mode = OpenSSL::SSL::VERIFY_NONE
+      @get_request = false
 
       port ||= URI.parse(uri).port if uri
 
@@ -60,48 +68,35 @@ module Net
 
       start_time = Time.now
 
-      begin
-        response = nil
-        uri_path = uri.path.empty? ? '/' : uri.path
-        headers = { }
-        headers["User-Agent"] = user_agent unless user_agent.nil?
-        Timeout.timeout(@timeout) do
-          http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = (uri.scheme == 'https')
-          request = Net::HTTP::Get.new(uri_path)
-          response = http.start{ |h| h.request(request) }
-        end
-      rescue Exception => err
-        @exception = err.message
-      else
-        if response.is_a?(Net::HTTPSuccess)
-          bool = true
-        else
-          if @follow_redirect
-            @warning = response.message
-            rlimit = 0
-
-            # Any response code in the 300 range is a redirect
-            while response.code.to_i >= 300 && response.code.to_i < 400
-              if rlimit >= redirect_limit
-                @exception = "Redirect limit exceeded"
-                break
-              end
-              redirect = URI.parse(response['location'])
-              redirect = uri + redirect if redirect.relative?
-              response = Net::HTTP.get_response(redirect.host, redirect.path, @port)
-              rlimit += 1
-            end
+      response = do_ping(uri)
 
-            if response.is_a?(Net::HTTPSuccess)
-              bool = true
-            else
-              @warning = nil
-              @exception ||= response.message
+      if response.is_a?(Net::HTTPSuccess)
+        bool = true
+      elsif redirect?(response) # Check code, HTTPRedirection does not always work
+        if @follow_redirect
+          @warning = response.message
+          rlimit = 0
+
+          while redirect?(response)
+            if rlimit >= redirect_limit
+              @exception = "Redirect limit exceeded"
+              break
             end
+            redirect = URI.parse(response['location'])
+            redirect = uri + redirect if redirect.relative?
+            response = do_ping(redirect)
+            rlimit += 1
+          end
+
+          if response.is_a?(Net::HTTPSuccess)
+            bool = true
           else
-            @exception = response.message
+            @warning = nil
+            @exception ||= response.message
           end
+
+        else
+          @exception = response.message
         end
       end
 
@@ -116,5 +111,39 @@ module Net
     alias follow_redirect? follow_redirect
     alias uri host
     alias uri= host=
+
+    private
+
+    def redirect?(response)
+      response && response.code.to_i >= 300 && response.code.to_i < 400
+    end
+
+    def do_ping(uri)
+      response = nil
+      begin
+        uri_path = uri.path.empty? ? '/' : uri.path
+        headers = { }
+        headers["User-Agent"] = user_agent unless user_agent.nil?
+        Timeout.timeout(@timeout) do
+          http = Net::HTTP.new(uri.host, uri.port)
+
+          if uri.scheme == 'https'
+            http.use_ssl = true
+            http.verify_mode = @ssl_verify_mode
+          end
+
+          if @get_request == true
+            request = Net::HTTP::Get.new(uri_path)
+          else
+            request = Net::HTTP::Head.new(uri_path)
+          end
+
+          response = http.start{ |h| h.request(request) }
+        end
+      rescue Exception => err
+        @exception = err.message
+      end
+      response
+    end
   end
 end

data/lib/net/ping/ping.rb

@@ -10,7 +10,7 @@ module Net
    #
    class Ping
       # The version of the net-ping library.
-      VERSION = '1.5.1'
+      VERSION = '1.5.2'
 
       # The host to ping. In the case of Ping::HTTP, this is the URI.
       attr_accessor :host

data/net-ping.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |gem|
   gem.name      = 'net-ping'
-  gem.version   = '1.5.1'
+  gem.version   = '1.5.2'
   gem.license   = 'Artistic 2.0'
   gem.author    = 'Daniel J. Berger'
   gem.email     = 'djberg96@gmail.com'

data/test/test_net_ping.rb

@@ -30,7 +30,7 @@ end
 
 class TC_Net_Ping < Test::Unit::TestCase
   def test_net_ping_version
-    assert_equal('1.5.1', Net::Ping::VERSION)
+    assert_equal('1.5.2', Net::Ping::VERSION)
   end
 end
 

data/test/test_net_ping_http.rb

@@ -16,8 +16,9 @@ class TC_Net_Ping_HTTP < Test::Unit::TestCase
     @uri_https = 'https://encrypted.google.com'
 
     FakeWeb.register_uri(:get, @uri, :body => "PONG")
-    FakeWeb.register_uri(:get, @uri_https, :body => "PONG")
-    FakeWeb.register_uri(:get, "http://jigsaw.w3.org/HTTP/300/302.html", 
+    FakeWeb.register_uri(:head, @uri, :body => "PONG")
+    FakeWeb.register_uri(:head, @uri_https, :body => "PONG")
+    FakeWeb.register_uri(:head, "http://jigsaw.w3.org/HTTP/300/302.html",
                          :body => "PONG",
                          :location => "#{@uri}",
                          :status => ["302", "Found"])
@@ -163,12 +164,17 @@ class TC_Net_Ping_HTTP < Test::Unit::TestCase
     assert_equal(443, @http.port)
   end
 
-  # This will generate a warning. Nothing I can do about it.
   test 'ping against https site works as expected' do
     @http = Net::Ping::HTTP.new(@uri_https)
     assert_true(@http.ping)
   end
 
+  test 'ping with get option' do
+    @http = Net::Ping::HTTP.new(@uri)
+    @http.get_request = true
+    assert_true(@http.ping)
+  end
+
   def teardown
     @uri  = nil
     @http = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-ping
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 Z
+date: 2011-11-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ldap