proxied 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e005242b58393ef158bf5c9174f37a1a9f8f0bfc28d7e2f6d2efe4dd8b055d9
-  data.tar.gz: 3f8eb894ecedf42f9915d1c622430962fd08ae7f0f194b1bf3e813710deec428
+  metadata.gz: 66fa9a15a7dc064d83d93c7dd0c96cb8821b1c638de850da05c68ed3fcec1ac6
+  data.tar.gz: fac32c45c518a4bac720595d1f9878446eaa6b946422a7ffc424af62dd7203c2
 SHA512:
-  metadata.gz: 8f72c919f4acae7c8dd32ea148f64e0e664de16dff6d2b2fb8050f5111ab32ff85f8ca266eb43459edc317d42abc1e83971aae839561ccc6ac5898870adc75b9
-  data.tar.gz: cabff401d31f825a5b909a7a16f3ae9a9ce4e8ee26104c5e3dcc5cf9db1eb3a67e985b781005cbbbd4b4b00534a694447e7af616f650e3585a6e2128a86729bd
+  metadata.gz: fc6356e29975968288d793a93709e3fde7ff55bd5a79a7578e9c34cc814d8c7094c5c3b0db25bbf4721f7ce508fd28f0051c522d9b934a15dbb5dfd103087656
+  data.tar.gz: 6d04d66c21be01142c3f848600df54732fcfd85b974a4f10ff4994bb6b27f9204f8fc1a653a93792c36b76873691ff0f2b2879707d299129ff289e5b75e1c3f1

data/Gemfile

@@ -5,4 +5,4 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in proxied.gemspec
 gemspec
 
-gem "rails", "~> 5.2"
+gem 'rails', '~> 6.0', '>= 6.0.1'

data/Gemfile.lock

@@ -1,61 +1,74 @@
 PATH
   remote: .
   specs:
