gdata-jruby-client 0.7.2 → 0.7.3

data/lib/base.rb

@@ -7,6 +7,23 @@ Dir.glob("#{File.dirname(__FILE__)}/gdata/java/lib/*.jar").each do |j|
 end
 
 module GData
+  class AuthenticationError < Exception; end
+  class ServiceForbidden < Exception; end
+  class ResourceNotFound < Exception; end
+  
+  def self.gdata_exception_for(e)
+    case e.message
+    when /AuthenticationException/
+      AuthenticationError.new(e.message)
+    when /ServiceForbiddenException/
+      ServiceForbidden.new(e.message)
+    when /ResourceNotFoundException/
+      ResourceNotFound.new(e.message)
+    else
+      e
+    end
+  end
+  
   include_package 'com.google.gdata.data'
   include_package 'com.google.gdata.data.acl'
   include_package 'com.google.gdata.data.batch'

data/lib/google_service.rb

@@ -25,8 +25,7 @@ class Java::ComGoogleGdataClient::GoogleService
           options[:class].java_class)
       end
     rescue NativeException => e
-      return nil if e.message =~ /NotFound/
-      raise e
+      raise GData.gdata_exception_for(e)
     end
   end
   
@@ -45,8 +44,7 @@ class Java::ComGoogleGdataClient::GoogleService
           options[:class].java_class)
       end
     rescue NativeException => e
-      return nil if e.message =~ /NotFound/
-      raise e
+      raise GData.gdata_exception_for(e)
     end
   end
   
@@ -54,8 +52,9 @@ class Java::ComGoogleGdataClient::GoogleService
     raise "Feed URL is required" unless options[:url]
     raise "Entry is required" unless options[:entry]
     options[:url] = url_for(options[:url]) if options[:url]
-    
     insert(options[:url], options[:entry])
+  rescue NativeException => e
+    raise GData.gdata_exception_for(e)
   end
   
   def delete_entry(options={})
@@ -71,6 +70,8 @@ class Java::ComGoogleGdataClient::GoogleService
     options[:url] = url_for(options[:url]) if options[:url]
     
     batch(options[:url], options[:feed])
+  rescue NativeException => e
+    raise GData.gdata_exception_for(e)
   end
   
 end

data/spec/google_service_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.dirname(__FILE__) + '/../lib/gdata_jruby_client'
+require File.dirname(__FILE__) + '/google_keys.rb'
+
+include GoogleHelpers
+
+describe GData::GoogleService do
+  it "should able to raise the right exception" do
+    e = GData.gdata_exception_for(Exception.new("com.google.gdata.util.AuthenticationException: Token invalid - Invalid AuthSub token."))
+    e.should be_instance_of(GData::AuthenticationError)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gdata-jruby-client
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
   - Jerry Luk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 -08:00
+date: 2010-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -131,5 +131,6 @@ test_files:
   - spec/google_contacts_service_spec.rb
   - spec/google_keys.rb
   - spec/google_oauth_parameters_spec.rb
+  - spec/google_service_spec.rb
   - spec/images/sergey.jpg
   - spec/images/sergey_out.jpg