gdata-jruby-client 0.7.0 → 0.7.1

data/README

@@ -1,6 +1,6 @@
 GData JRuby Client
 =====================
-The GData JRuby Client allows you to easily access data through Google Data APIs. It uses the GData Java Client Library from Google.
+Written at Presdo, the GData JRuby Client allows you to easily access data through Google Data APIs. It uses the GData Java Client Library from Google.
 
 See more at http://code.google.com/apis/gdata/docs/client-libraries.html
 The jar files are based on gdata-java-client v1.40.0
@@ -22,4 +22,17 @@ SESSION_TOKEN = "auth_sub_token"
 
 Usage
 =======
-TBD
+# To get contacts from Google:
+service = GData::ContactsService.new YOUR_APPLICATION_NAME
+# Use OAuth
+credentials = GData::GoogleOAuthParameters.new
+credentials.attributes = {
+  :consumer_key => CONSUMER_KEY,
+  :consumer_secret => CONSUMER_SECRET,
+  :token => TOKEN,
+  :token_secret => TOKEN_SECRET }
+service.oauth_credentials = credentials
+# Use AuthSubToken
+service.auth_sub_token = { :token => SESSION_TOKEN }
+feed = service.find_feed(:url => GData::ContactsService::DEFAULT_CONTACTS_URI)
+contacts = feed.entries

data/lib/base.rb

@@ -13,4 +13,5 @@ module GData
   include_package 'com.google.gdata.util'
   include_package 'com.google.gdata.client'
   include_package 'com.google.gdata.client.authn.oauth'
+  include_package 'com.google.gdata.client.http'
 end

data/lib/base_entry.rb

@@ -17,4 +17,8 @@ class Java::ComGoogleGdataData::BaseEntry
   def id
     get_id
   end
+  
+  def link
+    get_link(nil, nil)
+  end
 end

data/lib/calendar_service.rb

@@ -9,11 +9,27 @@ class Java::ComGoogleGdataClientCalendar::CalendarService
   OWN_CALENDAR_URL = 'http://www.google.com/calendar/feeds/default/owncalendars/full'
   DEFAULT_CALENDAR_URI = 'http://www.google.com/calendar/feeds/default/private/full'
   
-  def find_feed(options)
-    super(options.merge({:class => GData::CalendarFeed}))
+  def find_feed(options, klass = GData::CalendarFeed)
+    super(options.merge({:class => klass}))
   end
   
-  def find_entry(options)
-    super(options.merge({:class => GData::CalendarEntry}))
+  def find_calendars_feed(options)
+    find_feed(options, GData::CalendarFeed)
+  end
+  
+  def find_events_feed(options)
+    find_feed(options, GData::CalendarEventFeed)
+  end
+  
+  def find_entry(options, klass = GData::CalendarEntry)
+    super(options.merge({:class => klass}))
+  end
+  
+  def find_calendar_entry(options)
+    find_entry(options, GData::CalendarEntry)
+  end
+  
+  def find_event_entry(options)
+    find_entry(options, GData::CalendarEventEntry)
   end
 end

data/lib/gdata_jruby_client.rb

@@ -3,6 +3,7 @@ DEFAULT_APPLICATION_NAME = "Presdo-GDataJRubyClient-0.1"
 module GData end
 
 require 'java'
+require 'active_support'
 require File.dirname(__FILE__) + '/base'
 require File.dirname(__FILE__) + '/contacts_service'
 require File.dirname(__FILE__) + '/time_ext'

data/lib/google_service.rb

@@ -5,8 +5,9 @@ class Java::ComGoogleGdataClient::GoogleService
     self.set_oauth_credentials(credientials, signer)
   end
   
-  def auth_sub_token=(token, private_key=nil)
-    self.set_auth_sub_token(token, private_key)
+  def auth_sub_token=(options)
+    options = {:private_key => nil}.merge(options)
+    self.set_auth_sub_token(options[:token], options[:private_key])
   end
   
   def find_feed(options={})
@@ -14,13 +15,18 @@ class Java::ComGoogleGdataClient::GoogleService
     raise "Feed Class is required" unless options[:class]
     options[:url] = url_for(options[:url]) if options[:url]
     
-    if options[:etag] or options[:modified_since]
-      get_feed(options[:url] || options[:query], 
-        options[:class].java_class, 
-        options[:etag] || options[:modified_since])
-    else
-      get_feed(options[:url] || options[:query], 
-        options[:class].java_class)
+    begin
+      if options[:etag] or options[:modified_since]
+        get_feed(options[:url] || options[:query], 
+          options[:class].java_class, 
+          options[:etag] || options[:modified_since])
+      else
+        get_feed(options[:url] || options[:query], 
+          options[:class].java_class)
+      end
+    rescue NativeException => e
+      return nil if e.message =~ /NotFound/
+      raise e
     end
   end
   
@@ -29,13 +35,18 @@ class Java::ComGoogleGdataClient::GoogleService
     raise "Entry Class is required" unless options[:class]
     options[:url] = url_for(options[:url]) if options[:url]
     
-    if options[:etag] or options[:modified_since]
-      get_entry(options[:url] || options[:query], 
-        options[:class].java_class, 
-        options[:etag] || options[:modified_since])
-    else
-      get_entry(options[:url] || options[:query], 
-        options[:class].java_class)
+    begin
+      if options[:etag] or options[:modified_since]
+        get_entry(options[:url] || options[:query], 
+          options[:class].java_class, 
+          options[:etag] || options[:modified_since])
+      else
+        get_entry(options[:url] || options[:query], 
+          options[:class].java_class)
+      end
+    rescue NativeException => e
+      return nil if e.message =~ /NotFound/
+      raise e
     end
   end
   
@@ -47,6 +58,14 @@ class Java::ComGoogleGdataClient::GoogleService
     insert(options[:url], options[:entry])
   end
   
+  def delete_entry(options={})
+    raise "Feed URL is required" unless options[:url]
+    raise "Entry is required" unless options[:entry]
+    options[:url] = url_for(options[:url]) if options[:url]
+    
+    delete(options[:url], options[:entry])
+  end
+  
   def create_batch(options={})
     raise "Feed URL is required" unless options[:url]
     raise "Feed is required" unless options[:feed]

data/lib/query.rb

@@ -4,7 +4,21 @@ class Java::ComGoogleGdataClient::Query
   def initialize(options)
     if options.is_a? Hash
       super url_for(options.delete(:url))
-      update_attributes(options)
+      options.each do |k, v|
+        if self.respond_to? "#{k}=".to_sym
+          self.send("#{k}=".to_sym, (v.kind_of? Time)? v.to_joda_time : v)
+        else
+          name = k.to_s.dasherize
+          case v
+          when Fixnum
+            self.set_integer_custom_parameter(name, v)
+          when Time
+            self.set_string_custom_parameter(name, v.xmlschema)
+          else
+            self.set_string_custom_parameter(name, v.to_s)
+          end
+        end
+      end
     else
       super url_for(options)
     end

data/spec/google_calendar_service_spec.rb

@@ -281,15 +281,15 @@ describe GData::CalendarService do
   def create_service
     @service = GData::CalendarService.new DEFAULT_APPLICATION_NAME
     # Use OAuth
-    credentials = GData::GoogleOAuthParameters.new
-    credentials.attributes = {
-      :consumer_key => CONSUMER_KEY,
-      :consumer_secret => CONSUMER_SECRET,
-      :token => TOKEN,
-      :token_secret => TOKEN_SECRET }
-    @service.oauth_credentials = credentials
+    # credentials = GData::GoogleOAuthParameters.new
+    # credentials.attributes = {
+    #   :consumer_key => CONSUMER_KEY,
+    #   :consumer_secret => CONSUMER_SECRET,
+    #   :token => TOKEN,
+    #   :token_secret => TOKEN_SECRET }
+    # @service.oauth_credentials = credentials
     # Use AuthSubToken
-    # @service.auth_sub_token = SESSION_TOKEN
+    @service.auth_sub_token = { :token => SESSION_TOKEN }
     @service
   end
   

data/spec/google_contacts_service_spec.rb

@@ -136,13 +136,16 @@ describe GData::ContactsService do
   
   def create_service
     @service = GData::ContactsService.new DEFAULT_APPLICATION_NAME
-    credentials = GData::GoogleOAuthParameters.new
-    credentials.attributes = {
-      :consumer_key => CONSUMER_KEY,
-      :consumer_secret => CONSUMER_SECRET,
-      :token => TOKEN,
-      :token_secret => TOKEN_SECRET }
-    @service.oauth_credentials = credentials
+    # Use OAuth
+    # credentials = GData::GoogleOAuthParameters.new
+    # credentials.attributes = {
+    #   :consumer_key => CONSUMER_KEY,
+    #   :consumer_secret => CONSUMER_SECRET,
+    #   :token => TOKEN,
+    #   :token_secret => TOKEN_SECRET }
+    # @service.oauth_credentials = credentials
+    # Use AuthSubToken
+    @service.auth_sub_token = { :token => SESSION_TOKEN }
     @service
   end
   

data/spec/google_keys.rb

@@ -8,4 +8,4 @@ CONSUMER_SECRET = "/tO50sDR2F/8tckdObSBgJLl"
 TOKEN = "1/V1lDQFRoAgAMv-cvoIOmQmATiaQZnWPB51nTvo8n9Sw"
 TOKEN_SECRET = "uObNrVylI3S8vWeQXQboyC+8"
 
-SESSION_TOKEN = "CM-jpoTEHxDIxcORBg"
+SESSION_TOKEN = 'CM-jpoTEHxDFnoe4-P____8B'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gdata-jruby-client
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
   - Jerry Luk
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 -08:00
+date: 2010-01-28 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: activesupport
+    type: :runtime
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.2.2
+      version: 
 description: The GData JRuby Client allows you to easily access data through Google Data APIs. It uses the GData Java Client Library from Google.
 email: jerry@presdo.com
 executables: []