hidemyass 0.0.3 → 0.0.4

data/lib/hidemyass/http.rb

@@ -0,0 +1,36 @@
+module Hidemyass
+  module HTTP
+    def HTTP.start(address, opts = { :try_local => false }, *arg, &block)
+      Hidemyass.log 'Connecting to ' + address + ' from:'
+      response = nil
+  
+      if opts[:try_local]
+        begin
+          Hidemyass.log 'localhost...'
+          response = Net::HTTP.start(address, *arg, &block)
+          Hidemyass.log response.class.to_s
+          if response.class.ancestors.include?(Net::HTTPSuccess)
+            return response
+          end
+        rescue *HTTP_ERRORS => error
+          Hidemyass.log :error, error
+        end
+      end
+      
+      Hidemyass.proxies.each do |proxy|
+        begin
+          Hidemyass.log proxy[:host] + ':' + proxy[:port]
+          response = Net::HTTP::Proxy(proxy[:host], proxy[:port]).start(address, *arg, &block)
+          Hidemyass.log response.class.to_s
+          if response.class.ancestors.include?(Net::HTTPSuccess)
+            return response
+          end
+        rescue *HTTP_ERRORS => error
+          Hidemyass.log :error, error
+        end
+      end
+
+      response
+    end
+  end
+end

data/lib/hidemyass/logger.rb

@@ -0,0 +1,19 @@
+module Hidemyass
+  module Logger
+    def log(message)
+      logger.info("#{LOG_PREFIX} #{message}") if logging?
+    end
+
+    def logger #:nodoc:
+      @logger ||= options[:logger] || ::Logger.new(STDOUT)
+    end
+
+    def logger=(logger)
+      @logger = logger
+    end
+
+    def logging? #:nodoc:
+      options[:log]
+    end
+  end
+end

data/lib/hidemyass/version.rb

@@ -1,3 +1,3 @@
 module Hidemyass
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/hidemyass.rb

@@ -1,14 +1,17 @@
-require 'rubygems'
 require 'nokogiri'
 require 'open-uri'
 require 'net/http'
+require 'logger'
 
-require "hidemyass/version"
+require 'hidemyass/version'
+require 'hidemyass/logger'
+require 'hidemyass/http'
 
 module Hidemyass
+  extend Logger
 
   HOST = 'hidemyass.com'
-  LOG_PREFIX = "** [hidemyass] "
+  LOG_PREFIX = '** [hidemyass] '
 
   HTTP_ERRORS = [Timeout::Error,
                  Errno::EINVAL,
@@ -17,61 +20,21 @@ module Hidemyass
                  Net::HTTPBadResponse,
                  Net::HTTPHeaderSyntaxError,
                  Net::ProtocolError]
-
-  class << self
-    attr_reader :host, :port, :first_without_proxy, :proxies
-
-    def initialize(host = nil, port = nil, first_without_proxy = false, &block)
-      @host = host
-      @port = port
-      @first_without_proxy = first_without_proxy
-    end
-
-    def proxies
-      uri = URI.parse('http://%s/proxy-list/search-225729' % HOST)
-      dom = Nokogiri::HTML(open(uri))
-
-      @proxies ||= dom.xpath('//table[@id="listtable"]/tr').collect do |node|
-        { port: node.at_xpath('td[3]').content.strip,
-          host: node.at_xpath('td[2]/span').xpath('text() | *[not(contains(@style,"display:none"))]').
-                  map(&:content).compact.join.to_s }
-      end
-    end
-
-    def request(host = @host, port = @port, first_without_proxy = @first_without_proxy)
-      return unless host && port
-
-      response = nil
-      if first_without_proxy
-        begin
-          response = Net::HTTP.start(host, port, &block)
-        rescue *HTTP_ERRORS => error
-          log :error, error
-        end
-      end
-
-      proxies.each do |proxy|
-        begin
-          response = Net::HTTP::Proxy(proxy[:host], proxy[:port]).start(host, port, &block)
-          break if response == Net::HTTPSuccess
-        rescue *HTTP_ERRORS => error
-          log :error, error
-        end
-      end
-
-      response
-    end
-
-    def logger
-      if defined?(Rails.logger)
-        Rails.logger
-      elsif defined?(RAILS_DEFAULT_LOGGER)
-        RAILS_DEFAULT_LOGGER
-      end
-    end
-
-    def log(level, message, response = nil)
-      logger.send level, LOG_PREFIX + message if logger
+                 
+   def self.options
+     @options ||= {
+       :log => true
+     }
+   end
+
+  def self.proxies
+    uri = URI.parse('http://%s/proxy-list/search-225729' % HOST)
+    dom = Nokogiri::HTML(open(uri))
+
+    @proxies ||= dom.xpath('//table[@id="listtable"]/tr').collect do |node|
+      { port: node.at_xpath('td[3]').content.strip,
+        host: node.at_xpath('td[2]/span').xpath('text() | *[not(contains(@style,"display:none"))]').
+                map(&:content).compact.join.to_s }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hidemyass
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000 Z
+date: 2012-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -41,6 +41,8 @@ files:
 - Rakefile
 - hidemyass.gemspec
 - lib/hidemyass.rb
+- lib/hidemyass/http.rb
+- lib/hidemyass/logger.rb
 - lib/hidemyass/version.rb
 homepage: http://github.com/jassa/hidemyass
 licenses: []