-    proxied (0.2.3)
+    proxied (0.2.5)
       faraday (>= 0.15.4)
       net-ssh (>= 5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (6.0.1)
+      actionpack (= 6.0.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailbox (6.0.1)
+      actionpack (= 6.0.1)
+      activejob (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.1)
+      actionpack (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
+    actionpack (6.0.1)
+      actionview (= 6.0.1)
+      activesupport (= 6.0.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.1)
+      actionpack (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.1)
+      activesupport (= 6.0.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
+    activerecord (6.0.1)
+      activemodel (= 6.0.1)
+      activesupport (= 6.0.1)
+    activestorage (6.0.1)
+      actionpack (= 6.0.1)
+      activejob (= 6.0.1)
+      activerecord (= 6.0.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (9.0.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -67,13 +80,13 @@ GEM
     concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.4)
+    crass (1.0.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
     equalizer (0.0.11)
-    erubi (1.8.0)
-    faraday (0.15.4)
+    erubi (1.9.0)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
@@ -81,10 +94,10 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashdiff (1.0.0)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    loofah (2.2.3)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -95,11 +108,11 @@ GEM
     mimemagic (0.3.3)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.12.0)
+    minitest (5.13.0)
     multipart-post (2.1.1)
     net-ssh (5.2.0)
     nio4r (2.5.2)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -108,51 +121,53 @@ GEM
     rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (6.0.1)
+      actioncable (= 6.0.1)
+      actionmailbox (= 6.0.1)
+      actionmailer (= 6.0.1)
+      actionpack (= 6.0.1)
+      actiontext (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
+      activemodel (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 6.0.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.1)
+      actionpack (= 6.0.1)
+      activesupport (= 6.0.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (12.3.3)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.1)
     rdoc (6.2.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     safe_yaml (1.0.5)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -169,13 +184,14 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    webmock (3.7.5)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby
@@ -186,7 +202,7 @@ DEPENDENCIES
   generator_spec (>= 0.9.4)
   proxied!
   pry (>= 0.12.2)
-  rails (~> 5.2)
+  rails (~> 6.0, >= 6.0.1)
   rake (>= 12.3.2)
   rdoc (>= 6.1.1)
   rspec-core (>= 3.8)

data/lib/proxied/nosql/proxy_methods.rb

@@ -11,8 +11,8 @@ module Proxied
       end
 
       module ClassMethods
-        def should_be_checked(mode: :synchronous, protocol: :all, proxy_type: :all, category: nil, date: Time.now, limit: nil, maximum_failed_attempts: 10)
-          proxies     =   get_proxies(protocol: protocol, proxy_type: proxy_type, category: category)
+        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)
   
@@ -34,8 +34,8 @@ module Proxied
           return proxies
         end
       
-        def get_valid_proxies(protocol: :all, proxy_type: :all, category: nil, maximum_failed_attempts: nil)
-          proxies     =   get_proxies(protocol: protocol, proxy_type: proxy_type, category: category)
+        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: true)
           proxies     =   proxies.where(:failed_attempts.lte => maximum_failed_attempts) if maximum_failed_attempts
         end

data/lib/proxied/shared.rb

@@ -2,11 +2,12 @@ module Proxied
   module Shared
 
     module ClassMethods    
-      def get_proxies(protocol: :all, proxy_type: :all, category: nil)
+      def get_proxies(protocol: :all, proxy_type: :all, category: nil, country: nil)
         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))
-        proxies     =   proxies.where(category: category) unless category.to_s.empty?
+        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))
+        proxies     =   proxies.where(category: category)           unless category.to_s.empty?
+        proxies     =   proxies.where(country: country.to_s.upcase) unless country.to_s.empty?
       
         return proxies
       end
@@ -23,7 +24,12 @@ module Proxied
 
     module InstanceMethods
       def proxy_address(include_http: false)
-        ::Proxied::Utilities.format_proxy_address(host: self.host, port: self.port, include_http: include_http)
+        case self.auth_mode.to_sym
+          when :credentials
+            ::Proxied::Utilities.format_proxy_address(host: self.host, port: self.port, include_http: include_http)
+          when :basic_auth
+            ::Proxied::Utilities.format_proxy_address(host: self.host, port: self.port, username: self.username, password: self.password, include_http: include_http)
+        end
       end
 
       def proxy_credentials
@@ -38,9 +44,6 @@ module Proxied
         ::Proxied::Utilities.proxy_options_for_faraday(host: self.host, port: self.port, username: self.username, password: self.password, auth_mode: self.auth_mode)
       end
       
-      def proxy_switcher_import_format
-        ::Proxied::Utilities.proxy_switcher_import_format(host: self.host, port: self.port, username: self.username, password: self.password, country: self.country)
-      end
     end
         
   end

data/lib/proxied/sql/proxy_methods.rb

@@ -11,8 +11,8 @@ module Proxied
       end
 
       module ClassMethods
-        def should_be_checked(mode: :synchronous, protocol: :all, proxy_type: :all, category: nil, date: Time.now, limit: nil, maximum_failed_attempts: 10)
-          proxies     =   get_proxies(protocol: protocol, proxy_type: proxy_type, category: category)
+        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])
@@ -23,16 +23,16 @@ module Proxied
           return proxies
         end
       
-        def get_valid_proxies(protocol: :all, proxy_type: :all, category: nil, maximum_failed_attempts: nil)
-          proxies     =   get_proxies(protocol: protocol, proxy_type: proxy_type, category: category)
+        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
 
           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

data/lib/proxied/utilities.rb

@@ -11,7 +11,11 @@ module Proxied
       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)
@@ -25,8 +29,8 @@ module Proxied
       
       def proxy_options_for_faraday(host:, port: 80, username: nil, password: nil, auth_mode: :credentials)
         proxy_options             =   {}
-        username                  =   CGI::escape(username)
-        password                  =   CGI::escape(password)
+        username                  =   encode_credential(username)
+        password                  =   encode_credential(password)
         
         options                   =   {host: host, port: port, include_http: true}
         options[:username]        =   username if !username.to_s.empty? && auth_mode&.to_sym&.eql?(:basic_auth)
@@ -39,23 +43,6 @@ module Proxied
         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
-        
-        if !username.to_s.empty? && !password.to_s.empty?
-          address                +=   "#{username}:#{password}@"
-        end
-        
-        address                  +=   "#{host}:#{port}"
-      end
-      
     end
   end
 end

data/lib/proxied/version.rb

@@ -1,3 +1,3 @@
 module Proxied
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxied
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Sebastian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday