http_utilities 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07be36a100e4a796a3a8b7fe3c6bf91ae8868be2
-  data.tar.gz: 86c9ab65ecd84b8fa513a40a55a71ead7436a1ab
+  metadata.gz: b1c0b02b5b8356187e86ff1e3f45e5899247ee4c
+  data.tar.gz: 124fb89e7a57864d5ec402838bd41002e8fe3470
 SHA512:
-  metadata.gz: 7112683b789905dd8ef5c996daf79ae2b16d47364822a197f9e8577d09a488d146d0e89591b6668e9217f3e80a465c9882566922f83fb20a178715c0bbca3f8e
-  data.tar.gz: 3dceaebd2bc4eb906f20bc894f9f8ca42086a5c6a2eafe2c06a7c4bf6b0e00f42c77820d981b8f069740b4bf4d46a66c24764db418f83b607afb179e58d6dee8
+  metadata.gz: e26b5382bedec9b718580c74e5f74a7c3ab9f6ee7a25c4724f9e19a2953ba8a0062462dcee452f833673a8eda2af18d2a20ac9abb31f9b7d86be2198d52b31d0
+  data.tar.gz: 2b6fe44dc2398763d0de8c107755ce24344fda557ec3a88080934fda0d141445440e60b4658a9fdf1cc5807007d6385a076722f9faad43119aad8acf55ff8a50

data/http_utilities.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
   
   s.name = "http_utilities"
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.authors = ["Sebastian Johnsson"]
   s.description = "Wrapper for common Http Libraries (Net:HTTP/Open URI/Curl)"

data/lib/http_utilities.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module HttpUtilities
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
   
   require File.join(File.dirname(__FILE__), 'http_utilities/railtie') if defined?(Rails)
 

data/lib/http_utilities/http/proxy_support.rb

@@ -35,7 +35,7 @@ module HttpUtilities
             self.proxy            =   specific_proxy
 
           elsif (proxy_model_defined?)
-            proxy_object          =   Proxy.get_random_proxy(self.proxy[:protocol], self.proxy[:type])
+            proxy_object          =   Proxy.get_random_proxy(protocol: self.proxy[:protocol], proxy_type: self.proxy[:type])
             
             #log(:info, "[HttpUtilities::Http::ProxySupport] - Randomized Proxy object: #{proxy_object.inspect}")
 

data/lib/http_utilities/proxies/proxy_checker.rb

@@ -19,13 +19,19 @@ module HttpUtilities
         self.maximum_failed_attempts      =   10
       end
 
-      def check_and_update_proxies(protocol = :all, proxy_type = :all, mode = :synchronous)
-        check_proxies(protocol, proxy_type, mode)
+      def check_and_update_proxies(protocol: :all, proxy_type: :all, mode: :synchronous, maximum_failed_attempts: self.maximum_failed_attempts)
+        check_proxies(protocol: protocol, proxy_type: proxy_type, mode: mode, maximum_failed_attempts: maximum_failed_attempts)
         update_proxies
       end
 
-      def check_proxies(protocol = :all, proxy_type = :all, mode = :synchronous)
-        proxies = Proxy.should_be_checked(protocol, proxy_type, Time.now, self.limit)
+      def check_proxies(protocol: :all, proxy_type: :all, mode: :synchronous, maximum_failed_attempts: self.maximum_failed_attempts)
+        proxies                           =   Proxy.should_be_checked(
+          protocol:                 protocol,
+          proxy_type:               proxy_type,
+          date:                     Time.now,
+          limit:                    self.limit,
+          maximum_failed_attempts:  maximum_failed_attempts
+        )
 
         if (proxies && proxies.any?)
           Rails.logger.info "Found #{proxies.size} #{proxy_type} proxies to check."
@@ -62,6 +68,9 @@ module HttpUtilities
           client.write("#{test_query}\r\n")
           response      =   client.read
           
+          puts "SOCKS RESPONSE:\n"
+          puts response
+          
           valid_proxy   =   (response && response.present?)
         
         rescue StandardError => e

data/lib/http_utilities/proxies/proxy_module.rb

@@ -8,40 +8,47 @@ module HttpUtilities
       end
 
       module ClassMethods
-        def should_be_checked(protocol = :all, proxy_type = :all, date = Time.now, limit = 10)
-          conditions = set_protocol_and_proxy_type_conditions(protocol, proxy_type)
-          conditions << ActiveRecord::Base.send(:sanitize_sql_array, ["(last_checked_at IS NULL OR last_checked_at < ?)", date])
-          conditions << "failed_attempts <= 10"
-          query = conditions.join(" AND ")
+        def should_be_checked(protocol: :all, proxy_type: :all, date: Time.now, limit: 10, maximum_failed_attempts: 10)
+          proxies     =   get_proxies_for_protocol_and_proxy_type(protocol, proxy_type)
+          proxies     =   proxies.where(["(last_checked_at IS NULL OR last_checked_at < ?)", date])
+          proxies     =   proxies.where(["failed_attempts <= ?", maximum_failed_attempts])
+          proxies     =   proxies.order("valid_proxy ASC, failed_attempts ASC, last_checked_at ASC")
+          proxies     =   proxies.limit(limit)
           
-          where(query).order("valid_proxy ASC, failed_attempts ASC, last_checked_at ASC").limit(limit) 
+          return proxies
         end
         
-        def get_random_proxy(protocol = :all, proxy_type = :all)
-          conditions = set_protocol_and_proxy_type_conditions(protocol, proxy_type)
-          conditions << ActiveRecord::Base.send(:sanitize_sql_array, ["valid_proxy = ?", true])
-          conditions << "last_checked_at IS NOT NULL"
-          query = conditions.join(" AND ")
+        def get_random_proxy(protocol: :all, proxy_type: :all, maximum_failed_attempts: nil)
+          proxies     =   get_proxies_for_protocol_and_proxy_type(protocol, proxy_type)
+          proxies     =   proxies.where(["valid_proxy = ? AND last_checked_at IS NOT NULL", true])
+          proxies     =   proxies.where(["failed_attempts <= ?", maximum_failed_attempts]) if maximum_failed_attempts
           
           order_clause = case ActiveRecord::Base.connection.class.name
-            when "ActiveRecord::ConnectionAdapters::MysqlAdapter", "ActiveRecord::ConnectionAdapters::Mysql2Adapter" then "RAND() DESC"
-            when "ActiveRecord::ConnectionAdapters::SQLite3Adapter" then "RANDOM() DESC"
+            when "ActiveRecord::ConnectionAdapters::MysqlAdapter", "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
+              "RAND() DESC"
+            when "ActiveRecord::ConnectionAdapters::SQLite3Adapter"
+              "RANDOM() DESC"
+            else
+              "RAND() DESC"
           end
           
-          proxy = nil
+          proxies     =   proxies.order(order_clause)
+          
+          proxy       =   nil
           
           uncached do
-            proxy = where(query).order(order_clause).limit(1).first
+            proxy     =   proxies.limit(1).first
           end
 
           return proxy
         end
         
-        def set_protocol_and_proxy_type_conditions(protocol, proxy_type)
-          conditions = []
-          conditions << ActiveRecord::Base.send(:sanitize_sql_array, ["protocol = ?", protocol]) if (protocol && !protocol.downcase.to_sym.eql?(:all))
-          conditions << ActiveRecord::Base.send(:sanitize_sql_array, ["proxy_type = ?", proxy_type]) if (proxy_type && !proxy_type.downcase.to_sym.eql?(:all))
-          return conditions
+        def get_proxies_for_protocol_and_proxy_type(protocol, proxy_type)
+          proxies     =   ::Proxy.where(nil)
+          proxies     =   proxies.where(protocol: protocol)     if (protocol && !protocol.downcase.to_sym.eql?(:all))
+          proxies     =   proxies.where(proxy_type: proxy_type) if (proxy_type && !proxy_type.downcase.to_sym.eql?(:all))
+          
+          return proxies
         end
 
         def format_proxy_address(proxy_host, proxy_port = 80, include_http = false)

data/lib/tasks/http_utilities_tasks.rake

@@ -7,13 +7,16 @@ namespace :http_utilities do
       seeder.seed
     end
 
-    task :check_proxies, [:protocol, :proxy_type, :processing_method] => [:environment] do |task, args|
-      protocol                =   (args.protocol)             ?   args.protocol.to_sym            : :http
-      proxy_type              =   (args.proxy_type)           ?   args.proxy_type.to_sym          : :public
-      processing_method       =   (args.processing_method)    ?   args.processing_method.to_sym   : :synchronous
+    task :check_proxies, [:protocol, :proxy_type, :mode, :maximum_failed_attempts] => [:environment] do |task, args|
+      args.with_defaults(protocol: :http, proxy_type: :public, mode: :synchronous, maximum_failed_attempts: 10)
       
       proxy_checker = HttpUtilities::Proxies::ProxyChecker.new
-      proxy_checker.check_and_update_proxies(protocol, proxy_type, processing_method)
+      proxy_checker.check_and_update_proxies(
+        protocol:                 args.protocol.to_sym, 
+        proxy_type:               args.proxy_type.to_sym, 
+        mode:                     args.mode.to_sym,
+        maximum_failed_attempts:  args.maximum_failed_attempts.to_i
+      )
     end
   end
 end

data/spec/http_utilities/proxy_spec.rb

@@ -78,14 +78,14 @@ describe Proxy do
     
     [:http, :socks].each do |protocol|
       it "should return #{protocol.to_s} proxies that should be checked" do
-        proxies = Proxy.should_be_checked(protocol)
+        proxies = Proxy.should_be_checked(protocol: protocol)
         proxies.should_not be_nil
         proxies.size.should == 3
       end
       
       [:public, :shared, :private].each do |proxy_type|
         it "should return #{proxy_type.to_s} #{protocol.to_s} proxies that should be checked" do
-          proxies = Proxy.should_be_checked(protocol, proxy_type)
+          proxies = Proxy.should_be_checked(protocol: protocol, proxy_type: proxy_type)
           proxies.should_not be_nil
           proxies.size.should == 1
         end
@@ -94,14 +94,14 @@ describe Proxy do
     
     [:http, :socks].each do |protocol|
       it "should return a random #{protocol.to_s} proxy" do
-        random_proxy = Proxy.get_random_proxy(protocol)
+        random_proxy = Proxy.get_random_proxy(protocol: protocol)
         random_proxy.should_not be_nil
         random_proxy.protocol.should == protocol.to_s
       end
       
       [:public, :shared, :private].each do |proxy_type|
         it "should return a random #{proxy_type.to_s} #{protocol.to_s} proxy" do
-          random_proxy = Proxy.get_random_proxy(protocol, proxy_type)
+          random_proxy = Proxy.get_random_proxy(protocol: protocol, proxy_type: proxy_type)
           random_proxy.should_not be_nil
           random_proxy.protocol.should == protocol.to_s
           random_proxy.proxy_type.should == proxy_type.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_utilities
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Sebastian Johnsson