ruby-bitly 0.2.1 → 3.0.0.rc1

data/lib/ruby-bitly/version.rb

@@ -1,3 +1,3 @@
 module BitlyGem
-  VERSION = '0.2.1'
+  VERSION = '3.0.0.rc1'
 end

data/ruby-bitly.gemspec

@@ -5,20 +5,21 @@ Gem::Specification.new do |s|
   s.name                  = "ruby-bitly"
   s.version               = BitlyGem::VERSION
   s.authors               = ["dx7"]
-  s.email                 = ["dx7@protonmail.ch"]
+  s.email                 = ["dx7@pm.me"]
   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.test_files            = `git ls-files -- {spec,fixtures,gemfiles}/*`.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_runtime_dependency('rest-client', '~> 2.0')
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 3.5')
-  s.add_development_dependency('vcr', '~> 3.0')
-  s.add_development_dependency('webmock', '~> 2.1')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('vcr')
+  s.add_development_dependency('webmock')
+  s.add_development_dependency('public_suffix', '< 3') # it is a webmock dependency. it is neccessary to run tests on ruby 2.0
+  s.add_development_dependency('wwtd')
 end

data/spec/ruby-bitly_spec.rb

@@ -26,20 +26,7 @@ describe 'RubyBitly' do
   describe 'shorten' do
     context 'using local config' do
       before do
-        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, api_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]*/)
+        Bitly.config { |c| c.login = 'any login'; c.api_key = 'any api_key' }
       end
 
       it 'shorten long url using new API' do
@@ -47,12 +34,12 @@ describe 'RubyBitly' do
           Bitly.shorten(:long_url => 'http://google.com', :login => login, :api_key => api_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.success?).to eq(true)
+        expect(response.error).to eq(nil)
+        expect(response.new_hash?).to eq(false)
         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]*/)
+        expect(response.user_hash.length).not_to eq(0)
+        expect(response.short_url).to match(/^http:\/\/bit\.ly\/[A-Za-z0-9]*/)
       end
 
       it 'shorten long url with a preferred domain' do
@@ -60,21 +47,31 @@ describe 'RubyBitly' do
           Bitly.shorten(:long_url => 'http://google.com', :domain => 'j.mp', :login => login, :api_key => api_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.success?).to eq(true)
+        expect(response.error).to eq(nil)
+        expect(response.error).to eq(nil)
+        expect(response.new_hash?).to eq(false)
         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]*/)
+        expect(response.user_hash.length).not_to eq(0)
+        expect(response.short_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, api_key)
+          Bitly.shorten(long_url: 'http://bit.ly/bcvNe5', login: login, api_key: api_key)
         end
 
-        expect(response.status_txt).to eq('ALREADY_A_BITLY_LINK')
-        expect(response.status_code).to eq(500)
+        expect(response.success?).to eq(false)
+        expect(response.error).to eq('ALREADY_A_BITLY_LINK')
+      end
+
+      it 'uses invalid login' do
+        response = VCR.use_cassette('shorten_using_invalid_login') do
+          Bitly.shorten(long_url: 'http://bit.ly/bcvNe5', login: login, api_key: api_key)
+        end
+
+        expect(response.success?).to eq(false)
+        expect(response.error).to eq('INVALID_LOGIN')
       end
     end
 
@@ -83,30 +80,16 @@ describe 'RubyBitly' do
         Bitly.config { |c| c.login = login; c.api_key = api_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.success?).to eq(true)
+        expect(response.new_hash?).to eq(false)
         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]*/)
+        expect(response.user_hash.length).not_to eq(0)
+        expect(response.short_url).to match(/^http:\/\/bit\.ly\/[A-Za-z0-9]*/)
       end
     end
   end
@@ -114,16 +97,15 @@ describe 'RubyBitly' do
   describe 'expand' do
     context 'using local config' do
       before do
-        Bitly.config { |c| c.login = 'invalid login'; c.api_key = 'invalid api_key' }
+        Bitly.config { |c| c.login = 'any login'; c.api_key = 'any 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, api_key)
+          Bitly.expand(short_url: 'http://bit.ly/bcvNe5', login: login, api_key: api_key)
         end
 
-        expect(response.status_txt).to eq('OK')
-        expect(response.status_code).to eq(200)
+        expect(response.success?).to eq(true)
         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')
@@ -134,8 +116,7 @@ describe 'RubyBitly' do
           Bitly.expand({ :short_url => 'http://bit.ly/bcvNe5', :login => login, :api_key => api_key })
         end
 
-        expect(response.status_txt).to eq('OK')
-        expect(response.status_code).to eq(200)
+        expect(response.success?).to eq(true)
         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')
@@ -143,11 +124,10 @@ 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, api_key)
+          Bitly.expand(short_url: 'http://google.com', login: login, api_key: api_key)
         end
 
-        expect(response.status_txt).to eq('OK')
-        expect(response.status_code).to eq(200)
+        expect(response.success?).to eq(true)
         expect(response.long_url).to eq('NOT_FOUND')
         expect(response.short_url).to eq('http://google.com')
       end
@@ -158,25 +138,12 @@ describe 'RubyBitly' do
         Bitly.config { |c| c.login = login; c.api_key = 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')
-        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.success?).to eq(true)
         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')
@@ -188,21 +155,7 @@ 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 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, api_key)
-        end
-
-        expect(bitly.status_txt).to eq('OK')
-        expect(bitly.status_code).to eq(200)
-        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')
+        Bitly.config { |c| c.login = 'any login'; c.api_key = 'any api_key' }
       end
 
       it 'get clicks by short_url using options API' do
@@ -210,8 +163,7 @@ describe 'RubyBitly' do
           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.success?).to eq(true)
         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')
@@ -225,27 +177,12 @@ describe 'RubyBitly' do
         Bitly.config { |c| c.login = login; c.api_key = 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')
-        end
-
-        expect(bitly.status_txt).to eq('OK')
-        expect(bitly.status_code).to eq(200)
-        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')
-      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.success?).to eq(true)
         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')
@@ -286,8 +223,7 @@ describe 'RubyBitly' do
         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.success?).to eq(true)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'byebug'
 require 'ruby-bitly'
 require 'rspec'
 require 'vcr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bitly
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - dx7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2019-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,51 +53,65 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  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'
 description: A simple bit.ly ruby client to shorten URLs, expand or get number of
   clicks on a bitlink.
 email:
-- dx7@protonmail.ch
+- dx7@pm.me
 executables:
 - bitly
 extensions: []
@@ -120,6 +134,13 @@ files:
 - fixtures/vcr_cassettes/shorten_bitly_url.yml
 - fixtures/vcr_cassettes/shorten_long_url.yml
 - fixtures/vcr_cassettes/shorten_long_url_with_preferred_domain.yml
+- fixtures/vcr_cassettes/shorten_using_invalid_login.yml
+- gemfiles/rest-client-2.0.1.gemfile
+- gemfiles/rest-client-2.0.1.gemfile.lock
+- gemfiles/rest-client-2.0.2.gemfile
+- gemfiles/rest-client-2.0.2.gemfile.lock
+- gemfiles/rest-client-2.1.0.rc1.gemfile
+- gemfiles/rest-client-2.1.0.rc1.gemfile.lock
 - lib/ruby-bitly.rb
 - lib/ruby-bitly/version.rb
 - ruby-bitly.gemspec
@@ -140,16 +161,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A simple bit.ly ruby client to shorten URLs, expand or get number of clicks
   on a bitlink
 test_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
+- fixtures/vcr_cassettes/shorten_using_invalid_login.yml
+- gemfiles/rest-client-2.0.1.gemfile
+- gemfiles/rest-client-2.0.1.gemfile.lock
+- gemfiles/rest-client-2.0.2.gemfile
+- gemfiles/rest-client-2.0.2.gemfile.lock
+- gemfiles/rest-client-2.1.0.rc1.gemfile
+- gemfiles/rest-client-2.1.0.rc1.gemfile.lock
 - spec/ruby-bitly_spec.rb
 - spec/spec_helper.rb