proxied 0.2.1 → 0.2.7

data/lib/proxied/sql/proxy_methods.rb

@@ -11,27 +11,28 @@ module Proxied
       end
 
       module ClassMethods
-        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)
+        def should_be_checked(mode: :synchronous, protocol: :all, proxy_type: :all, category: nil, country: nil, date: Time.now, limit: nil, maximum_failed_attempts: 10)
+          proxies     =   get_proxies(protocol: protocol, proxy_type: proxy_type, category: category, country: country)
+          proxies     =   proxies.where(checkable: true)
+          proxies     =   proxies.where(asyncable: true) if mode.to_sym.eql?(:asynchronous)
           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)
+          proxies     =   proxies.limit(limit) if limit && !limit.zero?
         
           return proxies
         end
       
-        def get_valid_proxies(protocol: :all, proxy_type: :all, category: nil, maximum_failed_attempts: nil)
-          proxies     =   get_proxies_for_protocol_and_proxy_type(protocol, proxy_type)
+        def get_valid_proxies(protocol: :all, proxy_type: :all, category: nil, country: nil, maximum_failed_attempts: nil)
+          proxies     =   get_proxies(protocol: protocol, proxy_type: proxy_type, category: category, country: country)
           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
-          proxies     =   proxies.where(category: category) unless category.to_s.empty?
 
           return proxies
         end
       
-        def get_random_proxy(protocol: :all, proxy_type: :all, category: nil, maximum_failed_attempts: nil)
-          proxies     =   get_valid_proxies(protocol: protocol, proxy_type: proxy_type, category: category, maximum_failed_attempts: maximum_failed_attempts)
+        def get_random_proxy(protocol: :all, proxy_type: :all, category: nil, country: nil, maximum_failed_attempts: nil)
+          proxies     =   get_valid_proxies(protocol: protocol, proxy_type: proxy_type, category: category, country: country, maximum_failed_attempts: maximum_failed_attempts)
           proxies     =   yield(proxies) if block_given?
         
           order_clause = case ActiveRecord::Base.connection.class.name
@@ -45,7 +46,7 @@ module Proxied
               "RAND() DESC"
           end
         
-          proxies     =   proxies.order(order_clause)
+          proxies     =   proxies.order(Arel.sql(order_clause))
         
           proxy       =   nil
         

data/lib/proxied/utilities.rb

@@ -1,17 +1,22 @@
 module Proxied
   class Utilities
-    
     class << self
       
-      def format_proxy_address(host:, port: 80, include_http: false)
+      def format_proxy_address(host:, port: 80, username: nil, password: nil, protocol: 'http', include_protocol: false)
+        protocol                ||=   'http'
         address                   =   "#{host.strip}:#{port}"
-        address                   =   "http://#{address}" if include_http && !address.start_with?("http://")
+        address                   =   "#{format_proxy_credentials(username, password)}@#{address}" if !username.to_s.empty? && !password.to_s.empty?
+        address                   =   include_protocol && address !~ /^http(s)?/i ? "#{protocol}://#{address}" : address
         
         return address
       end
 
       def format_proxy_credentials(username, password)
-        return "#{username}:#{password}"
+        return "#{encode_credential(username)}:#{encode_credential(password)}"
+      end
+      
+      def encode_credential(credential)
+        CGI::escape(credential)
       end
       
       def socks_proxy_credentials(username: nil, password: nil)
@@ -23,34 +28,22 @@ module Proxied
         return credentials
       end
       
-      def proxy_options_for_faraday(host:, port: 80, username: nil, password: nil)
+      def proxy_options_for_faraday(host:, port: 80, username: nil, password: nil, auth_mode: :credentials, protocol: 'http')
         proxy_options             =   {}
-    
-        proxy_options[:uri]       =   format_proxy_address(host: host, port: port, include_http: true)
-        proxy_options[:user]      =   username if !username.to_s.empty?
-        proxy_options[:password]  =   password if !password.to_s.empty?
-    
-        return proxy_options
-      end
-      
-      def proxy_switcher_import_format(host:, port: 80, username: nil, password: nil, country: nil)
-        # Format:
-        # COUNTRY_CODE,COUNTRY_NAME,CITY,USERNAME:PASSWORD@IP_ADDRESS:PORT
-        
-        address                   =   ""
-                
-        if !country.to_s.empty?
-          address                +=   "#{country.upcase},,,"
-        end
+        username                  =   encode_credential(username)
+        password                  =   encode_credential(password)
         
-        if !username.to_s.empty? && !password.to_s.empty?
-          address                +=   "#{username}:#{password}@"
-        end
+        options                   =   {host: host, port: port, protocol: protocol, include_protocol: true}
+        options[:username]        =   username if !username.to_s.empty? && auth_mode&.to_sym&.eql?(:url)
+        options[:password]        =   password if !password.to_s.empty? && auth_mode&.to_sym&.eql?(:url)
         
-        address                  +=   "#{host}:#{port}"
+        proxy_options[:uri]       =   format_proxy_address(options)
+        proxy_options[:user]      =   username if !username.to_s.empty? && auth_mode&.to_sym&.eql?(:credentials)
+        proxy_options[:password]  =   password if !password.to_s.empty? && auth_mode&.to_sym&.eql?(:credentials)
+    
+        return proxy_options
       end
       
     end
-    
   end
 end

data/lib/proxied/version.rb

@@ -1,3 +1,3 @@
 module Proxied
-  VERSION = "0.2.1"
+  VERSION = "0.2.7"
 end

data/lib/tasks/tasks.rake

@@ -1,12 +1,12 @@
 namespace :proxied do
-  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)
+  task :check_proxies, [:protocol, :proxy_type, :category, :mode, :maximum_failed_attempts] => :environment do |task, args|
+    args.with_defaults(protocol: :http, proxy_type: :public, category: nil, mode: :synchronous, maximum_failed_attempts: 10)
     
     checker = ::Proxied::Checker.new(mode: args.mode.to_sym, maximum_failed_attempts: args.maximum_failed_attempts.to_i)
     checker.check_proxies(
       protocol:     args.protocol.to_sym, 
-      proxy_type:   args.proxy_type.to_sym, 
-      
+      proxy_type:   args.proxy_type.to_sym,
+      category:     args.category
     )
   end
 end

data/proxied.gemspec

@@ -23,25 +23,25 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   
-  spec.add_dependency "faraday",                    ">= 0.15.4"
-  spec.add_dependency "net-ssh",                    ">= 5.1"
+  spec.add_dependency 'faraday', '>= 1.0'
+  spec.add_dependency 'net-ssh', '>= 6.0'
   
-  spec.add_development_dependency "bundler",        ">= 1.17.2"
-  spec.add_development_dependency "rake",           ">= 12.3.2"
-  spec.add_development_dependency "appraisal",      ">= 2.2.0"
+  spec.add_development_dependency 'bundler', '>= 2.0'
+  spec.add_development_dependency 'rake', '>= 13.0'
+  spec.add_development_dependency 'appraisal', '>= 2.3'
   
-  spec.add_development_dependency "virtus",         ">= 1.0"
+  spec.add_development_dependency 'virtus', '>= 1.0'
   
-  spec.add_development_dependency "rspec-rails",    ">= 3.8.2"
-  spec.add_development_dependency "rspec-core",     ">= 3.8"
-  spec.add_development_dependency "rspec-expectations", ">= 3.8.2"
-  spec.add_development_dependency "rspec-mocks",    ">= 3.8"
-  spec.add_development_dependency "rspec-support",  ">= 3.8"
-  spec.add_development_dependency "generator_spec", ">= 0.9.4"
+  spec.add_development_dependency 'rspec-rails', '>= 4.0'
+  spec.add_development_dependency 'rspec-core', '>= 3.10'
+  spec.add_development_dependency 'rspec-expectations', '>= 3.10'
+  spec.add_development_dependency 'rspec-mocks', '>= 3.10'
+  spec.add_development_dependency 'rspec-support', '>= 3.10'
+  spec.add_development_dependency 'generator_spec', '>= 0.9'
   
-  spec.add_development_dependency "rdoc",           ">= 6.1.1"
-  spec.add_development_dependency "vcr",            ">= 4.0"
-  spec.add_development_dependency "webmock",        ">= 3.5.1"
+  spec.add_development_dependency 'rdoc', '>= 6.3'
+  spec.add_development_dependency 'vcr', '>= 6.0'
+  spec.add_development_dependency 'webmock', '>= 3.11'
   
-  spec.add_development_dependency "pry",            ">= 0.12.2"  
+  spec.add_development_dependency 'pry', '>= 0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxied
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.7
 platform: ruby
 authors:
 - Sebastian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -100,140 +100,140 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.2
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.2
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.2
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.2
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: '6.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.13'
 description: Manage HTTP(S) and SOCKS proxies for Rails apps. Supports ActiveRecord
   and Mongoid as ORM.
 email:
@@ -254,9 +254,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/.bundle/config
-- gemfiles/activerecord5.gemfile
-- gemfiles/mongoid7.gemfile
 - lib/generators/active_record/proxied_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/mongoid/proxied_generator.rb
@@ -298,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Proxied is a proxy management gem for Ruby/Rails.