panda 0.4.2 → 0.4.3

data/lib/panda/panda.rb

@@ -15,21 +15,29 @@ class Panda
   end
   
   def get(request_uri, params={})
-    query = signed_query("GET", request_uri, params)
-    body_of @connection[request_uri + '?' + query].get
+    rescue_resclient_error do
+      query = signed_query("GET", request_uri, params)
+      body_of @connection[request_uri + '?' + query].get
+    end
   end
 
   def post(request_uri, params)
-    body_of @connection[request_uri].post(signed_params("POST", request_uri, params))
+    rescue_resclient_error do
+      body_of @connection[request_uri].post(signed_params("POST", request_uri, params))
+    end
   end
 
   def put(request_uri, params)
-    body_of @connection[request_uri].put(signed_params("PUT", request_uri, params))
+    rescue_resclient_error do
+      body_of @connection[request_uri].put(signed_params("PUT", request_uri, params))
+    end
   end
 
   def delete(request_uri, params={})
-    query = signed_query("DELETE", request_uri, params)
-    body_of @connection[request_uri + '?' + query].delete
+    rescue_resclient_error do
+      query = signed_query("DELETE", request_uri, params)
+      body_of @connection[request_uri + '?' + query].delete
+    end
   end
   
   def authentication_params(verb, request_uri, params)
@@ -65,6 +73,14 @@ class Panda
   
   private
   
+  def rescue_resclient_error(&block)
+    begin 
+      yield 
+    rescue RestClient::Exception => e
+      e.http_body
+    end
+  end
+  
   # API change on rest-client 1.4
   def body_of(response)
     response.respond_to?(:body) ? response.body : response

data/panda.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{panda}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["New Bamboo"]

data/spec/panda_spec.rb

@@ -58,4 +58,19 @@ describe Panda do
       'space' => ' '
     }
   end
+  
+  it "should return a json file for every http code" do
+     FakeWeb.register_uri(:get, "http://myapihost:85/v2/videos?timestamp=2009-11-04T17%3A54%3A11%2B00%3A00&signature=CxSYPM65SeeWH4CE%2FLcq7Ny2NtwxlpS8QOXG2BKe4p8%3D&access_key=my_access_key&cloud_id=my_cloud_id", :body => "abc")
+
+     resource = RestClient::Resource.new("http://myapihost:85/v2")
+     RestClient::Resource.stub!(:new).and_return(resource)
+     
+     e = RestClient::Exception.new({:body => "abc", :code => 400})
+     e.stub!(:http_body).and_return("abc")
+     
+     resource.stub!(:get).and_raise(e)
+     
+     panda = Panda.new({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id' })
+     panda.get("/videos").should == "abc"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: panda
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - New Bamboo