url_fetcher 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0720abc5e87d7a504fb8d25c58cec2675fe2e6c
-  data.tar.gz: 93bb4aeffae265ce2acd95e84584b7d28ebd6f5f
+  metadata.gz: 5a80bd44f053156a452d45a80f43ef5b468fa19e
+  data.tar.gz: ba7077dedcf80cf86ee76b8d6a37f2f431fd42f6
 SHA512:
-  metadata.gz: 2a9d32727ad820eb13f494b70e242cbe7f81b751da46d4c53d91055ea4e43dde090bc3eb25fdb5f447f6484d819abb21e875e31592df4ff54e1c0b5c1b5b54ef
-  data.tar.gz: b61ae8d4f664273bf63a1deaa7a8d19025ed9acc74db06a8a92e5181869e4d40b60c1e1a8280ea93327f59c74d7d3b73b4f457f06bf375d063ffdce3497ee814
+  metadata.gz: fede6c50ad1bbdbf67e7ff4281828b604d2696efa6d77c18a01697d5175c105ceebd35cbb2f965caed2036ece8b851c3e031069425d9c89eafe7846ee5591473
+  data.tar.gz: c34c7070a64cb0d1715d347f211a6fd4b831d549949d70ff2d8720e54420826d35df86a7ade93a61523f4ee422e36a6b747b4dbc042088f4d79c0bd062de89bb

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 2.1.2
+  - 2.1.1
+  - 2.1.0
+  - 2.0.0
+cache:
+  bundler

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/url_fetcher/errors.rb

@@ -0,0 +1,28 @@
+class UrlFetcher
+
+  class Error < StandardError ; end
+
+  class TooManyRedirects < Error
+    attr_reader :url, :max_attempts
+    def initialize(url, max_attempts)
+      @url, @max_attempts = url, max_attempts
+    end
+
+    def to_s
+      "#{url} has too many redirects (over #{max_attempts})."
+    end
+  end
+
+
+  class CircularRedirect < Error
+    attr_reader :url
+
+    def initialize(url)
+      @url = url
+    end
+
+    def to_s
+      "#{url} has a redirect loop."
+    end
+  end
+end

data/lib/url_fetcher.rb

@@ -1,4 +1,6 @@
+require "url_fetcher/errors"
 require "net/http"
+require "openssl"
 require "open-uri"
 require "tempfile"
 
@@ -7,7 +9,8 @@ require "tempfile"
 # into memory all at once.
 class UrlFetcher
   MEGABYTE = 1048576
-  
+  MAX_ATTEMPTS = 5.freeze
+
   attr_reader :url
 
   # Create a fetcher for the specified URL.
@@ -53,10 +56,15 @@ class UrlFetcher
   end
 
   def fetch_response(url, options, previous_attempts = [])
-    raise "Too many redirects" if previous_attempts.size > 5
-    raise "Circular redirect" if previous_attempts.include?(url)
-    previous_attempts << url
+    if previous_attempts.size > MAX_ATTEMPTS
+      raise TooManyRedirects.new(previous_attempts.first, MAX_ATTEMPTS)
+    end
 
+    if previous_attempts.include?(url)
+      raise CircularRedirect.new(previous_attempts.first)
+    end
+
+    previous_attempts << url
     uri = URI(url)
 
     http = Net::HTTP.new(uri.host, uri.port)

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'url_fetcher'
 require 'webmock/rspec'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/url_fetcher_spec.rb

@@ -5,56 +5,58 @@ describe UrlFetcher do
   it "should fetch a URL to a temp file" do
     WebMock.stub_request(:get, "http://example.com/test").to_return(:status => 200, :body => "Hello", :headers => {"Content-Length" => 5})
     url_fetcher = UrlFetcher.new("http://example.com/test")
-    url_fetcher.success?.should == true
-    url_fetcher.redirect?.should == false
-    url_fetcher.header("content-length").should == "5"
+    expect(url_fetcher).to be_success
+    expect(url_fetcher).not_to be_redirect
+    expect(url_fetcher.header("content-length")).to eql("5")
     url_fetcher.body.open
-    url_fetcher.body.read.should == "Hello"
+    expect(url_fetcher.body.read).to eql("Hello")
   end
 
   it "should perform a POST request" do
     WebMock.stub_request(:post, "http://example.com/test").to_return(:status => 200, :body => "Hello", :headers => {"Content-Length" => 5})
     url_fetcher = UrlFetcher.new("http://example.com/test", :method => :post)
-    url_fetcher.success?.should == true
-    url_fetcher.redirect?.should == false
-    url_fetcher.header("content-length").should == "5"
+    expect(url_fetcher).to be_success
+    expect(url_fetcher).not_to be_redirect
+    expect(url_fetcher.header("content-length")).to eql("5")
     url_fetcher.body.open
-    url_fetcher.body.read.should == "Hello"
+    expect(url_fetcher.body.read).to eql("Hello")
   end
 
   it "should perform a HEAD request" do
     WebMock.stub_request(:head, "http://example.com/test").to_return(:status => 200, :body => nil, :headers => {"Content-Length" => 5})
     url_fetcher = UrlFetcher.new("http://example.com/test", :method => :head)
-    url_fetcher.success?.should == true
-    url_fetcher.redirect?.should == false
-    url_fetcher.header("content-length").should == "5"
-    url_fetcher.body.should == nil
+    expect(url_fetcher).to be_success
+    expect(url_fetcher).not_to be_redirect
+    expect(url_fetcher.header("content-length")).to eql("5")
+    expect(url_fetcher.body).to be_nil
   end
 
   it "should work with SSL" do
     WebMock.stub_request(:get, "https://example.com/test").to_return(:status => 200, :body => "Hello", :headers => {"Content-Length" => 5})
     url_fetcher = UrlFetcher.new("https://example.com/test")
-    url_fetcher.success?.should == true
-    url_fetcher.redirect?.should == false
-    url_fetcher.header("content-length").should == "5"
-    url_fetcher.body.open.read.should == "Hello"
+    expect(url_fetcher).to be_success
+    expect(url_fetcher).not_to be_redirect
+    expect(url_fetcher.header("content-length")).to eql("5")
+    expect(url_fetcher.body.open.read).to eql("Hello")
   end
 
   it "should honor redirects" do
     WebMock.stub_request(:get, "http://example.com/test1").to_return(:status => 301, :headers => {"Location" => "http://example.com/test2"})
     WebMock.stub_request(:get, "http://example.com/test2").to_return(:status => 200, :body => "Hello", :headers => {"Content-Length" => 5})
     url_fetcher = UrlFetcher.new("http://example.com/test1")
-    url_fetcher.success?.should == true
-    url_fetcher.redirect?.should == false
-    url_fetcher.header("content-length").should == "5"
-    url_fetcher.body.open.read.should == "Hello"
+
+    expect(url_fetcher).to be_success
+    expect(url_fetcher).not_to be_redirect
+    expect(url_fetcher.header("content-length")).to eql("5")
+    expect(url_fetcher.body.open.read).to eql("Hello")
   end
 
   it "should not honor redirects if :follow_redirects == false" do
     WebMock.stub_request(:get, "http://example.com/test1").to_return(:status => 301, :headers => {"Location" => "http://example.com/test2"})
     url_fetcher = UrlFetcher.new("http://example.com/test1", :follow_redirects => false)
-    url_fetcher.success?.should == false
-    url_fetcher.redirect?.should == true
+
+    expect(url_fetcher).not_to be_success
+    expect(url_fetcher).to be_redirect
   end
 
   it "should call a block before each redirect with the new location" do
@@ -65,10 +67,12 @@ describe UrlFetcher do
     url_fetcher = UrlFetcher.new("http://example.com/test1") do |location|
       redirects << location
     end
-    url_fetcher.success?.should == true
-    url_fetcher.body.open
-    url_fetcher.body.read.should == "Hello"
-    redirects.should == ["http://example.com/test2", "http://example.com/test3"]
+
+    expect(url_fetcher).to be_success
+    expect(url_fetcher).not_to be_redirect
+    expect(url_fetcher.header("content-length")).to eql("5")
+    expect(url_fetcher.body.open.read).to eql("Hello")
+    expect(redirects).to eql(["http://example.com/test2", "http://example.com/test3"])
   end
 
   it "should abort redirecting if a block is given that returns false" do
@@ -80,41 +84,45 @@ describe UrlFetcher do
       redirects << location
       false
     end
-    url_fetcher.success?.should == false
-    url_fetcher.redirect?.should == true
-    url_fetcher.body.should == nil
-    redirects.should == ["http://example.com/test2"]
+
+    expect(url_fetcher).not_to be_success
+    expect(url_fetcher).to be_redirect
+    expect(url_fetcher.body).to be_nil
+    expect(redirects).to eql(["http://example.com/test2"])
   end
 
   it "should raise an error if there is a circular redirect" do
     WebMock.stub_request(:get, "http://example.com/test").to_return(:status => 302, :headers => {"Location" => "http://example.com/test"})
-    lambda{ UrlFetcher.new("http://example.com/test") }.should raise_error("Circular redirect")
+    expect{ UrlFetcher.new("http://example.com/test") }.to raise_error(UrlFetcher::CircularRedirect)
   end
 
   it "should raise an error if there are too many redirects" do
     6.times do |i|
       WebMock.stub_request(:get, "http://example.com/test#{i}").to_return(:status => 302, :headers => {"Location" => "http://example.com/test#{i + 1}"})
     end
-    lambda{ UrlFetcher.new("http://example.com/test0") }.should raise_error("Too many redirects")
+    expect{ UrlFetcher.new("http://example.com/test0") }.to raise_error(UrlFetcher::TooManyRedirects)
   end
 
   it "should raise an error if an HTTP error is returned" do
     WebMock.stub_request(:get, "http://example.com/test").to_return(:status => 404, :body => "Not Found")
-    lambda{ UrlFetcher.new("http://example.com/test") }.should raise_error(Net::HTTPServerException)
+    expect{ UrlFetcher.new("http://example.com/test") }.to raise_error(Net::HTTPServerException)
   end
 
   it "should not unlink the temp file if asked not to" do
     WebMock.stub_request(:get, "http://example.com/test").to_return(:status => 200, :body => "Hello", :headers => {"Content-Length" => 5})
     url_fetcher = UrlFetcher.new("http://example.com/test", :unlink => false)
-    url_fetcher.success?.should == true
-    url_fetcher.body.open.read.should == "Hello"
-    url_fetcher.body.path.should_not == nil
+
+    expect(url_fetcher).to be_success
+    expect(url_fetcher).not_to be_redirect
+    expect(url_fetcher.header("content-length")).to eql("5")
+    expect(url_fetcher.body.open.read).to eql("Hello")
+    expect(url_fetcher.body.path).not_to be_nil
   end
 
   it "should limit the size of the file downloaded" do
     WebMock.stub_request(:get, "http://example.com/test").to_return(:status => 200, :body => "Hello", :headers => {"Content-Length" => 1001})
-    lambda do
+    expect do
       UrlFetcher.new("http://example.com/test", :max_size => 1000)
-    end.should raise_error
+    end.to raise_error
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: url_fetcher
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - weheartit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -89,12 +89,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
 - lib/url_fetcher.rb
+- lib/url_fetcher/errors.rb
 - spec/spec_helper.rb
 - spec/url_fetcher_spec.rb
 - url_fetcher.gemspec
@@ -118,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Fetch resources from the internetz with circular redirects support