proxied 0.2.1 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 259fa06faa16224529c74da60047158116d019a7017972887cd9c91228f854b4
-  data.tar.gz: a9a83e6416cc5db560e4b3d90129eabc7e0c55aeea4150bba155f482957091bb
+  metadata.gz: db12c4ace8bc64f321360c8e1a6157d07dbd7ee645b6736f38bd1b19e12ef952
+  data.tar.gz: a894a6f8b9ca8608bf1d09670fb3c41010f3fe2c4265645a6c7508564f4f31f1
 SHA512:
-  metadata.gz: 764f5d70013bf48d88064cf6bd90d5c29759f75b6672f26e4d443f3bebc7e49e18f71d4bd1dbd7628cfcbd3c9bd178027a2327d3f68732cf96b09a2be8234537
-  data.tar.gz: 1a79de19edcfb1bdef83ff8d110489ab43501732dbb04c38f6a312e382f69fbc63142c6a60fc1de9e081628952c5a3984bfd55e8e4373dbf4e99e0c0f5ec28c2
+  metadata.gz: 4621888e60cfedd8dc04f923c57b2a0ed7cae70a642e9bfa9c2a3fcc23c209b03455fbe306e0f4c83ed1e04f82f8d49d46d49f3284563b64aa8a16b15a31663d
+  data.tar.gz: bcf9e6d50d2730c415a29a20d4bd27ef57e45bc4d814867715117e029cd667641bd7687baaef49627aaea0446781e5b49517532fcf1bebd5b58287bcc7dda8dd

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /spec/tmp/
+/spec/fixtures/
 /spec/support/files/proxies.yml
 /tmp/
 
@@ -16,7 +17,7 @@
 .pry_history
 
 # appraisals
-/gemfiles/*.lock
+/gemfiles/
 
 # RVM
 .ruby-version

data/Appraisals

@@ -1,13 +1,20 @@
 appraise 'mongoid7' do
-  gem "mongoid", "~> 7", require: "mongoid"
+  gem "mongoid", "~> 7.2", require: "mongoid"
   gem "bson_ext", platform: "ruby"
 end
 
 appraise 'activerecord5' do
   gem "activerecord", ">= 5.2", require: "active_record"
   
-  # Ammeter dependencies:
   gem "actionpack", ">= 5.2"
   gem "activemodel", ">= 5.2"
   gem "railties", ">= 5.2"
 end
+
+appraise 'activerecord6' do
+  gem "activerecord", ">= 6.1", require: "active_record"
+  
+  gem "actionpack", ">= 6.1"
+  gem "activemodel", ">= 6.1"
+  gem "railties", ">= 6.1"
+end

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'

data/Gemfile.lock

@@ -1,202 +1,224 @@
 PATH
   remote: .
   specs:
-    proxied (0.2.0)
-      faraday (>= 0.15.4)
-      net-ssh (>= 5.1)
+    proxied (0.2.6)
+      faraday (>= 1.0)
+      net-ssh (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (6.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
       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.1.0)
+      actionpack (= 6.1.0)
+      activejob (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      mail (>= 2.7.1)
+    actionmailer (6.1.0)
+      actionpack (= 6.1.0)
+      actionview (= 6.1.0)
+      activejob (= 6.1.0)
+      activesupport (= 6.1.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (6.1.0)
+      actionview (= 6.1.0)
+      activesupport (= 6.1.0)
+      rack (~> 2.0, >= 2.0.9)
       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.1.0)
+      actionpack (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.0)
+      activesupport (= 6.1.0)
       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.1.0)
+      activesupport (= 6.1.0)
       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.1.0)
+      activesupport (= 6.1.0)
+    activerecord (6.1.0)
+      activemodel (= 6.1.0)
+      activesupport (= 6.1.0)
+    activestorage (6.1.0)
+      actionpack (= 6.1.0)
+      activejob (= 6.1.0)
+      activerecord (= 6.1.0)
+      activesupport (= 6.1.0)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+      mimemagic (~> 0.3.2)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    appraisal (2.2.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    appraisal (2.3.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)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.3)
-    coderay (1.1.2)
+    builder (3.2.4)
+    coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.5)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    crass (1.0.4)
+    concurrent-ruby (1.1.7)
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     equalizer (0.0.11)
-    erubi (1.8.0)
-    faraday (0.15.4)
+    erubi (1.10.0)
+    faraday (1.2.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    hashdiff (0.4.0)
-    i18n (1.6.0)
+    hashdiff (1.0.1)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    loofah (2.2.3)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.14.2)
     multipart-post (2.1.1)
-    net-ssh (5.2.0)
-    nio4r (2.3.1)
-    nokogiri (1.10.3)
+    net-ssh (6.1.0)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.1.1)
-    rack (2.0.7)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    rack (2.2.3)
     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)
-      bundler (>= 1.3.0)
-      railties (= 5.2.3)
+    rails (6.1.0)
+      actioncable (= 6.1.0)
+      actionmailbox (= 6.1.0)
+      actionmailer (= 6.1.0)
+      actionpack (= 6.1.0)
+      actiontext (= 6.1.0)
+      actionview (= 6.1.0)
+      activejob (= 6.1.0)
+      activemodel (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      bundler (>= 1.15.0)
+      railties (= 6.1.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      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.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (12.3.2)
-    rdoc (6.1.1)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+      thor (~> 1.0)
+    rake (13.0.3)
+    rdoc (6.3.0)
+    rexml (3.2.4)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
-      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)
-    safe_yaml (1.0.5)
-    sprockets (3.7.2)
+      rspec-support (~> 3.10.0)
+    rspec-rails (4.0.2)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.0)
+    ruby2_keywords (0.0.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    vcr (5.0.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    vcr (6.0.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    webmock (3.6.0)
+    webmock (3.11.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (>= 2.2.0)
-  bundler (>= 1.17.2)
-  generator_spec (>= 0.9.4)
+  appraisal (>= 2.3)
+  bundler (>= 2.0)
+  generator_spec (>= 0.9)
   proxied!
-  pry (>= 0.12.2)
-  rails (~> 5.2)
-  rake (>= 12.3.2)
-  rdoc (>= 6.1.1)
-  rspec-core (>= 3.8)
-  rspec-expectations (>= 3.8.2)
-  rspec-mocks (>= 3.8)
-  rspec-rails (>= 3.8.2)
-  rspec-support (>= 3.8)
-  vcr (>= 4.0)
+  pry (>= 0.13)
+  rails (>= 6.0)
+  rake (>= 13.0)
+  rdoc (>= 6.3)
+  rspec-core (>= 3.10)
+  rspec-expectations (>= 3.10)
+  rspec-mocks (>= 3.10)
+  rspec-rails (>= 4.0)
+  rspec-support (>= 3.10)
+  vcr (>= 6.0)
   virtus (>= 1.0)
-  webmock (>= 3.5.1)
+  webmock (>= 3.11)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/README.md

@@ -62,16 +62,22 @@ Features:
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
+### Appraisals
+
+Install appraisal dependencies (if not already done):
+```
+bundle exec appraisal install
+```
+
 To test specific appraisals/gemfiles, you can do
 
-* ActiveRecord: bundle exec appraisal activerecord5 rake spec
+* ActiveRecord: bundle exec appraisal activerecord6 rake spec
 
-In order to test specific specs: bundle exec appraisal activerecord5 rspec spec/lib/generators/activerecord_generator_spec.rb
+In order to test specific specs: `bundle exec appraisal activerecord6 rspec spec/lib/generators/activerecord_generator_spec.rb`
 
 * Mongoid: bundle exec appraisal mongoid7 rake spec ADAPTER=mongoid
 
-In order to test specific specs: ADAPTER=mongoid bundle exec appraisal mongoid7 rspec spec/lib/generators/mongoid_generator_spec.rb
-
+In order to test specific specs: `ADAPTER=mongoid bundle exec appraisal mongoid7 rspec spec/lib/generators/mongoid_generator_spec.rb`
 
 ## Contributing
 

data/bin/console

@@ -8,7 +8,7 @@ require "proxied"
 
 # (If you use this, don't forget to add pry to your Gemfile!)
 require "pry"
-Pry.config.history.file = File.join(__FILE__, "../.pry_history")
+Pry.config.history_file = File.join(__FILE__, "../.pry_history")
 Pry.start
 
 #require "irb"

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

@@ -3,19 +3,23 @@
 class ProxiedCreate<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
   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
+      t.string   :host,                 null: false, index: true
+      t.string   :ip_address,           null: false, index: true
+      t.integer  :port,                 null: false, index: true
       
-      t.string  :protocol,              null: false, default: 'http', index: true
-      t.string  :proxy_type,            null: false, default: 'public', index: true
-      t.string  :category
+      t.string   :username
+      t.string   :password
+      t.string   :auth_mode,            null: false, default: 'credentials', index: true
       
-      t.string  :country,               index: true
-      t.string  :city,                  index: true
+      t.string   :protocol,             null: false, default: 'http', index: true
+      t.string   :proxy_type,           null: false, default: 'public', index: true
+      t.string   :category
       
+      t.string   :country,              index: true
+      t.string   :city,                 index: true
+      
+      t.boolean  :checkable,            null: false, default: true, index: true
+      t.boolean  :asyncable,            null: false, default: true, index: true
       t.datetime :last_checked_at,      index: true
       
       t.boolean  :valid_proxy,          null:  false, default: false, index: true