proxied 0.2.1 → 0.2.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (25) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +2 -1
  3. data/Appraisals +9 -2
  4. data/Gemfile +1 -1
  5. data/Gemfile.lock +142 -120
  6. data/README.md +10 -4
  7. data/bin/console +1 -1
  8. data/lib/generators/active_record/templates/migration.rb +14 -10
  9. data/lib/generators/mongoid/proxied_generator.rb +4 -0
  10. data/lib/generators/templates/proxied.rb +21 -4
  11. data/lib/proxied/checker.rb +78 -40
  12. data/lib/proxied/configuration.rb +20 -14
  13. data/lib/proxied/importer.rb +13 -10
  14. data/lib/proxied/logger.rb +13 -3
  15. data/lib/proxied/nosql/proxy_methods.rb +7 -6
  16. data/lib/proxied/shared.rb +22 -11
  17. data/lib/proxied/sql/proxy_methods.rb +10 -9
  18. data/lib/proxied/utilities.rb +20 -27
  19. data/lib/proxied/version.rb +1 -1
  20. data/lib/tasks/tasks.rake +4 -4
  21. data/proxied.gemspec +16 -16
  22. metadata +33 -36
  23. data/gemfiles/.bundle/config +0 -2
  24. data/gemfiles/activerecord5.gemfile +0 -11
  25. data/gemfiles/mongoid7.gemfile +0 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 259fa06faa16224529c74da60047158116d019a7017972887cd9c91228f854b4
4
- data.tar.gz: a9a83e6416cc5db560e4b3d90129eabc7e0c55aeea4150bba155f482957091bb
3
+ metadata.gz: db12c4ace8bc64f321360c8e1a6157d07dbd7ee645b6736f38bd1b19e12ef952
4
+ data.tar.gz: a894a6f8b9ca8608bf1d09670fb3c41010f3fe2c4265645a6c7508564f4f31f1
5
5
  SHA512:
6
- metadata.gz: 764f5d70013bf48d88064cf6bd90d5c29759f75b6672f26e4d443f3bebc7e49e18f71d4bd1dbd7628cfcbd3c9bd178027a2327d3f68732cf96b09a2be8234537
7
- data.tar.gz: 1a79de19edcfb1bdef83ff8d110489ab43501732dbb04c38f6a312e382f69fbc63142c6a60fc1de9e081628952c5a3984bfd55e8e4373dbf4e99e0c0f5ec28c2
6
+ metadata.gz: 4621888e60cfedd8dc04f923c57b2a0ed7cae70a642e9bfa9c2a3fcc23c209b03455fbe306e0f4c83ed1e04f82f8d49d46d49f3284563b64aa8a16b15a31663d
7
+ data.tar.gz: bcf9e6d50d2730c415a29a20d4bd27ef57e45bc4d814867715117e029cd667641bd7687baaef49627aaea0446781e5b49517532fcf1bebd5b58287bcc7dda8dd
data/.gitignore CHANGED
@@ -6,6 +6,7 @@
6
6
  /pkg/
7
7
  /spec/reports/
8
8
  /spec/tmp/
9
+ /spec/fixtures/
9
10
  /spec/support/files/proxies.yml
10
11
  /tmp/
11
12
 
@@ -16,7 +17,7 @@
16
17
  .pry_history
17
18
 
18
19
  # appraisals
19
- /gemfiles/*.lock
20
+ /gemfiles/
20
21
 
21
22
  # RVM
22
23
  .ruby-version
data/Appraisals CHANGED
@@ -1,13 +1,20 @@
1
1
  appraise 'mongoid7' do
2
- gem "mongoid", "~> 7", require: "mongoid"
2
+ gem "mongoid", "~> 7.2", require: "mongoid"
3
3
  gem "bson_ext", platform: "ruby"
4
4
  end
5
5
 
6
6
  appraise 'activerecord5' do
7
7
  gem "activerecord", ">= 5.2", require: "active_record"
8
8
 
9
- # Ammeter dependencies:
10
9
  gem "actionpack", ">= 5.2"
11
10
  gem "activemodel", ">= 5.2"
12
11
  gem "railties", ">= 5.2"
13
12
  end
13
+
14
+ appraise 'activerecord6' do
15
+ gem "activerecord", ">= 6.1", require: "active_record"
16
+
17
+ gem "actionpack", ">= 6.1"
18
+ gem "activemodel", ">= 6.1"
19
+ gem "railties", ">= 6.1"
20
+ end
data/Gemfile CHANGED
@@ -5,4 +5,4 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
5
5
  # Specify your gem's dependencies in proxied.gemspec
6
6
  gemspec
7
7
 
8
- gem "rails", "~> 5.2"
8
+ gem 'rails', '>= 6.0'
data/Gemfile.lock CHANGED
@@ -1,202 +1,224 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- proxied (0.2.0)
5
- faraday (>= 0.15.4)
6
- net-ssh (>= 5.1)
4
+ proxied (0.2.6)
5
+ faraday (>= 1.0)
6
+ net-ssh (>= 6.0)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- actioncable (5.2.3)
12
- actionpack (= 5.2.3)
11
+ actioncable (6.1.0)
12
+ actionpack (= 6.1.0)
13
+ activesupport (= 6.1.0)
13
14
  nio4r (~> 2.0)
14
15
  websocket-driver (>= 0.6.1)
15
- actionmailer (5.2.3)
16
- actionpack (= 5.2.3)
17
- actionview (= 5.2.3)
18
- activejob (= 5.2.3)
16
+ actionmailbox (6.1.0)
17
+ actionpack (= 6.1.0)
18
+ activejob (= 6.1.0)
19
+ activerecord (= 6.1.0)
20
+ activestorage (= 6.1.0)
21
+ activesupport (= 6.1.0)
22
+ mail (>= 2.7.1)
23
+ actionmailer (6.1.0)
24
+ actionpack (= 6.1.0)
25
+ actionview (= 6.1.0)
26
+ activejob (= 6.1.0)
27
+ activesupport (= 6.1.0)
19
28
  mail (~> 2.5, >= 2.5.4)
20
29
  rails-dom-testing (~> 2.0)
21
- actionpack (5.2.3)
22
- actionview (= 5.2.3)
23
- activesupport (= 5.2.3)
24
- rack (~> 2.0)
30
+ actionpack (6.1.0)
31
+ actionview (= 6.1.0)
32
+ activesupport (= 6.1.0)
33
+ rack (~> 2.0, >= 2.0.9)
25
34
  rack-test (>= 0.6.3)
26
35
  rails-dom-testing (~> 2.0)
27
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
28
- actionview (5.2.3)
29
- activesupport (= 5.2.3)
36
+ rails-html-sanitizer (~> 1.0, >= 1.2.0)
37
+ actiontext (6.1.0)
38
+ actionpack (= 6.1.0)
39
+ activerecord (= 6.1.0)
40
+ activestorage (= 6.1.0)
41
+ activesupport (= 6.1.0)
42
+ nokogiri (>= 1.8.5)
43
+ actionview (6.1.0)
44
+ activesupport (= 6.1.0)
30
45
  builder (~> 3.1)
31
46
  erubi (~> 1.4)
32
47
  rails-dom-testing (~> 2.0)
33
- rails-html-sanitizer (~> 1.0, >= 1.0.3)
34
- activejob (5.2.3)
35
- activesupport (= 5.2.3)
48
+ rails-html-sanitizer (~> 1.1, >= 1.2.0)
49
+ activejob (6.1.0)
50
+ activesupport (= 6.1.0)
36
51
  globalid (>= 0.3.6)
37
- activemodel (5.2.3)
38
- activesupport (= 5.2.3)
39
- activerecord (5.2.3)
40
- activemodel (= 5.2.3)
41
- activesupport (= 5.2.3)
42
- arel (>= 9.0)
43
- activestorage (5.2.3)
44
- actionpack (= 5.2.3)
45
- activerecord (= 5.2.3)
52
+ activemodel (6.1.0)
53
+ activesupport (= 6.1.0)
54
+ activerecord (6.1.0)
55
+ activemodel (= 6.1.0)
56
+ activesupport (= 6.1.0)
57
+ activestorage (6.1.0)
58
+ actionpack (= 6.1.0)
59
+ activejob (= 6.1.0)
60
+ activerecord (= 6.1.0)
61
+ activesupport (= 6.1.0)
46
62
  marcel (~> 0.3.1)
47
- activesupport (5.2.3)
63
+ mimemagic (~> 0.3.2)
64
+ activesupport (6.1.0)
48
65
  concurrent-ruby (~> 1.0, >= 1.0.2)
49
- i18n (>= 0.7, < 2)
50
- minitest (~> 5.1)
51
- tzinfo (~> 1.1)
52
- addressable (2.6.0)
53
- public_suffix (>= 2.0.2, < 4.0)
54
- appraisal (2.2.0)
66
+ i18n (>= 1.6, < 2)
67
+ minitest (>= 5.1)
68
+ tzinfo (~> 2.0)
69
+ zeitwerk (~> 2.3)
70
+ addressable (2.7.0)
71
+ public_suffix (>= 2.0.2, < 5.0)
72
+ appraisal (2.3.0)
55
73
  bundler
56
74
  rake
57
75
  thor (>= 0.14.0)
58
- arel (9.0.0)
59
76
  axiom-types (0.1.1)
60
77
  descendants_tracker (~> 0.0.4)
61
78
  ice_nine (~> 0.11.0)
62
79
  thread_safe (~> 0.3, >= 0.3.1)
63
- builder (3.2.3)
64
- coderay (1.1.2)
80
+ builder (3.2.4)
81
+ coderay (1.1.3)
65
82
  coercible (1.0.0)
66
83
  descendants_tracker (~> 0.0.1)
67
- concurrent-ruby (1.1.5)
68
- crack (0.4.3)
69
- safe_yaml (~> 1.0.0)
70
- crass (1.0.4)
84
+ concurrent-ruby (1.1.7)
85
+ crack (0.4.5)
86
+ rexml
87
+ crass (1.0.6)
71
88
  descendants_tracker (0.0.4)
72
89
  thread_safe (~> 0.3, >= 0.3.1)
73
- diff-lcs (1.3)
90
+ diff-lcs (1.4.4)
74
91
  equalizer (0.0.11)
75
- erubi (1.8.0)
76
- faraday (0.15.4)
92
+ erubi (1.10.0)
93
+ faraday (1.2.0)
77
94
  multipart-post (>= 1.2, < 3)
95
+ ruby2_keywords
78
96
  generator_spec (0.9.4)
79
97
  activesupport (>= 3.0.0)
80
98
  railties (>= 3.0.0)
81
99
  globalid (0.4.2)
82
100
  activesupport (>= 4.2.0)
83
- hashdiff (0.4.0)
84
- i18n (1.6.0)
101
+ hashdiff (1.0.1)
102
+ i18n (1.8.5)
85
103
  concurrent-ruby (~> 1.0)
86
104
  ice_nine (0.11.2)
87
- loofah (2.2.3)
105
+ loofah (2.8.0)
88
106
  crass (~> 1.0.2)
89
107
  nokogiri (>= 1.5.9)
90
108
  mail (2.7.1)
91
109
  mini_mime (>= 0.1.1)
92
110
  marcel (0.3.3)
93
111
  mimemagic (~> 0.3.2)
94
- method_source (0.9.2)
95
- mimemagic (0.3.3)
96
- mini_mime (1.0.1)
112
+ method_source (1.0.0)
113
+ mimemagic (0.3.5)
114
+ mini_mime (1.0.2)
97
115
  mini_portile2 (2.4.0)
98
- minitest (5.11.3)
116
+ minitest (5.14.2)
99
117
  multipart-post (2.1.1)
100
- net-ssh (5.2.0)
101
- nio4r (2.3.1)
102
- nokogiri (1.10.3)
118
+ net-ssh (6.1.0)
119
+ nio4r (2.5.4)
120
+ nokogiri (1.10.10)
103
121
  mini_portile2 (~> 2.4.0)
104
- pry (0.12.2)
105
- coderay (~> 1.1.0)
106
- method_source (~> 0.9.0)
107
- public_suffix (3.1.1)
108
- rack (2.0.7)
122
+ pry (0.13.1)
123
+ coderay (~> 1.1)
124
+ method_source (~> 1.0)
125
+ public_suffix (4.0.6)
126
+ rack (2.2.3)
109
127
  rack-test (1.1.0)
110
128
  rack (>= 1.0, < 3)
111
- rails (5.2.3)
112
- actioncable (= 5.2.3)
113
- actionmailer (= 5.2.3)
114
- actionpack (= 5.2.3)
115
- actionview (= 5.2.3)
116
- activejob (= 5.2.3)
117
- activemodel (= 5.2.3)
118
- activerecord (= 5.2.3)
119
- activestorage (= 5.2.3)
120
- activesupport (= 5.2.3)
121
- bundler (>= 1.3.0)
122
- railties (= 5.2.3)
129
+ rails (6.1.0)
130
+ actioncable (= 6.1.0)
131
+ actionmailbox (= 6.1.0)
132
+ actionmailer (= 6.1.0)
133
+ actionpack (= 6.1.0)
134
+ actiontext (= 6.1.0)
135
+ actionview (= 6.1.0)
136
+ activejob (= 6.1.0)
137
+ activemodel (= 6.1.0)
138
+ activerecord (= 6.1.0)
139
+ activestorage (= 6.1.0)
140
+ activesupport (= 6.1.0)
141
+ bundler (>= 1.15.0)
142
+ railties (= 6.1.0)
123
143
  sprockets-rails (>= 2.0.0)
124
144
  rails-dom-testing (2.0.3)
125
145
  activesupport (>= 4.2.0)
126
146
  nokogiri (>= 1.6)
127
- rails-html-sanitizer (1.0.4)
128
- loofah (~> 2.2, >= 2.2.2)
129
- railties (5.2.3)
130
- actionpack (= 5.2.3)
131
- activesupport (= 5.2.3)
147
+ rails-html-sanitizer (1.3.0)
148
+ loofah (~> 2.3)
149
+ railties (6.1.0)
150
+ actionpack (= 6.1.0)
151
+ activesupport (= 6.1.0)
132
152
  method_source
133
153
  rake (>= 0.8.7)
134
- thor (>= 0.19.0, < 2.0)
135
- rake (12.3.2)
136
- rdoc (6.1.1)
137
- rspec-core (3.8.2)
138
- rspec-support (~> 3.8.0)
139
- rspec-expectations (3.8.4)
154
+ thor (~> 1.0)
155
+ rake (13.0.3)
156
+ rdoc (6.3.0)
157
+ rexml (3.2.4)
158
+ rspec-core (3.10.0)
159
+ rspec-support (~> 3.10.0)
160
+ rspec-expectations (3.10.0)
140
161
  diff-lcs (>= 1.2.0, < 2.0)
141
- rspec-support (~> 3.8.0)
142
- rspec-mocks (3.8.1)
162
+ rspec-support (~> 3.10.0)
163
+ rspec-mocks (3.10.0)
143
164
  diff-lcs (>= 1.2.0, < 2.0)
144
- rspec-support (~> 3.8.0)
145
- rspec-rails (3.8.2)
146
- actionpack (>= 3.0)
147
- activesupport (>= 3.0)
148
- railties (>= 3.0)
149
- rspec-core (~> 3.8.0)
150
- rspec-expectations (~> 3.8.0)
151
- rspec-mocks (~> 3.8.0)
152
- rspec-support (~> 3.8.0)
153
- rspec-support (3.8.2)
154
- safe_yaml (1.0.5)
155
- sprockets (3.7.2)
165
+ rspec-support (~> 3.10.0)
166
+ rspec-rails (4.0.2)
167
+ actionpack (>= 4.2)
168
+ activesupport (>= 4.2)
169
+ railties (>= 4.2)
170
+ rspec-core (~> 3.10)
171
+ rspec-expectations (~> 3.10)
172
+ rspec-mocks (~> 3.10)
173
+ rspec-support (~> 3.10)
174
+ rspec-support (3.10.0)
175
+ ruby2_keywords (0.0.2)
176
+ sprockets (4.0.2)
156
177
  concurrent-ruby (~> 1.0)
157
178
  rack (> 1, < 3)
158
- sprockets-rails (3.2.1)
179
+ sprockets-rails (3.2.2)
159
180
  actionpack (>= 4.0)
160
181
  activesupport (>= 4.0)
161
182
  sprockets (>= 3.0.0)
162
- thor (0.20.3)
183
+ thor (1.0.1)
163
184
  thread_safe (0.3.6)
164
- tzinfo (1.2.5)
165
- thread_safe (~> 0.1)
166
- vcr (5.0.0)
185
+ tzinfo (2.0.4)
186
+ concurrent-ruby (~> 1.0)
187
+ vcr (6.0.0)
167
188
  virtus (1.0.5)
168
189
  axiom-types (~> 0.1)
169
190
  coercible (~> 1.0)
170
191
  descendants_tracker (~> 0.0, >= 0.0.3)
171
192
  equalizer (~> 0.0, >= 0.0.9)
172
- webmock (3.6.0)
193
+ webmock (3.11.0)
173
194
  addressable (>= 2.3.6)
174
195
  crack (>= 0.3.2)
175
196
  hashdiff (>= 0.4.0, < 2.0.0)
176
- websocket-driver (0.7.1)
197
+ websocket-driver (0.7.3)
177
198
  websocket-extensions (>= 0.1.0)
178
- websocket-extensions (0.1.4)
199
+ websocket-extensions (0.1.5)
200
+ zeitwerk (2.4.2)
179
201
 
180
202
  PLATFORMS
181
203
  ruby
182
204
 
183
205
  DEPENDENCIES
184
- appraisal (>= 2.2.0)
185
- bundler (>= 1.17.2)
186
- generator_spec (>= 0.9.4)
206
+ appraisal (>= 2.3)
207
+ bundler (>= 2.0)
208
+ generator_spec (>= 0.9)
187
209
  proxied!
188
- pry (>= 0.12.2)
189
- rails (~> 5.2)
190
- rake (>= 12.3.2)
191
- rdoc (>= 6.1.1)
192
- rspec-core (>= 3.8)
193
- rspec-expectations (>= 3.8.2)
194
- rspec-mocks (>= 3.8)
195
- rspec-rails (>= 3.8.2)
196
- rspec-support (>= 3.8)
197
- vcr (>= 4.0)
210
+ pry (>= 0.13)
211
+ rails (>= 6.0)
212
+ rake (>= 13.0)
213
+ rdoc (>= 6.3)
214
+ rspec-core (>= 3.10)
215
+ rspec-expectations (>= 3.10)
216
+ rspec-mocks (>= 3.10)
217
+ rspec-rails (>= 4.0)
218
+ rspec-support (>= 3.10)
219
+ vcr (>= 6.0)
198
220
  virtus (>= 1.0)
199
- webmock (>= 3.5.1)
221
+ webmock (>= 3.11)
200
222
 
201
223
  BUNDLED WITH
202
- 1.17.2
224
+ 2.1.4
data/README.md CHANGED
@@ -62,16 +62,22 @@ Features:
62
62
 
63
63
  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.
64
64
 
65
+ ### Appraisals
66
+
67
+ Install appraisal dependencies (if not already done):
68
+ ```
69
+ bundle exec appraisal install
70
+ ```
71
+
65
72
  To test specific appraisals/gemfiles, you can do
66
73
 
67
- * ActiveRecord: bundle exec appraisal activerecord5 rake spec
74
+ * ActiveRecord: bundle exec appraisal activerecord6 rake spec
68
75
 
69
- In order to test specific specs: bundle exec appraisal activerecord5 rspec spec/lib/generators/activerecord_generator_spec.rb
76
+ In order to test specific specs: `bundle exec appraisal activerecord6 rspec spec/lib/generators/activerecord_generator_spec.rb`
70
77
 
71
78
  * Mongoid: bundle exec appraisal mongoid7 rake spec ADAPTER=mongoid
72
79
 
73
- In order to test specific specs: ADAPTER=mongoid bundle exec appraisal mongoid7 rspec spec/lib/generators/mongoid_generator_spec.rb
74
-
80
+ In order to test specific specs: `ADAPTER=mongoid bundle exec appraisal mongoid7 rspec spec/lib/generators/mongoid_generator_spec.rb`
75
81
 
76
82
  ## Contributing
77
83
 
data/bin/console CHANGED
@@ -8,7 +8,7 @@ require "proxied"
8
8
 
9
9
  # (If you use this, don't forget to add pry to your Gemfile!)
10
10
  require "pry"
11
- Pry.config.history.file = File.join(__FILE__, "../.pry_history")
11
+ Pry.config.history_file = File.join(__FILE__, "../.pry_history")
12
12
  Pry.start
13
13
 
14
14
  #require "irb"
data/lib/generators/active_record/templates/migration.rb CHANGED
@@ -3,19 +3,23 @@
3
3
  class ProxiedCreate<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
4
4
  def change
5
5
  create_table :<%= table_name %><%= primary_key_type %> do |t|
6
- t.string :host, null: false, index: true
7
- t.string :ip_address, null: false, index: true
8
- t.integer :port, null: false, index: true
9
- t.string :username
10
- t.string :password
6
+ t.string :host, null: false, index: true
7
+ t.string :ip_address, null: false, index: true
8
+ t.integer :port, null: false, index: true
11
9
 
12
- t.string :protocol, null: false, default: 'http', index: true
13
- t.string :proxy_type, null: false, default: 'public', index: true
14
- t.string :category
10
+ t.string :username
11
+ t.string :password
12
+ t.string :auth_mode, null: false, default: 'credentials', index: true
15
13
 
16
- t.string :country, index: true
17
- t.string :city, index: true
14
+ t.string :protocol, null: false, default: 'http', index: true
15
+ t.string :proxy_type, null: false, default: 'public', index: true
16
+ t.string :category
18
17
 
18
+ t.string :country, index: true
19
+ t.string :city, index: true
20
+
21
+ t.boolean :checkable, null: false, default: true, index: true
22
+ t.boolean :asyncable, null: false, default: true, index: true
19
23
  t.datetime :last_checked_at, index: true
20
24
 
21
25
  t.boolean :valid_proxy, null: false, default: false, index: true