proxied 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e69adf50671eb77dac5aab9fbe23f3704243a1f21678082bfb4d92cd1204a9
-  data.tar.gz: c10c1245e7fde08ab30b82e109e3c5d977dd0dc80332f48f37910d5c9b30bb23
+  metadata.gz: 259fa06faa16224529c74da60047158116d019a7017972887cd9c91228f854b4
+  data.tar.gz: a9a83e6416cc5db560e4b3d90129eabc7e0c55aeea4150bba155f482957091bb
 SHA512:
-  metadata.gz: de4a55cac54cf4906ad7ff46cc774d2ca0eec7e416227a5e8f091c8faead140741fe5f5defd9a3f7d5ac963430281aca48992953a1e88252f92a3cecf5de885d
-  data.tar.gz: 412e1cf5216ffd43e7b48c916331a5798ef139eab8372f7a917298728eb50935d08830b7ffb8abf9929877bed5101b2e65d84bbe6851ccbd93f0cc74c7c30ddf
+  metadata.gz: 764f5d70013bf48d88064cf6bd90d5c29759f75b6672f26e4d443f3bebc7e49e18f71d4bd1dbd7628cfcbd3c9bd178027a2327d3f68732cf96b09a2be8234537
+  data.tar.gz: 1a79de19edcfb1bdef83ff8d110489ab43501732dbb04c38f6a312e382f69fbc63142c6a60fc1de9e081628952c5a3984bfd55e8e4373dbf4e99e0c0f5ec28c2

data/lib/generators/active_record/proxied_generator.rb

@@ -20,16 +20,16 @@ module ActiveRecord
       end
       
       def inject_proxied_content
-        content = model_contents
+        content       =   model_contents
 
-        class_path = if namespaced?
+        class_path    =   if namespaced?
           class_name.to_s.split("::")
         else
           [class_name]
         end
 
-        indent_depth = class_path.size - 1
-        content = content.split("\n").map { |line| "  " * indent_depth + line } .join("\n") << "\n"
+        indent_depth  =   class_path.size - 1
+        content       =   content.split("\n").map { |line| "  " * indent_depth + line } .join("\n") << "\n"
 
         inject_into_class(model_path, class_path.last, content) if model_exists?
       end
@@ -40,8 +40,8 @@ module ActiveRecord
 RUBY
       end
 
-      def rails5?
-        Rails.version.start_with? '5'
+      def should_version_migration?
+        !(Rails.version.to_s =~ /^(5|6)/i).nil?
       end
 
       def postgresql?
@@ -49,20 +49,21 @@ RUBY
         config && config['adapter'] == 'postgresql'
       end
 
-     def migration_version
-       if rails5?
-         "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-       end
-     end
+      def migration_version
+        if should_version_migration?
+          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
 
-     def primary_key_type
-       primary_key_string if rails5?
-     end
+      def primary_key_type
+        primary_key_string if should_version_migration?
+      end
 
-     def primary_key_string
-       key_string = options[:primary_key_type]
-       ", id: :#{key_string}" if key_string
-     end
+      def primary_key_string
+        key_string = options[:primary_key_type]
+        ", id: :#{key_string}" if key_string
+      end
+     
     end
   end
 end

data/lib/generators/active_record/templates/migration.rb

@@ -4,6 +4,7 @@ class ProxiedCreate<%= table_name.camelize %> < ActiveRecord::Migration<%= migra
   def change
     create_table :<%= table_name %><%= primary_key_type %> do |t|
       t.string  :host,                  null: false, index: true
+      t.string  :ip_address,            null: false, index: true
       t.integer :port,                  null: false, index: true
       t.string  :username
       t.string  :password

data/lib/generators/mongoid/proxied_generator.rb

@@ -22,6 +22,7 @@ module Mongoid
   
   # Fields
   field :host, type: String
+  field :ip_address, type: String
   field :port, type: Integer
   
   field :username, type: String

data/lib/generators/templates/proxied.rb

@@ -5,4 +5,17 @@
   config.maximum_failed_attempts      =   10
   
   config.job_queue                    =   :proxies
+  
+  config.http_test                    =   {
+    url:      "http://ipinfo.io/ip",
+    evaluate: -> (proxy, response) { response.to_s.strip.eql?(proxy.ip_address.strip) },
+    timeout:  10,
+  }
+  
+  config.socks_test                   =   {
+    hostname: "whois.verisign-grs.com",
+    port:     43,
+    query:    "=google.com",
+    timeout:  10
+  }
 end

data/lib/proxied/checker.rb

@@ -67,11 +67,11 @@ module Proxied
       return valid_proxy
     end
     
-    def check_http_proxy(proxy, test_url: ::Proxied.configuration.http_test[:url], timeout: ::Proxied.configuration.http_test[:timeout], update: true)
+    def check_http_proxy(proxy, test_url: ::Proxied.configuration.http_test[:url], evaluate: ::Proxied.configuration.http_test[:evaluate], timeout: ::Proxied.configuration.http_test[:timeout], update: true)
       ::Proxied::Logger.log "#{Time.now}: Fetching #{::Proxied.configuration.http_test[:url]} with proxy #{proxy.proxy_address}."
 
       response        =   request(test_url, proxy, options: {timeout: timeout})
-      valid_proxy     =   response.to_s.strip.eql?(proxy.host.strip)
+      valid_proxy     =   evaluate.call(proxy, response)
 
       update_proxy(proxy, valid_proxy) if update
       

data/lib/proxied/configuration.rb

@@ -21,6 +21,7 @@ module Proxied
       
       self.http_test        =   {
         url:      "http://ipinfo.io/ip",
+        evaluate: -> (proxy, response) { response.to_s.strip.eql?(proxy.ip_address.strip) },
         timeout:  10,
       }
       

data/lib/proxied/importer.rb

@@ -16,12 +16,17 @@ module Proxied
     
     def self.import(proxies)
       proxies.each do |proxy_item|
+        host                        =   proxy_item[:host]&.to_s&.strip&.downcase
+        port                        =   proxy_item[:port]&.to_s&.strip&.to_i
+        ip_address                  =   proxy_item.fetch(:ip_address, host)&.to_s&.strip&.downcase
+        
         query                       =   {
-          host:       proxy_item[:host]&.to_s&.strip,
-          port:       proxy_item[:port]&.to_s&.strip&.to_i
+          host:       host,
+          port:       port
         }
     
         parsed                      =   {
+          ip_address: ip_address,
           protocol:   proxy_item.fetch(:protocol, "http")&.to_s&.strip&.downcase,
           proxy_type: proxy_item.fetch(:type, :private)&.to_s&.strip,
           category:   proxy_item.fetch(:category, nil)&.to_s&.strip&.downcase,

data/lib/proxied/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxied
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sebastian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday