ruby-bitly 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8e00677c2229d902e7a313440f78d6e87a94a60
-  data.tar.gz: 033846db3c3691ade37782e9f436022f2aa2e090
+  metadata.gz: d1771cca1a80ce56b33cfb9578d3bd378f0ce83c
+  data.tar.gz: c0fffae72cbab2491b2bb4a5688f192b6d48af00
 SHA512:
-  metadata.gz: 7fd6f69ce0a634a1328f0ce699be96b524661cc1f1d6105c15d0c6fdbd36876c41d4a18d8e42607ac499007d60214f41964e7967cec7d81ffc96793b45d5e7bd
-  data.tar.gz: bf4b2ee95401e3efdf5615c844432a64eae8c5af684321fb20eac07a73d9eee0e5f0584c45aadba4b56e3298151ad7c903576634f57b75212df1d99848bdceb5
+  metadata.gz: ed38e9827405f2463b37377ed955801c8f4be6173f418e83b777feacc4f123f150f8cad56f0f0cdbe2f30af80bf7ef33106586bdea31cac9fc8dc49a66f6e616
+  data.tar.gz: 9d3ecf027d2a2bf44786337415ce1ae88e565b00507c037d5787a3092d64bb4f81045ecf431446b7b8063ab75f9d8a81ffd0bfe60e44be09918dfb129e467f08

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 2.1.10
   - 2.2.5
   - 2.3.1
+  - 2.4.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+# 0.2.1
+- Add support for ruby 2.4.0
+- Add support for set domain on command line
+- Remove feature 'copy to clipboard' on command line
+
 # 0.2.0
 
 - Add http_proxy support by default

data/Gemfile.lock

@@ -1,28 +1,30 @@
 PATH
   remote: .
   specs:
-    ruby-bitly (0.2.0)
+    ruby-bitly (0.2.1)
       rest-client (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     byebug (9.0.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    domain_name (0.5.20160826)
+    diff-lcs (1.3)
+    domain_name (0.5.20170223)
       unf (>= 0.0.5, < 1.0.0)
-    hashdiff (0.3.0)
+    hashdiff (0.3.2)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     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)
+    public_suffix (2.0.5)
+    rake (12.0.0)
+    rest-client (2.0.1)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -44,7 +46,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.2)
     vcr (3.0.3)
-    webmock (2.1.0)
+    webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -61,4 +63,4 @@ DEPENDENCIES
   webmock (~> 2.1)
 
 BUNDLED WITH
-   1.13.2
+   1.14.6

data/README.rdoc

@@ -38,10 +38,10 @@
   bitly = Bitly.shorten("https://dx7.github.io/", "login-here", "key-here")
 
   # new way
-  bitly = Bitly.shorten(long_url: "https://dx7.github.io/")
+  bitly = Bitly.shorten(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")
+  bitly = Bitly.shorten(url: "https://dx7.github.io/", login: "login-here", api_key: "key-here", domain: "my.do")
 
   # result
   bitly.url #=> "http://bit.ly/2dAjjfo"
@@ -65,10 +65,10 @@
   bitly = Bitly.expand("http://bit.ly/2dAjjfo", "login-here", "key-here")
 
   # new way
-  bitly = Bitly.expand(short_url: "http://bit.ly/2dAjjfo")
+  bitly = Bitly.expand(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")
+  bitly = Bitly.expand(url: "http://bit.ly/2dAjjfo", login: "login-here", api_key: "key-here")
 
   # result
   y bitly
@@ -88,10 +88,10 @@
   bitly = Bitly.get_clicks("http://bit.ly/2dAjjfo", "login-here", "key-here")
 
   # new way
-  bitly = Bitly.get_clicks(short_url: "http://bit.ly/2dAjjfo")
+  bitly = Bitly.get_clicks(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")
+  bitly = Bitly.get_clicks(url: "http://bit.ly/2dAjjfo", login: "login-here", api_key: "key-here")
 
   # result
   y bitly

data/Rakefile

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/bitly

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
@@ -31,8 +30,6 @@ class App
       result = process_command
 
       puts "#{options.message} #{result}".strip
-
-      copy_to_clipboard(result)
     else
       output_help("ERROR: Invalid options", 'examples')
     end
@@ -40,12 +37,6 @@ class App
 
   protected
 
-    def copy_to_clipboard(value)
-      unless value.nil?
-        system "printf '#{value.strip}' 2> /dev/null | pbcopy 2> /dev/null" if RUBY_PLATFORM[/darwin/]
-      end
-    end
-
     def load_account_data
       begin
         account_data = YAML.load(File.read(ACCOUNT_FILE_PATH))
@@ -74,8 +65,9 @@ class App
       opts.on('-u', '--user-clicks')   { options.user_clicks = true; options.message = 'User clicks:' }
       opts.on('-g', '--global-clicks') { options.global_clicks = true; options.message = 'Global clicks:' }
 
-      opts.on('-l', '--login LOGIN')  { |login| options.login = login }
-      opts.on('-k', '--key KEY')      { |key| options.key = key }
+      opts.on('-l', '--login LOGIN')   { |login| options.login = login }
+      opts.on('-k', '--key KEY')       { |key| options.key = key }
+      opts.on('-d', '--domain DOMAIN') { |domain| options.domain = domain }
 
       opts.on('-v', '--version')    { output_version ; exit 0 }
       opts.on('-h', '--help')       { output_help }
@@ -128,10 +120,11 @@ class App
     end
 
     def process_command
-      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
+      return Bitly.shorten(url: arguments.first, login: options.login, api_key: options.key, domain: options.domain).url if options.shorten && options.domain
+      return Bitly.shorten(url: arguments.first, login: options.login, api_key: options.key).url if options.shorten
+      return Bitly.expand(url: arguments.first, login: options.login, api_key: options.key).long_url if options.expand
+      return Bitly.get_clicks(url: arguments.first, login: options.login, api_key: options.key).user_clicks.to_s if options.user_clicks
+      return Bitly.get_clicks(url: arguments.first, login: options.login, api_key: options.key).global_clicks.to_s if options.global_clicks
     end
 end
 

data/lib/ruby-bitly.rb

@@ -1,8 +1,8 @@
-# -*- encoding: utf-8 -*-
 require 'yaml'
 require 'rest-client'
 require 'json'
 require 'ostruct'
+require 'ruby-bitly/version'
 
 class Bitly < OpenStruct
 
@@ -35,7 +35,7 @@ class Bitly < OpenStruct
 
     # Old API:
     #
-    # shorten(long_url, login = self.login, key = self.key)
+    # shorten(long_url, login = self.login, api_key = self.api_key)
     #
     # New API:
     #
@@ -47,23 +47,11 @@ class Bitly < OpenStruct
     # :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 }
+    def shorten(long_url, login = self.login, api_key = self.api_key)
+      options = ensure_options(url: long_url, login: login, api_key: api_key)
+      options.select! { |k,_v| [:longURL, :domain, :login, :apiKey].include?(k) }
 
-      if options[:domain]
-        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], options)
       response.delete("data") if response["data"].empty?
 
       bitly = new response["data"]
@@ -77,7 +65,7 @@ class Bitly < OpenStruct
 
     # Old API:
     #
-    # expand(short_url, login = self.login, key = self.key)
+    # expand(short_url, login = self.login, api_key = self.api_key)
     #
     # New API:
     #
@@ -88,17 +76,11 @@ class Bitly < OpenStruct
     # :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
+    def expand(short_url, login = self.login, api_key = self.api_key)
+      options = ensure_options(url: short_url, login: login, api_key: api_key)
+      options.select! { |k,_v| [:shortURL, :login, :apiKey].include?(k) }
 
-      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], options)
 
       bitly = new(response["data"]["expand"].first)
       bitly.status_code = response["status_code"]
@@ -110,7 +92,7 @@ class Bitly < OpenStruct
 
     # Old API:
     #
-    # get_clicks(short_url, login = self.login, key = self.key)
+    # get_clicks(short_url, login = self.login, api_key = self.api_key)
     #
     # New API:
     #
@@ -121,17 +103,12 @@ class Bitly < OpenStruct
     # :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
+    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)
+      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]}?login=#{login}&apiKey=#{key}&shortUrl=#{short_url}")
+      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"]
@@ -142,6 +119,18 @@ 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[: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
       end

data/lib/ruby-bitly/version.rb

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

data/ruby-bitly.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "ruby-bitly/version"
 

data/spec/ruby-bitly_spec.rb

@@ -1,10 +1,9 @@
-# -*- encoding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe 'RubyBitly' do
 
   let(:login) { RSpec::RUBY_BITLY_LOGIN }
-  let(:key) { RSpec::RUBY_BITLY_APIKEY }
+  let(:api_key) { RSpec::RUBY_BITLY_APIKEY }
 
   describe 'config' do
     it 'set variable login' do
@@ -12,7 +11,7 @@ describe 'RubyBitly' do
       expect(Bitly.login).to eq('login-custom')
     end
 
-    it 'set variables key' do
+    it 'set variables api_key' do
       Bitly.config { |c| c.api_key = 'key-custom' }
       expect(Bitly.api_key).to eq('key-custom')
     end
@@ -27,12 +26,12 @@ describe 'RubyBitly' do
   describe 'shorten' do
     context 'using local config' do
       before do
-        Bitly.config { |c| c.login = 'invalid login'; c.api_key = 'invalid key' }
+        Bitly.config { |c| c.login = 'invalid login'; c.api_key = 'invalid api_key' }
       end
 
       it 'shorten long url using old API' do
         response = VCR.use_cassette('shorten_long_url') do
-          Bitly.shorten('http://google.com', login, key)
+          Bitly.shorten('http://google.com', login, api_key)
         end
 
         expect(response.status_txt).to eq('OK')
@@ -45,7 +44,7 @@ describe 'RubyBitly' do
 
       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)
+          Bitly.shorten(:long_url => 'http://google.com', :login => login, :api_key => api_key)
         end
 
         expect(response.status_txt).to eq('OK')
@@ -58,7 +57,7 @@ describe 'RubyBitly' do
 
       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)
+          Bitly.shorten(:long_url => 'http://google.com', :domain => 'j.mp', :login => login, :api_key => api_key)
         end
 
         expect(response.status_txt).to eq('OK')
@@ -71,7 +70,7 @@ describe 'RubyBitly' do
 
       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, api_key)
         end
 
         expect(response.status_txt).to eq('ALREADY_A_BITLY_LINK')
@@ -81,7 +80,7 @@ describe 'RubyBitly' do
 
     context 'using global config' do
       before do
-        Bitly.config { |c| c.login = login; c.api_key = key }
+        Bitly.config { |c| c.login = login; c.api_key = api_key }
       end
 
       it 'shorten long url using old API' do
@@ -115,12 +114,12 @@ describe 'RubyBitly' do
   describe 'expand' do
     context 'using local config' do
       before do
-        Bitly.config { |c| c.login = 'invalid login'; c.api_key = 'invalid key' }
+        Bitly.config { |c| c.login = 'invalid login'; c.api_key = 'invalid api_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)
+          Bitly.expand('http://bit.ly/bcvNe5', login, api_key)
         end
 
         expect(response.status_txt).to eq('OK')
@@ -132,7 +131,7 @@ describe 'RubyBitly' do
 
       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 })
+          Bitly.expand({ :short_url => 'http://bit.ly/bcvNe5', :login => login, :api_key => api_key })
         end
 
         expect(response.status_txt).to eq('OK')
@@ -144,7 +143,7 @@ describe 'RubyBitly' do
 
       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, api_key)
         end
 
         expect(response.status_txt).to eq('OK')
@@ -156,7 +155,7 @@ describe 'RubyBitly' do
 
     context 'using global config' do
       before do
-        Bitly.config { |c| c.login = login; c.api_key = key }
+        Bitly.config { |c| c.login = login; c.api_key = api_key }
       end
 
       it 'expand a short url to its long url old API' do
@@ -189,18 +188,18 @@ describe 'RubyBitly' do
   describe 'get clicks' do
     context 'using local config' do
       before do
-        Bitly.config { |c| c.login = 'invalid login'; c.api_key = 'invalid key' }
+        Bitly.config { |c| c.login = 'invalid login'; c.api_key = 'invalid api_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)
+          Bitly.get_clicks('http://bit.ly/xlii42', login, api_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.global_clicks).to be_an Integer
+        expect(bitly.user_clicks).to be_an Integer
         expect(bitly.short_url).to eq('http://bit.ly/xlii42')
         expect(bitly.global_hash).to eq('cunZEP')
         expect(bitly.user_hash).to eq('cT1Izu')
@@ -208,13 +207,13 @@ describe 'RubyBitly' do
 
       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)
+          Bitly.get_clicks(:short_url => 'http://bit.ly/xlii42', :login => login, :api_key => api_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.global_clicks).to be_an Integer
+        expect(bitly.user_clicks).to be_an Integer
         expect(bitly.short_url).to eq('http://bit.ly/xlii42')
         expect(bitly.global_hash).to eq('cunZEP')
         expect(bitly.user_hash).to eq('cT1Izu')
@@ -223,7 +222,7 @@ describe 'RubyBitly' do
 
     context 'using global config' do
       before do
-        Bitly.config { |c| c.login = login; c.api_key = key }
+        Bitly.config { |c| c.login = login; c.api_key = api_key }
       end
 
       it 'get clicks by short_url using old API' do
@@ -233,8 +232,8 @@ describe 'RubyBitly' do
 
         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.global_clicks).to be_an Integer
+        expect(bitly.user_clicks).to be_an Integer
         expect(bitly.short_url).to eq('http://bit.ly/xlii42')
         expect(bitly.global_hash).to eq('cunZEP')
         expect(bitly.user_hash).to eq('cT1Izu')
@@ -247,8 +246,8 @@ describe 'RubyBitly' do
 
         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.global_clicks).to be_an Integer
+        expect(bitly.user_clicks).to be_an Integer
         expect(bitly.short_url).to eq('http://bit.ly/xlii42')
         expect(bitly.global_hash).to eq('cunZEP')
         expect(bitly.user_hash).to eq('cT1Izu')
@@ -284,7 +283,7 @@ describe 'RubyBitly' do
       Bitly.use_ssl = false
 
       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)
+        Bitly.get_clicks(:short_url => 'http://bit.ly/xlii42', :login => login, :api_key => api_key)
       end
 
       expect(bitly.status_txt).to eq('OK')

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bitly
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - dx7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A simple bit.ly ruby client to shorten URLs, expand or get number of clicks