proxy_fetcher 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dac8f3b98762e29d5067e32689cef73be6905d4b
-  data.tar.gz: 5b488bb4180524c2cf64640aa031c9b2604c81cc
+  metadata.gz: 5350053943ea06b5eea6f0aae059ae35cda79350
+  data.tar.gz: 8fa58f71797bb165c06d6f8508058c92273b5e8b
 SHA512:
-  metadata.gz: aa4ff379c85314d81e660c84e65f9772a72b5a0d36110fcda2cff37d4ced8745cc82378bc98d290ab78c4c51868b201504a1067e2741ca3385d285a36bc525a8
-  data.tar.gz: 2fbc3811ca622aadda97e235b650a8603367fd4851d5a5319e71f994cc4b7520e2e88cbc45d4299c3fd74b58a569d0bf762e35c16eba1aaa9da01b1553759c3d
+  metadata.gz: 6a137676022ff0ed952383ce6868d2104c18c5ddb2389819525b20f00a97e00c43a2ff4f1366c5125ee8cd6224aa759299f2946e1634eaf2bafe2c705c50f050
+  data.tar.gz: 02ea4aa5f43892386fa4f50ea2fff7b7db432790aef2bcfb42ffa49e6940b97b150ab15a08bc4397d0f49699e3f1908e63a72a66b58b6bd188bfbc0ddd80fe40

data/README.md

@@ -86,6 +86,11 @@ Also you can call next instance method for every Proxy object:
 * `uri` (returns `URI::Generic` object)
 * `url` (returns a formatted URL like "_http://IP:PORT_" )
 
+You can use two methods to get the first proxy from the list:
+
+* `get` (will return first proxy and move it to the end of the list)
+* `get!` (will return first **connectable** proxy and move it to the end of the list; all the proxies till the working one will be removed)
+
 If you wanna clear current proxy manager list from dead servers, you can just call `cleanup!` method:
 
 ```ruby
@@ -104,7 +109,7 @@ manager.cleanup!
 
 ## TODO
 
-# Proxy filters
+* Proxy filters
 
 ## Contributing
 

data/lib/proxy_fetcher/version.rb

@@ -9,7 +9,7 @@ module ProxyFetcher
     # Minor version number
     MINOR = 1
     # Smallest version number
-    TINY  = 2
+    TINY  = 3
 
     # Full version number
     STRING = [MAJOR, MINOR, TINY].compact.join('.')

data/lib/proxy_fetcher.rb

@@ -37,6 +37,32 @@ module ProxyFetcher
 
     alias_method :fetch!, :refresh_list!
 
+    # Pop just first proxy (and back it to the end of the proxy list)
+    def get
+      first_proxy = @proxies.shift
+      @proxies << first_proxy
+
+      first_proxy
+    end
+
+    alias_method :pop, :get
+
+    # Pop first valid proxy (and back it to the end of the proxy list)
+    # Invalid proxies will be removed from the list
+    def get!
+      index = @proxies.find_index(&:connectable?)
+      return if index < 0
+
+      proxy = @proxies.delete_at(index)
+      tail = @proxies[index..-1]
+
+      @proxies = tail << proxy
+
+      proxy
+    end
+
+    alias_method :pop!, :get!
+
     # Clean current proxy list from dead proxies (doesn't respond by timeout)
     def cleanup!
       proxies.keep_if(&:connectable?)

data/proxy_fetcher.gemspec

@@ -5,7 +5,7 @@ require 'proxy_fetcher/version'
 Gem::Specification.new do |gem|
   gem.name = 'proxy_fetcher'
   gem.version = ProxyFetcher.gem_version
-  gem.date = '2017-05-19'
+  gem.date = '2017-05-25'
   gem.summary = 'Ruby gem for dealing with proxy lists '
   gem.description = 'This gem can help your Ruby application to make HTTP(S) requests ' \
                     'from proxy server, fetching and validating current proxy lists from the HideMyAss service.'

data/spec/proxy_fetcher/manager_spec.rb

@@ -33,4 +33,32 @@ describe ProxyFetcher::Manager do
     manager = described_class.new(refresh: false)
     expect(manager.inspect).to eq(manager.to_s)
   end
+
+  it 'returns first proxy' do
+    manager = described_class.new
+
+    first_proxy = manager.proxies.first
+
+    expect(manager.get).to eq(first_proxy)
+    expect(manager.proxies.first).not_to eq(first_proxy)
+  end
+
+  it 'returns first valid proxy' do
+    manager = described_class.new(refresh: false)
+
+    proxies = 5.times.collect { instance_double('ProxyFetcher::Proxy', connectable?: false) }
+    manager.instance_variable_set(:@proxies, proxies)
+
+    connectable_proxy = instance_double('ProxyFetcher::Proxy')
+    allow(connectable_proxy).to receive(:connectable?).and_return(true)
+
+    manager.proxies[0..2].each { |proxy| proxy.instance_variable_set(:@addr, '192.168.1.1') }
+    manager.proxies[2] = connectable_proxy
+
+    expect(manager.get!).to eq(connectable_proxy)
+    expect(manager.proxies.size).to be(3)
+
+    expect(manager.get!).to eq(connectable_proxy)
+    expect(manager.proxies.size).to be(1)
+  end
 end

data/spec/proxy_fetcher/proxy_spec.rb

@@ -18,7 +18,7 @@ describe ProxyFetcher::Proxy do
   end
 
   it "not connectable if server doesn't respond to head" do
-    allow_any_instance_of(Net::HTTP).to receive(:request_head).and_return(false)
+    allow_any_instance_of(Net::HTTP).to receive(:start).and_return(false)
     expect(proxy.connectable?).to be_falsey
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxy_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nikita Bulai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri