embiggen 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e042af897bb6b3d3f859ef7f8b98b2baa82a549c
-  data.tar.gz: de3ac88d70c05591727ba4cbd291dea762add074
+  metadata.gz: f799848928c0c97fed7139de5465eaf62b564c35
+  data.tar.gz: 6da8a48878868a89f5837b15c0cceca531eece18
 SHA512:
-  metadata.gz: 52ea1b1bdd91f6d958ff730e94dafa63475794b28803743fce061980288bd9d75d80f1937eaad6c998d7b6b967daf9c274500e3fa6979f590a5044ec121f20b7
-  data.tar.gz: 920c7a714f80a7d75ade6a8982a68c6791bc4bfda7aca81e7956469a2d8ec0e1d92c9c71995577bf6ef319d2a45c62e352b8f4fe8ef415e1f88b39e33023c3c1
+  metadata.gz: 185ef0720cd5c8a438aad74c4f15f68c68a5d37934ae829d777377330a57c2cfb070ac880945f5e85277a1359bad9070c45be273e567529377ce033a1e316acf
+  data.tar.gz: 84d6bc662878057e2dfe1f8a0e212947d41f53b4d0cd664810a47a2f96d7617de1957d79005f1cc3e700b74cfb270770f6da19cb492f279f7451a92303b1672d

data/README.md

@@ -2,19 +2,19 @@
 
 A Ruby library to expand shortened URLs.
 
-**Current version:** 0.2.0  
+**Current version:** 1.0.0  
 **Supported Ruby versions:** 1.8.7, 1.9.2, 1.9.3, 2.0, 2.1, 2.2
 
 ## Installation
 
 ```
-gem install embiggen -v '~> 0.2'
+gem install embiggen -v '~> 1.0'
 ```
 
 Or, in your `Gemfile`:
 
 ```ruby
-gem 'embiggen', '~> 0.2'
+gem 'embiggen', '~> 1.0'
 ```
 
 ## Usage
@@ -24,24 +24,24 @@ require 'embiggen'
 
 # Basic usage
 Embiggen::URI('https://youtu.be/dQw4w9WgXcQ').expand
-#=> #<URI:HTTPS https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be>
+#=> #<URI::HTTPS https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be>
 
 # Longer-form usage
 uri = Embiggen::URI.new(URI('https://youtu.be/dQw4w9WgXcQ'))
 uri.shortened?
 #=> true
 uri.expand
-#=> #<URI:HTTPS https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be>
+#=> #<URI::HTTPS https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be>
 
 # Gracefully deals with unshortened URIs
 uri = Embiggen::URI('http://www.altmetric.com')
 uri.shortened?
 #=> false
 uri.expand
-#=> #<URI:HTTP http://www.altmetric.com>
+#=> #<URI::HTTP http://www.altmetric.com>
 
-# Noisier expand! for explicit error handling
-Embiggen::URI('http://bit.ly/bad').expand!
+# Raises errors with bad shortened URIs
+Embiggen::URI('http://bit.ly/bad').expand
 #=> TooManyRedirects: http://bit.ly/bad redirected too many times
 # or...
 #=> BadShortenedURI: following http://bit.ly/bad did not redirect
@@ -66,13 +66,55 @@ end
 Embiggen ships with a default list of URL shortening service domains (c.f.
 [Acknowledgements](#acknowledgements)) but as it is likely to be outdated and
 incomplete, you are strongly encouraged to supply your own via
-`Embiggen.configure`:
+`Embiggen.configure`.
+
+The list of shorteners is an object that responds to `include?` and will be
+passed a URI. By default, Embiggen ships with a `ShortenerList` class which
+takes a list of string domains and will return `true` if given a URI with a
+matching host.
+
+You can supply your own values and logic like so:
 
 ```ruby
 Embiggen.configure do |config|
-  config.shorteners = %w(myshorten.er anoth.er)
+  config.shorteners = Embiggen::ShortenerList.new(%w(myshorten.er anoth.er))
   # or load from a file...
-  config.shorteners = File.readlines('shorteners.txt').map(&:chomp)
+  config.shorteners = Embiggen::ShortenerList.new(File.readlines('shorteners.txt').map(&:chomp))
+end
+
+# Custom logic to attempt to expand every URI
+class ExpandEverything
+  def self.include?(_uri)
+    true
+  end
+end
+
+Embiggen.configure do |config|
+  config.shorteners = ExpandEverything
+end
+
+# Use the Bitly API to only expand URIs on Bitly Pro domains
+require 'bitly'
+require 'forwardable'
+
+class BitlyDomains
+  extend Forwardable
+  attr_reader :client
+  def_delegator :client, :pro?, :include?
+
+  def initialize(client)
+    @client = client
+  end
+end
+
+Bitly.use_api_version_3
+Bitly.configure do |config|
+  config.api_version = 3
+  config.access_token = ENV.fetch('BITLY_ACCESS_TOKEN')
+end
+
+Embiggen.configure do |config|
+  config.shorteners = BitlyDomains.new(Bitly.client)
 end
 ```
 
@@ -97,7 +139,7 @@ valid URI.
 
 ```ruby
 Embiggen::URI('https://youtu.be/dQw4w9WgXcQ').expand
-#=> #<URI:HTTPS https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be>
+#=> #<URI::HTTPS https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be>
 
 Embiggen::URI('http://www.altmetric.com/').expand
 #=> #<URI::HTTP http://www.altmetric.com/>
@@ -107,9 +149,18 @@ Embiggen::URI('https://youtu.be/dQw4w9WgXcQ').expand(:redirects => 2)
 ```
 
 Expand the given URI, returning the full version as a [`URI`][URI] if it is
-shortened or the original if it cannot be expanded. Will not raise any
-exceptions thrown during expansion (e.g. timeouts, network errors, invalid
-return URIs); see `expand!` for an alternative.
+shortened or the original if it is not. Can raise the following exceptions
+during expansion:
+
+* `Embiggen::TooManyRedirects`: when a URI redirects more than the configured
+  number of times;
+* `Embiggen::BadShortenedURI`: when a URI appears to be shortened but
+  following it does not result in a redirect;
+* `Embiggen::NetworkError`: when an error occurs during expansion (e.g. a
+  network timeout, connection reset, unreachable host, etc.).
+
+All of the above inherit from `Embiggen::Error` and have a `uri` method for
+determining the problematic URI.
 
 Takes an optional hash of options for expansion:
 
@@ -120,30 +171,6 @@ Uses a whitelist of shortening domains (as configured through
 `Embiggen.configure`) to determine whether a URI is shortened or not. Be sure
 to [configure this to suit your needs](#shorteners).
 
-### `Embiggen::URI#expand!`
-
-```ruby
-Embiggen::URI('https://youtu.be/dQw4w9WgXcQ').expand!
-#=> #<URI:HTTPS https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be>
-
-Embiggen::URI('http://bit.ly/some-bad-link').expand!
-# TooManyRedirects: http://bit.ly/some-bad-link redirected too many times
-```
-
-Expand the given URI as with `Embiggen::URI#expand` but don't suppress any
-exceptions raised during expansion (including timeouts, network errors,
-invalid return URIs, too many redirects or no redirects whatsoever).
-
-Takes the same options as `Embiggen::URI#expand`.
-
-Two Embiggen-specific errors (both inheriting from `Embiggen::Error`) can be
-raised:
-
-* `Embiggen::TooManyRedirects`: when a URI redirects more than the configured
-  number of times;
-* `Embiggen::BadShortenedURI`: when a URI appears to be shortened but
-  following it does not result in a redirect.
-
 ### `Embiggen::URI#shortened?`
 
 ```ruby
@@ -170,10 +197,9 @@ end
 Override the following settings:
 
 * `timeout`: the default timeout for following any redirects (can be
-  overridden by passing options to `Embiggen::URI#expand` or
-  `Embiggen::URI#expand!`);
+  overridden by passing options to `Embiggen::URI#expand`);
 * `redirects`: the default number of redirects to follow (can be overridden by
-  passing options to `Embiggen::URI#expand` or `Embiggen::URI#expand!`);
+  passing options to `Embiggen::URI#expand`);
 * `shorteners`: the list of domains of shortening services, c.f.
   [Shorteners](#shorteners).
 

data/lib/embiggen/configuration.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'set'
+require 'embiggen/shortener_list'
 
 module Embiggen
   class Configuration
@@ -17,7 +18,7 @@ module Embiggen
 
     # From http://longurl.org/services
     def self.shorteners
-      @shorteners ||= Set.new(%w(
+      @shorteners ||= ShortenerList.new(%w(
         0rz.tw 1link.in 1url.com 2.gp 2big.at 2tu.us 3.ly 307.to 4ms.me
         4sq.com 4url.cc 6url.com 7.ly a.gg a.nf aa.cx abcurl.net ad.vu adf.ly
         adjix.com afx.cc all.fuseurl.com alturl.com amzn.to ar.gy arst.ch

data/lib/embiggen/error.rb

@@ -0,0 +1,14 @@
+module Embiggen
+  class Error < ::StandardError
+    attr_reader :uri
+
+    def initialize(message, uri)
+      super(message)
+      @uri = uri
+    end
+  end
+
+  class BadShortenedURI < Error; end
+  class NetworkError < Error; end
+  class TooManyRedirects < Error; end
+end

data/lib/embiggen/http_client.rb

@@ -0,0 +1,33 @@
+require 'embiggen/error'
+require 'net/http'
+
+module Embiggen
+  class HttpClient
+    attr_reader :uri, :http
+
+    def initialize(uri)
+      @uri = uri
+      @http = ::Net::HTTP.new(uri.host, uri.port)
+      @http.use_ssl = true if uri.scheme == 'https'
+    end
+
+    def follow(timeout)
+      response = request(timeout)
+      return unless response.is_a?(::Net::HTTPRedirection)
+
+      response.fetch('Location')
+    rescue StandardError, ::Timeout::Error => e
+      raise NetworkError.new(
+        "could not follow #{uri}: #{e.message}", uri)
+    end
+
+    private
+
+    def request(timeout)
+      http.open_timeout = timeout
+      http.read_timeout = timeout
+
+      http.head(uri.request_uri)
+    end
+  end
+end

data/lib/embiggen/shortener_list.rb

@@ -0,0 +1,25 @@
+require 'forwardable'
+require 'set'
+
+module Embiggen
+  class ShortenerList
+    extend Forwardable
+    include Enumerable
+
+    attr_reader :domains
+
+    def initialize(domains)
+      @domains = Set.new(domains)
+    end
+
+    def include?(uri)
+      domains.any? { |domain| uri.host =~ /\b#{domain}\z/i }
+    end
+
+    def +(other)
+      self.class.new(domains + other)
+    end
+
+    def_delegators :domains, :<<, :size, :delete, :empty?, :each
+  end
+end

data/lib/embiggen/uri.rb

@@ -1,82 +1,59 @@
 require 'embiggen/configuration'
+require 'embiggen/error'
+require 'embiggen/http_client'
 require 'addressable/uri'
-require 'net/http'
+require 'uri'
 
 module Embiggen
   class URI
-    attr_reader :uri
+    attr_reader :uri, :http_client
 
     def initialize(uri)
       @uri = URI(::Addressable::URI.parse(uri).normalize.to_s)
+      @http_client = HttpClient.new(@uri)
     end
 
     def expand(request_options = {})
-      expand!(request_options)
-    rescue TooManyRedirects => error
-      error.uri
-    rescue StandardError, ::Timeout::Error
-      uri
-    end
-
-    def expand!(request_options = {})
       return uri unless shortened?
 
-      redirects = request_options.fetch(:redirects) { Configuration.redirects }
-      check_redirects(redirects)
-
-      location = head_location(request_options)
-      check_location(location)
+      redirects = extract_redirects(request_options)
+      location = follow(request_options)
 
-      URI.new(location).
-        expand!(request_options.merge(:redirects => redirects - 1))
+      self.class.new(location).
+        expand(request_options.merge(:redirects => redirects - 1))
     end
 
     def shortened?
-      Configuration.shorteners.any? { |domain| uri.host =~ /\b#{domain}\z/i }
+      Configuration.shorteners.include?(uri)
     end
 
     private
 
-    def check_redirects(redirects)
-      return unless redirects.zero?
-
-      fail TooManyRedirects.new("#{uri} redirected too many times", uri)
-    end
-
-    def check_location(location)
-      return if location
+    def extract_redirects(request_options = {})
+      redirects = request_options.fetch(:redirects) { Configuration.redirects }
+      fail TooManyRedirects.new(
+        "following #{uri} reached the redirect limit", uri) if redirects.zero?
 
-      fail BadShortenedURI, "following #{uri} did not redirect"
+      redirects
     end
 
-    def head_location(request_options = {})
+    def follow(request_options = {})
       timeout = request_options.fetch(:timeout) { Configuration.timeout }
 
-      http.open_timeout = timeout
-      http.read_timeout = timeout
-
-      response = http.head(uri.request_uri)
+      location = http_client.follow(timeout)
+      fail BadShortenedURI.new(
+        "following #{uri} did not redirect", uri) unless followable?(location)
 
-      response.fetch('Location') if response.is_a?(::Net::HTTPRedirection)
+      location
     end
 
-    def http
-      http = ::Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true if uri.scheme == 'https'
-
-      http
-    end
-  end
-
-  class Error < ::StandardError; end
-  class BadShortenedURI < Error; end
-
-  class TooManyRedirects < Error
-    attr_reader :uri
+    def followable?(location)
+      return unless location
 
-    def initialize(message, uri)
-      super(message)
-      @uri = uri
+      Addressable::URI.parse(location).absolute?
+    rescue Addressable::URI::InvalidURIError => e
+      raise BadShortenedURI.new(
+        "following #{uri} returns an invalid URI: #{e}", uri)
     end
   end
 end

data/spec/embiggen/shortener_list_spec.rb

@@ -0,0 +1,86 @@
+require 'embiggen/shortener_list'
+
+RSpec.describe Embiggen::ShortenerList do
+  describe '#new' do
+    it 'can be given a set' do
+      list = described_class.new(Set['a.com', 'b.com', 'b.com'])
+
+      expect(list.size).to eq(2)
+    end
+
+    it 'converts a given enumerable to a set' do
+      list = described_class.new(%w(a.com a.com))
+
+      expect(list.size).to eq(1)
+    end
+  end
+
+  describe '#include?' do
+    it 'returns true if a URL host is on the whitelist' do
+      list = described_class.new(%w(bit.ly))
+
+      expect(list).to include(URI('http://bit.ly/foo'))
+    end
+
+    it 'returns false if a URL host is not on the whitelist' do
+      list = described_class.new(%w(bit.ly))
+
+      expect(list).to_not include(URI('http://www.altmetric.com'))
+    end
+  end
+
+  describe '#<<' do
+    it 'appends domains to the list' do
+      list = described_class.new([])
+      list << 'bit.ly'
+
+      expect(list).to include(URI('http://bit.ly/foo'))
+    end
+
+    it 'can be chained' do
+      list = described_class.new([])
+      list << 'bit.ly' << 'a.com'
+
+      expect(list).to include(URI('http://bit.ly/foo'), URI('http://a.com/bar'))
+    end
+  end
+
+  describe '#size' do
+    it 'returns the number of domains in the list' do
+      list = described_class.new(%w(bit.ly ow.ly))
+
+      expect(list.size).to eq(2)
+    end
+  end
+
+  describe '#delete' do
+    it 'removes domains from the list' do
+      list = described_class.new(%w(bit.ly))
+      list.delete('bit.ly')
+
+      expect(list).to be_empty
+    end
+  end
+
+  describe '#+' do
+    it 'appends a list of domains to the existing one' do
+      list = described_class.new(%w(bit.ly))
+      list += %w(a.com)
+
+      expect(list).to include(URI('http://a.com/foo'))
+    end
+
+    it 'can combine two lists' do
+      list = described_class.new(%w(bit.ly))
+      list += described_class.new(%w(a.com))
+
+      expect(list).to include(URI('http://a.com/foo'))
+    end
+  end
+
+  it 'is enumerable for 1.8 compatiblity' do
+    list = described_class.new([])
+
+    expect(list).to be_kind_of(Enumerable)
+  end
+end

data/spec/embiggen/uri_spec.rb

@@ -61,46 +61,103 @@ module Embiggen
         expect { uri.expand }.to_not raise_error
       end
 
-      it 'does not expand erroring URIs' do
-        stub_request(:head, 'http://bit.ly/bad').to_return(:status => 500)
-        uri = described_class.new(URI('http://bit.ly/bad'))
+      it 'raises an error if the URI redirects too many times' do
+        stub_redirect('http://bit.ly/1', 'http://bit.ly/2')
+        stub_redirect('http://bit.ly/2', 'http://bit.ly/3')
+        stub_redirect('http://bit.ly/3', 'http://bit.ly/4')
+        uri = described_class.new('http://bit.ly/1')
 
-        expect(uri.expand).to eq(URI('http://bit.ly/bad'))
+        expect { uri.expand(:redirects => 2) }.
+          to raise_error(TooManyRedirects)
       end
 
-      it 'does not expand URIs that time out' do
-        stub_request(:head, 'http://bit.ly/bad').to_timeout
-        uri = described_class.new(URI('http://bit.ly/bad'))
+      it 'retains the last URI when redirecting too many times' do
+        stub_redirect('http://bit.ly/1', 'http://bit.ly/2')
+        stub_redirect('http://bit.ly/2', 'http://bit.ly/3')
+        stub_redirect('http://bit.ly/3', 'http://bit.ly/4')
+        uri = described_class.new('http://bit.ly/1')
+
+        last_uri = nil
+
+        begin
+          uri.expand(:redirects => 2)
+        rescue TooManyRedirects => ex
+          last_uri = ex.uri
+        end
 
-        expect(uri.expand).to eq(URI('http://bit.ly/bad'))
+        expect(last_uri).to eq(URI('http://bit.ly/3'))
       end
 
-      it 'does not expand URIs whose connection resets' do
-        stub_request(:head, 'http://bit.ly/bad').to_raise(Errno::ECONNRESET)
-        uri = described_class.new(URI('http://bit.ly/bad'))
+      it 'raises an error if a shortened URI does not redirect' do
+        stub_request(:head, 'http://bit.ly/bad').to_return(:status => 500)
+        uri = described_class.new('http://bit.ly/bad')
 
-        expect(uri.expand).to eq(URI('http://bit.ly/bad'))
+        expect { uri.expand }.to raise_error(BadShortenedURI)
       end
 
-      it 'does not expand URIs whose host is unreachable' do
-        stub_request(:head, 'http://bit.ly/bad').to_raise(Errno::EHOSTUNREACH)
-        uri = described_class.new(URI('http://bit.ly/bad'))
+      it 'raises an error if the URI returned is not valid' do
+        stub_redirect('http://bit.ly/suspicious', '|cat /etc/passwd')
+        uri = described_class.new('http://bit.ly/suspicious')
 
-        expect(uri.expand).to eq(URI('http://bit.ly/bad'))
+        expect { uri.expand }.to raise_error(BadShortenedURI)
       end
 
-      it 'does not expand URIs whose name or service is not known' do
-        stub_request(:head, 'http://bit.ly/bad').to_raise(SocketError)
-        uri = described_class.new(URI('http://bit.ly/bad'))
+      it 'raises an error if the URI returned is not valid' do
+        stub_redirect('http://bit.ly/suspicious', 'http:')
+        uri = described_class.new('http://bit.ly/suspicious')
 
-        expect(uri.expand).to eq(URI('http://bit.ly/bad'))
+        expect { uri.expand }.to raise_error(BadShortenedURI)
       end
 
-      it 'takes an optional timeout' do
+      it 'retains the last URI if a shortened URI does not redirect' do
+        stub_redirect('http://bit.ly/bad', 'http://bit.ly/bad2')
+        stub_request(:head, 'http://bit.ly/bad2').to_return(:status => 500)
+        uri = described_class.new('http://bit.ly/bad')
+
+        last_uri = nil
+
+        begin
+          uri.expand
+        rescue BadShortenedURI => ex
+          last_uri = ex.uri
+        end
+
+        expect(last_uri).to eq(URI('http://bit.ly/bad2'))
+      end
+
+      it 'raises a network error if the URI times out' do
         stub_request(:head, 'http://bit.ly/bad').to_timeout
-        uri = described_class.new(URI('http://bit.ly/bad'))
+        uri = described_class.new('http://bit.ly/bad')
+
+        expect { uri.expand }.to raise_error(NetworkError)
+      end
+
+      it 'raises a network error if the connection resets' do
+        stub_request(:head, 'http://bit.ly/bad').to_raise(::Errno::ECONNRESET)
+        uri = described_class.new('http://bit.ly/bad')
 
-        expect(uri.expand(:timeout => 5)).to eq(URI('http://bit.ly/bad'))
+        expect { uri.expand }.to raise_error(NetworkError)
+      end
+
+      it 'raises a network error if the host cannot be reached' do
+        stub_request(:head, 'http://bit.ly/bad').to_raise(::Errno::EHOSTUNREACH)
+        uri = described_class.new('http://bit.ly/bad')
+
+        expect { uri.expand }.to raise_error(NetworkError)
+      end
+
+      it 'retains the last URI if there is a network error' do
+        stub_redirect('http://bit.ly/bad', 'http://bit.ly/bad2')
+        stub_request(:head, 'http://bit.ly/bad2').to_timeout
+        uri = described_class.new('http://bit.ly/bad')
+
+        begin
+          uri.expand
+        rescue NetworkError => ex
+          last_uri = ex.uri
+        end
+
+        expect(last_uri).to eq(URI('http://bit.ly/bad2'))
       end
 
       it 'expands redirects to other shorteners' do
@@ -122,7 +179,7 @@ module Embiggen
         stub_redirect('http://bit.ly/6', 'http://bit.ly/7')
         uri = described_class.new(URI('http://bit.ly/1'))
 
-        expect(uri.expand).to eq(URI('http://bit.ly/6'))
+        expect { uri.expand }.to raise_error(TooManyRedirects)
       end
 
       it 'takes an optional redirect threshold' do
@@ -131,7 +188,7 @@ module Embiggen
         stub_redirect('http://bit.ly/3', 'http://bit.ly/4')
         uri = described_class.new(URI('http://bit.ly/1'))
 
-        expect(uri.expand(:redirects => 2)).to eq(URI('http://bit.ly/3'))
+        expect { uri.expand(:redirects => 2) }.to raise_error(TooManyRedirects)
       end
 
       it 'uses the threshold from the configuration' do
@@ -141,7 +198,7 @@ module Embiggen
         uri = described_class.new(URI('http://bit.ly/1'))
         Configuration.redirects = 2
 
-        expect(uri.expand).to eq(URI('http://bit.ly/3'))
+        expect { uri.expand }.to raise_error(TooManyRedirects)
       end
 
       it 'uses shorteners from the configuration' do
@@ -158,55 +215,8 @@ module Embiggen
       end
     end
 
-    describe '#expand!' do
-      it 'expands shortened URLs' do
-        stub_redirect('https://youtu.be/dQw4w9WgXcQ',
-                      'https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be')
-        uri = described_class.new(URI('https://youtu.be/dQw4w9WgXcQ'))
-
-        expect(uri.expand!).to eq(URI('https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be'))
-      end
-
-      it 'does not expand unshortened URIs' do
-        uri = described_class.new(URI('http://www.altmetric.com'))
-
-        expect(uri.expand!).to eq(URI('http://www.altmetric.com'))
-      end
-
-      it 'raises an error if the URI redirects too many times' do
-        stub_redirect('http://bit.ly/1', 'http://bit.ly/2')
-        stub_redirect('http://bit.ly/2', 'http://bit.ly/3')
-        stub_redirect('http://bit.ly/3', 'http://bit.ly/4')
-        uri = described_class.new(URI('http://bit.ly/1'))
-
-        expect { uri.expand!(:redirects => 2) }.
-          to raise_error(TooManyRedirects)
-      end
-
-      it 'raises an error if a shortened URI does not redirect' do
-        stub_request(:head, 'http://bit.ly/bad').to_return(:status => 500)
-        uri = described_class.new(URI('http://bit.ly/bad'))
-
-        expect { uri.expand! }.to raise_error(BadShortenedURI)
-      end
-
-      it 'raises an error if the URI times out' do
-        stub_request(:head, 'http://bit.ly/bad').to_timeout
-        uri = described_class.new(URI('http://bit.ly/bad'))
-
-        expect { uri.expand! }.to raise_error(::Timeout::Error)
-      end
-
-      it 'raises an error if the URI errors' do
-        stub_request(:head, 'http://bit.ly/bad').to_raise(::Errno::ECONNRESET)
-        uri = described_class.new(URI('http://bit.ly/bad'))
-
-        expect { uri.expand! }.to raise_error(::Errno::ECONNRESET)
-      end
-    end
-
     describe '#uri' do
-      it 'returns the original URI' do
+      it 'returns a URI' do
         uri = described_class.new(URI('http://www.altmetric.com'))
 
         expect(uri.uri).to eq(URI('http://www.altmetric.com'))
@@ -246,6 +256,14 @@ module Embiggen
       end
     end
 
+    describe '#http_client' do
+      it 'returns the HTTP client for the given URI' do
+        uri = described_class.new('http://www.altmetric.com')
+
+        expect(uri.http_client.uri).to eq(URI('http://www.altmetric.com'))
+      end
+    end
+
     def stub_redirect(short_url, expanded_url, status = 301)
       stub_request(:head, short_url).
         to_return(:status => status, :headers => { 'Location' => expanded_url })

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: embiggen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Paul Mucur
+- Jonathan Hernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -64,8 +65,12 @@ files:
 - README.md
 - lib/embiggen.rb
 - lib/embiggen/configuration.rb
+- lib/embiggen/error.rb
+- lib/embiggen/http_client.rb
+- lib/embiggen/shortener_list.rb
 - lib/embiggen/uri.rb
 - spec/embiggen/configuration_spec.rb
+- spec/embiggen/shortener_list_spec.rb
 - spec/embiggen/uri_spec.rb
 - spec/embiggen_spec.rb
 - spec/spec_helper.rb
@@ -95,7 +100,7 @@ specification_version: 4
 summary: A library to expand shortened URLs
 test_files:
 - spec/embiggen/configuration_spec.rb
+- spec/embiggen/shortener_list_spec.rb
 - spec/embiggen/uri_spec.rb
 - spec/embiggen_spec.rb
 - spec/spec_helper.rb
-has_rdoc: