bitly 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6177384aaa8fda97a1c94d1690c28266a28c2146
-  data.tar.gz: 1e497fd4d5118627640bd6126e8a060f647da6f3
+  metadata.gz: 3592942cb5d03b9e56b4f751ee49f03fa59a7e96
+  data.tar.gz: 72f69d6ca04ecff3b8421571b9bea0d970940029
 SHA512:
-  metadata.gz: 127a9366b1b84e73653cbb3704f119c5bc73a324bf52e4223dd46e0b3529fe2531e916a6c4a407d8d21846cd0620113afd88dc1ab1ad95a7bc14188bbafeff78
-  data.tar.gz: f217f9b896824571c7f1a2676084c7bb93eaf135597128b69ff554231673dcd7b69230643ac2edb574d7d9e1aea294d2eb421c704feb5974a5dda8b85dc30cac
+  metadata.gz: 3cff305dfab3f5542b7f96ca2db26befedf5bce50d03e63f0243a2d96b42d11262dfe95f9e06fde19dcf2ee57c7df19ba07e38a5bebea4c562295d784f88bd65
+  data.tar.gz: 1e077835817c1d91860cbf62fec80130a0355d1f056a05ebff70bd4aecfc03a9f711b3a6c6063cf6534bac2064d428d958dc37199b445e3c119ad6daab52fd4e

data/Rakefile

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

data/bitly.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: bitly 1.0.2 ruby lib
+# stub: bitly 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bitly".freeze
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   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-11-03"
+  s.date = "2017-02-25"
   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]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   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.rubygems_version = "2.6.8".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]
 
@@ -27,24 +27,22 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<rack>.freeze, ["<2"]) if RUBY_VERSION.to_f < 2.2
       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<webmock>.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>.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<rack>.freeze, ["<2"]) if RUBY_VERSION.to_f < 2.2
       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<webmock>.freeze, [">= 0"])
       s.add_dependency(%q<activesupport>.freeze, ["~> 3.2"])
       s.add_dependency(%q<minitest>.freeze, ["~> 5.8.3"])
     end
@@ -52,12 +50,11 @@ Gem::Specification.new do |s|
     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<rack>.freeze, ["<2"]) if RUBY_VERSION.to_f < 2.2
     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<webmock>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, ["~> 3.2"])
     s.add_dependency(%q<minitest>.freeze, ["~> 5.8.3"])
   end

data/lib/bitly/url.rb

@@ -1,26 +1,26 @@
 module Bitly
-  
+
   class Url
     include Bitly::Utils
-    
+
     attr_accessor :long_url, :short_url, :hash, :user_hash
     VARIABLES = ['long_url', 'short_url', 'hash', 'user_hash']
-    
+
     def initialize(login,api_key,obj=nil)
       unless obj.nil?
         raise BitlyError.new(obj['errorMessage'],obj['errorCode']) if obj['statusCode'] == "ERROR"
         instance_variablise(obj, VARIABLES)
-        @info = obj[:info] if obj[:info]
-        @stats = obj[:stats] if obj[:stats]
+        @info = obj.fetch(:info, nil)
+        @stats = obj.fetch(:stats, nil)
       end
       @login = login
       @api_key = api_key
       raise ArgumentError.new("Please provide a login and api_key") if @login.nil? || @api_key.nil?
     end
-    
+
     def shorten(opts = {})
-      return @short_url if @short_url
-      unless @long_url.nil?
+      return @short_url if defined? @short_url
+      if defined? @long_url
         request = create_url("shorten", :longUrl => @long_url, :history => (opts[:history] ? 1 : nil))
         result = get_result(request)[@long_url.gsub(/\/$/,'')]
         if result['statusCode'] == "ERROR"
@@ -33,11 +33,11 @@ module Bitly
         raise ArgumentError.new("You need a long_url in order to shorten it")
       end
     end
-    
+
     def expand
-      return @long_url if @long_url
-      unless !(@short_url || @hash)
-        unless @hash
+      return @long_url if defined? @long_url
+      unless !(short_url || hash)
+        unless defined? @hash
           @hash = create_hash_from_url(@short_url)
         end
         request = create_url("expand", :hash => @hash)
@@ -52,15 +52,15 @@ module Bitly
         raise ArgumentError.new("You need a short_url or a hash in order to expand it")
       end
     end
-    
+
     def info
       if @info.nil?
-        if @hash
+        if defined? @hash
           request = create_url "info", :hash => @hash
           result = get_result(request)[@hash]
           instance_variablise(result, VARIABLES)
           @info = result
-        elsif @short_url
+        elsif defined? @short_url
           @hash = create_hash_from_url(@short_url)
           request = create_url "info", :hash => hash
           result = get_result(request)[hash]
