hidemyass2 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81daf30436f054fe6c5d00d0a65f3278e5225b7d
-  data.tar.gz: a8bc68d272b7e71af5808c8fc13bf03764c1cfc0
+  metadata.gz: 3cc56ceea3c002eea107248fe58041e11b466189
+  data.tar.gz: 0ac795de36bd83039765d57dc6d9155d5a13d55e
 SHA512:
-  metadata.gz: d17a7c7a96096f8dd132c15c819c34962ff5298d5ec178d64729edf15386b229cc069e85b15379190ba96dd6ea1b60c553cba3a1dc5e986d1b3c1580f094837b
-  data.tar.gz: 47d567766e3f75ce23edc547570cfd08dfeb823a7520de4061bbf50f6db582a62d321e4b2b786c40285847357dbd152f9131a20ddd077ad85d2be74549277c01
+  metadata.gz: 8322738781cefcf98cc7fbe7628202995b11a6aa539bea9396473cc261705cb32b4aa47863d52797f14a5fd793324b64f9cb633eaebc5549c37c25245d902e64
+  data.tar.gz: 00a2454206d63cb9df488256bffea114653208f54539f9f475d1b9bbb2dbcf5c59fde108ae5d8eb2750d076689d1fff90af43cbbb8178505d157c7445b8aae15

data/README.md

@@ -1,12 +1,18 @@
 # HIDE MY ASS! /2 [![Build Status](https://travis-ci.org/appPlant/hidemyass2.svg?branch=master)](https://travis-ci.org/appPlant/hidemyass2) [![Code Climate](https://codeclimate.com/github/appPlant/hidemyass2/badges/gpa.svg)](https://codeclimate.com/github/appPlant/hidemyass2) [![Test Coverage](https://codeclimate.com/github/appPlant/hidemyass2/badges/coverage.svg)](https://codeclimate.com/github/appPlant/hidemyass2/coverage) [![Dependency Status](https://gemnasium.com/badges/github.com/appPlant/hidemyass2.svg)](https://gemnasium.com/github.com/appPlant/hidemyass2)
 
-Hide My Ass! /2 fetches proxies at www.hidemyass.com to allow everyone to surf privately from anywhere.
+Hide My Ass! /2 fetches proxies at https://incloak.com to allow everyone to surf privately from anywhere.
 
 - Proxy lists are checked in real time
 
-- Sortable by speed, with the fastest proxies listed first
+- Around __1.000__ proxies at all
 
-- Sortable by country, anonymity, ...
+- Sortable by speed, country, anonymity and many more
+
+The graph shows the amount of change dynamics in the proxy list for the last 2 days.
+
+<p align="left">
+    <img src="https://incloak.com/images/last_2days_mini.png"></img>
+</p>
 
 ## Installation
 
@@ -26,42 +32,52 @@ Or install it yourself as:
 
 ## Usage
 
-To fetch all proxies simply run `HideMyAss.proxies`.
+From terminal execute:
+
+    $ bundle exec hidemyass
+
+    https://188.166.233.171:8080
+    http://187.85.207.47:3128
+    http://201.22.213.7:8080
+    https://103.253.146.197:8080
+    https://139.59.226.223:8080
+    socks4://80.255.139.145:1080
+    socks5://5.135.151.28:60088
+    ...
+
+For Ruby run:
 
 ```ruby
 require 'hidemyass'
 
-proxies = HideMyAss.proxies
-# => ProxyList
+HideMyAss.proxies
+#<HideMyAss::ProxyList:0x00000000000000 @uri="..." @proxies=[...]>
 ```
 
-To reuse that list instead of fetching a new one use `HideMyAss.proxies!`.
+__Note:__ To reuse that list instead of fetching a new one use `HideMyAss.proxies!`.
 
-To fetch proxies matching some criteria simply add filter options. Use `HideMyAss.form_data` to see and modify their defaults.
+#### Filter proxies
 
 ```ruby
 require 'hidemyass'
 
-# c[]  - Countries
-# p    - Port. Defaults to all ports.
-# pr[] - Protocol. 0..2 = HTTP, HTTPS, socks4/5
-# a[]  - Anonymity level. 0..4 = None, Low, Medium, High, High +KA
-# sp[] - Speed. 0..2 = Slow, Medium, Fast.
-# ct[] - Connection time. 0..2 = Slow, Medium, Fast
-# s    - Sort. 0..3 = Response time, Connection time, Country A-Z.
-# o    - Order. 0, 1 = DESC, ASC.
-# pp   - Per Page. 0..3 = 10, 25, 50, 100.
-# sortBy - Sort by. Defaults to date.
+# start     - Offset. Defaults to 0.
+# end       - Max. number of proxies to fetch. Defaults to 2000.
+# countries - Country. Defaults to all countries.
+# ports     - Port. Defaults to any port.
+# type      - Protocol. h = HTTP, s = HTTPS, 4 = SOCKS4, 5 = SOCKS5
+# anon      - Anonymity level. 1..4 = None, Low, Medium, High
+# maxtime   - Speed in milliseconds.
 
-proxies = HideMyAss.proxies 'c[]' => 'France', sortBy: 'response_time'
+proxies = HideMyAss.proxies countries: 'FR', type: 'hs'
 
 proxies.first.country
 # => 'france'
 ```
 
