uncoil 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWM0ZjY2YWI1MTM5ZmQ4M2M4NjY0ZDYwMzI2MTg1NTM2YTQyNGI0YQ==
+  data.tar.gz: !binary |-
+    NDBlOTBjZDU5NTI5OGFjY2RjN2JkN2YyYzg5NmQ5Zjc0MjJmODlkNA==
+SHA512:
+  metadata.gz: !binary |-
+    M2IxY2Y5NmZiNTI0MDE2NjllNzRlMzM2ODYwZmIwMWE4Y2IxNDM5N2M5M2Vl
+    MGFjYmQ0Yjc0OTI0NGFiNGZjYzM5ZThkOTlhYWNlMjZiYWU5NDQ0ZWY2MTZl
+    ZDJiYjI3YWFkYjNhNjVhNWMyNTFiOGM5NDNmZTJlYmQwOGE4NmU=
+  data.tar.gz: !binary |-
+    ODFmOTY3NzlhMjk5NWFhZWE0YjA2ZGI0YzdkMTIxNWE4YjBhNTFjMjEzYWIx
+    YmQzYWQ2OTQ5N2E4ZDk1Y2VmOGE1MTFhOTdkZTE1OGQ3MjgyZTlhNWE2Zjli
+    M2U3ODQ4YWIyNjNkOTc0MTdkYmIxYzVmMzZiMDgzMWVhYjYzODQ=

data/.gitignore

@@ -3,4 +3,5 @@
 Gemfile.lock
 pkg/*
 coverage/
-credentials.yml
+credentials.yml
+tmp/*

data/README.md

@@ -6,7 +6,7 @@ The uncoil gem is a one stop shop for un-shortening urls.
 
 The idea is based off of my site http://uncoil.me and I built this as part of my UWE-Ruby fall project.
 
-## Why the heck does this exist?
+### Why the heck does this exist?
 This gem is all about transparency, safety and knowing where you are going on the internet.
 
 The last straw was seeing TechCrunch articles with titles like "Don't click on this one specific goo.gl link! It's a virus!" (like [this](http://techcrunch.com/2010/12/07/twitter-virus/) one), which was flabbergasting. How is it that a tech blog and community's only response to these kind of threats is so reactionary and linear? **We can do better than that.**
@@ -29,6 +29,17 @@ require 'uncoil'
 ```
 
 ## Usage
+
+### One-off Calls
+If you want to just make a single call, give this a try:
+
+```ruby
+Uncoil.expand('http://bit.ly/2EEjBl') # => <Uncoil::Response:0x00000100a0d948 @long_url="http://www.cnn.com/" @short_url="http://bit.ly/2EEjBl" @error=nil>
+```
+
+### Creating an Instance
+If you need to make repeated calls or would like to access the bitly api, you need to create an instance.
+
 * If you have Bitly login credentials, use them to create a new instance:
 
 ```ruby
@@ -76,3 +87,15 @@ Here are a few ideas I have for the future:
 * Dynamic method assignment based on domain.  
   * This goes with the modularized structure above, because it allows you to just drop more API files into the folder and not have to modify the main method
 * Better error handling (I'd appreciate any comments on what to catch and what to leave)
+
+## License
+
+The MIT License (MIT)
+
+Copyright (c) 2012 Joel Stimson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -9,4 +9,9 @@ task :default => :spec
 desc "Run all the rspec examples"
 task :spec do
   system "bundle exec rspec -c spec"
+end
+
+desc "Remove the current VCR fixture files"
+task :clean_cassettes do
+  system "rm -rf spec/fixtures/uncoil_cassettes"
 end

data/lib/uncoil.rb

@@ -1,118 +1,43 @@
+require 'uncoil/domain_finder'
+require 'uncoil/expander'
+require 'uncoil/response'
+
 require 'bitly'
-require_relative 'uncoil_submethods'
 
-# @author Joel Stimson
 class Uncoil
-  ISGD_ROOT_URL = "http://is.gd/forward.php?format=json&shorturl="
-  BITLY_DOM_ARRAY = %w[bit.ly, j.mp, bitlypro.com, cs.pn, nyti.ms]
-  
-  # Creates a new Uncoil object and will log into Bit.ly if you provide credentials
-  #
-  # @option options [String] :bitlyuser A key for your Bit.ly API username
-  # @option options [String] :bitlykey A key for your Bit.ly API key
-  # 
-  # @return [Class] the new instance of the Uncoil class
-  # 
-  # @example Set up a new instance
-  #  Uncoil.new(:bitlyuser => CREDENTIALS['bitlyuser'], :bitlykey => CREDENTIALS['bitlykey']) => "#<Uncoil:0x00000102560d30 @bitly_access=true>"
-  #
-  def initialize options = {}
+  def initialize(options = {})
     Bitly.use_api_version_3
-    @bitly_access = false
-    
-    # create bitly instance if the auth criteria are all entered by user
+
     if options.has_key?(:bitlyuser) && options.has_key?(:bitlykey)
       @bitly_instance = Bitly.new("#{options[:bitlyuser]}", "#{options[:bitlykey]}")
-      @bitly_access = true
     end
   end
   
-  # A class method version of the main expand method. This will not have access to the bit.ly API, but it's faster than having to create an instance and then use it for a one-off request.
-  #
-  # @param [String, Array] short_url The single url or array of urls you would like to expand
-  #
-  # @example Use the class method for a one-off request
-  #  Uncoil.expand("http://tinyurl.com/736swvl") # => #<Uncoil::Response:0x00000101ed9250 @long_url="http://www.chinadaily.com.cn/usa/business/2011-11/08/content_14057648.htm", @short_url="http://tinyurl.com/736swvl", @error=nil> 
-  #
-  def self.expand short_url
-    Uncoil.new.expand(short_url)
+  def self.expand(urls)
+    Uncoil.new.expand(urls)
   end
 
-  # The main method used for all requests. This method will delegate to submethods based on the domain of the link given.
-  #
-  # @param [String, Array] url_arr This can be a single url as a String or an array of Strings that the method will expand in order
-  #
-  # @return [Uncoil::Response] Returns a response object with getters for the long and short url
-  # 
-  def expand url_arr
-    output_array = Array(url_arr).flatten.map do |short_url|
-      short_url  = clean_url(short_url)
-      domain     = identify_domain(short_url)
-      
-      begin
-        long_url = 
-          if @bitly_access && ( BITLY_DOM_ARRAY.include?(domain) || check_bitly_pro(domain) )
-            uncoil_bitly(short_url)
-          elsif domain == "is.gd"
-            uncoil_isgd(short_url)
-          else
-            uncoil_other(short_url)
-          end
-      rescue => exception
-        long_url = nil
-        error = exception.message
-      end
-      # return a response object for each time through the loop
-      Response.new(long_url, short_url, error)
-    end
-    # here's the return
-    output_array.length == 1 ? output_array[0] : output_array
+  def expand(urls)
+    format_output(expand_all(urls))
   end
 
+  private
 
-  # Contacts the bit.ly API to see if the domain is a bitlypro domain, which are custom domains purchased by 3rd parties but managed by bit.ly
-  #
-  # @param [String] url_domain The domain to check against the bit.ly API.
-  #
-  def check_bitly_pro url_domain
-    @bitly_instance.bitly_pro_domain(url_domain)
-  end
-  
-  
-  # Extracts the domain from the link to help match it with the right sub-method to expand the url
-  #
-  # @param [String] short_url A single url to extract a domain from.
-  #
-  def identify_domain short_url
-    clean_url(short_url).split("/")[2].to_s
+  def expand_all(urls)
+    Array(urls).flatten.map { |short_url| response_for(short_url) }
   end
-  
 
-  # Standardizes the url by adding a protocol if there isn't one and removing trailing slashes
-  #
-  # @param [String] short_url A single url to be cleaned up.
-  #
-  def clean_url short_url
-    short_url = "http://" << short_url unless short_url =~ /^https?:\/\//
-    short_url.chop! if short_url[-1] == "/"
-    short_url
+  def response_for(url)
+    response = Response.new({:short_url => url})
+    begin
+      response.long_url = Expander.expand(url, @bitly_instance)
+    rescue => exception
+      response.long_url, response.error = nil, exception.message
+    end
+    response
   end
-  
-end
 
-
-class Uncoil::Response
-  attr_reader :long_url, :short_url, :error
-  
-  # Creates a new Response object with attributes for the original and short url, as well as any errors that occured. It is called at the end of 'expand' method.
-  #
-  # @param [String] long_url The expanded url that we were looking for.
-  # @param [String] short_url The original, short url that we used to look up the long url.
-  # @param [String] error The error output if anything went wrong during the request. And I mean ANYTHING from a code error to an HTTP issue. It catches it all.
-  #
-  def initialize(long_url, short_url, error)
-    @long_url = long_url
-    @short_url = short_url
-    @error = error
+  def format_output(output_array)
+    output_array.length == 1 ? output_array[0] : output_array
   end
 end

data/lib/uncoil/domain_finder.rb

@@ -0,0 +1,33 @@
+require 'open-uri'
+
+class DomainFinder
+  def domain_for(short_url)
+    #TODO: new object here?
+    match_host_to_provider(host_for(short_url))
+  end
+
+  def host_for(url)
+    URI.parse(url).host
+  end
+
+  def match_host_to_provider(host)
+    case
+    when bitly_domains.include?(host)
+      :bitly
+    when isgd_domains.include?(host)
+      :isgd
+    else
+      host
+    end
+  end
+
+  private
+
+  def bitly_domains
+    %w[bit.ly j.mp bitlypro.com cs.pn nyti.ms]
+  end
+
+  def isgd_domains
+    'is.gd'
+  end
+end

data/lib/uncoil/expander.rb

@@ -0,0 +1,24 @@
+require_relative './expanders/default_expander'
+require_relative './expanders/bitly_expander'
+require_relative './expanders/isgd_expander'
+
+module Expander
+  class << self
+    def expand(short_url, bitly_instance = nil)
+      case 
+      when domain_for(short_url) == :bitly && bitly_instance
+        BitlyExpander.expand(short_url, bitly_instance)
+      when domain_for(short_url) == :isgd
+        IsgdExpander.expand(short_url)
+      else
+        DefaultExpander.expand(short_url)
+      end
+    end
+
+    private
+
+    def domain_for(short_url)
+      DomainFinder.new.domain_for(short_url)
+    end
+  end
+end

data/lib/uncoil/expanders/bitly_expander.rb

@@ -0,0 +1,5 @@
+class BitlyExpander
+  def self.expand(short_url, bitly_instance)
+    bitly_instance.expand(short_url).long_url
+  end
+end

data/lib/uncoil/expanders/default_expander.rb

@@ -0,0 +1,17 @@
+require 'open-uri'
+require 'net/http'
+
+class DefaultExpander
+  class << self
+    def expand(short_url)
+      response = Typhoeus.head(short_url, :followlocation => true)
+      location_from_response(response)
+    end
+
+    private
+
+    def location_from_response(response)
+      response.options[:effective_url]
+    end
+  end
+end

data/lib/uncoil/expanders/isgd_expander.rb

@@ -0,0 +1,19 @@
+require 'json'
+require 'typhoeus'
+
+class IsgdExpander
+  ISGD_ROOT_URL = "http://is.gd/forward.php?format=json&shorturl="
+
+  class << self
+    def expand(short_url)
+      response = Typhoeus.get("#{ISGD_ROOT_URL}#{short_url}")
+      isgd_location_from_response(response.response_body)
+    end
+
+    private
+
+    def isgd_location_from_response(body)
+      JSON.parse(body)["url"]
+    end
+  end
+end

data/lib/uncoil/response.rb

@@ -0,0 +1,11 @@
+class Uncoil
+  class Response
+    attr_accessor :long_url, :short_url, :error
+
+    def initialize(attributes = {})
+      attributes.each do |k, v|
+        self.send("#{k.to_s}=", v)
+      end
+    end
+  end
+end

data/lib/uncoil/version.rb

@@ -1,3 +1,3 @@
 class Uncoil
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/fixtures/uncoil_cassettes/array_of_links.yml

@@ -0,0 +1,102 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api.bit.ly/v3/expand?apiKey=R_7a6f6d845668a8a7bb3e0c80ee3c28d6&login=stim371&shortUrl=http://bit.ly/2EEjBl
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 12 Sep 2013 22:46:57 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Connection:
+      - keep-alive
+      Mime-Version:
+      - '1.0'
+      Content-Length:
+      - '199'
+    body:
+      encoding: US-ASCII
+      string: ! '{ "status_code": 200, "status_txt": "OK", "data": { "expand": [ {
+        "short_url": "http:\/\/bit.ly\/2EEjBl", "long_url": "http:\/\/www.cnn.com\/",
+        "user_hash": "2EEjBl", "global_hash": "2EEjBl" } ] } }
+
+'
+    http_version: 
+  recorded_at: Thu, 12 Sep 2013 22:47:09 GMT
+- request:
+    method: get
+    uri: http://is.gd/forward.php?format=json&shorturl=http://is.gd/gbKNRq
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Typhoeus - https://github.com/typhoeus/typhoeus
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 12 Sep 2013 22:46:57 GMT
+      Content-Type:
+      - text/javascript; charset=utf8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      X-Powered-By:
+      - PHP/5.2.17
+      Access-Control-Allow-Origin:
+      - ! '*'
+    body:
+      encoding: US-ASCII
+      string: ! '{ "url": "http://www.google.com" }'
+    http_version: 
+  recorded_at: Thu, 12 Sep 2013 22:47:09 GMT
+- request:
+    method: get
+    uri: http://api.bit.ly/v3/expand?apiKey=R_7a6f6d845668a8a7bb3e0c80ee3c28d6&login=stim371&shortUrl=http://cs.pn/vsZpra
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 12 Sep 2013 22:46:57 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Connection:
+      - keep-alive
+      Mime-Version:
+      - '1.0'
+      Content-Length:
+      - '222'
+    body:
+      encoding: US-ASCII
+      string: ! '{ "status_code": 200, "status_txt": "OK", "data": { "expand": [ {
+        "short_url": "http:\/\/cs.pn\/vsZpra", "long_url": "http:\/\/www.c-spanvideo.org\/program\/CainNew",
+        "user_hash": "vsZpra", "global_hash": "vPQYzq" } ] } }
+
+'
+    http_version: 
+  recorded_at: Thu, 12 Sep 2013 22:47:09 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/uncoil_cassettes/bitly_api.yml

@@ -0,0 +1,69 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api.bit.ly/v3/expand?apiKey=R_7a6f6d845668a8a7bb3e0c80ee3c28d6&login=stim371&shortUrl=http://bit.ly/2EEjBl
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 12 Sep 2013 22:46:55 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Connection:
+      - keep-alive
+      Mime-Version:
+      - '1.0'
+      Content-Length:
+      - '199'
+    body:
+      encoding: US-ASCII
+      string: ! '{ "status_code": 200, "status_txt": "OK", "data": { "expand": [ {
+        "short_url": "http:\/\/bit.ly\/2EEjBl", "long_url": "http:\/\/www.cnn.com\/",
+        "user_hash": "2EEjBl", "global_hash": "2EEjBl" } ] } }
+
+'
+    http_version: 
+  recorded_at: Thu, 12 Sep 2013 22:47:07 GMT
+- request:
+    method: get
+    uri: http://api.bit.ly/v3/expand?apiKey=R_7a6f6d845668a8a7bb3e0c80ee3c28d6&login=stim371&shortUrl=http://cs.pn/vsZpra
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 12 Sep 2013 22:46:55 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Connection:
+      - keep-alive
+      Mime-Version:
+      - '1.0'
+      Content-Length:
+      - '222'
+    body:
+      encoding: US-ASCII
+      string: ! '{ "status_code": 200, "status_txt": "OK", "data": { "expand": [ {
+        "short_url": "http:\/\/cs.pn\/vsZpra", "long_url": "http:\/\/www.c-spanvideo.org\/program\/CainNew",
+        "user_hash": "vsZpra", "global_hash": "vPQYzq" } ] } }
+
+'
+    http_version: 
+  recorded_at: Thu, 12 Sep 2013 22:47:08 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/uncoil_cassettes/isgd_api.yml

@@ -0,0 +1,36 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://is.gd/forward.php?format=json&shorturl=http://is.gd/gbKNRq
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Typhoeus - https://github.com/typhoeus/typhoeus
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 12 Sep 2013 22:46:56 GMT
+      Content-Type:
+      - text/javascript; charset=utf8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      X-Powered-By:
+      - PHP/5.2.17
+      Access-Control-Allow-Origin:
+      - ! '*'
+    body:
+      encoding: US-ASCII
+      string: ! '{ "url": "http://www.google.com" }'
+    http_version: 
+  recorded_at: Thu, 12 Sep 2013 22:47:08 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/uncoil_cassettes/isgd_response.yml

@@ -0,0 +1,36 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://is.gd/forward.php?format=json&shorturl=http://is.gd/gbKNRq
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Typhoeus - https://github.com/typhoeus/typhoeus
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 12 Sep 2013 22:46:55 GMT
+      Content-Type:
+      - text/javascript; charset=utf8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      X-Powered-By:
+      - PHP/5.2.17
+      Access-Control-Allow-Origin:
+      - ! '*'
+    body:
+      encoding: US-ASCII
+      string: ! '{ "url": "http://www.google.com" }'
+    http_version: 
+  recorded_at: Thu, 12 Sep 2013 22:47:07 GMT
+recorded_with: VCR 2.5.0

data/spec/spec_helper.rb

@@ -1,4 +1,22 @@
 require 'simplecov'
+require 'vcr'
+require 'webmock/rspec'
 SimpleCov.start
 
+require 'uncoil'
+
 CREDENTIALS = YAML.load_file("./credentials.yml")['bitly']
+
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/fixtures/uncoil_cassettes'
+  c.hook_into :webmock
+  c.allow_http_connections_when_no_cassette = true
+  c.configure_rspec_metadata!
+  c.default_cassette_options = {
+    :record => :new_episodes
+  }
+end
+
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+end

data/spec/uncoil/domain_finder_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe DomainFinder do
+  it 'should return the host from a url' do
+    subject.domain_for('http://bit.ly/abcde13').should eq :bitly
+    subject.domain_for('http://tinyurl.com/abcde13').should eq 'tinyurl.com'
+  end
+
+  it 'should raise error if url empty' do
+    lambda{ subject.domain_for(nil) }.should raise_error
+  end
+end

data/spec/uncoil/expander_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Expander do
+
+end

data/spec/uncoil_response_spec.rb

@@ -1,21 +1,24 @@
 require 'spec_helper'
-require 'uncoil'
 
-describe "the response object" do
+describe Uncoil::Response, :vcr => { :cassette_name => 'isgd_response' } do
   
-  subject { Uncoil.new(:bitlyuser => CREDENTIALS['bitlyuser'], :bitlykey => CREDENTIALS['bitlykey'])}
+  subject { Uncoil.expand('http://is.gd/gbKNRq') }
   
-  before(:all) {
-    @subject = subject.expand("http://is.gd/gbKNRq")
-  }
-  
-  it "should return a response object" do
-    @subject.class.should eq Uncoil::Response
+  it 'should return a response object' do
+    subject.class.should eq Uncoil::Response
   end
   
-  it "should respond to getter methods" do
-    @subject.long_url.should_not eq nil
-    @subject.short_url.should_not eq nil
+  it 'should respond to getter methods' do
+    lambda{subject.long_url}.should_not raise_error
+    lambda{subject.short_url}.should_not raise_error
+    lambda{subject.error}.should_not raise_error
   end
-  
-end
+
+  describe 'response body' do
+    it 'should assign variables correctly' do
+      subject.long_url.should eq 'http://www.google.com'
+      subject.short_url.should eq 'http://is.gd/gbKNRq'
+      subject.error.should be_nil
+    end
+  end
+end

data/spec/uncoil_spec.rb

@@ -1,101 +1,90 @@
 require 'spec_helper'
-require 'uncoil'
 
 describe Uncoil do
   
   subject { Uncoil.new(:bitlyuser => CREDENTIALS['bitlyuser'], :bitlykey => CREDENTIALS['bitlykey'])}
   
-  describe "#expand class method" do
-    it "should successfully return a response object" do
-      Uncoil.expand("http://tinyurl.com/736swvl").class.should eq Uncoil::Response
+  describe '#expand class method', :vcr => { :cassette_name => 'isgd_response' } do
+    it 'should successfully return a response object' do
+      Uncoil.expand('http://is.gd/gbKNRq').class.should eq Uncoil::Response
     end
     
     it "should bring back the correct link" do
-      response = Uncoil.expand("http://tinyurl.com/736swvl")
-      response.long_url.should eq "http://www.chinadaily.com.cn/usa/business/2011-11/08/content_14057648.htm"
+      response = Uncoil.expand('http://is.gd/gbKNRq')
+      response.long_url.should eq "http://www.google.com"
     end
   end
   
-  describe "when using the submethods" do
-    
-    context "when trying to undo a bit.ly and bit.ly pro link" do
-      it "should bring back the correct long link" do
-        {"http://bit.ly/2EEjBl" => "http://www.cnn.com/", "http://cs.pn/vsZpra" => "http://www.c-spanvideo.org/program/CainNew" }.each { |short_url, long_url| 
-        subject.uncoil_bitly(short_url).should eq long_url
-        }
-      end
-    end
-  
-    context "when trying to undo an is.gd link" do
-      it "should bring back the correct long link" do
-        subject.uncoil_isgd("http://is.gd/gbKNRq").should eq "http://www.google.com"
-      end
-    end
-  
-    context "when trying to undo from other services" do
-      it "should bring back the correct long link" do
-         subject.uncoil_other("http://tinyurl.com/736swvl").should eq "http://www.chinadaily.com.cn/usa/business/2011-11/08/content_14057648.htm"
-      end
-    end
-  end
-  
-  describe "the main expand method" do
+  describe "#expand instance method" do
     
     it "should raise an error for non-urls" do
       subject.expand("a").error.should_not be_nil
     end
     
-    context "when expanding a link" do
-      
-      def check_response response, expected_result
-        response.long_url.should eq expected_result[:long_url]
-        response.short_url.should eq expected_result[:short_url]
-        response.error.should eq expected_result[:error]
-      end
+    def check_response(response, expected_result)
+      response.long_url.should eq expected_result[:long_url]
+      response.short_url.should eq expected_result[:short_url]
+      response.error.should eq expected_result[:error]
+    end
+    
+    context 'for bitly api', :vcr => { :cassette_name => 'bitly_api' } do
       
-      it "should expand bitly correctly" do
-        expected_result = Hash[:long_url => "http://www.cnn.com/", :short_url => "http://bit.ly/2EEjBl", :error => nil]
-        response = subject.expand("http://bit.ly/2EEjBl")
+      it 'should expand bitly correctly' do
+        expected_result = Hash[:long_url => 'http://www.cnn.com/', :short_url => 'http://bit.ly/2EEjBl', :error => nil]
+        response = subject.expand('http://bit.ly/2EEjBl')
         check_response response, expected_result
       end
     
-      it "should expand bitlypro domains correctly" do
-        expected_result = Hash[:long_url => "http://www.c-spanvideo.org/program/CainNew", :short_url => "http://cs.pn/vsZpra", :error => nil]
-        response = subject.expand("http://cs.pn/vsZpra")
+      it 'should expand bitlypro domains correctly' do
+        expected_result = Hash[:long_url => 'http://www.c-spanvideo.org/program/CainNew', :short_url => 'http://cs.pn/vsZpra', :error => nil]
+        response = subject.expand('http://cs.pn/vsZpra')
         check_response response, expected_result
       end
-    
-      it "should expand isgd domains correctly" do
-        expected_result = Hash[:long_url => "http://www.google.com", :short_url => "http://is.gd/gbKNRq", :error => nil]
-        response = subject.expand("http://is.gd/gbKNRq")
+    end
+
+    context 'for isgd api', :vcr => { :cassette_name => 'isgd_api' } do
+      it 'should expand isgd domains correctly' do
+        expected_result = Hash[:long_url => 'http://www.google.com', :short_url => 'http://is.gd/gbKNRq', :error => nil]
+        response = subject.expand('http://is.gd/gbKNRq')
         check_response response, expected_result
       end
-    
-      it "should expand other shortened urls correctly" do
-        expected_result = Hash[:long_url => "http://www.chinadaily.com.cn/usa/business/2011-11/08/content_14057648.htm", :short_url => "http://tinyurl.com/736swvl", :error => nil]
-        response = subject.expand("http://tinyurl.com/736swvl")
+    end
+
+    context 'for other requests' do
+      it 'should expand other shortened urls correctly' do
+        expected_result = Hash[:long_url => 'http://paulgraham.com/', :short_url => 'http://tinyurl.com/p8o2', :error => nil]
+        response = subject.expand('http://tinyurl.com/p8o2')
         check_response response, expected_result
       end
+
+      it 'should expand https urls correctly' do
+        expected_result = Hash[:long_url => 'https://www.facebook.com/photo.php?fbid=436380063146407&l=7554e08219', :short_url => 'http://fb.me/6txI6APS5', :error => nil]
+        response = subject.expand('http://fb.me/6txI6APS5')
+        check_response response, expected_result
+      end
+    end
     
-      context "with an array input" do
+    describe 'with an array input', :vcr => { :cassette_name => 'array_of_links' } do
         
-        before(:all) {
-          arr_of_links = ["http://bit.ly/2EEjBl","http://is.gd/gbKNRq","http://cs.pn/vsZpra"]
-          @response = subject.expand(arr_of_links)
-          }
+        arr_of_links = %w[http://bit.ly/2EEjBl http://is.gd/gbKNRq http://cs.pn/vsZpra]
         
-        it "should return an array" do
-          @response.class.should eq Array
-        end
+        let(:resp) {subject.expand(arr_of_links) }
         
-        it "should return an array of response objects" do
-          @response.each { |r| r.class.should eq Uncoil::Response }
+        it 'should return an array' do
+          resp.class.should eq Array
         end
         
-        it "should successfully expand all links" do
-          @expected_result = [Hash[:long_url => "http://www.cnn.com/", :short_url => "http://bit.ly/2EEjBl", :error => nil], Hash[:long_url => "http://www.google.com", :short_url => "http://is.gd/gbKNRq", :error => nil],Hash[:long_url => "http://www.c-spanvideo.org/program/CainNew", :short_url => "http://cs.pn/vsZpra", :error => nil]]
-          @response.each_with_index { |response_array, index| check_response response_array, @expected_result[index] }
+        it 'should return an array of response objects' do
+          resp.each { |r| r.class.should eq Uncoil::Response }
         end
+        
+        it 'should successfully expand all links' do
+          @expected_result = [Hash[:long_url => 'http://www.cnn.com/', :short_url => 'http://bit.ly/2EEjBl', :error => nil],
+                              Hash[:long_url => 'http://www.google.com', :short_url => 'http://is.gd/gbKNRq', :error => nil],
+                              Hash[:long_url => 'http://www.c-spanvideo.org/program/CainNew', :short_url => 'http://cs.pn/vsZpra', :error => nil]]
+          resp.each_with_index { |response, index|
+            check_response(response, @expected_result[index])
+            }
       end
     end
   end

data/uncoil.gemspec

@@ -23,6 +23,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rake"
+  s.add_development_dependency "vcr"
+  s.add_development_dependency "webmock"
   
   s.add_runtime_dependency "bitly"
+  s.add_runtime_dependency "typhoeus"
 end

metadata

@@ -1,71 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: uncoil
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Joel Stimson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152984160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152984160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152983000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152983000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152981500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152981500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152980660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152980660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bitly
-  requirement: &2152979620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152979620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Uncoil is a gem to unshorten urls so you know where obscured links really
   go. If you have bitly login credentials, initialize an instance of Uncoil to use
   the bitly API.
@@ -77,50 +133,61 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- .yardoc/checksums
-- .yardoc/objects/root.dat
-- .yardoc/proxy_types
 - Gemfile
 - Guardfile
 - Manifest
 - README.md
 - Rakefile
 - lib/uncoil.rb
+- lib/uncoil/domain_finder.rb
+- lib/uncoil/expander.rb
+- lib/uncoil/expanders/bitly_expander.rb
+- lib/uncoil/expanders/default_expander.rb
+- lib/uncoil/expanders/isgd_expander.rb
+- lib/uncoil/response.rb
 - lib/uncoil/version.rb
-- lib/uncoil_submethods.rb
-- spec/helper_method_spec.rb
+- spec/fixtures/uncoil_cassettes/array_of_links.yml
+- spec/fixtures/uncoil_cassettes/bitly_api.yml
+- spec/fixtures/uncoil_cassettes/isgd_api.yml
+- spec/fixtures/uncoil_cassettes/isgd_response.yml
 - spec/spec_helper.rb
+- spec/uncoil/domain_finder_spec.rb
+- spec/uncoil/expander_spec.rb
 - spec/uncoil_response_spec.rb
 - spec/uncoil_spec.rb
 - uncoil.gemspec
 homepage: https://github.com/stim371/uncoil
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: uncoil
-rubygems_version: 1.8.10
+rubygems_version: 2.1.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Uncoil is a gem to unshorten urls so you know where obscured links really
   go.
 test_files:
-- spec/helper_method_spec.rb
+- spec/fixtures/uncoil_cassettes/array_of_links.yml
+- spec/fixtures/uncoil_cassettes/bitly_api.yml
+- spec/fixtures/uncoil_cassettes/isgd_api.yml
+- spec/fixtures/uncoil_cassettes/isgd_response.yml
 - spec/spec_helper.rb
+- spec/uncoil/domain_finder_spec.rb
+- spec/uncoil/expander_spec.rb
 - spec/uncoil_response_spec.rb
 - spec/uncoil_spec.rb
 has_rdoc: 

data/.yardoc/checksums

@@ -1,3 +0,0 @@
-lib/uncoil.rb 0ab3336a87ae06d8a3aa55e15104552fcd7f6e9e
-lib/uncoil/version.rb 2a25a2d46f761aa4d70eeee4a7f6adc42215db7a
-lib/uncoil_submethods.rb 94e18e69c539be74e772316cc9cdc9cfaad296fd

data/.yardoc/proxy_types

@@ -1,2 +0,0 @@
-{I"Object:EF:
-class

data/lib/uncoil_submethods.rb

@@ -1,38 +0,0 @@
-require 'open-uri'
-require 'net/http'
-require 'json'
-
-class Uncoil
-  
-  # Expands any links that are bitly or bitlypro domains as long as you have logged into the bitly API.
-  # 
-  # @param [String] short_url The short url you would like to expand.
-  # 
-  def uncoil_bitly short_url
-    @bitly_instance.expand(short_url).long_url
-  end
-
-  # Expands any links that are isgd domains.
-  # 
-  # @param [String] short_url The short url you would like to expand.
-  #
-  def uncoil_isgd short_url
-    JSON.parse(open(ISGD_ROOT_URL + "#{short_url}") { |file| file.read } )["url"]
-  end
-
-  # Expands any links that do not match the above domains.
-  # 
-  # @param [String] short_url The short url you would like to expand.
-  # @param [Integer, 10] depth The number of redirects you would like this method to follow.
-  #
-  def uncoil_other short_url, depth = 10
-    url = URI.encode(short_url)
-    response = Net::HTTP.get_response(URI.parse(url))
-  
-    case response
-      when Net::HTTPSuccess     then url
-      when Net::HTTPRedirection then uncoil_other(response['location'], depth - 1)
-    end
-  end
-  
-end

data/spec/helper_method_spec.rb

@@ -1,55 +0,0 @@
-require 'spec_helper'
-require 'uncoil'
-
-describe Uncoil do
-  
-  subject { Uncoil.new(:bitlyuser => "stim371", :bitlykey => "R_7a6f6d845668a8a7bb3e0c80ee3c28d6")}
-  
-  context "when cleaning up the url" do
-    
-    it "should add the prefix if none exists" do
-      subject.clean_url("cnn.com").should eq "http://cnn.com"
-      subject.clean_url("cnn.com/").should eq "http://cnn.com"
-    end
-    
-    it "should not add the prefix if one exists" do
-      subject.clean_url("http://cnn.com").should eq "http://cnn.com"
-      subject.clean_url("http://cnn.com/").should eq "http://cnn.com"
-    end
-    
-    it "should not add the prefix if a secure one exists" do
-      subject.clean_url("https://cnn.com").should eq "https://cnn.com"
-      subject.clean_url("https://cnn.com/").should eq "https://cnn.com"
-    end
-    
-    it "should remove the trailing slash" do
-      subject.clean_url("http://cnn.com/").should eq "http://cnn.com"
-      subject.clean_url("cnn.com/").should eq "http://cnn.com"
-    end
-    
-    it "should not remove characters on the end that aren't slashes" do
-      subject.clean_url("http://cnn.com").should eq "http://cnn.com"
-      subject.clean_url("cnn.com").should eq "http://cnn.com"
-    end
-    
-  end
-  
-  context "when extracting the domain" do
-    it "should correctly extract the domain from a normal url" do
-      subject.identify_domain("http://bit.ly/2EEjBl").should eq "bit.ly"
-    end
-  end
-  
-  context "when checking a domain" do
-    
-    it "should identify pro domains" do
-      subject.check_bitly_pro("cs.pn").should be_true
-      subject.check_bitly_pro("nyti.ms").should be_true
-    end
-    
-    it "should identify non-pro domains" do
-      subject.check_bitly_pro("bit.ly").should be_false #the bit.ly domain comes back false since its not a "pro" domain
-      subject.check_bitly_pro("tinyurl.com").should be_false
-    end
-  end
-end