tor_requests 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0ac25341693bafea5996c448ef54db15aa0fde
-  data.tar.gz: 55d973833d109be95f02a01dee6750fb98f4bb38
+  metadata.gz: 3039e336b9ccc9eda4c8a1c2637d701143e686ff
+  data.tar.gz: bc46d12b75ff059014173ae34355ff524a58f8ed
 SHA512:
-  metadata.gz: e0d929d85ef4bcc132be60487d39e6e7125811bdea881b2f5853ede1e4fa0536722d7a90d51d7bb19fcfb3d4d7d3730600e6603669c81cb1329cc2cd3a85c08f
-  data.tar.gz: 9defd11b28a878c01703d016de736a2efeef137360830c2c5e5f6f26a32414f50e5c426e026ce8c4fcf8c5a2a0379a82972d321fa9ff46b083c48d4d8eaedb35
+  metadata.gz: b183d9288375f0570debeb7f330b936697855e895450dba8dd1f2d0930e58d85c66a58d7b568b01c67b81e3bcbaa06d03afdfb0e233c1a5ca6630f12576b6884
+  data.tar.gz: af016dee2a17df76220a12de563efe519dfb021fb4d3aa70e4f52bd0078ecfa033b05de228e12601c4a8e9ed7a8bbb3afe280d98d8fc95e6fca147dc0c5c0e5e

data/README.rdoc

@@ -22,24 +22,29 @@ with URIs (http & https)
   Tor::HTTP.get(URI('https://github.com/'))
   Tor::HTTP.post(URI('http://posttestserver.com/post.php?dir=example'), {"var" => "variable"})
 
-  
+with redirects
+  res = Tor::HTTP.get("google.com", "/", 80, 10)
+  By default 3 redirects are followed. 
+  To prevent infinite loops a TooManyRedirects error is raised.
+  The limit can be changed by updating the last parameter.
+
 The default port configuration is 9050 and ip configuration is 127.0.0.1. If you need to change configuration, you can use:
 
   Tor.configure do |config|
      config.ip = "127.0.0.1"
      config.port = 9050
-  end  
+  end
 
 You can also set additional custom header fields, e.g. User-Agent:
 
   Tor.configure do |config|
     config.add_header('User-Agent', 'Netscape 2.0')
-  end  
+  end
 
 
 
 == Contributing to tor_requests
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/tor/http.rb

@@ -5,15 +5,14 @@ module Tor
 
   class HTTP
     class TooManyRedirects < StandardError; end
-    REDIRECT_LIMIT = 3
 
     class << self
-      attr_accessor :redirects_count
+      attr_accessor :redirects_made
     end
 
-    def self.get(uri_or_host, path = nil, port = nil)
+    def self.get(uri_or_host, path = nil, port = nil, max_redirects = 3)
       res, host = "", nil
-      self.redirects_count = 0
+      self.redirects_made = 0
 
       if path
         host = uri_or_host
@@ -31,8 +30,9 @@ module Tor
         end
 
         res = http.request(request)
-        res = follow_redirect(res, http) # Follow redirects
+        res = follow_redirect(res, http, max_redirects) # Follow redirects
       end
+
       res
     end
 
@@ -76,15 +76,13 @@ module Tor
       ]
     end
 
-    def self.follow_redirect(response, http)
+    def self.follow_redirect(response, http, max_redirects)
       if response.kind_of?(Net::HTTPRedirection)
-        raise TooManyRedirects if self.redirects_count >= REDIRECT_LIMIT
-
+        raise TooManyRedirects if self.redirects_made >= max_redirects
         request  = Net::HTTP::Get.new(fetch_redirect_url(response))
         response = http.request(request)
-        self.redirects_count += 1
-        response = follow_redirect(response, http)
-
+        self.redirects_made += 1
+        response = follow_redirect(response, http, max_redirects)
       else
         response
       end

data/spec/http_spec.rb

@@ -17,10 +17,12 @@ describe "Http" do
           res.code.should eq("200")
         end
 
-        it "raises TooManyRedirects error" do
-          stub_const("Tor::HTTP::REDIRECT_LIMIT", 1)
-          expect { Tor::HTTP.get(URI("#{protocol}://google.com/")) }.to raise_error("Tor::HTTP::TooManyRedirects")
+        context "with custom redirects limit" do
+          it "raises TooManyRedirects error after 1 retry" do
+            expect { Tor::HTTP.get(URI("#{protocol}://bit.ly/1ngrqeH"), nil, nil, 1) }.to raise_error("Tor::HTTP::TooManyRedirects")
+          end
         end
+
       end
     end
 

data/tor_requests.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tor_requests"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bruno Ghisi"]
@@ -72,4 +72,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<socksify>, [">= 0"])
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tor_requests
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Bruno Ghisi
@@ -154,8 +154,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Create anonymously requests through Tor network
 test_files: []
+has_rdoc: