bitly 0.10.4 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c137650fcf36f5135ae2283ab1246bd75b3ce505
+  data.tar.gz: df43c50f72e8b841f0749c01d890b592d28ced82
+SHA512:
+  metadata.gz: daaacffdcf70c390ddb2b39d4ad82102ce6275d33c416619e8ffd46c7f07273f2e70121022420d2290c2bba4d2c006da966e230bd6f43f359495e2bec3639f27
+  data.tar.gz: 5c0c02ea1ff855597a65986710ec75864a613eff42135f9e91e28d3843fbd023e53e877ff50833365a92f8d5a5169bc1c173232e1611e02bd00f5f8347dd0966

data/LICENSE.md

@@ -0,0 +1,22 @@
+Copyright (c) 2016 Phil Nash
+
+### MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest

@@ -1,9 +1,9 @@
 Gemfile
 History.txt
+LICENSE.md
 Manifest
 README.md
 Rakefile
-bitly.gemspec
 lib/bitly.rb
 lib/bitly/client.rb
 lib/bitly/config.rb

data/README.md

@@ -77,7 +77,7 @@ If you want to configure bitly through an initializer (e.g. `config/initializers
 
 ```ruby
 Bitly.use_api_version_3
-    
+
 Bitly.configure do |config|
   config.api_version = 3
   config.access_token = "API_KEY"
@@ -89,28 +89,3 @@ Instead of using `Bitly.new(username, api_key)` to get the client, use `Bitly.cl
 ```ruby
 Bitly.client.shorten('http://www.google.com')
 ```
-
-## LICENSE:
-
-> (The MIT License)
->
-> Copyright (c) 2009 Phil Nash
->
-> Permission is hereby granted, free of charge, to any person obtaining
-> a copy of this software and associated documentation files (the
-> 'Software'), to deal in the Software without restriction, including
-> without limitation the rights to use, copy, modify, merge, publish,
-> distribute, sublicense, and/or sell copies of the Software, and to
-> permit persons to whom the Software is furnished to do so, subject to
-> the following conditions:
->
-> The above copyright notice and this permission notice shall be
-> included in all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-> IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-> CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-> TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-> SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -19,6 +19,7 @@ Echoe.new('bitly', Bitly::VERSION) do |p|
     ['shoulda'],
     ['flexmock'],
     ['fakeweb'],
-    ['activesupport', '~> 3.2']
+    ['activesupport', '~> 3.2'],
+    ['minitest', '~> 5.8.3']
   ]
 end

data/bitly.gemspec

@@ -1,57 +1,61 @@
 # -*- encoding: utf-8 -*-
+# stub: bitly 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "bitly"
-  s.version = "0.10.4"
+  s.name = "bitly".freeze
+  s.version = "1.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Phil Nash"]
-  s.date = "2015-01-09"
-  s.description = "Use the bit.ly API to shorten or expand URLs"
-  s.email = "philnash@gmail.com"
-  s.extra_rdoc_files = ["README.md", "lib/bitly.rb", "lib/bitly/client.rb", "lib/bitly/config.rb", "lib/bitly/url.rb", "lib/bitly/utils.rb", "lib/bitly/v3.rb", "lib/bitly/v3/bitly.rb", "lib/bitly/v3/client.rb", "lib/bitly/v3/country.rb", "lib/bitly/v3/day.rb", "lib/bitly/v3/missing_url.rb", "lib/bitly/v3/oauth.rb", "lib/bitly/v3/realtime_link.rb", "lib/bitly/v3/referrer.rb", "lib/bitly/v3/url.rb", "lib/bitly/v3/user.rb", "lib/bitly/version.rb"]
-  s.files = ["Gemfile", "History.txt", "Manifest", "README.md", "Rakefile", "bitly.gemspec", "lib/bitly.rb", "lib/bitly/client.rb", "lib/bitly/config.rb", "lib/bitly/url.rb", "lib/bitly/utils.rb", "lib/bitly/v3.rb", "lib/bitly/v3/bitly.rb", "lib/bitly/v3/client.rb", "lib/bitly/v3/country.rb", "lib/bitly/v3/day.rb", "lib/bitly/v3/missing_url.rb", "lib/bitly/v3/oauth.rb", "lib/bitly/v3/realtime_link.rb", "lib/bitly/v3/referrer.rb", "lib/bitly/v3/url.rb", "lib/bitly/v3/user.rb", "lib/bitly/version.rb", "test/bitly/test_client.rb", "test/bitly/test_config.rb", "test/bitly/test_url.rb", "test/bitly/test_utils.rb", "test/fixtures/cnn.json", "test/fixtures/cnn_and_google.json", "test/fixtures/expand_cnn.json", "test/fixtures/expand_cnn_and_google.json", "test/fixtures/google_and_cnn_info.json", "test/fixtures/google_info.json", "test/fixtures/google_stats.json", "test/fixtures/shorten_error.json", "test/test_helper.rb"]
-  s.homepage = "http://github.com/philnash/bitly"
-  s.rdoc_options = ["--line-numbers", "--title", "Bitly", "--main", "README.md"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "bitly"
-  s.rubygems_version = "1.8.23.2"
-  s.summary = "Use the bit.ly API to shorten or expand URLs"
-  s.test_files = ["test/bitly/test_client.rb", "test/bitly/test_config.rb", "test/bitly/test_url.rb", "test/bitly/test_utils.rb", "test/test_helper.rb"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Phil Nash".freeze]
+  s.date = "2016-10-21"
+  s.description = "Use the bit.ly API to shorten or expand URLs".freeze
+  s.email = "philnash@gmail.com".freeze
+  s.extra_rdoc_files = ["LICENSE.md".freeze, "README.md".freeze, "lib/bitly.rb".freeze, "lib/bitly/client.rb".freeze, "lib/bitly/config.rb".freeze, "lib/bitly/url.rb".freeze, "lib/bitly/utils.rb".freeze, "lib/bitly/v3.rb".freeze, "lib/bitly/v3/bitly.rb".freeze, "lib/bitly/v3/client.rb".freeze, "lib/bitly/v3/country.rb".freeze, "lib/bitly/v3/day.rb".freeze, "lib/bitly/v3/missing_url.rb".freeze, "lib/bitly/v3/oauth.rb".freeze, "lib/bitly/v3/realtime_link.rb".freeze, "lib/bitly/v3/referrer.rb".freeze, "lib/bitly/v3/url.rb".freeze, "lib/bitly/v3/user.rb".freeze, "lib/bitly/version.rb".freeze]
+  s.files = ["Gemfile".freeze, "History.txt".freeze, "LICENSE.md".freeze, "Manifest".freeze, "README.md".freeze, "Rakefile".freeze, "bitly.gemspec".freeze, "lib/bitly.rb".freeze, "lib/bitly/client.rb".freeze, "lib/bitly/config.rb".freeze, "lib/bitly/url.rb".freeze, "lib/bitly/utils.rb".freeze, "lib/bitly/v3.rb".freeze, "lib/bitly/v3/bitly.rb".freeze, "lib/bitly/v3/client.rb".freeze, "lib/bitly/v3/country.rb".freeze, "lib/bitly/v3/day.rb".freeze, "lib/bitly/v3/missing_url.rb".freeze, "lib/bitly/v3/oauth.rb".freeze, "lib/bitly/v3/realtime_link.rb".freeze, "lib/bitly/v3/referrer.rb".freeze, "lib/bitly/v3/url.rb".freeze, "lib/bitly/v3/user.rb".freeze, "lib/bitly/version.rb".freeze, "test/bitly/test_client.rb".freeze, "test/bitly/test_config.rb".freeze, "test/bitly/test_url.rb".freeze, "test/bitly/test_utils.rb".freeze, "test/fixtures/cnn.json".freeze, "test/fixtures/cnn_and_google.json".freeze, "test/fixtures/expand_cnn.json".freeze, "test/fixtures/expand_cnn_and_google.json".freeze, "test/fixtures/google_and_cnn_info.json".freeze, "test/fixtures/google_info.json".freeze, "test/fixtures/google_stats.json".freeze, "test/fixtures/shorten_error.json".freeze, "test/test_helper.rb".freeze]
+  s.homepage = "http://github.com/philnash/bitly".freeze
+  s.rdoc_options = ["--line-numbers".freeze, "--title".freeze, "Bitly".freeze, "--main".freeze, "README.md".freeze]
+  s.rubyforge_project = "bitly".freeze
+  s.rubygems_version = "2.6.6".freeze
+  s.summary = "Use the bit.ly API to shorten or expand URLs".freeze
+  s.test_files = ["test/bitly/test_client.rb".freeze, "test/bitly/test_config.rb".freeze, "test/bitly/test_url.rb".freeze, "test/bitly/test_utils.rb".freeze, "test/test_helper.rb".freeze]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<multi_json>, ["~> 1.3"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0.7.6"])
-      s.add_runtime_dependency(%q<oauth2>, ["< 2.0", ">= 0.5.0"])
-      s.add_development_dependency(%q<echoe>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<flexmock>, [">= 0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
-      s.add_development_dependency(%q<activesupport>, ["~> 3.2"])
+      s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.3"])
+      s.add_runtime_dependency(%q<httparty>.freeze, [">= 0.7.6"])
+      s.add_runtime_dependency(%q<oauth2>.freeze, ["< 2.0", ">= 0.5.0"])
+      s.add_development_dependency(%q<echoe>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<flexmock>.freeze, [">= 0"])
+      s.add_development_dependency(%q<fakeweb>.freeze, [">= 0"])
+      s.add_development_dependency(%q<activesupport>.freeze, ["~> 3.2"])
+      s.add_development_dependency(%q<minitest>.freeze, ["~> 5.8.3"])
     else
-      s.add_dependency(%q<multi_json>, ["~> 1.3"])
-      s.add_dependency(%q<httparty>, [">= 0.7.6"])
-      s.add_dependency(%q<oauth2>, ["< 2.0", ">= 0.5.0"])
-      s.add_dependency(%q<echoe>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<flexmock>, [">= 0"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-      s.add_dependency(%q<activesupport>, ["~> 3.2"])
+      s.add_dependency(%q<multi_json>.freeze, ["~> 1.3"])
+      s.add_dependency(%q<httparty>.freeze, [">= 0.7.6"])
+      s.add_dependency(%q<oauth2>.freeze, ["< 2.0", ">= 0.5.0"])
+      s.add_dependency(%q<echoe>.freeze, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<flexmock>.freeze, [">= 0"])
+      s.add_dependency(%q<fakeweb>.freeze, [">= 0"])
+      s.add_dependency(%q<activesupport>.freeze, ["~> 3.2"])
+      s.add_dependency(%q<minitest>.freeze, ["~> 5.8.3"])
     end
   else
-    s.add_dependency(%q<multi_json>, ["~> 1.3"])
-    s.add_dependency(%q<httparty>, [">= 0.7.6"])
-    s.add_dependency(%q<oauth2>, ["< 2.0", ">= 0.5.0"])
-    s.add_dependency(%q<echoe>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<flexmock>, [">= 0"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-    s.add_dependency(%q<activesupport>, ["~> 3.2"])
+    s.add_dependency(%q<multi_json>.freeze, ["~> 1.3"])
+    s.add_dependency(%q<httparty>.freeze, [">= 0.7.6"])
+    s.add_dependency(%q<oauth2>.freeze, ["< 2.0", ">= 0.5.0"])
+    s.add_dependency(%q<echoe>.freeze, [">= 0"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<flexmock>.freeze, [">= 0"])
+    s.add_dependency(%q<fakeweb>.freeze, [">= 0"])
+    s.add_dependency(%q<activesupport>.freeze, ["~> 3.2"])
+    s.add_dependency(%q<minitest>.freeze, ["~> 5.8.3"])
   end
 end

data/lib/bitly/client.rb

@@ -4,11 +4,11 @@ require 'uri'
 
 module Bitly
   extend Config
-  API_URL     = 'http://api.bit.ly/'
+  API_URL     = 'https://api-ssl.bitly.com/'
   API_VERSION = '2.0.1'
 
   def self.new(login, api_key = nil, timeout=nil)
-    if @version == 3
+    if api_version == 3
       Bitly::V3::Client.new(login, api_key, timeout)
     else
       Bitly::Client.new(login,api_key)
@@ -16,11 +16,11 @@ module Bitly
   end
 
   def self.use_api_version_3
-    @version = 3
+    api_version = 3
   end
 
   def self.use_api_version_2
-    @version = 2
+    api_version = 2
   end
 
   # get and initialize a client if configured using Config

data/lib/bitly/utils.rb

@@ -9,11 +9,11 @@ module Bitly
       tr("-", "_").
       downcase
     end
-    
+
     def create_hash_from_url(url)
       url.gsub(/^.*(bit\.ly|j\.mp)\//,'')
     end
-    
+
     def attr_define(k,v)
       instance_variable_set("@#{k}", v)
       meta = class << self; self; end
@@ -31,7 +31,7 @@ module Bitly
         end
       end
     end
-    
+
     def create_url(resource="",args={})
       args = args.merge({:login => @login, :apiKey => @api_key, :version => API_VERSION})
       url = URI.join(API_URL,resource)
@@ -40,7 +40,7 @@ module Bitly
       url.query << "&" + long_urls.map { |long_url| "longUrl=#{CGI.escape(long_url)}" }.join("&") unless long_urls.nil?
       url
     end
-    
+
     def get_result(request)
       begin
         json = Net::HTTP.get(request)
@@ -55,6 +55,6 @@ module Bitly
         raise BitlyError.new(result['errorMessage'],result['errorCode'])
       end
     end
-    
+
   end
 end

data/lib/bitly/v3/user.rb

@@ -84,9 +84,8 @@ module Bitly
         @client ||= Bitly::V3::Client.new(login, api_key)
       end
 
-      # OAuth 2 endpoint that OAuth 2 endpoint that provides a given user's link
-      # shortening history, in reverse chronological order (most recent to least
-      # recent).
+      # OAuth 2 endpoint that provides a given user's link shortening history,
+      # in reverse chronological order (most recent to least recent).
       def link_history(opts={})
         opts.merge!(:access_token => @access_token.token)
         result = self.class.get("/user/link_history", :query => opts)
@@ -133,4 +132,4 @@ module Bitly
       end
     end
   end
-end
+end

data/lib/bitly/version.rb

@@ -1,3 +1,3 @@
 module Bitly
-  VERSION = '0.10.4'
+  VERSION = '1.0.0'
 end

data/test/bitly/test_client.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
 
-class TestClient < Test::Unit::TestCase
+class TestClient < Minitest::Test
   context "bitly module" do
     should "create a new bitly client" do
       b = Bitly.new(login, api_key)
@@ -43,7 +43,7 @@ class TestClient < Test::Unit::TestCase
     context "shortening" do
       context "a single link" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/shorten\?.*longUrl=.*cnn.com.*$/,"cnn.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/shorten\?.*longUrl=.*cnn.com.*$/,"cnn.json")
           @url = @bitly.shorten('http://cnn.com')
         end
         should "return a Bitly::Url" do
@@ -62,7 +62,7 @@ class TestClient < Test::Unit::TestCase
       end
       context "multiple links" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/shorten\?.*longUrl=.*longUrl=.*$/,"cnn_and_google.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/shorten\?.*longUrl=.*longUrl=.*$/,"cnn_and_google.json")
           @urls = @bitly.shorten(['http://cnn.com', 'http://google.com'])
         end
         should "return an array of Bitly::Urls" do
@@ -80,7 +80,7 @@ class TestClient < Test::Unit::TestCase
       end
       context "no links" do
         should "raise an ArgumentError" do
-          assert_raise ArgumentError do
+          assert_raises ArgumentError do
             @bitly.shorten
           end
         end
@@ -89,7 +89,7 @@ class TestClient < Test::Unit::TestCase
     context "expanding" do
       context "a hash" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
           @url = @bitly.expand("31IqMl")
         end
         should "return a Bitly::Url" do
@@ -107,7 +107,7 @@ class TestClient < Test::Unit::TestCase
       end
       context "a short bitly url" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
           @url = @bitly.expand("http://bit.ly/31IqMl")
         end
         should "return a Bitly::Url" do
@@ -128,7 +128,7 @@ class TestClient < Test::Unit::TestCase
       end
       context "a short jmp url" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
           @url = @bitly.expand("http://j.mp/31IqMl")
         end
         should "return a Bitly::Url" do
@@ -149,7 +149,7 @@ class TestClient < Test::Unit::TestCase
       end
       context "multiple hashes" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=15DlK.*3j4ir4.*$/,"expand_cnn_and_google.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/expand\?.*hash=15DlK.*3j4ir4.*$/,"expand_cnn_and_google.json")
           @urls = @bitly.expand(["15DlK","3j4ir4"])
         end
         should "return an array of Bitly::Urls" do
@@ -170,70 +170,70 @@ class TestClient < Test::Unit::TestCase
     context "to get info on" do
       context "a single link" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/info\?.*hash=3j4ir4.*$/,"google_info.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/info\?.*hash=3j4ir4.*$/,"google_info.json")
           @url = @bitly.info('http://bit.ly/3j4ir4')
         end
         should "return a Bitly::Url" do
           assert_kind_of Bitly::Url, @url
         end
         should "return an info object with the url" do
-          assert_not_nil @url.info
+          assert !@url.info.nil?
         end
       end
       context "a single hash" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/info\?.*hash=3j4ir4.*$/,"google_info.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/info\?.*hash=3j4ir4.*$/,"google_info.json")
           @url = @bitly.info('3j4ir4')
         end
         should "return a Bitly::Url" do
           assert_kind_of Bitly::Url, @url
         end
         should "return an info object with the url" do
-          assert_not_nil @url.info
+          assert !@url.info.nil?
         end
       end
       context "a list of hashes" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/info\?.*hash=3j4ir4.*31IqMl.*$/,"google_and_cnn_info.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/info\?.*hash=3j4ir4.*31IqMl.*$/,"google_and_cnn_info.json")
           @urls = @bitly.info(['3j4ir4','31IqMl'])
         end
         should "return a Bitly::Url" do
           assert_kind_of Array, @urls
         end
         should "return an info object with the url" do
-          assert_not_nil @urls[0].info
-          assert_not_nil @urls[1].info
+          assert !@urls[0].info.nil?
+          assert !@urls[1].info.nil?
         end
       end
     end
     context "to get stats on" do
       context "a single link" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
           @url = @bitly.stats('http://bit.ly/3j4ir4')
         end
         should "return a Bitly::Url" do
           assert_kind_of Bitly::Url, @url
         end
         should "return an stats object" do
-          assert_not_nil @url.stats
+          assert !@url.stats.nil?
         end
       end
       context "a single hash" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
           @url = @bitly.stats('3j4ir4')
         end
         should "return a Bitly::Url" do
           assert_kind_of Bitly::Url, @url
         end
         should "return an stats object" do
-          assert_not_nil @url.stats
+          assert !@url.stats.nil?
         end
       end
       context "a list of hashes" do
         should "return an argument error" do
-          assert_raise ArgumentError do
+          assert_raises ArgumentError do
             @bitly.stats(['3j4ir4','31IqMl'])
           end
         end

data/test/bitly/test_config.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
 
-class TestConfig < Test::Unit::TestCase
+class TestConfig < Minitest::Test
   context "bitly module" do
     should "create a new bitly v3 client through initializer" do
       # configure

data/test/bitly/test_url.rb

@@ -1,22 +1,16 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
 
-class TestUrl < Test::Unit::TestCase
+class TestUrl < Minitest::Test
   context "a new Bitly::Url" do
     should "require a login and api_key" do
-      assert_raise ArgumentError do Bitly::Url.new end
-      assert_raise ArgumentError do Bitly::Url.new(login) end
-      assert_raise ArgumentError do Bitly::Url.new(nil, api_key) end
-      assert_nothing_raised do
-        Bitly::Url.new(login, api_key)
-        Bitly::Url.new(login, api_key, :hash => '3j4ir4')
-        Bitly::Url.new(login, api_key, :short_url => 'http://bit.ly/3j4ir4')
-        Bitly::Url.new(login, api_key, :long_url => 'http://google.com/')
-      end
+      assert_raises ArgumentError do Bitly::Url.new end
+      assert_raises ArgumentError do Bitly::Url.new(login) end
+      assert_raises ArgumentError do Bitly::Url.new(nil, api_key) end
     end
     context "shortening" do
       context "with a long url" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/shorten\?.*longUrl=.*cnn.com.*$/,"cnn.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/shorten\?.*longUrl=.*cnn.com.*$/,"cnn.json")
           @url = Bitly::Url.new(login, api_key, :long_url => 'http://cnn.com/')
         end
         should "return a short url" do
@@ -33,7 +27,7 @@ class TestUrl < Test::Unit::TestCase
           @url = Bitly::Url.new(login, api_key)
         end
         should "raise an error" do
-          assert_raise ArgumentError do
+          assert_raises ArgumentError do
             @url.shorten
           end
         end
@@ -51,7 +45,7 @@ class TestUrl < Test::Unit::TestCase
     context "expanding" do
       context "with a hash" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
           @url = Bitly::Url.new(login, api_key, :hash => '31IqMl')
         end
         should "return an expanded url" do
@@ -60,7 +54,7 @@ class TestUrl < Test::Unit::TestCase
       end
       context "with a short url" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
           @url = Bitly::Url.new(login, api_key, :short_url => 'http://bit.ly/31IqMl')
         end
         should "return an expanded url" do
@@ -72,7 +66,7 @@ class TestUrl < Test::Unit::TestCase
           @url = Bitly::Url.new(login, api_key)
         end
         should "raise an error" do
-          assert_raise ArgumentError do
+          assert_raises ArgumentError do
             @url.expand
           end
         end
@@ -90,7 +84,7 @@ class TestUrl < Test::Unit::TestCase
     context "info" do
       context "with a hash" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/info\?.*hash=3j4ir4.*$/,"google_info.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/info\?.*hash=3j4ir4.*$/,"google_info.json")
           @url = Bitly::Url.new(login, api_key, :hash => '3j4ir4')
         end
         should "return info" do
@@ -99,7 +93,7 @@ class TestUrl < Test::Unit::TestCase
       end
       context "with a short url" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/info\?.*hash=3j4ir4.*$/,"google_info.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/info\?.*hash=3j4ir4.*$/,"google_info.json")
           @url = Bitly::Url.new(login, api_key, :short_url => 'http://bit.ly/3j4ir4')
         end
         should "return an expanded url" do
@@ -111,14 +105,14 @@ class TestUrl < Test::Unit::TestCase
           @url = Bitly::Url.new(login, api_key, :long_url => 'http://google.com')
         end
         should "raise an error" do
-          assert_raise ArgumentError do
+          assert_raises ArgumentError do
             @url.info
           end
         end
       end
       context "with info already" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/info\?.*hash=3j4ir4.*$/,"google_info.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/info\?.*hash=3j4ir4.*$/,"google_info.json")
           @url = Bitly::Url.new(login, api_key, :short_url => 'http://bit.ly/3j4ir4')
           @url.info
         end
@@ -131,7 +125,7 @@ class TestUrl < Test::Unit::TestCase
     context "stats" do
       context "with a hash" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
           @url = Bitly::Url.new(login, api_key, :hash => '3j4ir4')
         end
         should "return info" do
@@ -140,7 +134,7 @@ class TestUrl < Test::Unit::TestCase
       end
       context "with a short url" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
           @url = Bitly::Url.new(login, api_key, :short_url => 'http://bit.ly/3j4ir4')
         end
         should "return an expanded url" do
@@ -152,14 +146,14 @@ class TestUrl < Test::Unit::TestCase
           @url = Bitly::Url.new(login, api_key, :long_url => 'http://google.com')
         end
         should "raise an error" do
-          assert_raise ArgumentError do
+          assert_raises ArgumentError do
             @url.stats
           end
         end
       end
       context "with info already" do
         setup do
-          stub_get(/^http:\/\/api.bit.ly\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
+          stub_get(/^https:\/\/api-ssl\.bitly\.com\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
           @url = Bitly::Url.new(login, api_key, :short_url => 'http://bit.ly/3j4ir4')
           @url.stats
         end
@@ -170,4 +164,4 @@ class TestUrl < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/bitly/test_utils.rb

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
 
-class TestUtils < Test::Unit::TestCase
+class TestUtils < Minitest::Test
   include Bitly::Utils
   API_VERSION = '2.0.1'
-  
+
   context "text utils" do
     should "underscore a word" do
       assert_equal "hello_world", underscore("HelloWorld")
@@ -15,24 +15,24 @@ class TestUtils < Test::Unit::TestCase
       assert_equal "hello", create_hash_from_url("http://j.mp/hello")
     end
   end
-  
+
   context "class utils" do
     should "turn a key value pair into an instance variable" do
       attr_define('hello','goodbye')
       assert_equal @hello, "goodbye"
     end
-    
+
     should "turn a hash into instance variables" do
       instance_variablise({'hello' => 'goodbye'}, ['hello'])
       assert_equal @hello, "goodbye"
     end
-    
+
     should "not turn nonspecified variables into instance variables" do
       instance_variablise({'hello' => 'goodbye'}, [])
       assert_nil @hello
     end
   end
-  
+
   context "creating a url" do
     setup do
       @api_key = api_key
@@ -40,7 +40,7 @@ class TestUtils < Test::Unit::TestCase
     end
     should "contain all the basic information" do
       url = create_url.to_s
-      assert url.include?('http://api.bit.ly/')
+      assert url.include?('https://api-ssl.bitly.com/')
       assert url.include?("version=#{API_VERSION}")
       assert url.include?("apiKey=#{api_key}")
       assert url.include?("login=#{login}")
@@ -54,7 +54,7 @@ class TestUtils < Test::Unit::TestCase
       assert url.include?("longUrl=#{CGI.escape('http://google.com')}")
     end
   end
-  
+
   context "fetching a url" do
     context "successfully" do
       setup do
@@ -70,10 +70,10 @@ class TestUtils < Test::Unit::TestCase
         stub_get("http://example.com", 'shorten_error.json')
       end
       should "raise BitlyError" do
-        assert_raise BitlyError do
-          result = get_result(URI.join("http://example.com"))
+        assert_raises BitlyError do
+          get_result(URI.join("http://example.com"))
         end
       end
     end
   end
-end
+end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'rubygems'
 require 'shoulda'
-require 'flexmock/test_unit'
+require 'flexmock/minitest'
 require 'fakeweb'
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'bitly')
@@ -31,7 +31,7 @@ def access_token
   'test_access_token'
 end
 
-class Test::Unit::TestCase
+class Minitest::Test
   def teardown
     FakeWeb.clean_registry
   end

metadata

@@ -1,171 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: bitly
 version: !ruby/object:Gem::Version
-  version: 0.10.4
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.6
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: echoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.8.3
 description: Use the bit.ly API to shorten or expand URLs
 email: philnash@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- LICENSE.md
 - README.md
 - lib/bitly.rb
 - lib/bitly/client.rb
@@ -187,6 +183,7 @@ extra_rdoc_files:
 files:
 - Gemfile
 - History.txt
+- LICENSE.md
 - Manifest
 - README.md
 - Rakefile
@@ -223,32 +220,31 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/philnash/bitly
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --title
+- "--line-numbers"
+- "--title"
 - Bitly
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: bitly
-rubygems_version: 1.8.23.2
+rubygems_version: 2.6.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use the bit.ly API to shorten or expand URLs
 test_files:
 - test/bitly/test_client.rb