viddler-ruby 0.0.3 → 0.1.0

data/lib/viddler/api_exception.rb

@@ -0,0 +1,13 @@
+module Viddler
+  class ApiException < ::StandardError
+    attr_accessor :code, :description, :details
+    
+    def initialize(code, description, details)
+      self.code        = code.to_i
+      self.description = description
+      self.details     = details
+      
+      super("\##{self.code}: #{self.description} (#{self.details})")
+    end
+  end
+end

data/lib/viddler/client.rb

@@ -77,6 +77,8 @@ module Viddler
       arguments[:api_key]   = api_key
       arguments[:sessionid] = sessionid if authenticated?
       JSON.parse RestClient.get(DEFAULT_ENDPOINT + method + '.json', :params => arguments)
+    rescue RestClient::ExceptionWithResponse => e
+      raise_api_exception e
     end
     
     # Public: Make a POST call to the Viddler API.
@@ -95,6 +97,8 @@ module Viddler
       arguments[:api_key]   = api_key
       arguments[:sessionid] = sessionid if authenticated?
       JSON.parse RestClient.post(DEFAULT_ENDPOINT + method + '.json', :params => arguments)
+    rescue RestClient::ExceptionWithResponse => e
+      raise_api_exception e
     end
     
     # Public: Upload a video to the Viddler API.
@@ -130,6 +134,16 @@ module Viddler
       ordered_arguments[:file]      = file
       
       JSON.parse RestClient.post(endpoint, ordered_arguments)
+    rescue RestClient::ExceptionWithResponse => e
+      raise_api_exception e
+    end
+    
+    private
+    
+    def raise_api_exception(exception)
+      resp = JSON.parse(exception.response) 
+      
+      raise Viddler::ApiException.new(resp['error']['code'], resp['error']['description'], resp['error']['details']) if resp['error']
     end
   end
 end

data/lib/viddler/version.rb

@@ -1,3 +1,3 @@
 module Viddler
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/viddler-ruby.rb

@@ -4,4 +4,5 @@ require 'rest-client'
 require 'json'
 require 'active_support'
 
-require 'viddler/client'
+require 'viddler/client'
+require 'viddler/api_exception'

data/spec/api_exception_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Viddler::ApiException, ".new" do
+  before(:each) do
+    @exception = Viddler::ApiException.new("300", "The Description", "The Details")
+  end
+  
+  it "sets code" do
+    @exception.code.should == 300
+  end
+  
+  it "sets description" do
+    @exception.description.should == "The Description"
+  end
+  
+  it "sets details" do
+    @exception.details.should == "The Details"
+  end
+end
+
+describe Viddler::ApiException, ".to_s" do
+  before(:each) do
+    @exception = Viddler::ApiException.new("300", "The Description", "The Details")
+  end
+  
+  it "returns proper string" do
+    @exception.to_s.should == '#300: The Description (The Details)'
+  end
+end

data/spec/client_spec.rb

@@ -67,7 +67,11 @@ describe Viddler::Client, "#get" do
     @client.get('viddler.api.getInfo')
   end
   
-  it "raises ApiException if an error occurs"
+  it "raises ApiException if an error occurs" do
+    error = RestClient::ExceptionWithResponse.new '{"error":{"code":"9","description":"session invalid","details":"details"}}'
+    RestClient.stub!(:get).and_raise(error)
+    lambda {@client.get('viddler.api.getInfo')}.should raise_error(Viddler::ApiException, "#9: session invalid (details)")
+  end
   
   context "with authenticated client" do
     before(:each) do
@@ -102,7 +106,11 @@ describe Viddler::Client, "#post" do
     @client.post('viddler.api.getInfo')
   end
   
-  it "raises ApiException if an error occurs"
+  it "raises ApiException if an error occurs" do
+    error = RestClient::ExceptionWithResponse.new '{"error":{"code":"9","description":"session invalid","details":"details"}}'
+    RestClient.stub!(:post).and_raise(error)
+    lambda {@client.post('viddler.api.getInfo')}.should raise_error(Viddler::ApiException, "#9: session invalid (details)")
+  end
   
   context "with authenticated client" do
     before(:each) do
@@ -151,5 +159,9 @@ describe Viddler::Client, "#upload" do
     @client.upload(@file, :param1 => 'asdf').should == 'asdfasdf'
   end
   
-  it "raises an ApiException on API error"
+  it "raises an ApiException on API error" do
+    error = RestClient::ExceptionWithResponse.new '{"error":{"code":"9","description":"session invalid","details":"details"}}'
+    RestClient.stub!(:post).and_raise(error)
+    lambda {@client.upload(@file, :param1 => 'asdf')}.should raise_error(Viddler::ApiException, "#9: session invalid (details)")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: viddler-ruby
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Kyle Slattery
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 -05:00
+date: 2010-12-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,8 +96,10 @@ files:
 - Rakefile
 - autotest/discover.rb
 - lib/viddler-ruby.rb
+- lib/viddler/api_exception.rb
 - lib/viddler/client.rb
 - lib/viddler/version.rb
+- spec/api_exception_spec.rb
 - spec/client_spec.rb
 - spec/spec_helper.rb
 - viddler-ruby.gemspec