@@ -74,12 +74,12 @@ module Bitly
         @info
       end
     end
-    
+
     def stats
       if @stats.nil?
-        if @hash
+        if defined? @hash
           request = create_url "stats", :hash => @hash
-        elsif @short_url
+        elsif defined? @short_url
           @hash = create_hash_from_url(@short_url)
           request = create_url "stats", :hash => @hash
         else
@@ -90,14 +90,14 @@ module Bitly
         @stats
       end
     end
-    
+
     def bitly_url
       @short_url.nil? ? nil : @short_url.gsub(/j\.mp/,'bit.ly')
     end
-    
+
     def jmp_url
       @short_url.nil? ? nil : @short_url.gsub(/bit\.ly/,'j.mp')
     end
   end
 
-end
+end

data/lib/bitly/utils.rb

@@ -16,8 +16,6 @@ module Bitly
 
     def attr_define(k,v)
       instance_variable_set("@#{k}", v)
-      meta = class << self; self; end
-      meta.class_eval { attr_reader k.to_sym }
     end
 
     def instance_variablise(obj,variables)
@@ -44,7 +42,6 @@ module Bitly
     def get_result(request)
       begin
         json = Net::HTTP.get(request)
-        # puts json.inspect
         result = MultiJson.load(json)
       rescue MultiJson::DecodeError
         result = {'errorMessage' => 'JSON Parse Error(Bit.ly messed up)', 'errorCode' => 69, 'statusCode' => 'ERROR'}

data/lib/bitly/v3/client.rb

@@ -4,9 +4,8 @@ module Bitly
     # username and API key and then you will be able to use the client to perform
     # all the rest of the actions available through the API.
     class Client
-      API_URL_SSL = 'https://api-ssl.bitly.com/v3/'
       include HTTParty
-      base_uri 'http://api.bitly.com/v3/'
+      base_uri 'https://api-ssl.bitly.com/v3/'
 
       # Requires a generic OAuth2 access token or -deprecated- login and api key.
       # http://dev.bitly.com/authentication.html#apikey
@@ -15,11 +14,10 @@ module Bitly
       # Visit your account at http://bit.ly/a/account
       def initialize(*args)
         args.compact!
-        self.timeout = args.last.is_a?(Fixnum) ? args.pop : nil
+        self.timeout = args.last.is_a?(0.class) ? args.pop : nil
         if args.count == 1
-          # Set generic OAuth2 access token and change base URI (use SSL)
+          # Set generic OAuth2 access token
           @default_query_opts = { :access_token => args.first }
-          self.class.base_uri API_URL_SSL
         else
           # Deprecated ApiKey authentication
           @default_query_opts = {

data/lib/bitly/version.rb

@@ -1,3 +1,3 @@
 module Bitly
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/test/bitly/test_client.rb

@@ -2,6 +2,10 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
 
 class TestClient < Minitest::Test
   context "bitly module" do
+    setup do
+      Bitly.api_version = nil
+    end
+
     should "create a new bitly client" do
       b = Bitly.new(login, api_key)
       assert_equal Bitly::Client, b.class
@@ -55,6 +59,7 @@ class TestClient < Minitest::Test
   end
   context "using the bitly client" do
     setup do
+      Bitly.use_api_version_2
       @bitly = Bitly.new(login, api_key)
     end
 

data/test/bitly/test_utils.rb

@@ -29,7 +29,7 @@ class TestUtils < Minitest::Test
 
     should "not turn nonspecified variables into instance variables" do
       instance_variablise({'hello' => 'goodbye'}, [])
-      assert_nil @hello
+      assert !(defined? @hello)
     end
   end
 

data/test/test_helper.rb

@@ -2,11 +2,12 @@ require 'minitest/autorun'
 require 'rubygems'
 require 'shoulda'
 require 'flexmock/minitest'
-require 'fakeweb'
+require 'webmock/minitest'
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'bitly')
 
-FakeWeb.allow_net_connect = false
+WebMock.disable_net_connect!
+WebMock::Config.instance.query_values_notation = :flat_array
 
 def fixture_file(filename)
   return '' if filename == ''
@@ -18,7 +19,7 @@ def stub_get(url, filename, status=nil)
   options = {:body => fixture_file(filename)}
   options.merge!({:status => status}) unless status.nil?
 
-  FakeWeb.register_uri(:get, url, options)
+  stub_request(:get, url).to_return(options)
 end
 
 def api_key
@@ -33,6 +34,6 @@ end
 
 class Minitest::Test
   def teardown
-    FakeWeb.clean_registry
+    WebMock.reset!
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitly
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -42,22 +42,22 @@ dependencies:
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !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
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !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
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: bitly
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Use the bit.ly API to shorten or expand URLs