ruby-bitly 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c173fdedc9e8eb666ec603ae9f8d3cee19e3b070
-  data.tar.gz: 7bf398863c2f068f3d52ca8f5d15347ae885101f
+  metadata.gz: ff50be2b324d891776449f31237b35f8d95aa265
+  data.tar.gz: c99ae534047471483cc3585e2d7dc35d6b5793d5
 SHA512:
-  metadata.gz: 7afbb33e8e8524bcd6c7259b5e831cfe51ece8292dd0d0486067d6bcd00299035d4a406a01ecf106fb8c1041c9682023253bbf485528ce87332c7f5c0aec07f0
-  data.tar.gz: f8369b7e41778a32a12ff74dc8222392982dd3142d41c4e3048abd5784427ff3b1419cc70e376bc3b4552ff6592f7a15d4fbb9118407526683b35e3048b574e6
+  metadata.gz: 3f6f11d961827a80b1d76f32e8432d7b2aa773e9db87ea6cb8a64ba691ea7c768ec3f9b107150d53d148c551f16773e13ff4f6b788b864a42b032a7944f809ac
+  data.tar.gz: c2e528bc64410d3611886f326475c3c5b99bffc124343d90fbece352e5acf76af3a89160ed35440827e8e359dc318b23fc81a95c2cf55a017fa57e4138c0c259

data/.gitignore

@@ -13,6 +13,9 @@ tmtags
 ## VIM
 *.swp
 
+## BUNDLER
+.bundle
+
 ## PROJECT::GENERAL
 coverage
 rdoc

data/CHANGELOG

@@ -1,4 +1,13 @@
-# 0.1.4
+# 0.1.7
+
+- Add new possibility to use named parameters
+- Add support for custom domains
+
+# 0.1.6
+
+- Code improvements
+
+# 0.1.5
 
 - Code improvements
 

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in ruby-bitly.gemspec
 gemspec
@@ -10,7 +10,7 @@ group :development, :test do
   end
 
   platforms :ruby_19, :ruby_20 do
-    gem 'debugger'
+    gem 'debugger', '1.6.5'
   end
 
 end

data/Gemfile.lock

@@ -1,58 +1,79 @@
 PATH
   remote: .
   specs:
-    ruby-bitly (0.1.6)
-      json_pure (~> 1.7)
-      rest-client (~> 1.6)
+    ruby-bitly (0.1.7)
+      rest-client (~> 2.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.3.3)
-    columnize (0.3.6)
-    crack (0.3.2)
-    debugger (1.4.0)
+    addressable (2.4.0)
+    byebug (9.0.6)
+    columnize (0.9.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    debugger (1.6.5)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.2.0)
-    diff-lcs (1.2.1)
-    json_pure (1.7.7)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mime-types (1.21)
-    rake (10.0.3)
-    rbx-require-relative (0.0.9)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.1)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.8)
+    diff-lcs (1.2.5)
+    domain_name (0.5.20160826)
+      unf (>= 0.0.5, < 1.0.0)
+    hashdiff (0.3.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    linecache (1.3.1)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    netrc (0.11.0)
+    rake (11.3.0)
+    rest-client (2.0.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    vcr (1.10.3)
-    webmock (1.6.4)
-      addressable (~> 2.2, > 2.2.5)
-      crack (>= 0.1.7)
+    safe_yaml (1.0.4)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
+    vcr (3.0.3)
+    webmock (2.1.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  debugger
+  byebug
+  debugger (= 1.6.5)
   rake
-  rspec (~> 2.13)
+  rspec (~> 3.5)
   ruby-bitly!
   ruby-debug
-  vcr (~> 1.10.0)
-  webmock (~> 1.6.4)
+  vcr (~> 3.0)
+  webmock (~> 2.1)
+
+BUNDLED WITH
+   1.13.1

data/README.rdoc

@@ -1,22 +1,67 @@
 = A simple bit.ly ruby client.
 
-== Examples
+{<img src="https://codeclimate.com/github/dx7/ruby-bitly/badges/gpa.svg" />}[https://codeclimate.com/github/dx7/ruby-bitly]
+
+
+== Shorten
   require 'ruby-bitly'
 
-  bitly = Bitly.shorten("http://rafaeldx7.github.com", "username", "key-here")
+  # old way (deprecated)
+  bitly = Bitly.shorten("https://dx7.github.io/", "login-here", "key-here")
 
-  bitly.url #=> "http://bit.ly/le0JRh"
+  # new way
+  bitly = Bitly.shorten(long_url: "https://dx7.github.io/", login: "login-here", api_key: "key-here")
+
+  bitly.url #=> "http://bit.ly/2dAjjfo"
 
   y bitly
-    :long_url: http://rafaeldx7.github.com/
-    :url: http://bit.ly/le0JRh
-    :hash: le0JRh
+    :long_url: http://dx7.github.io/
+    :url: http://bit.ly/2dAjjfo
+    :hash: 2dAjjfo
     :global_hash: micSj7
     :new_hash: 0
-    :hash_path: le0JRh
+    :hash_path: 2dAjjfo
     :status_code: 200
     :status_txt: OK
 
+
+== Expand
+  require 'ruby-bitly'
+
+  # old way (deprecated)
+  bitly = Bitly.expand("http://bit.ly/2dAjjfo", "login-here", "key-here")
+
+  # new way
+  bitly = Bitly.expand(short_url: "http://bit.ly/2dAjjfo", login: "login-here", api_key: "key-here")
+
+  y bitly
+    :short_url: http://bit.ly/2dAjjfo
+    :long_url: https://dx7.github.io/
+    :user_hash: 2dAjjfo
+    :global_hash: 2dAkyet
+    :status_code: 200
+    :status_txt: OK
+
+
+== Get Clicks
+  require 'ruby-bitly'
+
+  # old way (deprecated)
+  bitly = Bitly.get_clicks("http://bit.ly/2dAjjfo", "login-here", "key-here")
+
+  # new way
+  bitly = Bitly.get_clicks(short_url: "http://bit.ly/2dAjjfo", login: "login-here", api_key: "key-here")
+
+  y bitly
+    :short_url: https://bit.ly/2dAjjfo
+    :global_hash: 2dAkyet
+    :user_clicks: 0
+    :user_hash: 2dAjjfo
+    :global_clicks: 0
+    :status_code: 200
+    :status_txt: OK
+
+
 == Command Line Examples
   Usage
     bitly [options] url
@@ -24,14 +69,14 @@
     For help: bitly -h
 
   Basic examples:
-    bitly -s http://xlii.com.br
-    bitly -e http://bit.ly/XLII42
-    bitly --user-clicks http://bit.ly/XLII42
-    bitly --global-clicks http://bit.ly/XLII42
+    bitly -s http://dx7.github.io
+    bitly -e http://bit.ly/2dAjjfo
+    bitly --user-clicks http://bit.ly/2dAjjfo
+    bitly --global-clicks http://bit.ly/2dAjjfo
 
   Other examples:
-    bitly -q -s http://xlii.com.br
-    bitly --verbose -e http://bit.ly/XLII42
+    bitly -q -s http://dx7.github.io
+    bitly --verbose -e http://bit.ly/2dAjjfo
 
   Options
     -s, --shorten        Shorten a long url (default option)
@@ -47,22 +92,25 @@
     -q, --quiet          Output as little as possible, overrides verbose
     -V, --verbose        Verbose output
 
+
 === Authentication
-  bit.ly API require that authentication credentials be supplied.
+  bit.ly API requires authentication credentials.
 
-  To get started, you'll need a free bit.ly user account and apiKey. Signup at: http://bit.ly/a/sign_up
+  You need a free bit.ly user account and apiKey. Signup at: http://bit.ly/a/sign_up
   If you already have an account, you can find your apiKey at: http://bit.ly/a/your_api_key
 
-  You can supply credentials as parameters. By example:
-    bitly -l <username> -k <key-here> -s http://xlii.com.br
+  You can supply credentials as parameters. For example:
+    bitly -l <username> -k <key-here> -s http://dx7.github.io
 
   Or you can create the file ~/.bitly (YAML format) with this content:
     login: <username>
     key: <key-here>
 
+
 == Author
-    rafaeldx7 ~ rafaeldx7(a)gmail.com
+    dx7 ~ dx7(a)protonmail.ch
+
 
 == Copyright
-    Copyright (c) 2010 rafaeldx7. Licensed under the MIT License:
+    Copyright (c) 2010 dx7. Licensed under the MIT License:
     http://www.opensource.org/licenses/mit-license.php

data/bin/bitly

@@ -128,10 +128,10 @@ class App
     end
 
     def process_command
-      return Bitly.shorten(arguments.first, options.login, options.key).url if options.shorten
-      return Bitly.expand(arguments.first, options.login, options.key).long_url if options.expand
-      return Bitly.get_clicks(arguments.first, options.login, options.key).user_clicks.to_s if options.user_clicks
-      return Bitly.get_clicks(arguments.first, options.login, options.key).global_clicks.to_s if options.global_clicks
+      return Bitly.shorten(:long_url => arguments.first, :login => options.login, :api_key => options.key).url if options.shorten
+      return Bitly.expand(:short_url => arguments.first, :login => options.login, :api_key => options.key).long_url if options.expand
+      return Bitly.get_clicks(:short_url => arguments.first, :login => options.login, :api_key => options.key).user_clicks.to_s if options.user_clicks
+      return Bitly.get_clicks(:short_url => arguments.first, :login => options.login, :api_key => options.key).global_clicks.to_s if options.global_clicks
     end
 end
 

data/fixtures/vcr_cassettes/expand_a_long_url_should_result_an_error.yml

@@ -1,36 +1,45 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :post
-    uri: http://api.bit.ly:80/v3/expand
-    body: shortURL=http%3A%2F%2Fgoogle.com&login=my-login&apiKey=my-secret-key
-    headers: 
-      accept: 
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://api.bit.ly/v3/expand
+    body:
+      encoding: UTF-8
+      string: shortURL=http%3A%2F%2Fgoogle.com&login=my-login&apiKey=my-api-key
+    headers:
+      Accept:
       - "*/*; q=0.5, application/xml"
-      accept-encoding: 
+      Accept-Encoding:
       - gzip, deflate
-      content-length: 
-      - "90"
-      content-type: 
+      Content-Length:
+      - '90'
+      Content-Type:
       - application/x-www-form-urlencoded
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+      User-Agent:
+      - Ruby
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      Server:
       - nginx
-      date: 
-      - Sat, 28 May 2011 17:22:28 GMT
-      content-type: 
+      Date:
+      - Sat, 01 Oct 2016 19:29:26 GMT
+      Content-Type:
       - application/json; charset=utf-8
-      connection: 
+      Content-Length:
+      - '131'
+      Connection:
       - keep-alive
-      mime-version: 
-      - "1.0"
-      content-length: 
-      - "131"
-    body: |
-      { "status_code": 200, "status_txt": "OK", "data": { "expand": [ { "error": "NOT_FOUND", "short_url": "http:\/\/google.com" } ] } }
+      Mime-Version:
+      - '1.0'
+    body:
+      encoding: UTF-8
+      string: '{ "status_code": 200, "status_txt": "OK", "data": { "expand": [ { "error":
+        "NOT_FOUND", "short_url": "http:\/\/google.com" } ] } }
 
-    http_version: "1.1"
+'
+    http_version: 
+  recorded_at: Sat, 01 Oct 2016 19:29:26 GMT
+recorded_with: VCR 3.0.3

data/fixtures/vcr_cassettes/expand_a_short_url_to_it_long_url.yml

@@ -1,36 +1,46 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :post
-    uri: http://api.bit.ly:80/v3/expand
-    body: shortURL=http%3A%2F%2Fbit.ly%2FbcvNe5&login=my-login&apiKey=my-secret-key
-    headers: 
-      accept: 
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://api.bit.ly/v3/expand
+    body:
+      encoding: UTF-8
+      string: shortURL=http%3A%2F%2Fbit.ly%2FbcvNe5&login=my-login&apiKey=my-api-key
+    headers:
+      Accept:
       - "*/*; q=0.5, application/xml"
-      accept-encoding: 
+      Accept-Encoding:
       - gzip, deflate
-      content-length: 
-      - "95"
-      content-type: 
+      Content-Length:
+      - '95'
+      Content-Type:
       - application/x-www-form-urlencoded
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+      User-Agent:
+      - Ruby
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      Server:
       - nginx
-      date: 
-      - Sat, 28 May 2011 17:22:27 GMT
-      content-type: 
+      Date:
+      - Sat, 01 Oct 2016 19:29:26 GMT
+      Content-Type:
       - application/json; charset=utf-8
-      connection: 
+      Content-Length:
+      - '197'
+      Connection:
       - keep-alive
-      mime-version: 
-      - "1.0"
-      content-length: 
-      - "197"
-    body: |
-      { "status_code": 200, "status_txt": "OK", "data": { "expand": [ { "short_url": "http:\/\/bit.ly\/bcvNe5", "long_url": "http:\/\/google.com", "user_hash": "bcvNe5", "global_hash": "zzzzzzz" } ] } }
+      Mime-Version:
+      - '1.0'
+    body:
+      encoding: UTF-8
+      string: '{ "status_code": 200, "status_txt": "OK", "data": { "expand": [ { "short_url":
+        "http:\/\/bit.ly\/bcvNe5", "long_url": "http:\/\/google.com", "user_hash":
+        "bcvNe5", "global_hash": "zzzzzzz" } ] } }
 
-    http_version: "1.1"
+'
+    http_version: 
+  recorded_at: Sat, 01 Oct 2016 19:29:26 GMT
+recorded_with: VCR 3.0.3

data/fixtures/vcr_cassettes/get_clicks_by_short_url.yml

@@ -1,30 +1,40 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :get
-    uri: http://api.bit.ly:80/v3/clicks?apiKey=my-secret-key&login=my-login&shortUrl=http://bit.ly/xlii42
-    body: 
-    headers: 
-      accept: 
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api.bit.ly/v3/clicks?apiKey=my-api-key&login=my-login&shortUrl=http://bit.ly/xlii42
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
       - "*/*; q=0.5, application/xml"
-      accept-encoding: 
+      Accept-Encoding:
       - gzip, deflate
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+      User-Agent:
+      - Ruby
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      Server:
       - nginx
-      date: 
-      - Sat, 28 May 2011 17:22:28 GMT
-      content-type: 
+      Date:
+      - Sat, 01 Oct 2016 19:29:27 GMT
+      Content-Type:
       - application/json; charset=utf-8
-      connection: 
+      Content-Length:
+      - '187'
+      Connection:
       - keep-alive
-      content-length: 
-      - "187"
-      etag: 
-      - "\"20a0b40a65714ad5a2440caad07fd5c5518584b7\""
-    body: "{\"status_code\": 200, \"data\": {\"clicks\": [{\"short_url\": \"http://bit.ly/xlii42\", \"global_hash\": \"cunZEP\", \"user_clicks\": 1, \"user_hash\": \"cT1Izu\", \"global_clicks\": 1}]}, \"status_txt\": \"OK\"}"
-    http_version: "1.1"
+      Etag:
+      - '"a6d2ce859ab41b205deb5d920fa10e3143a79bf2"'
+    body:
+      encoding: UTF-8
+      string: '{"status_code": 200, "data": {"clicks": [{"short_url": "http://bit.ly/xlii42",
+        "global_hash": "cunZEP", "user_clicks": 2, "user_hash": "cT1Izu", "global_clicks":
+        2}]}, "status_txt": "OK"}'
+    http_version: 
+  recorded_at: Sat, 01 Oct 2016 19:29:27 GMT
+recorded_with: VCR 3.0.3

data/fixtures/vcr_cassettes/shorten_bitly_url.yml

@@ -1,34 +1,43 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :post
-    uri: http://api.bit.ly:80/v3/shorten
-    body: longURL=http%3A%2F%2Fbit.ly%2FbcvNe5&login=my-login&apiKey=my-secret-key
-    headers: 
-      accept: 
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://api.bit.ly/v3/shorten
+    body:
+      encoding: UTF-8
+      string: longURL=http%3A%2F%2Fbit.ly%2FbcvNe5&login=my-login&apiKey=my-api-key
+    headers:
+      Accept:
       - "*/*; q=0.5, application/xml"
-      accept-encoding: 
+      Accept-Encoding:
       - gzip, deflate
-      content-length: 
-      - "94"
-      content-type: 
+      Content-Length:
+      - '94'
+      Content-Type:
       - application/x-www-form-urlencoded
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+      User-Agent:
+      - Ruby
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      Server:
       - nginx
-      date: 
-      - Sat, 28 May 2011 17:22:26 GMT
-      content-type: 
+      Date:
+      - Sat, 01 Oct 2016 19:29:25 GMT
+      Content-Type:
       - application/json; charset=utf-8
-      connection: 
+      Content-Length:
+      - '73'
+      Connection:
       - keep-alive
-      mime-version: 
-      - "1.0"
-      content-length: 
-      - "73"
-    body: "{ \"data\": [ ], \"status_code\": 500, \"status_txt\": \"ALREADY_A_BITLY_LINK\" }"
-    http_version: "1.1"
+      Mime-Version:
+      - '1.0'
+    body:
+      encoding: UTF-8
+      string: '{ "data": [ ], "status_code": 500, "status_txt": "ALREADY_A_BITLY_LINK"
+        }'
+    http_version: 
+  recorded_at: Sat, 01 Oct 2016 19:29:25 GMT
+recorded_with: VCR 3.0.3

data/fixtures/vcr_cassettes/shorten_long_url.yml

@@ -1,36 +1,46 @@
 ---
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
-    method: :post
-    uri: http://api.bit.ly:80/v3/shorten
-    body: longURL=http%3A%2F%2Fgoogle.com&login=my-login&apiKey=my-secret-key
+http_interactions:
+- request:
+    method: post
+    uri: http://api.bit.ly/v3/shorten
+    body:
+      encoding: UTF-8
+      string: longURL=http%3A%2F%2Fgoogle.com&login=my-login&apiKey=my-api-key
     headers:
-      accept:
+      Accept:
       - "*/*; q=0.5, application/xml"
-      accept-encoding:
+      Accept-Encoding:
       - gzip, deflate
-      content-length:
-      - "89"
-      content-type:
+      Content-Length:
+      - '89'
+      Content-Type:
       - application/x-www-form-urlencoded
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+      User-Agent:
+      - Ruby
+  response:
+    status:
       code: 200
       message: OK
     headers:
-      server:
+      Server:
       - nginx
-      date:
-      - Sat, 28 May 2011 17:11:14 GMT
-      content-type:
+      Date:
+      - Sat, 01 Oct 2016 19:28:37 GMT
+      Content-Type:
       - application/json; charset=utf-8
-      connection:
+      Content-Length:
+      - '184'
+      Connection:
       - keep-alive
-      mime-version:
-      - "1.0"
-      content-length:
-      - "184"
-    body: |
-      { "status_code": 200, "status_txt": "OK", "data": { "long_url": "http:\/\/google.com\/", "url": "http:\/\/bit.ly\/lVW32C", "hash": "lVW32C", "global_hash": "3j4ir4", "new_hash": 3 } }
+      Mime-Version:
+      - '1.0'
+    body:
+      encoding: UTF-8
+      string: '{ "status_code": 200, "status_txt": "OK", "data": { "long_url": "http:\/\/google.com\/",
+        "url": "http:\/\/bit.ly\/lVW32C", "hash": "lVW32C", "global_hash": "3j4ir4",
+        "new_hash": 0 } }
 
-    http_version: "1.1"
+'
+    http_version: 
+  recorded_at: Sat, 01 Oct 2016 19:28:37 GMT
+recorded_with: VCR 3.0.3

data/fixtures/vcr_cassettes/shorten_long_url_with_preferred_domain.yml

@@ -0,0 +1,46 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://api.bit.ly/v3/shorten
+    body:
+      encoding: UTF-8
+      string: longURL=http%3A%2F%2Fgoogle.com&login=my-login&apiKey=my-api-key&domain=j.mp
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Length:
+      - '101'
+      Content-Type:
+      - application/x-www-form-urlencoded
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Sat, 01 Oct 2016 19:29:25 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '182'
+      Connection:
+      - keep-alive
+      Mime-Version:
+      - '1.0'
+    body:
+      encoding: UTF-8
+      string: '{ "status_code": 200, "status_txt": "OK", "data": { "long_url": "http:\/\/google.com\/",
+        "url": "http:\/\/j.mp\/lVW32C", "hash": "lVW32C", "global_hash": "3j4ir4",
+        "new_hash": 0 } }
+
+'
+    http_version: 
+  recorded_at: Sat, 01 Oct 2016 19:29:25 GMT
+recorded_with: VCR 3.0.3

data/lib/ruby-bitly.rb

@@ -12,8 +12,37 @@ class Bitly < OpenStruct
   class << self
     attr_accessor :login, :key
 
-    def shorten(new_long_url, login = self.login, key = self.key)
-      response = JSON.parse RestClient.post(REST_API_URL + ACTION_PATH[:shorten], { :longURL => new_long_url, :login => login, :apiKey => key })
+    # Old API:
+    #
+    # shorten(long_url, login = self.login, key = self.key)
+    #
+    # New API:
+    #
+    # shorten(options)
+    #
+    # Options can have:
+    #
+    # :long_url
+    # :login
+    # :api_key
+    # :domain
+    def shorten(long_url, login = self.login, key = self.key)
+      if long_url.is_a?(Hash)
+        options = long_url
+        long_url = options[:long_url]
+        login = options[:login] || self.login
+        key = options[:api_key] || self.key
+      else
+        options = {}
+      end
+
+      params = { :longURL => long_url, :login => login, :apiKey => key }
+
+      if options[:domain]
+        params[:domain] = options[:domain]
+      end
+
+      response = JSON.parse RestClient.post(REST_API_URL + ACTION_PATH[:shorten], params)
       response.delete("data") if response["data"].empty?
 
       bitly = new response["data"]
@@ -25,8 +54,30 @@ class Bitly < OpenStruct
       bitly
     end
 
-    def expand(new_short_url, login = self.login, key = self.key)
-      response = JSON.parse RestClient.post(REST_API_URL + ACTION_PATH[:expand], { :shortURL => new_short_url, :login => login, :apiKey => key })
+    # Old API:
+    #
+    # expand(short_url, login = self.login, key = self.key)
+    #
+    # New API:
+    #
+    # expand(options)
+    #
+    # Options can have:
+    #
+    # :long_url
+    # :login
+    # :api_key
+    def expand(short_url, login = self.login, key = self.key)
+      if short_url.is_a?(Hash)
+        options = short_url
+        short_url = options[:short_url]
+        login = options[:login] || self.login
+        key = options[:api_key] || self.key
+      else
+        options = {}
+      end
+
+      response = JSON.parse RestClient.post(REST_API_URL + ACTION_PATH[:expand], { :shortURL => short_url, :login => login, :apiKey => key })
 
       bitly = new(response["data"]["expand"].first)
       bitly.status_code = response["status_code"]
@@ -36,8 +87,30 @@ class Bitly < OpenStruct
       bitly
     end
 
-    def get_clicks(new_short_url, login = self.login, key = self.key)
-      response = JSON.parse RestClient.get("#{REST_API_URL}#{ACTION_PATH[:clicks]}?login=#{login}&apiKey=#{key}&shortUrl=#{new_short_url}")
+    # Old API:
+    #
+    # get_clicks(short_url, login = self.login, key = self.key)
+    #
+    # New API:
+    #
+    # get_clicks(options)
+    #
+    # Options can have:
+    #
+    # :long_url
+    # :login
+    # :api_key
+    def get_clicks(short_url, login = self.login, key = self.key)
+      if short_url.is_a?(Hash)
+        options = short_url
+        short_url = options[:short_url]
+        login = options[:login] || self.login
+        key = options[:api_key] || self.key
+      else
+        options = {}
+      end
+
+      response = JSON.parse RestClient.get("#{REST_API_URL}#{ACTION_PATH[:clicks]}?login=#{login}&apiKey=#{key}&shortUrl=#{short_url}")
 
       bitly = new(response["data"]["clicks"].first)
       bitly.status_code = response["status_code"]

data/lib/ruby-bitly/version.rb

@@ -1,3 +1,3 @@
 module BitlyGem
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/ruby-bitly.gemspec

@@ -5,19 +5,19 @@ require "ruby-bitly/version"
 Gem::Specification.new do |s|
   s.name          = "ruby-bitly"
   s.version       = BitlyGem::VERSION
-  s.authors       = ["rafaeldx7"]
-  s.email         = ["rafaeldx7@gmail.com"]
-  s.homepage      = "http://github.com/rafaeldx7/ruby-bitly"
+  s.authors       = ["dx7"]
+  s.email         = ["dx7@protonmail.ch"]
+  s.homepage      = "http://github.com/dx7/ruby-bitly"
   s.summary       = %q{A simple bit.ly ruby client}
   s.description   = %q{A simple bit.ly ruby client}
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency('rest-client', '~> 1.6')
-  s.add_dependency('json_pure', '~> 1.7')
+  s.add_dependency('rest-client', '~> 2.0')
+  s.add_development_dependency('byebug')
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.13')
-  s.add_development_dependency('vcr', '~> 1.10.0')
-  s.add_development_dependency('webmock', '~> 1.6.4')
+  s.add_development_dependency('rspec', '~> 3.5')
+  s.add_development_dependency('vcr', '~> 3.0')
+  s.add_development_dependency('webmock', '~> 2.1')
 end

data/spec/ruby-bitly_spec.rb

@@ -1,69 +1,122 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'byebug'
 
 describe "RubyBitly" do
 
-  before(:all) do
-    @login = 'my-login'
-    @key = 'my-secret-key'
+  let(:login) { ENV['RUBY_BITLY_LOGIN'] || 'my-login' }
+  let(:key) { ENV['RUBY_BITLY_APIKEY'] || 'my-api-key' }
+
+  it "Shorten long url using old API" do
+    response = VCR.use_cassette('shorten_long_url') do
+      Bitly.shorten("http://google.com", login, key)
+    end
+
+    expect(response.status_txt).to eq("OK")
+    expect(response.status_code).to eq(200)
+    expect(response.new_hash).to eq(0)
+    expect(response.global_hash).not_to be_empty
+    expect(response.hash_path.length).not_to eq(0)
+    expect(response.url).to match(/^http:\/\/bit\.ly\/[A-Za-z0-9]*/)
   end
 
-  it "Shorten long url" do
+  it 'Shorten long url using options API' do
     response = VCR.use_cassette('shorten_long_url') do
-      Bitly.shorten("http://google.com", @login, @key)
+      Bitly.shorten(:long_url => "http://google.com", :login => login, :api_key => key)
     end
 
-    response.status_code.should == 200
-    response.status_txt.should == "OK"
-    response.new_hash.should == 3
-    response.global_hash.should_not be_empty
-    response.hash_path.length.should_not == 0
-    response.url.should match /^http:\/\/bit\.ly\/[A-Za-z0-9]*/
+    expect(response.status_txt).to eq("OK")
+    expect(response.status_code).to eq(200)
+    expect(response.new_hash).to eq(0)
+    expect(response.global_hash).not_to be_empty
+    expect(response.hash_path.length).not_to eq(0)
+    expect(response.url).to match(/^http:\/\/bit\.ly\/[A-Za-z0-9]*/)
+  end
+
+  it 'Shorten url with a preferred domain' do
+    response = VCR.use_cassette('shorten_long_url_with_preferred_domain') do
+      Bitly.shorten(:long_url => "http://google.com", :domain => 'j.mp',
+        :login => login, :api_key => key)
+    end
+
+    expect(response.status_txt).to eq("OK")
+    expect(response.status_code).to eq(200)
+    expect(response.new_hash).to eq(0)
+    expect(response.global_hash).not_to be_empty
+    expect(response.hash_path.length).not_to eq(0)
+    expect(response.url).to match(/^http:\/\/j\.mp\/[A-Za-z0-9]*/)
   end
 
   it "Shorten bitly url" do
     response = VCR.use_cassette('shorten_bitly_url') do
-      Bitly.shorten("http://bit.ly/bcvNe5", @login, @key)
+      Bitly.shorten("http://bit.ly/bcvNe5", login, key)
+    end
+
+    expect(response.status_txt).to eq("ALREADY_A_BITLY_LINK")
+    expect(response.status_code).to eq(500)
+  end
+
+  it "Expand a short url to it long url using old API" do
+    response = VCR.use_cassette('expand_a_short_url_to_it_long_url') do
+      Bitly.expand("http://bit.ly/bcvNe5", login, key)
     end
 
-    response.status_code.should == 500
+    expect(response.status_txt).to eq("OK")
+    expect(response.status_code).to eq(200)
+    expect(response.long_url).to eq("http://google.com")
+    expect(response.short_url).to eq("http://bit.ly/bcvNe5")
+    expect(response.user_hash).to eq("bcvNe5")
   end
 
-  it "Expand a short url to it long url" do
+  it "Expand a short url to it long url using options API" do
     response = VCR.use_cassette('expand_a_short_url_to_it_long_url') do
-      Bitly.expand("http://bit.ly/bcvNe5", @login, @key)
+      Bitly.expand({ :short_url => "http://bit.ly/bcvNe5", :login => login, :api_key => key })
     end
 
-    response.status_code.should == 200
-    response.status_txt.should == "OK"
-    response.long_url.should == "http://google.com"
-    response.short_url.should == "http://bit.ly/bcvNe5"
-    response.user_hash.should == "bcvNe5"
+    expect(response.status_txt).to eq("OK")
+    expect(response.status_code).to eq(200)
+    expect(response.long_url).to eq("http://google.com")
+    expect(response.short_url).to eq("http://bit.ly/bcvNe5")
+    expect(response.user_hash).to eq("bcvNe5")
   end
 
   it "Expand a long url should result an error" do
     response = VCR.use_cassette('expand_a_long_url_should_result_an_error') do
-      Bitly.expand("http://google.com", @login, @key)
+      Bitly.expand("http://google.com", login, key)
     end
 
-    response.status_code.should == 200
-    response.status_txt.should == "OK"
-    response.long_url.should == "NOT_FOUND"
-    response.short_url.should == "http://google.com"
+    expect(response.status_txt).to eq("OK")
+    expect(response.status_code).to eq(200)
+    expect(response.long_url).to eq("NOT_FOUND")
+    expect(response.short_url).to eq("http://google.com")
   end
 
 
-  it "Get clicks by short_url" do
+  it "Get clicks by short_url using old API" do
+    bitly = VCR.use_cassette('get_clicks_by_short_url') do
+      Bitly.get_clicks("http://bit.ly/xlii42", login, key)
+    end
+
+    expect(bitly.status_txt).to eq("OK")
+    expect(bitly.status_code).to eq(200)
+    expect(bitly.global_clicks).to be_an_instance_of Fixnum
+    expect(bitly.user_clicks).to be_an_instance_of Fixnum
+    expect(bitly.short_url).to eq("http://bit.ly/xlii42")
+    expect(bitly.global_hash).to eq("cunZEP")
+    expect(bitly.user_hash).to eq("cT1Izu")
+  end
+
+  it "Get clicks by short_url using options API" do
     bitly = VCR.use_cassette('get_clicks_by_short_url') do
-      Bitly.get_clicks("http://bit.ly/xlii42", @login, @key)
+      Bitly.get_clicks(:short_url => "http://bit.ly/xlii42", :login => login, :api_key => key)
     end
 
-    bitly.status_txt.should == "OK"
-    bitly.status_code.should == 200
-    bitly.global_clicks.should be_an_instance_of Fixnum
-    bitly.user_clicks.should be_an_instance_of Fixnum
-    bitly.short_url.should == "http://bit.ly/xlii42"
-    bitly.global_hash.should == "cunZEP"
-    bitly.user_hash.should == "cT1Izu"
+    expect(bitly.status_txt).to eq("OK")
+    expect(bitly.status_code).to eq(200)
+    expect(bitly.global_clicks).to be_an_instance_of Fixnum
+    expect(bitly.user_clicks).to be_an_instance_of Fixnum
+    expect(bitly.short_url).to eq("http://bit.ly/xlii42")
+    expect(bitly.global_hash).to eq("cunZEP")
+    expect(bitly.user_hash).to eq("cT1Izu")
   end
 end

data/spec/spec_helper.rb

@@ -3,12 +3,11 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ruby-bitly'
 require 'rspec'
-require 'rspec/autorun'
 require 'vcr'
 
-VCR.config do |c|
+VCR.configure do |c|
   c.cassette_library_dir = 'fixtures/vcr_cassettes'
   c.ignore_localhost = true
-  c.stub_with :webmock # or :fakeweb
-  c.default_cassette_options = { :record => :once }
+  c.hook_into :webmock
+  c.default_cassette_options = { :record => :once, :match_requests_on => [:method, :uri, :host, :path, :body, :query] }
 end

metadata

@@ -1,109 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bitly
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
-- rafaeldx7
+- dx7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '2.1'
 description: A simple bit.ly ruby client
 email:
-- rafaeldx7@gmail.com
+- dx7@protonmail.ch
 executables:
 - bitly
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -116,12 +116,13 @@ files:
 - fixtures/vcr_cassettes/get_clicks_by_short_url.yml
 - fixtures/vcr_cassettes/shorten_bitly_url.yml
 - fixtures/vcr_cassettes/shorten_long_url.yml
+- fixtures/vcr_cassettes/shorten_long_url_with_preferred_domain.yml
 - lib/ruby-bitly.rb
 - lib/ruby-bitly/version.rb
 - ruby-bitly.gemspec
 - spec/ruby-bitly_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/rafaeldx7/ruby-bitly
+homepage: http://github.com/dx7/ruby-bitly
 licenses: []
 metadata: {}
 post_install_message: 
@@ -130,17 +131,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple bit.ly ruby client