bitly_quickly 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d359577bdaa34c60135ce813d2df657b16c69a4
-  data.tar.gz: 50d8201cc818ce629dd95f6e5a4fa2146308922c
+  metadata.gz: cc642eb00ffcbbe76c53e87d63f13eac6821cc36
+  data.tar.gz: f6deeab3d454752ebea1fca7dc1abab848211bc4
 SHA512:
-  metadata.gz: ad9bab5c499ea454db79bcb8cd57b9f9b7709ffa5abf0568d45da2adab39462ccc55b6557880b32ecd0ff47c32dcbb65bb4c609599961aa20b3617cd5bb8f500
-  data.tar.gz: 61ba5554b55af1bd439f0f1cb2e645ffcacbd0bcbffb4da66aecb0099723b4c914bf165af0344cc3380dfaaacda6201ec75e96f9688d4e61242360ffcf423ad0
+  metadata.gz: 7f4ba7db16ebe33411651facba34be59a88ac15d17aca34c063e0e49faf72ad436d5b2c180f66616b1aae00ec1a080ecfa981dff3f9fafe9cbd4b9c29294ac9e
+  data.tar.gz: 326d27a4874010aa9853e4055a85707823842ff60b8aa04ebfbda6cc46e6619633240592f635c08a34e357c6e8cbcb8fc971b203a71486c5d6f3c4b271e6c98e

data/lib/bitly_quickly.rb

@@ -5,7 +5,12 @@ require 'bitly_quickly/version'
 
 # V3 Wrapper
 class BitlyQuickly
-  class InvalidAccessToken < StandardError; end
+  class BitlyError                    < StandardError; end
+  class RateLimitExceededError        < BitlyError; end
+  class TemporarilyUnavailableError   < BitlyError; end
+  class NotFoundError                 < BitlyError; end
+  class InvalidRequestOrResponseError < BitlyError; end
+  class UnknownError                  < BitlyError; end
 
   DEFAULT_API_ADDRESS = 'https://api-ssl.bitly.com'
   OJ_OPTIONS          = {
@@ -67,9 +72,6 @@ class BitlyQuickly
           access_token: access_token,
           longUrl:      long_url
         },
-        headers: {
-          user_agent: 'Photolane.co'
-        }
       }
     )
 
@@ -91,9 +93,20 @@ class BitlyQuickly
   def response_to_json(response)
     json_response = parse_response response
 
-    raise InvalidAccessToken if json_response[:status_txt] == 'INVALID_ARG_ACCESS_TOKEN'
-
-    json_response
+    case json_response[:status_code]
+    when 200
+      return json_response
+    when 403
+      raise RateLimitExceededError, json_response[:status_txt]
+    when 404
+      raise NotFoundError, json_response[:status_txt]
+    when 500
+      raise InvalidRequestOrResponseError, json_response[:status_txt]
+    when 503
+      raise TemporarilyUnavailableError, json_response[:status_txt]
+    else
+      raise UnknownError, json_response[:status_txt]
+    end
   end
 
   def parse_response(response)

data/lib/bitly_quickly/version.rb

@@ -1,3 +1,3 @@
 class BitlyQuickly
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/lib/bitly_quickly_spec.rb

@@ -39,19 +39,11 @@ describe BitlyQuickly do
     end
 
     it 'makes request' do
-      expect(@client.make_shorten_request('http://www.google.com/1')).to be_kind_of(Typhoeus::Request)
+      expect(@client.make_shorten_request('http://example.org/1')).to be_kind_of(Typhoeus::Request)
     end
   end
 
-  context 'Response with invalid token' do
-    before do
-      @client = BitlyQuickly.new access_token: 'token'
-    end
-
-    it 'raises an execption' do
-      expect { @client.shorten('http://www.google.com/1') }.to raise_error
-    end
-  end
+  # Success
 
   context 'Response with valid token' do
     before do
@@ -59,11 +51,11 @@ describe BitlyQuickly do
     end
 
     it 'raises an execption' do
-      expect { @client.shorten('http://www.google.com/1') }.to_not raise_error
+      expect { @client.shorten('http://example.org/200/1') }.to_not raise_error
     end
 
     it 'status code' do
-      expect(@client.shorten('http://www.google.com/1')).to eq('http://pht.io/1eyUhF1')
+      expect(@client.shorten('http://example.org/200/1')).to eq('http://pht.io/1eyUhF1')
     end
   end
 
@@ -74,22 +66,74 @@ describe BitlyQuickly do
 
     it 'makes many requests' do
       request_urls = [
-        'http://www.google.com/1',
-        'http://www.google.com/2',
-        'http://www.google.com/3',
-        'http://www.google.com/4',
-        'http://www.google.com/5',
+        '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://www.google.com/1' => 'http://pht.io/1eyUhF1',
-        'http://www.google.com/2' => 'http://pht.io/1eyUhF2',
-        'http://www.google.com/3' => 'http://pht.io/1eyUhF3',
-        'http://www.google.com/4' => 'http://pht.io/1eyUhF4',
-        'http://www.google.com/5' => 'http://pht.io/1eyUhF5',
+        '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
+    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
+    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
+    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
+    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
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'simplecov'
-require 'webmock/rspec' # Disable all HTTP access
+require 'webmock' # Disable all HTTP access
 
 # Coverage tool, needs to be started as soon as possible
 SimpleCov.start do
@@ -8,22 +8,40 @@ end
 
 require 'bitly_quickly'
 
-RSpec.configure do |config|
-  config.before(:each) do
-    stub_request(:get, 'https://api-ssl.bitly.com/v3/shorten?access_token=token&longUrl=http://www.google.com/1').
-      with(headers: { 'User-Agent' => 'Photolane.co' }).
-      to_return(
-        status: 200,
-        body: '{ "data": [ ], "status_code": 500, "status_txt": "INVALID_ARG_ACCESS_TOKEN" }'
-      )
-
-    1.upto(5) do |n|
-      stub_request(:get, %(https://api-ssl.bitly.com/v3/shorten?access_token=valid_token&longUrl=http://www.google.com/#{ n })).
-        with(headers: { 'User-Agent' => 'Photolane.co' }).
-        to_return(
-          status: 200,
-          body: %({ "status_code": 200, "status_txt": "OK", "data": { "long_url": "http:\/\/www.google.com\/#{ n }", "url": "http:\/\/pht.io\/1eyUhF#{ n }", "hash": "1eyUhFo", "global_hash": "2V6CFi", "new_hash": 0 } })
-        )
-    end
-  end
+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" }'
+  )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitly_quickly
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Oldrich Vetesnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Shorten URLs with bit.ly API