philnash-bitly 0.1.2 → 0.1.4

data/History.txt

@@ -1,10 +1,15 @@
-=== 0.1.2 / 2009-04-12
+=== 0.1.4 / 2009-04-13
+
+* 1 bug fix
+
+	* Urls with parameters were choking, changed to using CGI.
+
+=== 0.1.2 / 2009-03-12
 
 * 1 minor enhancement
 
 	* Allows to add a keyword for shortening urls
 
-
 === 0.1.1 / 2009-01-26
 
 * 1 bug fix

data/Manifest

@@ -0,0 +1,11 @@
+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

data/bitly.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitly}
-  s.version = "0.1.2"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Nash"]
-  s.date = %q{2009-03-13}
+  s.date = %q{2009-04-13}
   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"]

data/lib/bitly/client.rb

@@ -6,8 +6,6 @@ require 'json'
 module Bitly
   API_URL     = 'http://api.bit.ly/'
   API_VERSION = '2.0.1'
-  # login = 'philnash'
-  # api_key = 'R_7776acc394294b2b0ad2c261a91c483d'
 
   def self.new(login, api_key)
     Bitly::Client.new(login,api_key)
@@ -30,7 +28,7 @@ module Bitly
         Bitly::Url.new(@login,@api_key,result)
       elsif input.is_a? Array
         request = create_url "shorten"
-        request.query << "&" + input.map { |long_url| "longUrl=#{URI.encode(long_url)}" }.join("&") unless input.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|
           new_url = {:long_url => long_url}.merge result[long_url]

data/lib/bitly/utils.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module Bitly
   module Utils
     private
@@ -31,8 +33,8 @@ module Bitly
       args = args.merge({:login => @login, :apiKey => @api_key, :version => API_VERSION})
       url = URI.join(API_URL,resource)
       long_urls = args.delete(:long_urls)
-      url.query = args.map { |k,v| "%s=%s" % [URI.encode(k.to_s), URI.encode(v.to_s)] }.join("&")
-      url.query << "&" + long_urls.map { |long_url| "longUrl=#{URI.encode(long_url)}" }.join("&") unless long_urls.nil?
+      url.query = args.map { |k,v| "%s=%s" % [CGI.escape(k.to_s), CGI.escape(v.to_s)] }.join("&")
+      url.query << "&" + long_urls.map { |long_url| "longUrl=#{CGI.escape(long_url)}" }.join("&") unless long_urls.nil?
       url
     end
     

data/lib/bitly/version.rb

@@ -1,3 +1,3 @@
 module Bitly
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
 end

data/test/test_bitly.rb

@@ -12,31 +12,35 @@ class TestBitly < Test::Unit::TestCase
   # 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_equal url.class, Bitly::Url
-    assert_equal url.long_url, "http://google.com"
-    assert_equal url.short_url, "http://bit.ly/wQaT"
+    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 urls[0].long_url, "http://google.com"
-    assert_equal urls[0].short_url, "http://bit.ly/wQaT"
+    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_equal urls[0].class, Bitly::Url
-    assert_equal urls[0].long_url, "http://cnn.com"
-    assert_equal urls[0].hash, "2bYgqR"
-    assert_equal urls[1].long_url, "http://google.com"
-    assert_equal urls[1].hash, "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_equal url.class, Bitly::Url
-    assert_equal url.short_url, "http://bit.ly/wQaT"
-    assert_equal url.long_url, "http://google.com/"
-    assert_equal url.hash, "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_equal url2.class, Bitly::Url
-    assert_equal url2.hash, "wQaT"
-    assert_equal url2.short_url, "http://bit.ly/wQaT"
-    assert_equal url2.long_url, "http://google.com/"
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: philnash-bitly
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors: 
 - Phil Nash
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-13 00:00:00 -07:00
+date: 2009-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency