sproutvideo-rb 1.1.0 → 1.1.1

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "httpclient"
+gem "rest-client"
 gem "multi_json"
 
 group :development do

data/Gemfile.lock

@@ -3,18 +3,20 @@ GEM
   specs:
     diff-lcs (1.1.3)
     git (1.2.5)
-    httpclient (2.2.4)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     json (1.6.5)
+    mime-types (1.19)
     multi_json (1.0.4)
     rake (0.9.2.2)
     rcov (1.0.0)
     rdoc (3.12)
       json (~> 1.4)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -29,9 +31,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  httpclient
   jeweler (~> 1.8.3)
   multi_json
   rcov
   rdoc (~> 3.12)
+  rest-client
   rspec (~> 2.8.0)

data/lib/sproutvideo.rb

@@ -1,5 +1,5 @@
 require 'multi_json'
-require 'httpclient'
+require 'rest_client'
 
 require 'sproutvideo/version.rb'
 require 'sproutvideo/sproutvideo.rb'

data/lib/sproutvideo/resource.rb

@@ -9,10 +9,14 @@ module Sproutvideo
 
     def self.post(path, options={})
       body = MultiJson.encode(options.dup)
-      resp = HTTPClient.new.post(
-        "#{base_url}#{path}",
-        body,
-        {'SproutVideo-Api-Key' => api_key})
+      begin
+        resp = RestClient.post(
+          "#{base_url}#{path}",
+          body,
+          {'SproutVideo-Api-Key' => api_key})
+      rescue => e
+        resp = e.response
+      end
       Response.new(resp)
     end
 
@@ -20,40 +24,51 @@ module Sproutvideo
       resp = nil
       File.open(file_path) do |file|
         body = {:source_video => file}.merge(options.dup)
-        client = HTTPClient.new
-        client.send_timeout = 18000
-        resp = client.post(
-          "#{base_url}#{path}",
-          body,
-          {'SproutVideo-Api-Key' => api_key})
+        begin
+          resp = RestClient.post(
+            "#{base_url}#{path}",
+            body,
+            {'SproutVideo-Api-Key' => api_key, :timeout => 18000})
+        rescue => e
+          resp = e.response
+        end
       end
       
       Response.new(resp)
     end
 
     def self.get(path, options={})
-      options = options.dup
-      resp = HTTPClient.new.get(
-        "#{base_url}#{path}",
-        options,
-        {'SproutVideo-Api-Key' => api_key})
+      begin
+        resp = RestClient.get(
+          "#{base_url}#{path}",
+          {'SproutVideo-Api-Key' => api_key, :params => options.dup})
+      rescue => e
+        resp = e.response
+      end
       Response.new(resp)
     end
 
     def self.put(path, options={})
       body = MultiJson.encode(options.dup)
-      resp = HTTPClient.new.put(
-        "#{base_url}#{path}",
-        body,
-        {'SproutVideo-Api-Key' => api_key})
+      begin
+        resp = RestClient.put(
+          "#{base_url}#{path}",
+          body,
+          {'SproutVideo-Api-Key' => api_key})
+      rescue => e
+        resp = e.response
+      end
       Response.new(resp)
     end
 
     def self.delete(path, options={})
-      resp = HTTPClient.new.delete(
-        "#{base_url}#{path}",
-        {},
-        {'SproutVideo-Api-Key' => api_key})
+      begin
+        resp = RestClient.delete(
+          "#{base_url}#{path}",
+          {'SproutVideo-Api-Key' => api_key})
+      rescue => e
+        resp = e.response
+      end
       Response.new(resp)
     end
   end

data/lib/sproutvideo/response.rb

@@ -3,8 +3,8 @@ module Sproutvideo
     attr_accessor :status, :body, :raw_body
     
     def initialize(msg)
-      self.status = msg.status
-      self.raw_body = msg.body
+      self.status = msg.code
+      self.raw_body = msg.to_s
       self.body = MultiJson.decode(self.raw_body, :symbolize_keys => true)
     end 
 

data/lib/sproutvideo/version.rb

@@ -1,3 +1,3 @@
 module Sproutvideo
-	VERSION = "1.1.0"
+	VERSION = "1.1.1"
 end

data/spec/sproutvideo/access_grant_spec.rb

@@ -4,9 +4,7 @@ describe Sproutvideo::AccessGrant do
 		@api_key = 'abc123'
 		Sproutvideo.api_key = @api_key
 		Sproutvideo.base_url = 'https://api.sproutvideo.com/v1'
-		@http_mock = mock()
-		HTTPClient.stub!(:new).and_return(@http_mock)
-		@msg =  mock(:body => "{}", :status => 200)
+		@msg =  mock(:to_s => "{}", :code => 200)
 	end
 
 	describe "#create" do
@@ -16,7 +14,7 @@ describe Sproutvideo::AccessGrant do
 
 		it "should POST the correct url and return a response" do
 			data = {:email => 'test@example.com', :password => 'password'}
-			@http_mock.should_receive(:post).with(
+			RestClient.should_receive(:post).with(
 				@url,
 				MultiJson.encode(data),
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
@@ -31,26 +29,23 @@ describe Sproutvideo::AccessGrant do
 
 		it "should GET the correct url and return a response" do
 			
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25}}).and_return(@msg)
 			Sproutvideo::AccessGrant.list.class.should == Sproutvideo::Response
 		end
 
 		it "should merge params" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25, :foo => 'bar'},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25, :foo => 'bar'}}).and_return(@msg)
 			Sproutvideo::AccessGrant.list(:foo => 'bar')
 		end
 
 		it "should use pagination params" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 2, :per_page => 5},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 2, :per_page => 5}}).and_return(@msg)
 			Sproutvideo::AccessGrant.list(:page => 2, :per_page => 5)
 		end
 	end
@@ -62,10 +57,9 @@ describe Sproutvideo::AccessGrant do
 		end
 
 		it "should get the correct url and return a response" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {}}).and_return(@msg)
 			Sproutvideo::AccessGrant.details(@access_grant_id).class.should == Sproutvideo::Response
 		end
 	end
@@ -79,7 +73,7 @@ describe Sproutvideo::AccessGrant do
 		it "should PUT the correct url and return a response" do
 			data = {:password => 'new password'}
 
-			@http_mock.should_receive(:put).with(
+			RestClient.should_receive(:put).with(
 				@url,
 				MultiJson.encode(data),
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
@@ -95,9 +89,8 @@ describe Sproutvideo::AccessGrant do
 		end
 
 		it "should DELETE the correct url and return a response" do
-			@http_mock.should_receive(:delete).with(
+			RestClient.should_receive(:delete).with(
 				@url,
-				{},
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
 			Sproutvideo::AccessGrant.destroy(@access_grant_id).class.should == Sproutvideo::Response
 		end

data/spec/sproutvideo/login_spec.rb

@@ -4,9 +4,7 @@ describe Sproutvideo::Login do
 		@api_key = 'abc123'
 		Sproutvideo.api_key = @api_key
 		Sproutvideo.base_url = 'https://api.sproutvideo.com/v1'
-		@http_mock = mock()
-		HTTPClient.stub!(:new).and_return(@http_mock)
-		@msg =  mock(:body => "{}", :status => 200)
+		@msg =  mock(:to_s => "{}", :code => 200)
 	end
 
 	describe "#create" do
@@ -16,7 +14,7 @@ describe Sproutvideo::Login do
 
 		it "should POST the correct url and return a response" do
 			data = {:email => 'test@example.com', :password => 'password'}
-			@http_mock.should_receive(:post).with(
+			RestClient.should_receive(:post).with(
 				@url,
 				MultiJson.encode(data),
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
@@ -31,26 +29,23 @@ describe Sproutvideo::Login do
 
 		it "should GET the correct url and return a response" do
 			
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25}}).and_return(@msg)
 			Sproutvideo::Login.list.class.should == Sproutvideo::Response
 		end
 
 		it "should merge params" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25, :foo => 'bar'},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25, :foo => 'bar'}}).and_return(@msg)
 			Sproutvideo::Login.list(:foo => 'bar')
 		end
 
 		it "should use pagination params" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 2, :per_page => 5},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 2, :per_page => 5}}).and_return(@msg)
 			Sproutvideo::Login.list(:page => 2, :per_page => 5)
 		end
 	end
@@ -62,10 +57,9 @@ describe Sproutvideo::Login do
 		end
 
 		it "should get the correct url and return a response" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {}}).and_return(@msg)
 			Sproutvideo::Login.details(@login_id).class.should == Sproutvideo::Response
 		end
 	end
@@ -79,7 +73,7 @@ describe Sproutvideo::Login do
 		it "should PUT the correct url and return a response" do
 			data = {:password => 'new password'}
 
-			@http_mock.should_receive(:put).with(
+			RestClient.should_receive(:put).with(
 				@url,
 				MultiJson.encode(data),
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
@@ -95,9 +89,8 @@ describe Sproutvideo::Login do
 		end
 
 		it "should DELETE the correct url and return a response" do
-			@http_mock.should_receive(:delete).with(
+			RestClient.should_receive(:delete).with(
 				@url,
-				{},
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
 			Sproutvideo::Login.destroy(@login_id).class.should == Sproutvideo::Response
 		end

data/spec/sproutvideo/playlist_spec.rb

@@ -4,9 +4,7 @@ describe Sproutvideo::Playlist do
 		@api_key = 'abc123'
 		Sproutvideo.api_key = @api_key
 		Sproutvideo.base_url = 'https://api.sproutvideo.com/v1'
-		@http_mock = mock()
-		HTTPClient.stub!(:new).and_return(@http_mock)
-		@msg =  mock(:body => "{}", :status => 200)
+		@msg =  mock(:to_s => "{}", :code => 200)
 	end
 
 	describe "#create" do
@@ -16,7 +14,7 @@ describe Sproutvideo::Playlist do
 
 		it "should POST the correct url and return a response" do
 			data = {:name => 'new playlist'}
-			@http_mock.should_receive(:post).with(
+			RestClient.should_receive(:post).with(
 				@url,
 				MultiJson.encode(data),
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
@@ -31,26 +29,23 @@ describe Sproutvideo::Playlist do
 
 		it "should GET the correct url and return a response" do
 			
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25}}).and_return(@msg)
 			Sproutvideo::Playlist.list.class.should == Sproutvideo::Response
 		end
 
 		it "should merge params" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25, :foo => 'bar'},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25, :foo => 'bar'}}).and_return(@msg)
 			Sproutvideo::Playlist.list(:foo => 'bar')
 		end
 
 		it "should use pagination params" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 2, :per_page => 5},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 2, :per_page => 5}}).and_return(@msg)
 			Sproutvideo::Playlist.list(:page => 2, :per_page => 5)
 		end
 	end
@@ -62,10 +57,9 @@ describe Sproutvideo::Playlist do
 		end
 
 		it "should get the correct url and return a response" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {}}).and_return(@msg)
 			Sproutvideo::Playlist.details(@playlist_id).class.should == Sproutvideo::Response
 		end
 	end
@@ -79,7 +73,7 @@ describe Sproutvideo::Playlist do
 		it "should PUT the correct url and return a response" do
 			data = {:name => 'new name'}
 
-			@http_mock.should_receive(:put).with(
+			RestClient.should_receive(:put).with(
 				@url,
 				MultiJson.encode(data),
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
@@ -95,9 +89,8 @@ describe Sproutvideo::Playlist do
 		end
 
 		it "should DELETE the correct url and return a response" do
-			@http_mock.should_receive(:delete).with(
+			RestClient.should_receive(:delete).with(
 				@url,
-				{},
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
 			Sproutvideo::Playlist.destroy(@playlist_id).class.should == Sproutvideo::Response
 		end

data/spec/sproutvideo/response_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 describe Sproutvideo::Response do 
 	describe "#success?" do
 		it "should return true when status is between 200 and 299" do
-			msg = mock(:status => 200, :body => "{}")
+			msg = mock(:code => 200, :to_s => "{}")
 			Sproutvideo::Response.new(msg).success?.should == true
 			msg.stub!(:status).and_return(299)
 			Sproutvideo::Response.new(msg).success?.should == true
@@ -11,21 +11,21 @@ describe Sproutvideo::Response do
 		end
 
 		it "should return false when status is less than 200 or greater than 299" do
-			msg = mock(:status => 300, :body => "{}")
+			msg = mock(:code => 300, :to_s => "{}")
 			Sproutvideo::Response.new(msg).success?.should == false
-			msg.stub!(:status => 199)
+			msg.stub!(:code => 199)
 			Sproutvideo::Response.new(msg).success?.should == false
 		end
 	end
 	
 	describe "#errors" do
 		it "should return an empty array when the result has no errors" do
-			msg = mock(:status => 200, :body => "{}")
+			msg = mock(:code => 200, :to_s => "{}")
 			Sproutvideo::Response.new(msg).errors.should == []
 		end
 
 		it "should return a compacted array of errors if the body has errors" do
-			msg = mock(:status => 200, :body => '{"error":"Unauthorized"}')
+			msg = mock(:code => 200, :to_s => '{"error":"Unauthorized"}')
 			Sproutvideo::Response.new(msg).errors.should == ['Unauthorized']
 		end
 	end
@@ -33,7 +33,7 @@ describe Sproutvideo::Response do
 	describe "#body" do
 		it "should decode the body" do
 			body = {:foo => 'bar'}
-			msg = mock(:status => 200, :body => MultiJson.encode(body))
+			msg = mock(:code => 200, :to_s => MultiJson.encode(body))
 			Sproutvideo::Response.new(msg).body.should == body
 		end
 	end

data/spec/sproutvideo/tag_spec.rb

@@ -4,9 +4,7 @@ describe Sproutvideo::Tag do
 		@api_key = 'abc123'
 		Sproutvideo.api_key = @api_key
 		Sproutvideo.base_url = 'https://api.sproutvideo.com/v1'
-		@http_mock = mock()
-		HTTPClient.stub!(:new).and_return(@http_mock)
-		@msg =  mock(:body => "{}", :status => 200)
+		@msg =  mock(:to_s => "{}", :code => 200)
 	end
 
 	describe "#create" do
@@ -16,7 +14,7 @@ describe Sproutvideo::Tag do
 
 		it "should POST the correct url and return a response" do
 			data = {:name => 'new tag'}
-			@http_mock.should_receive(:post).with(
+			RestClient.should_receive(:post).with(
 				@url,
 				MultiJson.encode(data),
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
@@ -31,26 +29,23 @@ describe Sproutvideo::Tag do
 
 		it "should GET the correct url and return a response" do
 			
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25}}).and_return(@msg)
 			Sproutvideo::Tag.list.class.should == Sproutvideo::Response
 		end
 
 		it "should merge params" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25, :foo => 'bar'},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25, :foo => 'bar'}}).and_return(@msg)
 			Sproutvideo::Tag.list(:foo => 'bar')
 		end
 
 		it "should use pagination params" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 2, :per_page => 5},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 2, :per_page => 5}}).and_return(@msg)
 			Sproutvideo::Tag.list(:page => 2, :per_page => 5)
 		end
 	end
@@ -62,10 +57,9 @@ describe Sproutvideo::Tag do
 		end
 
 		it "should get the correct url and return a response" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {}}).and_return(@msg)
 			Sproutvideo::Tag.details(@tag_id).class.should == Sproutvideo::Response
 		end
 	end
@@ -79,7 +73,7 @@ describe Sproutvideo::Tag do
 		it "should PUT the correct url and return a response" do
 			data = {:name => 'new name'}
 
-			@http_mock.should_receive(:put).with(
+			RestClient.should_receive(:put).with(
 				@url,
 				MultiJson.encode(data),
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
@@ -95,9 +89,8 @@ describe Sproutvideo::Tag do
 		end
 
 		it "should DELETE the correct url and return a response" do
-			@http_mock.should_receive(:delete).with(
+			RestClient.should_receive(:delete).with(
 				@url,
-				{},
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
 			Sproutvideo::Tag.destroy(@tag_id).class.should == Sproutvideo::Response
 		end

data/spec/sproutvideo/video_spec.rb

@@ -4,9 +4,7 @@ describe Sproutvideo::Video do
 		@api_key = 'abc123'
 		Sproutvideo.api_key = @api_key
 		Sproutvideo.base_url = 'https://api.sproutvideo.com/v1'
-		@http_mock = mock(:send_timeout= => 18000)
-		HTTPClient.stub!(:new).and_return(@http_mock)
-		@msg =  mock(:body => "{}", :status => 200)
+		@msg =  mock(:to_s => "{}", :code => 200)
 	end
 
 	describe "#create" do
@@ -20,10 +18,10 @@ describe Sproutvideo::Video do
 
 			File.stub!(:open).with('upload_test').and_yield(file)
 
-			@http_mock.should_receive(:post).with(
+			RestClient.should_receive(:post).with(
 				"#{Sproutvideo.base_url}/videos",
 				{:source_video => file, :title => 'test title'},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :timeout => 18000}).and_return(@msg)
 
 
 			Sproutvideo::Video.create('upload_test', {:title => 'test title'}).class.should == Sproutvideo::Response
@@ -39,34 +37,30 @@ describe Sproutvideo::Video do
 
 		it "should GET the correct url and return a response" do
 			
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25}}).and_return(@msg)
 			Sproutvideo::Video.list.class.should == Sproutvideo::Response
 		end
 
 		it "should merge params" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25, :foo => 'bar'},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25, :foo => 'bar'}}).and_return(@msg)
 			Sproutvideo::Video.list(:foo => 'bar')
 		end
 
 		it "should use pagination params" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 2, :per_page => 5},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 2, :per_page => 5}}).and_return(@msg)
 			Sproutvideo::Video.list(:page => 2, :per_page => 5)
 		end
 
 		it "should request videos for a tag if tag_id is passed in" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{:page => 1, :per_page => 25, :tag_id => 'asdf'},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {:page => 1, :per_page => 25, :tag_id => 'asdf'}}).and_return(@msg)
 			Sproutvideo::Video.list(:tag_id => 'asdf')
 		end
 	end
@@ -78,10 +72,9 @@ describe Sproutvideo::Video do
 		end
 
 		it "should get the correct url and return a response" do
-			@http_mock.should_receive(:get).with(
+			RestClient.should_receive(:get).with(
 				@url,
-				{},
-				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
+				{'SproutVideo-Api-Key' => @api_key, :params => {}}).and_return(@msg)
 			Sproutvideo::Video.details(@video_id).class.should == Sproutvideo::Response
 		end
 	end
@@ -95,7 +88,7 @@ describe Sproutvideo::Video do
 		it "should PUT the correct url and return a response" do
 			data = {:title => 'new title'}
 
-			@http_mock.should_receive(:put).with(
+			RestClient.should_receive(:put).with(
 				@url,
 				MultiJson.encode(data),
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
@@ -111,9 +104,8 @@ describe Sproutvideo::Video do
 		end
 
 		it "should DELETE the correct url and return a response" do
-			@http_mock.should_receive(:delete).with(
+			RestClient.should_receive(:delete).with(
 				@url,
-				{},
 				{'SproutVideo-Api-Key' => @api_key}).and_return(@msg)
 			Sproutvideo::Video.destroy(@video_id).class.should == Sproutvideo::Response
 		end

data/sproutvideo-rb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sproutvideo-rb}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["SproutVideo"]
-  s.date = %q{2012-08-04}
+  s.date = %q{2012-12-12}
   s.description = %q{SproutVideo API Client}
   s.email = %q{support@sproutvideo.com}
   s.extra_rdoc_files = [
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httpclient>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_runtime_dependency(%q<multi_json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<httpclient>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<multi_json>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<httpclient>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<multi_json>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - SproutVideo
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-04 00:00:00 -04:00
+date: 2012-12-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: httpclient
+  name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: