bitly_quickly 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63dd1b93398c8f64dfedb5fd187f74257d4b612d
-  data.tar.gz: 544f7bd45d92e35caaa34f859e20f198497a9b8c
+  metadata.gz: b7c550c1a0c10e31d3afe5836c7cbb9aae2551e0
+  data.tar.gz: a064475020ff8f03983c6e8a30e2b2f06295cd51
 SHA512:
-  metadata.gz: 71141e4ae5b260e34aedd4f64caa75c374760a987d42d34c363ce229b7a303eccbae4bab153775eca41fda47b0acf89700cc56ce3da72242dbed87932a171f39
-  data.tar.gz: 87b4d282ffe2bf6aa10da60ee922a0f0403ac7fec294e59667add7c98a10b90c1115efbdac9ab60b1bcf03519d86e5d1cdfbb6431fa0c93d31da26d51fa53a8e
+  metadata.gz: 2caffc56097c4b4697965c65888f74a9621155eaf34831e9c310c5ed05d93a9678747fa44d2e9373e48710b43aa779328517bdd1f99814c9256d455f4ef20a8d
+  data.tar.gz: e192e6b1fa33cc3c7010e1fca2ead80e04201e3367fc491dfeb8a2dabf3583098daa3d561088ca34e5d7d56f43ed4a8a0dab4be5939312ada1b85612029341d1

data/.gitignore

@@ -1,17 +1,10 @@
 *.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format documentation
+--require spec_helper.rb

data/.rubocop-my.yml

@@ -0,0 +1,5 @@
+Metrics/MethodLength:
+  Max: 15
+
+Style/Documentation:
+  Enabled: false

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: .rubocop-my.yml

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 
 rvm:
-  - 2.1.1
-  - 2.1.0
+  - 2.2.2
+  - 2.1.6
   - 2.0.0
   - 1.9.3
+  - jruby-19mode
 
 branches:
   only:

data/.yardopts

@@ -0,0 +1,7 @@
+--protected
+--private
+--embed-mixins
+lib/**/*.rb
+-
+README.md
+LICENSE.txt

data/LICENSE.txt

@@ -1,22 +1,21 @@
-Copyright (c) 2014 Oldrich Vetesnik
+The MIT License (MIT)
 
-MIT License
+Copyright (c) 2014-2015 Oldrich Vetesnik
 
-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:
+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 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.
+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/README.md

@@ -1,6 +1,4 @@
-# BitlyQuickly
-
-[![Build Status](https://travis-ci.org/ollie/bitly_quickly.png?branch=master)](https://travis-ci.org/ollie/bitly_quickly)
+# BitlyQuickly [![Build Status](https://img.shields.io/travis/ollie/bitly_quickly/master.svg)](https://travis-ci.org/ollie/bitly_quickly) [![Code Climate](https://img.shields.io/codeclimate/github/ollie/bitly_quickly.svg)](https://codeclimate.com/github/ollie/bitly_quickly) [![Gem Version](https://img.shields.io/gem/v/bitly_quickly.svg)](https://rubygems.org/gems/bitly_quickly)
 
 There are many great [bit.ly](https://bitly.com/) gems, it's just that I wanted something as fast and as simple as possible.
 It can only shorten URLs. :-)
@@ -8,13 +6,6 @@ It can only shorten URLs. :-)
 It uses [Typhoeus](https://github.com/typhoeus/typhoeus) which is an awesome HTTP library for fast
 and parallel networking. It also uses [Oj](https://github.com/ohler55/oj) which is a fast JSON parser.
 
-## Tested on
-
-* 2.1.1
-* 2.1.0
-* 2.0.0
-* 1.9.3
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -31,14 +22,34 @@ Or install it yourself as:
 
 ## Usage
 
-    client         = BitlyQuickly.new(access_token: 'token')
-    shortened_url  = client.shorten('http://www.google.com/') # returns String
-    shortened_urls = client.shorten([                         # returns Hash
-      'https://www.google.com/',
-      'https://www.youtube.com/',
-      'https://www.yahoo.com/',
-    ])
+```ruby
+client         = BitlyQuickly.new(access_token: 'token')
+shortened_url  = client.shorten('http://www.google.com/') # Returns shortened URL.
+shortened_urls = client.shorten([                         # Returns original => shortend URL hash.
+  'https://www.google.com/',
+  'https://www.youtube.com/',
+  'https://www.yahoo.com/'
+])
+
+shortened_url == 'http://pht.io/1eyUhFo'
+
+shortened_urls == {
+  'https://www.yahoo.com/'   => 'http://pht.io/1ezI6Z6',
+  'https://www.youtube.com/' => 'http://pht.io/1ezI8Qz',
+  'https://www.google.com/'  => 'http://pht.io/1ezI8QA'
+}
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-You know the routine…
+1. Fork it (https://github.com/ollie/bitly_quickly/fork)
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/Rakefile

@@ -0,0 +1,13 @@
+task default: :combo
+
+desc 'Run tests, rubocop and generate documentation'
+task :combo do
+  sh 'bundle exec rspec'
+  sh('bundle exec rubocop') {} # ignore status > 0
+  sh 'bundle exec yardoc'
+end
+
+desc 'Same as :combo but build a gem, too'
+task mega_combo: :combo do
+  sh 'gem build bitly_quickly.gemspec'
+end

data/bin/console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'bitly_quickly'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+require 'pry'
+Pry.start

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/bitly_quickly.gemspec

@@ -8,21 +8,37 @@ Gem::Specification.new do |spec|
   spec.version       = BitlyQuickly::VERSION
   spec.authors       = ['Oldrich Vetesnik']
   spec.email         = ['oldrich.vetesnik@gmail.com']
-  spec.summary       = %q{Shorten URLs with bit.ly API}
-  spec.description   = %q{Shorten URLs with bit.ly API, make parallel requests.}
+
+  spec.summary       = 'Shorten URLs with bit.ly API'
+  spec.description   = 'Shorten URLs with bit.ly API, make parallel requests.'
   spec.homepage      = 'https://github.com/ollie/bitly_quickly'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  # rubocop:disable Metrics/LineLength
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler',   '~> 1.5'
-  spec.add_development_dependency 'rspec',     '~> 2.14'
-  spec.add_development_dependency 'webmock',   '~> 1.17'
-  spec.add_development_dependency 'simplecov', '~> 0.8'
+  # System
+  spec.add_development_dependency 'bundler', '~> 1.7'
+
+  # Test
+  spec.add_development_dependency 'rspec',     '~> 3.2'
+  spec.add_development_dependency 'webmock',   '~> 1.21'
+  spec.add_development_dependency 'simplecov', '~> 0.10'
+
+  # Code style, debugging, docs
+  spec.add_development_dependency 'rubocop', '~> 0.31'
+  spec.add_development_dependency 'pry',     '~> 0.10'
+  spec.add_development_dependency 'yard',    '~> 0.8'
+  spec.add_development_dependency 'rake',    '~> 10.4'
+
+  # Runtime
 
-  spec.add_runtime_dependency 'typhoeus', '~> 0.6'
-  spec.add_runtime_dependency 'oj',       '~> 2.5'
+  # Networking
+  # Fast networking
+  spec.add_runtime_dependency 'typhoeus',   '~> 0.7'
+  # A common interface to multiple JSON libraries
+  spec.add_runtime_dependency 'multi_json', '~> 1.11'
 end

data/lib/bitly_quickly.rb

@@ -1,51 +1,100 @@
 require 'typhoeus'
-require 'oj'
+require 'multi_json'
 
 require 'bitly_quickly/version'
-
-# V3 Wrapper
+require 'bitly_quickly/error'
+
+# Wrapper around Bitly V3 API.
+#
+# @example
+#   client         = BitlyQuickly.new(access_token: 'token')
+#   shortened_url  = client.shorten('http://www.google.com/')
+#   shortened_urls = client.shorten([
+#     'https://www.google.com/',
+#     'https://www.youtube.com/',
+#     'https://www.yahoo.com/'
+#   ])
+#
+#   shortened_url == 'http://pht.io/1eyUhFo'
+#
+#   shortened_urls == {
+#     'https://www.yahoo.com/'   => 'http://pht.io/1ezI6Z6',
+#     'https://www.youtube.com/' => 'http://pht.io/1ezI8Qz',
+#     'https://www.google.com/'  => 'http://pht.io/1ezI8QA'
+#   }
 class BitlyQuickly
-  class BitlyError                    < StandardError; end
-  class RateLimitExceededError        < BitlyError; end # 403
-  class TemporarilyUnavailableError   < BitlyError; end # 503
-  class NotFoundError                 < BitlyError; end # 404
-  class InvalidRequestOrResponseError < BitlyError; end # 500
-  class UnknownError                  < BitlyError; end
-
+  # Bitly API server.
   DEFAULT_API_ADDRESS = 'https://api-ssl.bitly.com'
-  OJ_OPTIONS          = {
-    mode:             :compat,     # Converts values with to_hash or to_json
-    symbol_keys:      true,        # Symbol keys to string keys
-    time_format:      :xmlschema,  # ISO8061 format
-    second_precision: 0,           # No include milliseconds
-  }
-
-  attr_reader :access_token,
-              :api_address
-
-  def initialize(options)
-    @access_token = options.delete(:access_token) || raise( ArgumentError.new('Missing access_token option') )
-    @api_address  = options.delete(:api_address)  || DEFAULT_API_ADDRESS
+
+  # API Access Token.
+  #
+  # @return [String]
+  attr_reader :access_token
+
+  # Alternate API server URL.
+  #
+  # @return [String]
+  attr_reader :api_address
+
+  # Init with access token and api address.
+  #
+  # @param  config [Hash]                 Config settings.
+  # @option config :access_token [String] API Access Token.
+  # @option config :api_address  [String] Alternate API server URL, optional.
+  def initialize(config)
+    @access_token = config.delete(:access_token) || fail(
+      ArgumentError, 'Missing access_token option'
+    )
+
+    @api_address = config.delete(:api_address) || DEFAULT_API_ADDRESS
   end
 
+  # Shorten URL or array of URLs. In case single URL is passed, it returns
+  # the shortened URL. If an array is passed, it returns a hash where keys
+  # are original URLs and values are shortened URLs.
+  #
+  # @param long_url_or_array [String, Array<String>]
+  #
+  # @return [String, Hash<String, String>]
   def shorten(long_url_or_array)
-    if long_url_or_array.respond_to? :each
-      get_many_responses long_url_or_array
+    if long_url_or_array.respond_to?(:each)
+      get_many_responses(long_url_or_array)
     else
-      get_single_response long_url_or_array
+      get_single_response(long_url_or_array)
     end
   end
 
+  # Create endpoint URL.
+  #
+  # @param path [String] Endpoint path.
+  #
+  # @return [String] Endpoint URL.
+  def endpoint_url(path)
+    URI.join(api_address, path).to_s
+  end
+
+  ##########################
+  # Private instance methods
+  ##########################
+
+  private
+
+  # Shorten each URL and return a hash where keys
+  # are original URLs and values are shortened URLs.
+  #
+  # @param array_of_long_urls [String, Array<String>]
+  #
+  # @return [Hash<String, String>]
   def get_many_responses(array_of_long_urls)
     hydra     = Typhoeus::Hydra.new
     responses = {}
 
     array_of_long_urls.each do |long_url|
-      request = make_shorten_request long_url
+      request = make_shorten_request(long_url)
 
       request.on_complete do |response|
-        json_response = response_to_json response
-        responses[ response.request.long_url ] = json_response[:data][:url]
+        json_response       = response_to_json(response)
+        responses[long_url] = json_response[:data][:url]
       end
 
       hydra.queue request
@@ -55,61 +104,65 @@ class BitlyQuickly
     responses
   end
 
+  # Shorten single URL.
+  #
+  # @param long_url [String] Original URL.
+  #
+  # @return [String] Shortened URL.
   def get_single_response(long_url)
-    response = get_response long_url
-    response[:data][:url]
-  end
+    request       = make_shorten_request(long_url)
+    response      = request.run
+    json_response = response_to_json(response)
 
-  def api_url(path)
-    URI.join(api_address, path).to_s
+    json_response[:data][:url]
   end
 
+  # Prepare Typhoeus shorten request.
+  #
+  # @param long_url [String] Original URL.
+  #
+  # @return [Typhoues::Request]
   def make_shorten_request(long_url)
-    request = Typhoeus::Request.new(
-      api_url('/v3/shorten'),
-      {
-        params: {
-          access_token: access_token,
-          longUrl:      long_url
-        },
+    Typhoeus::Request.new(
+      endpoint_url('/v3/shorten'),
+      params: {
+        access_token: access_token,
+        longUrl:      long_url
       }
     )
-
-    # I need to access this later in the result
-    class << request
-      attr_accessor :long_url
-    end
-
-    request.long_url = long_url
-    request
-  end
-
-  def get_response(long_url)
-    request  = make_shorten_request long_url
-    response = request.run
-    response_to_json response
   end
 
+  # Check response code and raise an appropriate error.
+  # Otherwise return parsed JSON body.
+  #
+  # @param response [Typhoues::Response]
+  #
+  # @return [Hash]
   def response_to_json(response)
-    json_response = parse_response response
+    json_response = parse_json(response.body)
 
     case json_response[:status_code]
     when 200
       return json_response
     when 403
-      raise RateLimitExceededError, json_response[:status_txt]
+      fail Error::RateLimitExceeded, json_response[:status_txt]
     when 404
-      raise NotFoundError, json_response[:status_txt]
+      fail Error::NotFound, json_response[:status_txt]
     when 500
-      raise InvalidRequestOrResponseError, json_response[:status_txt]
+      fail Error::InvalidRequestOrResponse, json_response[:status_txt]
     when 503
-      raise TemporarilyUnavailableError, json_response[:status_txt]
+      fail Error::TemporarilyUnavailable, json_response[:status_txt]
     else
-      raise UnknownError, json_response[:status_txt]
+      fail Error::UnknownError, json_response[:status_txt]
     end
   end
 
-  def parse_response(response)
-    Oj.load response.body, OJ_OPTIONS
+  # Parse JSON string into Ruby hash.
+  #
+  # @param json [String] JSON string.
+  #
+  # @return [Hash]
+  def parse_json(json)
+    MultiJson.load(json, symbolize_keys: true)
   end
 end

data/lib/bitly_quickly/error.rb

@@ -0,0 +1,11 @@
+class BitlyQuickly
+  # # Error classes.
+  # rubocop:disable Style/SpaceAroundOperators
+  class Error < StandardError
+    class RateLimitExceeded        < Error; end # 403
+    class TemporarilyUnavailable   < Error; end # 503
+    class NotFound                 < Error; end # 404
+    class InvalidRequestOrResponse < Error; end # 500
+    class UnknownError             < Error; end # Huh?
+  end
+end

data/lib/bitly_quickly/version.rb

@@ -1,3 +1,4 @@
 class BitlyQuickly
-  VERSION = '0.0.5'
+  # Version number, happy now?
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitly_quickly
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Oldrich Vetesnik
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,44 +16,86 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.31'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.31'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -66,34 +108,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.11'
 description: Shorten URLs with bit.ly API, make parallel requests.
 email:
 - oldrich.vetesnik@gmail.com
@@ -103,16 +159,20 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop-my.yml"
+- ".rubocop.yml"
 - ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE.txt
 - README.md
+- Rakefile
+- bin/console
+- bin/setup
 - bitly_quickly.gemspec
 - lib/bitly_quickly.rb
+- lib/bitly_quickly/error.rb
 - lib/bitly_quickly/version.rb
-- spec/lib/bitly_quickly_spec.rb
-- spec/request_stubs.rb
-- spec/spec_helper.rb
 homepage: https://github.com/ollie/bitly_quickly
 licenses:
 - MIT
@@ -133,12 +193,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Shorten URLs with bit.ly API
-test_files:
-- spec/lib/bitly_quickly_spec.rb
-- spec/request_stubs.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: 

data/spec/lib/bitly_quickly_spec.rb

@@ -1,139 +0,0 @@
-require 'spec_helper'
-
-describe BitlyQuickly do
-  it 'fails to make a client' do
-    expect { BitlyQuickly.new }.to raise_error
-  end
-
-  context 'With access_token' do
-    before do
-      @client = BitlyQuickly.new access_token: 'token'
-    end
-
-    it 'access_token' do
-      expect(@client.access_token).to eq('token')
-    end
-
-    it 'api_address' do
-      expect(@client.api_address).to eq(BitlyQuickly::DEFAULT_API_ADDRESS)
-    end
-  end
-
-  context 'With access_token and api_address' do
-    before do
-      @client = BitlyQuickly.new access_token: 'token', api_address: 'http://api.bitly.com'
-    end
-
-    it 'api_address' do
-      expect(@client.api_address).to eq('http://api.bitly.com')
-    end
-  end
-
-  context 'Methods' do
-    before do
-      @client = BitlyQuickly.new access_token: 'token'
-    end
-
-    it 'api_url' do
-      expect(@client.api_url('/test')).to eq('https://api-ssl.bitly.com/test')
-    end
-
-    it 'makes request' do
-      expect(@client.make_shorten_request('http://example.org/1')).to be_kind_of(Typhoeus::Request)
-    end
-  end
-
-  # Success
-
-  context 'Response with valid token' do
-    before do
-      @client = BitlyQuickly.new access_token: 'valid_token'
-    end
-
-    it 'raises an execption' do
-      expect { @client.shorten('http://example.org/200/1') }.to_not raise_error
-    end
-
-    it 'status code' do
-      expect(@client.shorten('http://example.org/200/1')).to eq('http://pht.io/1eyUhF1')
-    end
-  end
-
-  context 'Many requests' do
-    before do
-      @client = BitlyQuickly.new access_token: 'valid_token'
-    end
-
-    it 'makes many requests' do
-      request_urls = [
-        'http://example.org/200/1',
-        'http://example.org/200/2',
-        'http://example.org/200/3',
-        'http://example.org/200/4',
-        'http://example.org/200/5',
-      ]
-
-      response_urls = {
-        'http://example.org/200/1' => 'http://pht.io/1eyUhF1',
-        'http://example.org/200/2' => 'http://pht.io/1eyUhF2',
-        'http://example.org/200/3' => 'http://pht.io/1eyUhF3',
-        'http://example.org/200/4' => 'http://pht.io/1eyUhF4',
-        'http://example.org/200/5' => 'http://pht.io/1eyUhF5',
-      }
-
-      expect(@client.shorten(request_urls)).to eq(response_urls)
-    end
-  end
-
-  # Errors
-
-  context 'Response 403' do
-    before do
-      @client = BitlyQuickly.new access_token: 'token'
-    end
-
-    it 'raises an execption' do
-      expect { @client.shorten('http://example.org/403') }.to raise_error(BitlyQuickly::RateLimitExceededError)
-    end
-  end
-
-  context 'Response 503' do
-    before do
-      @client = BitlyQuickly.new access_token: 'token'
-    end
-
-    it 'raises an execption' do
-      expect { @client.shorten('http://example.org/503') }.to raise_error(BitlyQuickly::TemporarilyUnavailableError)
-    end
-  end
-
-  context 'Response 404' do
-    before do
-      @client = BitlyQuickly.new access_token: 'token'
-    end
-
-    it 'raises an execption' do
-      expect { @client.shorten('http://example.org/404') }.to raise_error(BitlyQuickly::NotFoundError)
-    end
-  end
-
-  context 'Response 500' do
-    before do
-      @client = BitlyQuickly.new access_token: 'token'
-    end
-
-    it 'raises an execption' do
-      expect { @client.shorten('http://example.org/500') }.to raise_error(BitlyQuickly::InvalidRequestOrResponseError)
-    end
-  end
-
-  context 'Response 666' do
-    before do
-      @client = BitlyQuickly.new access_token: 'token'
-    end
-
-    it 'raises an execption' do
-      expect { @client.shorten('http://example.org/666') }.to raise_error(BitlyQuickly::UnknownError)
-    end
-  end
-end

data/spec/request_stubs.rb

@@ -1,37 +0,0 @@
-1.upto(5) do |n|
-  WebMock.stub_request(:get, %(https://api-ssl.bitly.com/v3/shorten?access_token=valid_token&longUrl=http://example.org/200/#{ n })).
-    to_return(
-      status: 200,
-      body: %({ "status_code": 200, "status_txt": "OK", "data": { "long_url": "http:\/\/example.org\/200\/#{ n }", "url": "http:\/\/pht.io\/1eyUhF#{ n }", "hash": "1eyUhFo", "global_hash": "2V6CFi", "new_hash": 0 } })
-    )
-end
-
-WebMock.stub_request(:get, 'https://api-ssl.bitly.com/v3/shorten?access_token=token&longUrl=http://example.org/403').
-  to_return(
-    status: 200,
-    body: '{ "data": null, "status_code": 403, "status_txt": "RATE_LIMIT_EXCEEDED" }'
-  )
-
-WebMock.stub_request(:get, 'https://api-ssl.bitly.com/v3/shorten?access_token=token&longUrl=http://example.org/404').
-  to_return(
-    status: 200,
-    body: '{ "data": null, "status_code": 404, "status_txt": "NOT_FOUND" }'
-  )
-
-WebMock.stub_request(:get, 'https://api-ssl.bitly.com/v3/shorten?access_token=token&longUrl=http://example.org/500').
-  to_return(
-    status: 200,
-    body: '{ "data": null, "status_code": 500, "status_txt": "INVALID_URI" }'
-  )
-
-WebMock.stub_request(:get, 'https://api-ssl.bitly.com/v3/shorten?access_token=token&longUrl=http://example.org/503').
-  to_return(
-    status: 200,
-    body: '{ "data": null, "status_code": 503, "status_txt": "UNKNOWN_ERROR" }'
-  )
-
-WebMock.stub_request(:get, 'https://api-ssl.bitly.com/v3/shorten?access_token=token&longUrl=http://example.org/666').
-  to_return(
-    status: 200,
-    body: '{ "data": null, "status_code": 666, "status_txt": "WHO_KNOWS" }'
-  )

data/spec/spec_helper.rb

@@ -1,12 +0,0 @@
-require 'bundler/setup'
-
-require 'simplecov'
-require 'webmock' # Disable all HTTP access
-
-# Coverage tool, needs to be started as soon as possible
-SimpleCov.start do
-  add_filter '/spec/' # Ignore spec directory
-end
-
-require 'request_stubs'
-require 'bitly_quickly'