bitly 0.2 → 0.3

data/History.txt

@@ -1,3 +1,17 @@
+=== 0.3 / 2009-07-09
+
+* 1 major enhancement
+
+  * a full set of tests, properly mocked
+
+* 1 minor enhancement
+
+  * calling bitly.shorten(:history => 1) will add the url to the api user's history.
+  
+* 1 bug fix
+
+  * you can no longer call shorten with a keyword, this was unsupported in the API and consequently removed
+
 === 0.2 / 2009-06-23
 
 * 1 enhancement

data/README.txt

@@ -6,6 +6,10 @@ A Ruby API for bit.ly
 
 http://code.google.com/p/bitly-api/wiki/ApiDocumentation
 
+== INSTALLATION:
+
+gem install bitly
+
 == USAGE:
 
 Create a Bitly client using your username and api key as follows:
@@ -15,7 +19,7 @@ bitly = Bitly.new(username, api_key)
 You can then use that client to shorten or expand urls or return more information or statistics as so:
 
 bitly.shorten('http://www.google.com')
-bitly.shorten('http://www.google.com', 'keyword') # returns a shortened url using the given keyword
+bitly.shorten('http://www.google.com', :history => 1) # adds the url to the api user's history
 bitly.expand('wQaT')
 bitly.info('http://bit.ly/wQaT')
 bitly.stats('http://bit.ly/wQaT')
@@ -33,8 +37,6 @@ u.hash #=> "2V6CFi"
 u.info #=> a ruby hash of the JSON returned from the API
 u.stats #=> a ruby hash of the JSON returned from the API
 
-You should be able to specify a keyword when shortening (though at last test, this didn't seem to be working http://code.google.com/p/bitly-api/issues/detail?id=5). To do so, just add a keyword parameter:
-
 bitly.shorten('http://www.google.com', 'keyword')
 
 == LICENSE:

data/bitly.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitly}
-  s.version = "0.2"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Nash"]
-  s.date = %q{2009-06-23}
+  s.date = %q{2009-07-09}
   s.description = %q{Use the bit.ly API to shorten or expand URLs}
   s.email = %q{philnash@gmail.com}
   s.extra_rdoc_files = ["lib/bitly/client.rb", "lib/bitly/url.rb", "lib/bitly/utils.rb", "lib/bitly/version.rb", "lib/bitly.rb", "README.txt"]
-  s.files = ["bitly.gemspec", "History.txt", "lib/bitly/client.rb", "lib/bitly/url.rb", "lib/bitly/utils.rb", "lib/bitly/version.rb", "lib/bitly.rb", "Manifest", "Rakefile", "README.txt", "test/test_bitly.rb"]
+  s.files = ["bitly.gemspec", "History.txt", "lib/bitly/client.rb", "lib/bitly/url.rb", "lib/bitly/utils.rb", "lib/bitly/version.rb", "lib/bitly.rb", "Manifest", "Rakefile", "README.txt", "test/test_bitly.rb", "test/bitly/test_client.rb", "test/bitly/test_url.rb", "test/bitly/test_utils.rb", "test/test_helper.rb"]
   s.homepage = %q{http://github.com/philnash/bitly}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Bitly", "--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{bitly}
   s.rubygems_version = %q{1.3.4}
   s.summary = %q{Use the bit.ly API to shorten or expand URLs}
-  s.test_files = ["test/test_bitly.rb"]
+  s.test_files = ["test/bitly/test_client.rb", "test/bitly/test_url.rb", "test/bitly/test_utils.rb", "test/test_bitly.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/bitly/client.rb

@@ -18,15 +18,15 @@ module Bitly
       @login = login
       @api_key = api_key
     end
-    
-    def shorten(input, keyword=nil)
+
+    def shorten(input, opts={})
       if input.is_a? String
-        request = create_url "shorten", :longUrl => input, :keyword => keyword
+        request = create_url("shorten", :longUrl => input, :history => (opts[:history] ? 1 : nil))
         result = get_result(request)
         result = {:long_url => input}.merge result[input]
         Bitly::Url.new(@login,@api_key,result)
       elsif input.is_a? Array
-        request = create_url "shorten"
+        request = create_url("shorten", :history => (opts[:history] ? 1 : nil))
         request.query << "&" + input.map { |long_url| "longUrl=#{CGI.escape(long_url)}" }.join("&") unless input.nil?
         result = get_result(request)
         input.map do |long_url|
@@ -34,14 +34,14 @@ module Bitly
           long_url = Bitly::Url.new(@login,@api_key,new_url)
         end
       else
-        raise ArgumentError
+        raise ArgumentError.new("Shorten requires either a url or an array of urls")
       end
     end
     
     def expand(input)
       if input.is_a? String
         if input.include? "bit.ly/"
-          hash = input.gsub(/^.*bit.ly\//,'')
+          hash = create_hash_from_url(input)
           request = create_url "expand", :hash => hash
           result = get_result(request)
           result = { :short_url => input, :hash => hash }.merge result[hash]
@@ -59,14 +59,14 @@ module Bitly
           hsh = Bitly::Url.new(@login,@api_key,new_url)
         end
       else
-        raise ArgumentError
+        raise ArgumentError('Expand requires either a short url, a hash or an array of hashes')
       end
     end
     
     def info(input)
       if input.is_a? String
         if input.include? "bit.ly/"
-          hash = input.gsub(/^.*bit.ly\//,'')
+          hash = create_hash_from_url(input)
           request = create_url 'info', :hash => hash
           result = get_result(request)
           result = { :short_url => "http://bit.ly/#{hash}", :hash => hash }.merge result[hash]
@@ -83,13 +83,15 @@ module Bitly
           new_url = {:hash => hsh, :short_url => "http://bit.ly/#{hsh}"}.merge result[hsh]
           hsh = Bitly::Url.new(@login,@api_key,:info => new_url)
         end
+      else
+        raise ArgumentError.new('Info requires either a short url, a hash or an array of hashes')
       end
     end
     
     def stats(input)
       if input.is_a? String
         if input.include? "bit.ly/"
-          hash = input.gsub(/^.*bit.ly\//,'')
+          hash = create_hash_from_url(input)
           request = create_url 'stats', :hash => hash
           result = get_result(request)
           result = { :short_url => "http://bit.ly/#{hash}", :hash => hash }.merge result
@@ -100,7 +102,7 @@ module Bitly
         end
         Bitly::Url.new(@login,@api_key,:stats => result)
       else
-        raise ArgumentError
+        raise ArgumentError.new("Stats requires either a short url or a hash")
       end
     end
     
@@ -111,9 +113,9 @@ end
 class BitlyError < StandardError
   attr_reader :code
   alias :msg :message
-  def initialize(msg, code, req)
+  def initialize(msg, code)
     @code = code
-    super("'#{req}' - #{msg}")
+    super("#{msg} - '#{code}'")
   end
 end
 

data/lib/bitly/url.rb

@@ -3,19 +3,55 @@ module Bitly
   class Url
     include Bitly::Utils
     
-    VARIABLES = ['long_url', 'short_url', 'hash', 'user_hash', 'short_keyword_url']
+    attr_accessor :long_url, :short_url, :hash, :user_hash
+    attr_reader :info, :stats
+    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'],'expand') if obj['statusCode'] == "ERROR"
-        
+        raise BitlyError.new(result['errorMessage'],result['errorCode']) if obj['statusCode'] == "ERROR"
         instance_variablise(obj, VARIABLES)
         @info = obj[:info] if obj[:info]
         @stats = obj[:stats] if obj[:stats]
       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?
+        request = create_url("shorten", :longUrl => @long_url, :history => (opts[:history] ? 1 : nil))
+        result = get_result(request)[@long_url.gsub(/\/$/,'')]
+        if result['statusCode'] == "ERROR"
+          raise BitlyError.new(result['errorMessage'],result['errorCode'])
+        else
+          instance_variablise(result,VARIABLES)
+          return @short_url
+        end
+      else
+        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
+          @hash = create_hash_from_url(@short_url)
+        end
+        request = create_url("expand", :hash => @hash)
+        result = get_result(request)[@hash]
+        if result['statusCode'] == "ERROR"
+          raise BitlyError.new(result['errorMessage'],result['errorCode'])
+        else
+          instance_variablise(result,VARIABLES)
+          return @long_url
+        end
+      else
+        raise ArgumentError.new("You need a short_url or a hash in order to expand it")
+      end
     end
     
     def info
@@ -26,14 +62,15 @@ module Bitly
           instance_variablise(result, VARIABLES)
           @info = result
         elsif @short_url
-          hash = @short_url.gsub(/^.*bit.ly\//,'')
+          @hash = create_hash_from_url(@short_url)
           request = create_url "info", :hash => hash
           result = get_result(request)[hash]
           instance_variablise(result, VARIABLES)
           @info = result
         else
-          nil
+          raise ArgumentError.new("You need a hash or short_url in order to get info")
         end
+        return @info
       else
         @info
       end
@@ -44,7 +81,10 @@ module Bitly
         if @hash
           request = create_url "stats", :hash => @hash
         elsif @short_url
-          request = create_url "stats", :shortUrl => @short_url
+          @hash = create_hash_from_url(@short_url)
+          request = create_url "stats", :hash => @hash
+        else
+          raise ArgumentError.new("You need a hash or short_url in order to get stats")
         end
         @stats = get_result(request)
       else

data/lib/bitly/utils.rb

@@ -2,7 +2,6 @@ require 'cgi'
 
 module Bitly
   module Utils
-    private
     def underscore(camel_cased_word) # stolen from rails
       camel_cased_word.to_s.gsub(/::/, '/').
       gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
@@ -11,6 +10,10 @@ module Bitly
       downcase
     end
     
+    def create_hash_from_url(url)
+      url.gsub(/^.*bit.ly\//,'')
+    end
+    
     def attr_define(k,v)
       instance_variable_set("@#{k}", v)
       meta = class << self; self; end
@@ -42,12 +45,12 @@ module Bitly
       begin
         result = Crack::JSON.parse(Net::HTTP.get(request))
       rescue
-        result = {'statusCode' => 'JSON Parse Error(Bit.ly messed up)', 'errorCode' => 69}
+        result = {'errorMessage' => 'JSON Parse Error(Bit.ly messed up)', 'errorCode' => 69, 'statusCode' => 'ERROR'}
       end
       if result['statusCode'] == "OK"
         result = result['results']
       else
-        raise BitlyError.new(result['errorMessage'],result['errorCode'],'expand')
+        raise BitlyError.new(result['errorMessage'],result['errorCode'])
       end
     end
     

data/lib/bitly/version.rb

@@ -1,3 +1,3 @@
 module Bitly
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/test/bitly/test_client.rb

@@ -0,0 +1,187 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
+
+class TestClient < Test::Unit::TestCase
+  context "bitly module" do
+    should "create a new bitly client" do
+      b = Bitly.new(login, api_key)
+      assert_equal Bitly::Client, b.class
+    end
+  end
+  context "using the bitly client" do
+    setup do
+      @bitly = Bitly.new(login, api_key)
+    end
+    
+    context "shortening" do
+      context "a single link" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/shorten\?.*longUrl=.*cnn.com.*$/,"cnn.json")
+          @url = @bitly.shorten('http://cnn.com')
+        end
+        should "return a Bitly::Url" do
+          assert_kind_of Bitly::Url, @url
+        end
+        should "return a short bitly url" do
+          assert_equal "http://bit.ly/15DlK", @url.short_url
+        end
+        should "save the long url" do
+          assert_equal "http://cnn.com", @url.long_url
+        end
+      end
+      context "multiple links" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/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
+          assert_kind_of Array, @urls
+          assert_kind_of Bitly::Url, @urls[0]
+        end
+        should "shorten the urls in order" do
+          assert_equal "http://bit.ly/15DlK", @urls[0].short_url
+          assert_equal "http://bit.ly/11etr", @urls[1].short_url
+        end
+        should "save the long urls" do
+          assert_equal "http://cnn.com", @urls[0].long_url
+          assert_equal "http://google.com", @urls[1].long_url
+        end
+      end
+      context "no links" do
+        should "raise an ArgumentError" do
+          assert_raise ArgumentError do
+            @bitly.shorten
+          end
+        end
+      end
+    end
+    context "expanding" do
+      context "a hash" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
+          @url = @bitly.expand("31IqMl")
+        end
+        should "return a Bitly::Url" do
+          assert_kind_of Bitly::Url, @url
+        end
+        should "return the expanded url" do
+          assert_equal "http://cnn.com/", @url.long_url
+        end
+        should "save the hash" do
+          assert_equal "31IqMl", @url.hash
+        end
+        should "save the short url" do
+          assert_equal "http://bit.ly/31IqMl", @url.short_url
+        end
+      end
+      context "a short url" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
+          @url = @bitly.expand("http://bit.ly/31IqMl")
+        end
+        should "return a Bitly::Url" do
+          assert_kind_of Bitly::Url, @url
+        end
+        should "return the expanded url" do
+          assert_equal "http://cnn.com/", @url.long_url
+        end
+        should "save the hash" do
+          assert_equal "31IqMl", @url.hash
+        end
+        should "save the short url" do
+          assert_equal "http://bit.ly/31IqMl", @url.short_url
+        end
+      end
+      context "multiple hashes" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=15DlK.*3j4ir4.*$/,"expand_cnn_and_google.json")
+          @urls = @bitly.expand(["15DlK","3j4ir4"])
+        end
+        should "return an array of Bitly::Urls" do
+          assert_kind_of Array, @urls
+          assert_kind_of Bitly::Url, @urls[0]
+          assert_kind_of Bitly::Url, @urls[1]
+        end
+        should "expand the hashes in order" do
+          assert_equal "http://cnn.com/", @urls[0].long_url
+          assert_equal "http://google.com/", @urls[1].long_url
+        end
+        should "save the hash to each url" do
+          assert_equal "15DlK", @urls[0].hash
+          assert_equal "3j4ir4", @urls[1].hash
+        end
+      end
+    end
+    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")
+          @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
+        end
+      end
+      context "a single hash" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/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
+        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")
+          @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
+        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")
+          @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
+        end
+      end
+      context "a single hash" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/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
+        end
+      end
+      context "a list of hashes" do
+        should "return an argument error" do
+          assert_raise ArgumentError do
+            @bitly.stats(['3j4ir4','31IqMl'])
+          end
+        end
+      end
+    end
+  end
+end

data/test/bitly/test_url.rb

@@ -0,0 +1,168 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
+
+class TestUrl < Test::Unit::TestCase
+  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
+    end
+    context "shortening" do
+      context "with a long url" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/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
+          assert_equal "http://bit.ly/15DlK", @url.shorten
+        end
+      end
+      context "with no long url" do
+        setup do
+          @url = Bitly::Url.new(login, api_key)
+        end
+        should "raise an error" do
+          assert_raise ArgumentError do
+            @url.shorten
+          end
+        end
+      end
+      context "with a short url already" do
+        setup do
+          @url = Bitly::Url.new(login, api_key, :short_url => 'http://bit.ly/31IqMl')
+          flexmock(@url).should_receive(:create_url).never
+        end
+        should "not need to call the api" do
+          assert_equal "http://bit.ly/31IqMl", @url.shorten
+        end
+      end
+    end
+    context "expanding" do
+      context "with a hash" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
+          @url = Bitly::Url.new(login, api_key, :hash => '31IqMl')
+        end
+        should "return an expanded url" do
+          assert_equal "http://cnn.com/", @url.expand
+        end
+      end
+      context "with a short url" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/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
+          assert_equal "http://cnn.com/", @url.expand
+        end
+      end
+      context "with no short url or hash" do
+        setup do
+          @url = Bitly::Url.new(login, api_key)
+        end
+        should "raise an error" do
+          assert_raise ArgumentError do
+            @url.expand
+          end
+        end
+      end
+      context "with a long url already" do
+        setup do
+          @url = Bitly::Url.new(login, api_key, :long_url => 'http://google.com')
+          flexmock(@url).should_receive(:create_url).never
+        end
+        should "not need to call the api" do
+          assert_equal "http://google.com", @url.expand
+        end
+      end
+    end
+    context "info" do
+      context "with a hash" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/info\?.*hash=3j4ir4.*$/,"google_info.json")
+          @url = Bitly::Url.new(login, api_key, :hash => '3j4ir4')
+        end
+        should "return info" do
+          assert_equal "Google", @url.info['htmlTitle']
+        end
+      end
+      context "with a short url" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/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
+          assert_equal "Google", @url.info['htmlTitle']
+        end
+      end
+      context "without a short url or hash" do
+        setup do
+          @url = Bitly::Url.new(login, api_key, :long_url => 'http://google.com')
+        end
+        should "raise an error" do
+          assert_raise 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")
+          @url = Bitly::Url.new(login, api_key, :short_url => 'http://bit.ly/3j4ir4')
+          @url.info
+        end
+        should "not call the api twice" do
+          flexmock(@url).should_receive(:create_url).never
+          @url.info
+        end
+      end
+    end
+    context "stats" do
+      context "with a hash" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/stats\?.*hash=3j4ir4.*$/,"google_stats.json")
+          @url = Bitly::Url.new(login, api_key, :hash => '3j4ir4')
+        end
+        should "return info" do
+          assert_equal 2644, @url.stats['clicks']
+        end
+      end
+      context "with a short url" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/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
+          assert_equal 2644, @url.stats['clicks']
+        end
+      end
+      context "without a short url or hash" do
+        setup do
+          @url = Bitly::Url.new(login, api_key, :long_url => 'http://google.com')
+        end
+        should "raise an error" do
+          assert_raise 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")
+          @url = Bitly::Url.new(login, api_key, :short_url => 'http://bit.ly/3j4ir4')
+          @url.stats
+        end
+        should "not call the api twice" do
+          flexmock(@url).should_receive(:create_url).never
+          @url.stats
+        end
+      end
+    end
+  end
+end

data/test/bitly/test_utils.rb

@@ -0,0 +1,76 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
+
+class TestUtils < Test::Unit::TestCase
+  include Bitly::Utils
+  API_VERSION = '2.0.1'
+  
+  context "text utils" do
+    should "underscore a word" do
+      assert_equal "hello_world", underscore("HelloWorld")
+    end
+    should "create a hash from a short url" do
+      assert_equal "hello", create_hash_from_url("http://bit.ly/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
+      @login = login
+    end
+    should "contain all the basic information" do
+      url = create_url.to_s
+      assert url.include?('http://api.bit.ly/')
+      assert url.include?("version=#{API_VERSION}")
+      assert url.include?("apiKey=#{api_key}")
+      assert url.include?("login=#{login}")
+    end
+    should "contain the right resource" do
+      url = create_url('shorten').to_s
+      assert url.include?('/shorten')
+    end
+    should "contain extra parameters" do
+      url = create_url('shorten', :longUrl => 'http://google.com').to_s
+      assert url.include?("longUrl=#{CGI.escape('http://google.com')}")
+    end
+  end
+  
+  context "fetching a url" do
+    context "successfully" do
+      setup do
+        stub_get("http://example.com","cnn.json")
+      end
+      should "return a json object successfully" do
+        result = get_result(URI.join("http://example.com"))
+        assert_equal Hash, result.class
+      end
+    end
+    context "unsuccessfully" do
+      setup do
+        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"))
+        end
+      end
+    end
+  end
+end

data/test/test_bitly.rb

@@ -1,65 +1,81 @@
-require 'test/unit'
-require 'rubygems'
-require 'bitly'
-
-class TestBitly < Test::Unit::TestCase
-  
-  def setup
-    @api_key = 'R_7776acc394294b2b0ad2c261a91c483d'
-    @login = 'philnash'
-    @bitly = Bitly.new(@login,@api_key)
-  end
-  
-  # not a good test, but it makes sure things are working for now.
-  def test_returns_short_url
-    url = @bitly.shorten("http://google.com")
-    assert_kind_of Bitly::Url, url
-    assert_equal "http://google.com", url.long_url
-    assert_equal "http://bit.ly/wQaT", url.short_url
-    urls = @bitly.shorten(["http://google.com","http://cnn.com"])
-    assert_equal "http://google.com", urls[0].long_url
-    assert_equal "http://bit.ly/wQaT", urls[0].short_url
-		url = @bitly.shorten("http://www.google.com/search?hl=en&q=url&btnG=Google+Search&aq=f&oq=")
-		assert_kind_of Bitly::Url, url
-		assert_equal "http://www.google.com/search?hl=en&q=url&btnG=Google+Search&aq=f&oq=", url.long_url
-		assert_equal "http://bit.ly/NqK6i", url.short_url
-  end
-  
-  def test_returns_a_long_url
-    urls = @bitly.expand(["2bYgqR","1RmnUT"])
-    assert_kind_of Bitly::Url, urls[0]
-    assert_equal "http://cnn.com", urls[0].long_url
-    assert_equal "2bYgqR", urls[0].hash
-    assert_equal "http://google.com", urls[1].long_url
-    assert_equal "1RmnUT", urls[1].hash
-    url = @bitly.expand("http://bit.ly/wQaT")
-    assert_kind_of Bitly::Url, url
-    assert_equal "http://bit.ly/wQaT", url.short_url
-    assert_equal "http://google.com/", url.long_url
-    assert_equal "wQaT", url.hash
-    url2 = @bitly.expand("wQaT")
-    assert_kind_of Bitly::Url, url2
-    assert_equal "wQaT", url2.hash
-    assert_equal "http://bit.ly/wQaT", url2.short_url
-    assert_equal "http://google.com/", url2.long_url
-  end
-  
-  def test_returns_keyword_url
-    #kind of ghetto test but we need it to be different every time
-    require 'digest/sha1'
-    keyword = Digest::SHA1.hexdigest(DateTime.now.to_s)
-
-    url = @bitly.shorten("http://google.com", keyword)
-    assert_equal url.short_keyword_url, "http://bit.ly/#{keyword}"
-  end
-
-  def test_returns_error_on_existing_keyword
-    keyword = 'apple'
-    assert_raise BitlyError do
-      @bitly.shorten("http://apple.com/itunes", keyword)
-    end
-  end
-
-  
-  
-end
+# require 'test/unit'
+# require 'rubygems'
+# require 'shoulda'
+# require 'flexmock'
+# require 'bitly'
+# 
+# class TestBitly < Test::Unit::TestCase
+#   
+#   context "with a bitly client" do
+#     setup do
+#       @api_key = 'test_key'
+#       @login = 'test_account'
+#       @bitly = Bitly.new(@login,@api_key)
+#     end
+#   
+#     context "shortening" do
+#       
+#       context "a single url" do
+#         setup do
+#           
+#         end
+#       def test_returns_single_short_url
+#         url = @bitly.shorten("http://cnn.com")
+#         assert_kind_of Bitly::Url, url
+#         assert_equal "http://cnn.com", url.long_url
+#         assert_equal "http://bit.ly/15DlK", url.short_url
+#       end
+#   
+#   def test_shortens_multiple_urls
+#     urls = @bitly.shorten(["http://cnn.com","http://google.com"])
+#     assert_equal "http://cnn.com", urls[0].long_url
+#     assert_equal "http://bit.ly/15DlK", urls[0].short_url
+#     assert_equal "http://google.com", urls[1].long_url
+#     assert_equal "http://bit.ly/11etr", urls[1].short_url
+#   end
+#   
+#   def test_can_shorten_a_url_with_parameters
+#     url = @bitly.shorten("http://www.google.com/search?hl=en&q=url&btnG=Google+Search&aq=f&oq=")
+#     assert_kind_of Bitly::Url, url
+#     assert_equal "http://www.google.com/search?hl=en&q=url&btnG=Google+Search&aq=f&oq=", url.long_url
+#     assert_equal "http://bit.ly/NqK6i", url.short_url
+#   end
+#   
+#   def test_returns_a_long_url
+#     urls = @bitly.expand(["2bYgqR","1RmnUT"])
+#     assert_kind_of Bitly::Url, urls[0]
+#     assert_equal "http://cnn.com", urls[0].long_url
+#     assert_equal "2bYgqR", urls[0].hash
+#     assert_equal "http://google.com", urls[1].long_url
+#     assert_equal "1RmnUT", urls[1].hash
+#     url = @bitly.expand("http://bit.ly/wQaT")
+#     assert_kind_of Bitly::Url, url
+#     assert_equal "http://bit.ly/wQaT", url.short_url
+#     assert_equal "http://google.com/", url.long_url
+#     assert_equal "wQaT", url.hash
+#     url2 = @bitly.expand("wQaT")
+#     assert_kind_of Bitly::Url, url2
+#     assert_equal "wQaT", url2.hash
+#     assert_equal "http://bit.ly/wQaT", url2.short_url
+#     assert_equal "http://google.com/", url2.long_url
+#   end
+#   
+#   # def test_returns_keyword_url
+#   #   #kind of ghetto test but we need it to be different every time
+#   #   require 'digest/sha1'
+#   #   keyword = Digest::SHA1.hexdigest(DateTime.now.to_s)
+#   # 
+#   #   url = @bitly.shorten("http://google.com", :keyword => keyword)
+#   #   assert_equal url.short_keyword_url, "http://bit.ly/#{keyword}"
+#   # end
+# 
+#   def test_returns_error_on_existing_keyword
+#     keyword = 'apple'
+#     assert_raise BitlyError do
+#       @bitly.shorten("http://apple.com/itunes", :keyword => keyword)
+#     end
+#   end
+# 
+#   
+#   
+# end

data/test/test_helper.rb

@@ -0,0 +1,29 @@
+require 'test/unit'
+require 'rubygems'
+require 'shoulda'
+require 'flexmock/test_unit'
+require 'fakeweb'
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'bitly')
+
+FakeWeb.allow_net_connect = false
+
+def fixture_file(filename)
+  return '' if filename == ''
+  file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)
+  File.read(file_path)
+end
+
+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)
+end
+
+def api_key
+  'test_key'
+end
+def login
+  'test_account'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bitly
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Phil Nash
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 +01:00
+date: 2009-07-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,4 +81,8 @@ signing_key:
 specification_version: 3
 summary: Use the bit.ly API to shorten or expand URLs
 test_files: 
+- test/bitly/test_client.rb
+- test/bitly/test_url.rb
+- test/bitly/test_utils.rb
 - test/test_bitly.rb
+- test/test_helper.rb