the_mask 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52659c1a94c839e53e22a7f8f102f669131a9c57
-  data.tar.gz: 68868c3f8b546f9dd2f2e97f281b56886b3b9bc9
+  metadata.gz: 2e23912c7fb5129bb925acbd4e9e609ebe056919
+  data.tar.gz: 552488893034e2a9833f794c8d09af9e9b246531
 SHA512:
-  metadata.gz: 08ae3c783d2502c83ba962cc4ddb37f32dfb3bd992a33f32f1a7a2f7f5fa681772453804d1e3e11feca3e278b1d2962f19851b801698f31962e10fb26f6411bf
-  data.tar.gz: c5b7ec9fc1bc9f64694fe61701f9f7e7d67c9161b39cbadfaa6813596c124d5681ecec4ff96d2529c7e8d7538ed84eaff9b258268adfc005873483a0378ebb03
+  metadata.gz: cf1ecb0d2bf67090fc760a5bb5f198127a3050e6c442c62ddb50a2c3d99c66f59abc177152d58bc082c59ead384087a3d6b620ec648bc14670b9ace58376fb63
+  data.tar.gz: c5459ce1dd5e26f70b3e7f7202294bf99339ec48df2d6671d7f4edb58bd101c720def4dd7d043e5f6032210e96ed4ad593fa316a6963359934c4e73738bb127e

data/README.md

@@ -29,13 +29,13 @@ Or install it yourself as:
 This will return the body data from the supplied URL.  
   
 Available options:  
-`read_timeout` = Read timeout in seconds (default: 3)  
-`open_timeout` = Open timeout in seconds (default: 3)  
-`timeout` = Timeout for whole procedure in seconds (default: 5)  
-`max_tries` = Maximum attempts in reading the page (default: 3)  
-`min_page_length` = Minimum page length in bytes, if not satisfied, reattempt retrieval (default: 100 bytes)  
-`reset_ua` = Reset user agent on every request. (default: true)
-`force` = Force continuous opening of page until data is retrieved (default: false)  
+`read_timeout = Read timeout in seconds (default: 3)`  
+`open_timeout = Open timeout in seconds (default: 3)`  
+`timeout = Timeout for whole procedure in seconds (default: 5)`  
+`max_tries = Maximum attempts in reading the page (default: 3)`  
+`min_page_length = Minimum page length in bytes, if not satisfied, reattempt retrieval (default: 100 bytes)`   
+`reset_ua = Reset user agent on every request. (default: true)`  
+`force = Force continuous opening of page until data is retrieved (default: false)`  
 
 Proxy options example:  
 `mask_connect = TheMask::Connect.new(proxy: { ip: '127.0.0.1', port: 8080, username: 'asd333', password: 'asd333' })`  

data/lib/the_mask/proxy_list.rb

@@ -1,5 +1,6 @@
 module TheMask
   class ProxyList
+    #TheMask::ProxyList::Proxy class
     class Proxy
       attr_accessor :ip, :port, :username, :password
 
@@ -20,16 +21,29 @@ module TheMask
       end
 
     end
+    #ProxyList class
+    attr_accessor :proxy_list
 
     def initialize(arr = [])
       @proxy_list ||= []
-      arr.each{ |element| @proxy_list << [TheMask::ProxyList::Proxy.new(element), 0] } unless arr.empty?
+
+      arr.each do |element|
+        @proxy_list << [TheMask::ProxyList::Proxy.new(element), 0] unless arr.empty?
+      end
     end
 
     def get_proxy
-      @proxy_list = @proxy_list.sort_by(&:last) # Least used proxy
+      if @proxy_list.empty?
+        raise "Tried to get_proxy when proxy list is empty. Check that your input proxy list is populated."
+      end
+
+      @proxy_list = @proxy_list.sort_by(&:last) # Least used proxy list sort by 2nd element in inner array
       @proxy_list[0] = [@proxy_list[0][0], @proxy_list[0][1] + 1]
       @proxy_list[0][0]
     end
+
+    def remove_proxy!(proxy)
+      @proxy_list.delete(proxy)
+    end
   end
 end

data/lib/the_mask/socket.rb

@@ -39,8 +39,9 @@ module TheMask
 
     def open_url(url)
       read_proc = Proc.new do
-        tries = 0
-        page_data = nil
+        tries = 0 #Total URL retrieval tries
+        page_data = nil #Retrieved page html data
+
         begin
           tries += 1
 
@@ -50,14 +51,24 @@ module TheMask
 
           @agent.user_agent = TheMask.get_random_user_agent_str if @reset_user_agent
 
-          unless @proxies.nil?
-            proxy = @proxies.get_proxy
+          proxy = nil
+
+          begin
+            unless @proxies.nil?
+              begin
+                proxy = @proxies.get_proxy
 
-            if proxy.username && proxy.password
-              @agent.set_proxy proxy.ip, proxy.port, proxy.username, proxy.password
-            else
-              @agent.set_proxy proxy.ip, proxy.port
+                if proxy.username && proxy.password
+                  @agent.set_proxy proxy.ip, proxy.port, proxy.username, proxy.password
+                else
+                  @agent.set_proxy proxy.ip, proxy.port
+                end
+              end
             end
+          rescue Timeout::ExitException => e
+            #Exception timeout from mechanize
+            @proxies.remove_proxy!(proxy)
+            retry
           end
 
           Timeout::timeout(@timeout) do

data/lib/the_mask/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_mask
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Saoud Khalifah
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,9 +89,6 @@ files:
 - lib/the_mask/socket.rb
 - lib/the_mask/user_agents.rb
 - lib/the_mask/version.rb
-- the_mask-0.1.0.gem
-- the_mask-0.1.1.gem
-- the_mask-0.1.2.gem
 - the_mask.gemspec
 homepage: http://github.com/saouddk/the_mask
 licenses: