proxi_clean 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f5030f18725abe227258fb52fd86acb87076d3
-  data.tar.gz: 5dc61fcee5b3c27e9b3a2c9db1b4041fa677ae8f
+  metadata.gz: 37b2808d78d23e3acb73baae1109f2856577cb65
+  data.tar.gz: 34cd41a3b0bdd3245661231bcc3465860292db64
 SHA512:
-  metadata.gz: 42ef3886baf40113f2827b1a615aae78d6d791229078b1c19b112eb8bfb0302543392e6f0aacea1c2791e622064af8be1d740499f6c1225c270d4ea0c04e8f32
-  data.tar.gz: 778804f73bd1f35832b23d26baaba5572208e330711cbfb003efbf784ee15fe275167910087ca5fc209313f7a864a4fe16382a94618f0ecebe0b587f58d4631e
+  metadata.gz: f00387a4977f012ef6649223596752cd92158ace51bfbb4b38c4dd966930c35d9b19ea4b835d3e86b0b3f4fe938f6366e221ea93cd5a890fa0b82a1ea044b227
+  data.tar.gz: f4ecc1d355b6feb8ef7ea26588c6acdd40d9d3f060ef4e4a6189919ff545328c13595a7195fb9c2d918db9972777a0e07234e1550c04eb8236c105968939fbc2

data/lib/proxi_clean/client.rb

@@ -1,17 +1,21 @@
-require 'rest_client'
+require 'faraday'
+require 'json'
 
 module ProxiClean
   class Client
-    attr_reader :public_ip
+    attr_reader :public_ip, :debug
 
-    def initialize
+    def initialize(debug=false)
+      @debug = debug
       public_ip
     end
 
     def works?(proxy_uri)
       begin
+        puts 'Checking: ' + proxy_uri if @debug
         proxied_ip = proxied_ip(proxy_uri)
       rescue StandardError => e
+        puts 'ERROR: ' + e.message if @debug
         # If anything goes wrong, assuming the proxy is no good
         return false
       end
@@ -20,25 +24,25 @@ module ProxiClean
     end
 
     def public_ip
-      RestClient.proxy = nil
       # Try to not hit realip more than we really need
-      @public_ip ||= result_from_real_ip_api
+      @public_ip ||= real_ip(proxy_uri: nil)
     end
 
-    private
-
     def proxied_ip(proxy_uri)
-      RestClient.proxy = proxy_uri
-      result_from_real_ip_api
+      real_ip(proxy_uri: proxy_uri)
     end
 
-    def result_from_real_ip_api
-      real_up_url = 'http://www.realip.info/api/p/realip.php'
-      response = RestClient::Request.execute(method: :get,
-                                             url: real_up_url,
-                                             read_timeout: 10,
-                                             open_timeout: 10)
-      JSON.parse(response)['IP']
+    private
+
+    def real_ip(proxy_uri: nil)
+      conn = Faraday.new(proxy: proxy_uri)
+      conn.headers[:user_agent] = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.89 Safari/537.36'
+      response = conn.get do |req|
+        req.url 'http://www.realip.info/api/p/realip.php'
+        req.options.timeout = 5
+        req.options.open_timeout = 2
+      end
+      JSON.parse(response.body)['IP']
     end
   end
 end

data/lib/proxi_clean/version.rb

@@ -1,3 +1,3 @@
 module ProxiClean
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/proxi_clean.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rest-client', '~> 1.8', '>= 1.8.0'
+  spec.add_runtime_dependency 'faraday', '~> 0.9.1'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: proxi_clean
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mario Zigliotto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement