Merge branch 'integration'

sferik · Sep 22, 2010 · af8304c · af8304c
2 parents d2432da + e71e0bf
commit af8304c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Rakefile b/Rakefile
@@ -9,15 +9,15 @@ Jeweler::Tasks.new do |gem|
   gem.authors           = ["John Nunemaker", "Wynn Netherland"]
   gem.files             = FileList["[A-Z]*", "{examples,lib,test}/**/*"]
 
-  gem.add_dependency("oauth", "~> 0.4.1")
-  gem.add_dependency("hashie", "~> 0.2.0")
-  gem.add_dependency("httparty", "~> 0.5.0")
-  gem.add_dependency("yajl-ruby", "~> 0.7.0")
+  gem.add_dependency("oauth", "~> 0.4.3")
+  gem.add_dependency("hashie", "~> 0.4.0")
+  gem.add_dependency("httparty", "~> 0.6.1")
+  gem.add_dependency("yajl-ruby", "~> 0.7.7")
 
-  gem.add_development_dependency("shoulda", "~> 2.10.0")
+  gem.add_development_dependency("shoulda", "~> 2.11.3")
   gem.add_development_dependency("jnunemaker-matchy", "~> 0.4.0")
-  gem.add_development_dependency("mocha", "~> 0.9.0")
-  gem.add_development_dependency("fakeweb", "~> 1.2.0")
+  gem.add_development_dependency("mocha", "~> 0.9.8")
+  gem.add_development_dependency("fakeweb", "~> 1.3.0")
   gem.add_development_dependency("redgreen", "~> 1.2.2")
 end
 

diff --git a/lib/twitter.rb b/lib/twitter.rb
@@ -46,7 +46,7 @@ def self.status(id,options={})
     perform_get("/statuses/show/#{id}.json")
   end
 
-  def self.friend_ids(id,options={})	
+  def self.friend_ids(id,options={})
     perform_get("/friends/ids/#{id}.json")
   end