Hoodow-bitly-api 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,9 @@
+== 0.1.1 2009-07-21 (by Luke Francl)
+
+* Use HTTPClient instead of Net::HTTP
+* make sure long_url is CGI escaped before submitting it to Bit.ly
+
+
 == 0.1.0 2009-07-07
 
 * Covering all api methods

data/README.rdoc

@@ -17,6 +17,10 @@ Small library to access bitly api
     gem sources -a http://gems.github.com
     gem install Hoodow-bitly-api
 
+== CONTRIBUTORS:
+
+* Luke Francl ( http://github.com/look )
+
 == LICENSE:
 
 (The MIT License)

data/bitly-api.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitly-api}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ole Riesenberg"]
@@ -34,4 +34,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<newgem>, [">= 1.4.1"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
+
+  s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
 end

data/lib/bitly-api.rb

@@ -2,11 +2,11 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'rubygems'
-require 'net/http'
-require 'open-uri'
+require 'httpclient'
 require 'json'
+require 'cgi'
 require 'bitly-api/bitly-api'
 
 module BitlyApi
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/bitly-api/bitly-api.rb

@@ -5,7 +5,7 @@ module BitlyApi
   class Bitly
     attr_accessor :login
     attr_accessor :api_key
-    attr_accessor :api_version 
+    attr_accessor :api_version
 
     def initialize(options = {})
       raise ArgumentError.new(":login and :api_key are required") if (options[:login].nil? or options[:api_key].nil?)
@@ -14,38 +14,40 @@ module BitlyApi
       self.login = options[:login]
       self.api_key = options[:api_key]
       self.api_version = options[:version]
+      @httpclient = HTTPClient.new
     end
 
+    # shorten +long_url+. +long_url+ is CGI escaped, so you shouldn't escape it yourself.
     def shorten(long_url)
-      http_response = open(build_url("shorten", "longUrl=#{long_url}")).read
+      http_response = @httpclient.get_content(build_url("shorten", "longUrl=#{CGI::escape(long_url)}"))
       data = JSON.parse(http_response)
       raise BitlyError.new(data["errorMessage"]) unless data["statusCode"] == "OK"
       data["results"][long_url]
     end
 
     def expand(short_url)
-      http_response = open(build_url("expand", "shortUrl=#{short_url}")).read
+      http_response = @httpclient.get_content(build_url("expand", "shortUrl=#{short_url}"))
       data = JSON.parse(http_response)
       raise BitlyError.new(data["errorMessage"]) unless data["statusCode"] == "OK"
       data["results"][short_url]
     end
 
     def info(short_url)
-      http_response = open(build_url("info", "shortUrl=#{short_url}")).read
+      http_response = @httpclient.get_content(build_url("info", "shortUrl=#{short_url}"))
       data = JSON.parse(http_response)
       raise BitlyError.new(data["errorMessage"]) unless data["statusCode"] == "OK"
       data["results"][short_url.split(/\//)[-1]]
     end
 
     def stats(short_url)
-      http_response = open(build_url("stats", "shortUrl=#{short_url}")).read
+      http_response = @httpclient.get_content(build_url("stats", "shortUrl=#{short_url}"))
       data = JSON.parse(http_response)
       raise BitlyError.new(data["errorMessage"]) unless data["statusCode"] == "OK"
       data["results"]
     end
 
     def errors
-      http_response = open("http://api.bit.ly/errors?version=#{api_version}&login=#{login}&apiKey=#{api_key}").read
+      http_response = @httpclient.get_content("http://api.bit.ly/errors?version=#{api_version}&login=#{login}&apiKey=#{api_key}")
       data = JSON.parse(http_response)
       raise BitlyError.new(data["errorMessage"]) unless data["statusCode"] == "OK"
       data["results"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Hoodow-bitly-api
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ole Riesenberg
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: httpclient
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.5.2
+    version: 
 description: Small library to access bitly api
 email: 
 - or@oleriesenberg.com