ruby-bitly 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff50be2b324d891776449f31237b35f8d95aa265
-  data.tar.gz: c99ae534047471483cc3585e2d7dc35d6b5793d5
+  metadata.gz: d8e00677c2229d902e7a313440f78d6e87a94a60
+  data.tar.gz: 033846db3c3691ade37782e9f436022f2aa2e090
 SHA512:
-  metadata.gz: 3f6f11d961827a80b1d76f32e8432d7b2aa773e9db87ea6cb8a64ba691ea7c768ec3f9b107150d53d148c551f16773e13ff4f6b788b864a42b032a7944f809ac
-  data.tar.gz: c2e528bc64410d3611886f326475c3c5b99bffc124343d90fbece352e5acf76af3a89160ed35440827e8e359dc318b23fc81a95c2cf55a017fa57e4138c0c259
+  metadata.gz: 7fd6f69ce0a634a1328f0ce699be96b524661cc1f1d6105c15d0c6fdbd36876c41d4a18d8e42607ac499007d60214f41964e7967cec7d81ffc96793b45d5e7bd
+  data.tar.gz: bf4b2ee95401e3efdf5615c844432a64eae8c5af684321fb20eac07a73d9eee0e5f0584c45aadba4b56e3298151ad7c903576634f57b75212df1d99848bdceb5

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1

data/CHANGELOG

@@ -1,3 +1,10 @@
+# 0.2.0
+
+- Add http_proxy support by default
+- Add proxy configuration support
+- Add ssl support by default
+- Add global config support
+
 # 0.1.7
 
 - Add new possibility to use named parameters

data/Gemfile

@@ -2,15 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in ruby-bitly.gemspec
 gemspec
-
-group :development, :test do
-
-  platforms :ruby_18 do
-    gem 'ruby-debug'
-  end
-
-  platforms :ruby_19, :ruby_20 do
-    gem 'debugger', '1.6.5'
-  end
-
-end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-bitly (0.1.7)
+    ruby-bitly (0.2.0)
       rest-client (~> 2.0)
 
 GEM
@@ -9,22 +9,14 @@ GEM
   specs:
     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.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)
@@ -47,11 +39,6 @@ GEM
       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)
     safe_yaml (1.0.4)
     unf (0.1.4)
       unf_ext
@@ -67,13 +54,11 @@ PLATFORMS
 
 DEPENDENCIES
   byebug
-  debugger (= 1.6.5)
   rake
   rspec (~> 3.5)
   ruby-bitly!
-  ruby-debug
   vcr (~> 3.0)
   webmock (~> 2.1)
 
 BUNDLED WITH
-   1.13.1
+   1.13.2

data/README.rdoc

@@ -1,17 +1,49 @@
 = A simple bit.ly ruby client.
 
+{<img src="https://travis-ci.org/dx7/ruby-bitly.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/dx7/ruby-bitly]
 {<img src="https://codeclimate.com/github/dx7/ruby-bitly/badges/gpa.svg" />}[https://codeclimate.com/github/dx7/ruby-bitly]
 
 
-== Shorten
+== Configuration
+  You need to load the gem:
+
   require 'ruby-bitly'
 
-  # old way (deprecated)
+  Set global configuration:
+
+  Bitly.config do |c|
+    c.login   = 'login-here'
+    c.api_key = 'key-here'
+    c.key     = 'key-here' # deprecated: use api_key instead
+    c.use_ssl = false # read more below
+    c.proxy   = 'http://localhost:8888' # read more below
+  end
+
+  Or set them individualy:
+
+  Bitly.login   = 'login-here'
+  Bitly.api_key = 'key-here'
+  Bitly.key     = 'key-here' # deprecated: use api_key instead
+  Bitly.use_ssl = false # read more below
+  Bitly.proxy   = 'http://localhost:8888' # read more below
+
+  Or set them on methods if you prefer (see it below).
+
+
+== Shorten
+  # old way
+  bitly = Bitly.shorten("https://dx7.github.io/")
+
+  # old way setting local configuration
   bitly = Bitly.shorten("https://dx7.github.io/", "login-here", "key-here")
 
   # new way
-  bitly = Bitly.shorten(long_url: "https://dx7.github.io/", login: "login-here", api_key: "key-here")
+  bitly = Bitly.shorten(long_url: "https://dx7.github.io/")
+
+  # new way setting local configuration
+  bitly = Bitly.shorten(long_url: "https://dx7.github.io/", login: "login-here", api_key: "key-here", domain: "my.do")
 
+  # result
   bitly.url #=> "http://bit.ly/2dAjjfo"
 
   y bitly
@@ -26,14 +58,19 @@
 
 
 == Expand
-  require 'ruby-bitly'
+  # old way
+  bitly = Bitly.expand("http://bit.ly/2dAjjfo")
 
-  # old way (deprecated)
+  # old way setting local configuration
   bitly = Bitly.expand("http://bit.ly/2dAjjfo", "login-here", "key-here")
 
   # new way
+  bitly = Bitly.expand(short_url: "http://bit.ly/2dAjjfo")
+
+  # new way setting local configuration
   bitly = Bitly.expand(short_url: "http://bit.ly/2dAjjfo", login: "login-here", api_key: "key-here")
 
+  # result
   y bitly
     :short_url: http://bit.ly/2dAjjfo
     :long_url: https://dx7.github.io/
@@ -44,14 +81,19 @@
 
 
 == Get Clicks
-  require 'ruby-bitly'
+  # old way
+  bitly = Bitly.get_clicks("http://bit.ly/2dAjjfo")
 
-  # old way (deprecated)
+  # old way setting local configuration
   bitly = Bitly.get_clicks("http://bit.ly/2dAjjfo", "login-here", "key-here")
 
   # new way
+  bitly = Bitly.get_clicks(short_url: "http://bit.ly/2dAjjfo")
+
+  # new way setting local configuration
   bitly = Bitly.get_clicks(short_url: "http://bit.ly/2dAjjfo", login: "login-here", api_key: "key-here")
 
+  # result
   y bitly
     :short_url: https://bit.ly/2dAjjfo
     :global_hash: 2dAkyet
@@ -62,7 +104,21 @@
     :status_txt: OK
 
 
-== Command Line Examples
+== Proxy
+  All calls will use the proxy specified by environment variable "http_proxy" by default.
+
+  You can set the proxy directly if you prefer:
+
+  Bitly.proxy = 'http://localhost:8888'
+
+
+== SSL
+  All calls will use SSL by default. You can disable it:
+
+  Bitly.use_ssl = false
+
+
+== Command Line
   Usage
     bitly [options] url
 
@@ -93,17 +149,17 @@
     -V, --verbose        Verbose output
 
 
-=== Authentication
+== Authentication
   bit.ly API requires authentication credentials.
 
-  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'll need a free bit.ly login and apiKey. Sign up here: http://bit.ly/a/sign_up
+  If you've already signed up, you can find your apiKey here: http://bit.ly/a/your_api_key
 
-  You can supply credentials as parameters. For example:
-    bitly -l <username> -k <key-here> -s http://dx7.github.io
+  Using commmand line you can supply credentials as parameters. For example:
+    bitly -l <login-here> -k <key-here> -s http://dx7.github.io
 
-  Or you can create the file ~/.bitly (YAML format) with this content:
-    login: <username>
+  Or you can create the file ~/.bitly (YAML format) with that content:
+    login: <login-here>
     key: <key-here>
 
 

data/fixtures/vcr_cassettes/expand_a_long_url_should_result_an_error.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: http://api.bit.ly/v3/expand
+    uri: https://api-ssl.bitly.com/v3/expand
     body:
       encoding: UTF-8
       string: shortURL=http%3A%2F%2Fgoogle.com&login=my-login&apiKey=my-api-key

data/fixtures/vcr_cassettes/expand_a_short_url_to_it_long_url.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: http://api.bit.ly/v3/expand
+    uri: https://api-ssl.bitly.com/v3/expand
     body:
       encoding: UTF-8
       string: shortURL=http%3A%2F%2Fbit.ly%2FbcvNe5&login=my-login&apiKey=my-api-key

data/fixtures/vcr_cassettes/get_clicks_by_short_url.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://api.bit.ly/v3/clicks?apiKey=my-api-key&login=my-login&shortUrl=http://bit.ly/xlii42
+    uri: https://api-ssl.bitly.com/v3/clicks?apiKey=my-api-key&login=my-login&shortUrl=http://bit.ly/xlii42
     body:
       encoding: US-ASCII
       string: ''

data/fixtures/vcr_cassettes/get_clicks_by_short_url_without_ssl.yml

@@ -0,0 +1,44 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api.bitly.com/v3/clicks?apiKey=my-api-key&login=my-login&shortUrl=http://bit.ly/xlii42
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*"
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - rest-client/2.0.0 (darwin15.6.0 x86_64) ruby/2.3.0p0
+      Host:
+      - api.bitly.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Sun, 02 Oct 2016 03:40:18 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '187'
+      Etag:
+      - '"a6d2ce859ab41b205deb5d920fa10e3143a79bf2"'
+      Age:
+      - '356'
+      Connection:
+      - keep-alive
+    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: Sun, 02 Oct 2016 03:46:13 GMT
+recorded_with: VCR 3.0.3

data/fixtures/vcr_cassettes/shorten_bitly_url.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: http://api.bit.ly/v3/shorten
+    uri: https://api-ssl.bitly.com/v3/shorten
     body:
       encoding: UTF-8
       string: longURL=http%3A%2F%2Fbit.ly%2FbcvNe5&login=my-login&apiKey=my-api-key

data/fixtures/vcr_cassettes/shorten_long_url.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: http://api.bit.ly/v3/shorten
+    uri: https://api-ssl.bitly.com/v3/shorten
     body:
       encoding: UTF-8
       string: longURL=http%3A%2F%2Fgoogle.com&login=my-login&apiKey=my-api-key

data/fixtures/vcr_cassettes/shorten_long_url_with_preferred_domain.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: http://api.bit.ly/v3/shorten
+    uri: https://api-ssl.bitly.com/v3/shorten
     body:
       encoding: UTF-8
       string: longURL=http%3A%2F%2Fgoogle.com&login=my-login&apiKey=my-api-key&domain=j.mp

data/lib/ruby-bitly.rb

@@ -1,16 +1,37 @@
 # -*- encoding: utf-8 -*-
 require 'yaml'
-require 'restclient'
+require 'rest-client'
 require 'json'
 require 'ostruct'
 
 class Bitly < OpenStruct
 
-  REST_API_URL = "http://api.bit.ly"
+  REST_API_URL = "http://api.bitly.com"
+  REST_API_URL_SSL = "https://api-ssl.bitly.com"
   ACTION_PATH = { :shorten => '/v3/shorten', :expand => '/v3/expand', :clicks => '/v3/clicks' }
+  RestClient.proxy = ENV['http_proxy']
 
   class << self
-    attr_accessor :login, :key
+    attr_accessor :login, :api_key
+    attr_writer :use_ssl
+    alias :key :api_key
+    alias :key= :api_key=
+
+    def use_ssl
+      instance_variable_defined?(:@use_ssl) ? @use_ssl : true
+    end
+
+    def proxy=(addr)
+      RestClient.proxy = addr
+    end
+
+    def proxy
+      RestClient.proxy
+    end
+
+    def config
+      yield self
+    end
 
     # Old API:
     #
@@ -42,7 +63,7 @@ class Bitly < OpenStruct
         params[:domain] = options[:domain]
       end
 
-      response = JSON.parse RestClient.post(REST_API_URL + ACTION_PATH[:shorten], params)
+      response = JSON.parse RestClient.post(rest_api_url + ACTION_PATH[:shorten], params)
       response.delete("data") if response["data"].empty?
 
       bitly = new response["data"]
@@ -77,7 +98,7 @@ class Bitly < OpenStruct
         options = {}
       end
 
-      response = JSON.parse RestClient.post(REST_API_URL + ACTION_PATH[:expand], { :shortURL => short_url, :login => login, :apiKey => key })
+      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"]
@@ -110,7 +131,7 @@ class Bitly < OpenStruct
         options = {}
       end
 
-      response = JSON.parse RestClient.get("#{REST_API_URL}#{ACTION_PATH[:clicks]}?login=#{login}&apiKey=#{key}&shortUrl=#{short_url}")
+      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"]
@@ -118,5 +139,11 @@ class Bitly < OpenStruct
 
       bitly
     end
+
+    private
+
+      def rest_api_url
+        use_ssl ? REST_API_URL_SSL : REST_API_URL
+      end
   end
 end

data/lib/ruby-bitly/version.rb

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

data/ruby-bitly.gemspec

@@ -3,17 +3,19 @@ $:.push File.expand_path("../lib", __FILE__)
 require "ruby-bitly/version"
 
 Gem::Specification.new do |s|
-  s.name          = "ruby-bitly"
-  s.version       = BitlyGem::VERSION
-  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.name                  = "ruby-bitly"
+  s.version               = BitlyGem::VERSION
+  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 to shorten URLs, expand or get number of clicks on a bitlink}
+  s.description           = %q{A simple bit.ly ruby client to shorten URLs, expand or get number of clicks on a bitlink.}
+  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.licenses              = ['MIT']
+  s.required_ruby_version = '>= 2.0.0'
   s.add_dependency('rest-client', '~> 2.0')
   s.add_development_dependency('byebug')
   s.add_development_dependency('rake')

data/spec/ruby-bitly_spec.rb

@@ -1,122 +1,294 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'byebug'
 
-describe "RubyBitly" do
+describe 'RubyBitly' do
 
-  let(:login) { ENV['RUBY_BITLY_LOGIN'] || 'my-login' }
-  let(:key) { ENV['RUBY_BITLY_APIKEY'] || 'my-api-key' }
+  let(:login) { RSpec::RUBY_BITLY_LOGIN }
+  let(:key) { RSpec::RUBY_BITLY_APIKEY }
 
-  it "Shorten long url using old API" do
-    response = VCR.use_cassette('shorten_long_url') do
-      Bitly.shorten("http://google.com", login, key)
+  describe 'config' do
+    it 'set variable login' do
+      Bitly.config { |c| c.login = 'login-custom' }
+      expect(Bitly.login).to eq('login-custom')
     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 using options API' do
-    response = VCR.use_cassette('shorten_long_url') do
-      Bitly.shorten(:long_url => "http://google.com", :login => login, :api_key => key)
+    it 'set variables key' do
+      Bitly.config { |c| c.api_key = 'key-custom' }
+      expect(Bitly.api_key).to eq('key-custom')
     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]*/)
+    it 'set variables use_ssl' do
+      Bitly.config { |c| c.use_ssl = false }
+      expect(Bitly.use_ssl).to be false
+      Bitly.config { |c| c.use_ssl = true } # reset to default value
+    end
   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
+  describe 'shorten' do
+    context 'using local config' do
+      before do
+        Bitly.config { |c| c.login = 'invalid login'; c.api_key = 'invalid 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 long url using old API' do
+        response = VCR.use_cassette('shorten_long_url') do
+          Bitly.shorten('http://google.com', login, key)
+        end
 
-  it "Shorten bitly url" do
-    response = VCR.use_cassette('shorten_bitly_url') do
-      Bitly.shorten("http://bit.ly/bcvNe5", 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
 
-    expect(response.status_txt).to eq("ALREADY_A_BITLY_LINK")
-    expect(response.status_code).to eq(500)
-  end
+      it 'shorten long url using new API' do
+        response = VCR.use_cassette('shorten_long_url') do
+          Bitly.shorten(:long_url => 'http://google.com', :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:\/\/bit\.ly\/[A-Za-z0-9]*/)
+      end
+
+      it 'shorten long 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)
+        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)
+        expect(response.status_txt).to eq('ALREADY_A_BITLY_LINK')
+        expect(response.status_code).to eq(500)
+      end
     end
 
-    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")
+    context 'using global config' do
+      before do
+        Bitly.config { |c| c.login = login; c.api_key = key }
+      end
+
+      it 'shorten long url using old API' do
+        response = VCR.use_cassette('shorten_long_url') do
+          Bitly.shorten('http://google.com')
+        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 using global config' do
+        response = VCR.use_cassette('shorten_long_url') do
+          Bitly.shorten(:long_url => 'http://google.com')
+        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
+    end
   end
 
-  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({ :short_url => "http://bit.ly/bcvNe5", :login => login, :api_key => key })
+  describe 'expand' do
+    context 'using local config' do
+      before do
+        Bitly.config { |c| c.login = 'invalid login'; c.api_key = 'invalid key' }
+      end
+
+      it 'expand a short url to its long url 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
+
+        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 its long url' do
+        response = VCR.use_cassette('expand_a_short_url_to_it_long_url') do
+          Bitly.expand({ :short_url => 'http://bit.ly/bcvNe5', :login => login, :api_key => key })
+        end
+
+        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)
+        end
+
+        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
     end
 
-    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")
+    context 'using global config' do
+      before do
+        Bitly.config { |c| c.login = login; c.api_key = key }
+      end
+
+      it 'expand a short url to its long url old API' do
+        response = VCR.use_cassette('expand_a_short_url_to_it_long_url') do
+          Bitly.expand('http://bit.ly/bcvNe5')
+        end
+
+        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 its long url using global config' do
+        response = VCR.use_cassette('expand_a_short_url_to_it_long_url') do
+          Bitly.expand({ :short_url => 'http://bit.ly/bcvNe5' })
+        end
+
+        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
+    end
   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)
+
+  describe 'get clicks' do
+    context 'using local config' do
+      before do
+        Bitly.config { |c| c.login = 'invalid login'; c.api_key = 'invalid key' }
+      end
+
+      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(:short_url => 'http://bit.ly/xlii42', :login => login, :api_key => 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
     end
 
-    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")
+    context 'using global config' do
+      before do
+        Bitly.config { |c| c.login = login; c.api_key = key }
+      end
+
+      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')
+        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 global config' do
+        bitly = VCR.use_cassette('get_clicks_by_short_url') do
+          Bitly.get_clicks(:short_url => 'http://bit.ly/xlii42')
+        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
+    end
   end
 
+  describe 'proxy' do
+    it 'uses http_proxy as default' do
+      expect(RestClient.proxy).not_to eq('http://http-proxy.host.com:1234')
+
+      ENV['http_proxy'] = 'http://http-proxy.host.com:1234'
+      Object.send :remove_const, :Bitly
+      load './lib/ruby-bitly.rb'
 
-  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)
+      expect(RestClient.proxy).to eq('http://http-proxy.host.com:1234')
     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 'uses set proxy on configuration' do
+      expect(RestClient.proxy).not_to eq('http://config-proxy.host.com:1234')
 
-  it "Get clicks by short_url using options API" do
-    bitly = VCR.use_cassette('get_clicks_by_short_url') do
-      Bitly.get_clicks(:short_url => "http://bit.ly/xlii42", :login => login, :api_key => key)
+      ENV['http_proxy'] = 'http://http-proxy.host.com:1234'
+      Object.send :remove_const, :Bitly
+      load './lib/ruby-bitly.rb'
+      Bitly.proxy = 'http://config-proxy.host.com:1234'
+
+      expect(RestClient.proxy).to eq('http://config-proxy.host.com:1234')
     end
+  end
+
+  describe 'ssl' do
+    it 'do not use ssl if it is disabled' do
+      Bitly.use_ssl = false
 
-    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")
+      bitly = VCR.use_cassette('get_clicks_by_short_url_without_ssl') do
+        Bitly.get_clicks(:short_url => 'http://bit.ly/xlii42', :login => login, :api_key => key)
+      end
+
+      expect(bitly.status_txt).to eq('OK')
+      expect(bitly.status_code).to eq(200)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,13 +1,19 @@
 # -*- encoding: utf-8 -*-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'byebug'
 require 'ruby-bitly'
 require 'rspec'
 require 'vcr'
 
+RSpec::RUBY_BITLY_LOGIN = ENV['RUBY_BITLY_LOGIN'] || 'my-login'
+RSpec::RUBY_BITLY_APIKEY = ENV['RUBY_BITLY_APIKEY'] || 'my-api-key'
+
 VCR.configure do |c|
   c.cassette_library_dir = 'fixtures/vcr_cassettes'
   c.ignore_localhost = true
   c.hook_into :webmock
   c.default_cassette_options = { :record => :once, :match_requests_on => [:method, :uri, :host, :path, :body, :query] }
+  c.filter_sensitive_data('my-login') { RSpec::RUBY_BITLY_LOGIN }
+  c.filter_sensitive_data('my-api-key') { RSpec::RUBY_BITLY_APIKEY }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bitly
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - dx7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -94,7 +94,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-description: A simple bit.ly ruby client
+description: A simple bit.ly ruby client to shorten URLs, expand or get number of
+  clicks on a bitlink.
 email:
 - dx7@protonmail.ch
 executables:
@@ -104,6 +105,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -114,6 +116,7 @@ files:
 - fixtures/vcr_cassettes/expand_a_long_url_should_result_an_error.yml
 - fixtures/vcr_cassettes/expand_a_short_url_to_it_long_url.yml
 - fixtures/vcr_cassettes/get_clicks_by_short_url.yml
+- fixtures/vcr_cassettes/get_clicks_by_short_url_without_ssl.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
@@ -123,7 +126,8 @@ files:
 - spec/ruby-bitly_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/dx7/ruby-bitly
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -133,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -144,7 +148,8 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A simple bit.ly ruby client
+summary: A simple bit.ly ruby client to shorten URLs, expand or get number of clicks
+  on a bitlink
 test_files:
 - spec/ruby-bitly_spec.rb
 - spec/spec_helper.rb