ruby-bitly 0.2.1 → 3.0.0.rc1

data/fixtures/vcr_cassettes/shorten_long_url_with_preferred_domain.yml

@@ -5,7 +5,7 @@ http_interactions:
     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
+      string: longURL=http%3A%2F%2Fgoogle.com&domain=j.mp&login=my-login&apiKey=my-api-key
     headers:
       Accept:
       - "*/*; q=0.5, application/xml"
@@ -41,6 +41,6 @@ http_interactions:
         "new_hash": 0 } }
 
 '
-    http_version: 
+    http_version:
   recorded_at: Sat, 01 Oct 2016 19:29:25 GMT
 recorded_with: VCR 3.0.3

data/fixtures/vcr_cassettes/shorten_using_invalid_login.yml

@@ -0,0 +1,42 @@
+---
+http_interactions:
+- request:
+    method: post
+    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
+    headers:
+      Accept:
+      - "*/*"
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - rest-client/2.0.1 (darwin18.2.0 x86_64) ruby/2.6.3p62
+      Content-Length:
+      - '69'
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Host:
+      - api-ssl.bitly.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Sat, 11 May 2019 22:34:41 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '58'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"status_code":500,"status_txt":"INVALID_LOGIN","data":[]}'
+    http_version: 
+  recorded_at: Sat, 11 May 2019 22:34:42 GMT
+recorded_with: VCR 4.0.0

data/gemfiles/rest-client-2.0.1.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rest-client', '2.0.1'

data/gemfiles/rest-client-2.0.1.gemfile.lock

@@ -0,0 +1,68 @@
+PATH
+  remote: ..
+  specs:
+    ruby-bitly (0.2.1)
+      rest-client (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    hashdiff (0.3.9)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    netrc (0.11.0)
+    public_suffix (2.0.5)
+    rake (12.3.2)
+    rest-client (2.0.1)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    safe_yaml (1.0.5)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+    vcr (4.0.0)
+    webmock (3.5.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  public_suffix (< 3)
+  rake
+  rest-client (= 2.0.1)
+  rspec
+  ruby-bitly!
+  vcr
+  webmock
+  wwtd
+
+BUNDLED WITH
+   1.17.3

data/gemfiles/rest-client-2.0.2.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rest-client', '2.0.2'

data/gemfiles/rest-client-2.0.2.gemfile.lock

@@ -0,0 +1,68 @@
+PATH
+  remote: ..
+  specs:
+    ruby-bitly (0.2.1)
+      rest-client (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    hashdiff (0.3.9)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    netrc (0.11.0)
+    public_suffix (2.0.5)
+    rake (12.3.2)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    safe_yaml (1.0.5)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+    vcr (4.0.0)
+    webmock (3.5.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  public_suffix (< 3)
+  rake
+  rest-client (= 2.0.2)
+  rspec
+  ruby-bitly!
+  vcr
+  webmock
+  wwtd
+
+BUNDLED WITH
+   1.17.3

data/gemfiles/rest-client-2.1.0.rc1.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rest-client', '2.1.0.rc1'

data/gemfiles/rest-client-2.1.0.rc1.gemfile.lock

@@ -0,0 +1,70 @@
+PATH
+  remote: ..
+  specs:
+    ruby-bitly (0.2.1)
+      rest-client (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    hashdiff (0.3.9)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    netrc (0.11.0)
+    public_suffix (2.0.5)
+    rake (12.3.2)
+    rest-client (2.1.0.rc1)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    safe_yaml (1.0.5)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+    vcr (4.0.0)
+    webmock (3.5.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  public_suffix (< 3)
+  rake
+  rest-client (= 2.1.0.rc1)
+  rspec
+  ruby-bitly!
+  vcr
+  webmock
+  wwtd
+
+BUNDLED WITH
+   1.17.3

data/lib/ruby-bitly.rb

@@ -6,16 +6,14 @@ require 'ruby-bitly/version'
 
 class Bitly < OpenStruct
 
-  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' }
+  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, :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
@@ -33,86 +31,72 @@ class Bitly < OpenStruct
       yield self
     end
 
-    # Old API:
-    #
-    # shorten(long_url, login = self.login, api_key = self.api_key)
-    #
-    # New API:
-    #
     # shorten(options)
     #
-    # Options can have:
+    # Options are:
     #
-    # :long_url
-    # :login
-    # :api_key
-    # :domain
-    def shorten(long_url, login = self.login, api_key = self.api_key)
-      options = ensure_options(url: long_url, login: login, api_key: api_key)
+    # long_url
+    # login
+    # api_key
+    # domain
+    def shorten(options)
+      options = ensure_options(options)
       options.select! { |k,_v| [:longURL, :domain, :login, :apiKey].include?(k) }
 
       response = JSON.parse RestClient.post(rest_api_url + ACTION_PATH[:shorten], options)
-      response.delete("data") if response["data"].empty?
-
-      bitly = new response["data"]
-
-      bitly.hash_path = response["data"]["hash"] if response["status_code"] == 200
-      bitly.status_code = response["status_code"]
-      bitly.status_txt = response["status_txt"]
+      response['data'] = {} if response['data'].empty?
+
+      bitly = new({ 'success?' => response['status_code'].to_i == 200 })
+
+      if bitly.success?
+        bitly.send('new_hash?=', response['data']['new_hash'].to_i == 1)
+        bitly.short_url = response['data']['url']
+        bitly.long_url = response['data']['long_url']
+        bitly.global_hash = response['data']['global_hash']
+        bitly.user_hash = response['data']['hash']
+      else
+        bitly.error = response['status_txt'] unless bitly.success?
+      end
 
       bitly
     end
 
-    # Old API:
-    #
-    # expand(short_url, login = self.login, api_key = self.api_key)
-    #
-    # New API:
-    #
     # expand(options)
     #
-    # Options can have:
+    # Options are:
     #
-    # :long_url
-    # :login
-    # :api_key
-    def expand(short_url, login = self.login, api_key = self.api_key)
-      options = ensure_options(url: short_url, login: login, api_key: api_key)
+    # short_url
+    # login
+    # api_key
+    def expand(options)
+      options = ensure_options(options)
       options.select! { |k,_v| [:shortURL, :login, :apiKey].include?(k) }
 
       response = JSON.parse RestClient.post(rest_api_url + ACTION_PATH[:expand], options)
 
       bitly = new(response["data"]["expand"].first)
-      bitly.status_code = response["status_code"]
-      bitly.status_txt = response["status_txt"]
+      bitly.send('success?=', response["status_code"] == 200)
       bitly.long_url = bitly.error if bitly.error
 
       bitly
     end
 
-    # Old API:
-    #
-    # get_clicks(short_url, login = self.login, api_key = self.api_key)
-    #
-    # New API:
-    #
     # get_clicks(options)
     #
-    # Options can have:
+    # Options are:
     #
-    # :long_url
-    # :login
-    # :api_key
-    def get_clicks(short_url, login = self.login, api_key = self.api_key)
-      options = ensure_options(url: short_url, login: login, api_key: api_key)
+    # short_url
+    # login
+    # api_key
+    def get_clicks(options)
+      options = ensure_options(options)
       options.select! { |k,_v| [:shortURL, :login, :apiKey].include?(k) }
       options[:shortUrl] = options.delete(:shortURL)
 
       response = JSON.parse RestClient.get("#{rest_api_url}#{ACTION_PATH[:clicks]}", params: options)
 
       bitly = new(response["data"]["clicks"].first)
-      bitly.status_code = response["status_code"]
-      bitly.status_txt = response["status_txt"]
+      bitly.send('success?=', response["status_code"] == 200)
 
       bitly
     end
@@ -120,19 +104,17 @@ class Bitly < OpenStruct
     private
 
       def ensure_options(options)
-        options = options[:url] if options[:url].is_a?(Hash)
-
         response = {}
-        response[:shortURL] = options[:short_url] || options[:url]
-        response[:longURL] = options[:long_url] || options[:url]
+        response[:shortURL] = options[:short_url]
+        response[:longURL] = options[:long_url]
+        response[:domain] = options[:domain]
         response[:login] = options[:login] || self.login
         response[:apiKey] = options[:api_key] || self.api_key
-        response[:domain] = options[:domain]
         response.reject { |_k,v| v.nil? }
       end
 
       def rest_api_url
-        use_ssl ? REST_API_URL_SSL : REST_API_URL
+        { true => REST_API_URL_SSL, false => REST_API_URL }[use_ssl]
       end
   end
 end