-Visit http://proxylist.hidemyass.com for more informations how to filter.
+Visit https://incloak.com/proxy-list/ for more informations how to filter.
 
-To get the url of each proxy call `proxy.url`.
+#### Get the url of each proxy
 
 ```ruby
 require 'hidemyass'
@@ -72,10 +88,6 @@ urls = HideMyAss.proxies.map(&:url)
 
 Refer to the [Proxy](https://github.com/appPlant/hidemyass2/blob/master/lib/hidemyass/proxy.rb) class for more advanced usage and a complete list of properties like `speed`, `ip`, `ssl?`, `anonym?` or `secure?`.
 
-Print out all proxy urls on command line:
-
-    $ bundle exec hidemyass
-
 ## Development
 
 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.

data/lib/hidemyass/proxy.rb

@@ -33,62 +33,34 @@ module HideMyAss
       @row = row
     end
 
-    # Time in seconds when the last ping was made.
-    #
-    # @return [ Int ]
-    def last_updated
-      @last_updated ||= begin
-        @row.at_xpath('td[1]').text.strip.split(' ').map do |it|
-          case it
-          when /sec/ then it.scan(/\d+/)[0].to_i
-          when /min/ then it.scan(/\d+/)[0].to_i * 60
-          when /h/   then it.scan(/\d+/)[0].to_i * 3_600
-          when /d/   then it.scan(/\d+/)[0].to_i * 86_400
-          end
-        end.reduce(&:+)
-      end
-    end
-
-    alias last_test last_updated
-
     # The IP of the proxy server.
     #
     # @return [ String ]
     def ip
-      @ip ||= @row.at_xpath('td[2]/span').children
-                  .select { |el| ip_block? el }
-                  .map! { |el| el.text.strip }
-                  .join('')
+      @ip ||= @row.at_xpath('td[1]/text()').text.strip
     end
 
     # The port for the proxy.
     #
     # @return [ Int ]
     def port
-      @port ||= @row.at_xpath('td[3]').text.strip.to_i
+      @port ||= @row.at_xpath('td[2]/text()').text.strip.to_i
     end
 
     # The country where the proxy is hosted in downcase letters.
     #
     # @return [ String ]
     def country
-      @country ||= @row.at_xpath('td[4]').text.strip.downcase
+      @country ||= @row.at_xpath('td[3]/div/text()')
+                       .text.strip.downcase!.scan(/[[:word:]]+$/).last
     end
 
     # The average response time in milliseconds.
     #
     # @return [ Int ]
     def speed
-      @speed ||= @row.at_xpath('td[5]/div')[:value].to_i
-    end
-
-    alias response_time speed
-
-    # The average connection time in milliseconds.
-    #
-    # @return [ Int ]
-    def connection_time
-      @connection_time ||= @row.at_xpath('td[6]/div')[:value].to_i
+      @speed ||= @row.at_xpath('td[4]/div/div/p/text()')
+                     .text.scan(/^\d+/)[0].to_i
     end
 
     # The network protocol in in downcase letters.
@@ -96,7 +68,7 @@ module HideMyAss
     #
     # @return [ String ]
     def type
-      @type ||= @row.at_xpath('td[7]').text.strip.downcase[0..4]
+      @type ||= @row.at_xpath('td[5]/text()').text.strip.split.last.downcase!
     end
 
     alias protocol type
@@ -106,21 +78,28 @@ module HideMyAss
     #
     # @return [ String ]
     def anonymity
-      @anonymity ||= @row.at_xpath('td[8]').text.strip.downcase
+      @anonymity ||= @row.at_xpath('td[6]').text.strip.downcase!
     end
 
-    # The complete URL of that proxy server.
+    # Time in minutes when its been last checked.
+    #
+    # @return [ Int ]
+    def last_check
+      @last_check ||= @row.at_xpath('td[7]/text()').text.scan(/^\d+/)[0].to_i
+    end
+
+    # The relative URL without the leading protocol.
     #
     # @return [ String ]
-    def url
-      "#{protocol}://#{ip}:#{port}"
+    def rel_url
+      "#{ip}:#{port}"
     end
 
-    # If the IP is valid.
+    # The complete URL of that proxy server.
     #
-    # @return [ Boolean ]
-    def valid?
-      ip.split('.').reject(&:empty?).count == 4
+    # @return [ String ]
+    def url
+      "#{protocol}://#{rel_url}"
     end
 
     # If the proxy's network protocol is HTTP.
@@ -165,7 +144,6 @@ module HideMyAss
       anonym? && ssl?
     end
 
-    # :nocov:
     # Custom inspect method.
     #
     # @example
@@ -173,27 +151,10 @@ module HideMyAss
     # => '<HideMyAss::Proxy http://123.57.52.171:80>'
     #
     # @return [ String ]
+    # :nocov:
     def inspect
       "<#{self.class.name} #{url}>"
     end
     # :nocov:
-
-    private
-
-    # To find out if the element is a part of the IP.
-    #
-    # @param [ Nokogiri::XML ] el
-    #
-    # @return [ Boolean ]
-    def ip_block?(el)
-      return el[:style].include? 'in' if el[:style]
-
-      @clss ||= @row.at_xpath('td[2]/span/style').text.split
-                    .map! { |it| it[1..4] if it !~ /none/ }.compact
-
-      cls = el[:class].to_s
-
-      el.name == 'text' || @clss.include?(cls) || cls =~ /^\d+$/
-    end
   end
 end

data/lib/hidemyass/proxy_list.rb

@@ -17,7 +17,7 @@ module HideMyAss
     include Enumerable
     extend Forwardable
 
-    ENDPOINT = 'http://proxylist.hidemyass.com'.freeze
+    ENDPOINT = 'https://incloak.com/proxy-list/?start=0&end=2000'.freeze
 
     private_constant :ENDPOINT
 
@@ -27,30 +27,37 @@ module HideMyAss
     #
     # @return [ HideMyAss::ProxyList ]
     def initialize(form_data = HideMyAss.form_data)
-      self.form_data = form_data.dup
-      @proxies       = fetch.keep_if(&:valid?)
+      self.form_data = form_data.reject { |_, v| v.nil? }
+      @proxies       = fetch
     end
 
+    def_delegator :@proxies, :each
+
     # Form data to support custom searches
+    #
+    # @return [ Hash ]
     attr_accessor :form_data
 
-    def_delegator :@proxies, :each
+    # Build URI for endpoint including all search form params.
+    #
+    # @return [ URI ]
+    def uri
+      uri       = URI(ENDPOINT)
+      uri.query = URI.encode_www_form(form_data)
+      uri
+    end
 
     private
 
     # Fetch list of all proxies.
     #
     # @return [ Array<HideMyAss::Proxy> ]
-    def fetch(url = ENDPOINT)
-      res     = Net::HTTP.post_form(URI(url), form_data)
-      page    = Nokogiri::HTML(res.body, nil, 'UTF-8')
-      sel_row = '//table[@id="listable"]/tbody/tr'
-      sel_lnk = 'section > section.section-component > section.hma-pagination li.arrow.next:not(.unavailable) > a' # rubocop:disable Metrics/LineLength
-
-      proxies = page.xpath(sel_row).map { |row| Proxy.new(row) }
-      link    = page.at_css(sel_lnk)
+    def fetch
+      body  = Net::HTTP.get(uri)
+      page  = Nokogiri::HTML(body, nil, 'UTF-8')
+      sel   = '//*[@id="content-section"]/section[1]/div/table/tbody/tr'
 
-      link ? proxies.concat(fetch("#{ENDPOINT}#{link[:href]}")) : proxies
+      page.xpath(sel).map { |row| Proxy.new(row) }
     rescue Timeout::Error
       []
     end

data/lib/hidemyass/version.rb

@@ -1,3 +1,3 @@
 module HideMyAss
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/hidemyass.rb

@@ -69,28 +69,21 @@ module HideMyAss
 
   # Get form data for custom search.
   #
-  # c[]  - Countries
-  # p    - Port. Defaults to all ports.
-  # pr[] - Protocol. 0..2 = HTTP, HTTPS, socks4/5
-  # a[]  - Anonymity level. 0..4 = None, Low, Medium, High, High +KA
-  # sp[] - Speed. 0..2 = Slow, Medium, Fast.
-  # ct[] - Connection time. 0..2 = Slow, Medium, Fast
-  # s    - Sort. 0..3 = Response time, Connection time, Country A-Z.
-  # o    - Order. 0, 1 = DESC, ASC.
-  # pp   - Per Page. 0..3 = 10, 25, 50, 100.
-  # sortBy - Sort by. Defaults to date.
+  # start     - Offset. Defaults to 0.
+  # end       - Max. number of proxies to fetch. Defaults to 2000.
+  # countries - Country. Defaults to all countries.
+  # ports     - Port. Defaults to any port.
+  # type      - Protocol. h = HTTP, s = HTTPS, 4 = SOCKS4, 5 = SOCKS5
+  # anon      - Anonymity level. 1..4 = None, Low, Medium, High
+  # maxtime   - Speed in milliseconds.
   #
   # @return [ Hash ]
   def self.form_data
-    @form_data ||= { 'c[]'  => nil,
-                     'p'    => nil,
-                     'pr[]' => [0, 1],
-                     'a[]'  => [3, 4],
-                     'sp[]' => [1, 2, 3],
-                     'ct[]' => [1, 2, 3],
-                     's'    => 1,
-                     'o'    => 0,
-                     'pp'   => 3,
-                     'sortBy' => 'response_time' }
+    @form_data ||= { start: 0,
+                     end:   2000,
+                     anon:  nil,
+                     type:  nil,
+                     ports: nil,
+                     maxtime: nil }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hidemyass2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Sebastián Katzer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler