gdocs4ruby 0.1.1 → 0.1.2

data/lib/gdocs4ruby/base_object.rb

@@ -95,18 +95,6 @@ module GDocs4Ruby
              
     TYPES = ["document", "folder", "spreadsheet", "presentation", "any"]
     
-    #The raw date the document was published
-    attr_reader :published
-    
-    #The raw date the document was last updated
-    attr_reader :updated
-    
-    #The author/owner name
-    attr_reader :author_name
-    
-    #The author/owner email
-    attr_reader :author_email
-    
     #An array of folders this object belongs to
     attr_reader :folders
     
@@ -119,9 +107,6 @@ module GDocs4Ruby
     #The uri for the html editor of the object (the web editor for documents)
     attr_reader :html_uri
     
-    #The content uri for exporting the object content
-    attr_reader :content_uri
-    
     #Flag indicating whether the document has the 'viewed' category link.
     attr_reader :viewed
     
@@ -133,7 +118,6 @@ module GDocs4Ruby
       super(service, attributes)
       @xml = ENTRY_XML
       @folders = []
-      @content_uri = nil
       @edit_content_uri = nil
       @viewed = false
       @content = @content_type = nil
@@ -148,12 +132,6 @@ module GDocs4Ruby
       xml.root.elements.each(){}.map do |ele|
         @etag = xml.root.attributes['etag'] if xml.root.attributes['etag']
         case ele.name
-          when 'published'
-            @published = ele.text
-          when 'updated'
-            @updated = ele.text
-          when 'content'
-            @content_uri = ele.attributes['src']
           when 'link'
             case ele.attributes['rel']
               when 'edit-media'
@@ -161,9 +139,6 @@ module GDocs4Ruby
               when 'alternate'
                 @html_uri = ele.attributes['href']
             end
-          when 'author'
-            ele.elements.each('name'){}.map {|e| @author_name = e.text}
-            ele.elements.each('email'){}.map {|e| @author_email = e.text}
           when 'quotaBytesUsed'
             @bytes_used = ele.text
         end
@@ -199,13 +174,13 @@ module GDocs4Ruby
         else
           ret = service.send_request(GData4Ruby::Request.new(:put, @edit_uri, to_xml()))
         end
-        if not load(ret.read_body)
-          raise SaveFailed
-        end
-        return true
       else
-        return create
+        ret = create
+      end
+      if not load(ret.read_body)
+        raise SaveFailed
       end
+      return true
     end
           
     #Retrieves an array of GData4Ruby::AccessRules representing the access rules for the object, as contained in the Google ACL.
@@ -291,9 +266,6 @@ module GDocs4Ruby
       else
         service.send_request(GData4Ruby::Request.new(:post, DOCUMENT_LIST_FEED, to_xml()))
       end
-      if not load(ret.read_body)
-        raise SaveFailed
-      end
       return ret
     end
     
@@ -319,7 +291,7 @@ module GDocs4Ruby
     
     #Finds a BaseObject based on a text query or by an id.  Parameters are:
     #*service*::  A valid Service object to search.
-    #*query*:: either a string containing a text query to search by, or a hash containing an +id+ key with an associated id to find, or a +query+ key containint a text query to search for.
+    #*query*:: either a string containing a text query to search by, or a hash containing an +id+ key with an associated id to find, or a +query+ key containint a text query to search for, or a +title+ key containing a title to search.
     #*type*:: used to limit results to a specific document type, as list in TYPES.
     #*args*:: a hash containing optional additional query paramters to use.  See http://code.google.com/apis/gdata/docs/2.0/reference.html#Queries for a full list of possible values.  Example: 
     # {'max-results' => '100'}
@@ -331,7 +303,7 @@ module GDocs4Ruby
       raise ArgumentError, "type must be one of #{TYPES.join(" ")}" if not TYPES.include? type
       if query.is_a? Hash and query[:id]
         id = query[:id]
-        puts "id passed, finding event by id" if service.debug
+        puts "id passed, finding document by id" if service.debug
         puts "id = "+id if service.debug
         d = service.send_request(GData4Ruby::Request.new(:get, FEEDS[type.to_sym]+id, {"If-Not-Match" => "*"}))
         puts d.inspect if service.debug
@@ -340,8 +312,12 @@ module GDocs4Ruby
         end
       else
         results = []
-        term = query.is_a?(Hash) ? CGI::escape(query[:query]) : CGI::escape(query)
-        args["q"] = term if term and term != ''
+        if query.is_a?(Hash)
+          args["q"] = query[:query] if query[:query]
+          args['title'] = query[:title] if query[:title]
+        else
+          args["q"] = CGI::escape(query) if query != ''
+        end
         ret = service.send_request(GData4Ruby::Request.new(:get, QUERY_FEEDS[type.to_sym], nil, nil, args))
         xml = REXML::Document.new(ret.body).root
         xml.elements.each("entry") do |e|

data/lib/gdocs4ruby/service.rb

@@ -15,7 +15,7 @@
 # Feel free to use and update, but be sure to contribute your
 # code back to the project and attribute as required by the license.
 #++
-require 'gdocs4ruby/base' 
+require 'gdocs4ruby' 
 require 'gdocs4ruby/base_object'
 require 'gdocs4ruby/folder'
 require 'gdocs4ruby/document'

data/test/unit.rb

@@ -1,3 +1,114 @@
-if __FILE__ == $0
-  # TODO Generated stub
-end
+#!/usr/bin/ruby
+
+require 'rubygems'
+require 'gdocs4ruby'
+include GDocs4Ruby
+
+@service = Service.new
+@username = nil
+@password = nil
+
+def tester
+  if ARGV.include?("-d")
+      @service.debug = true
+  end
+  ARGV.each do |ar|
+    if ar.match("username=")
+      @username = ar.gsub("username=", "")
+    end
+    if ar.match("password=")
+      @password = ar.gsub("password=", "")
+    end
+  end
+  service_test
+  document_crud
+  find_document
+end
+
+def service_test
+  puts "---Starting Service Test---"
+  puts "1. Authenticate"
+  if @service.authenticate(@username, @password)
+    successful
+  else
+    failed
+  end
+  
+  puts "2. Authenticate with GData version 3.0"
+  @service = Service.new({:gdata_version => '3.0'})
+  if @service.authenticate(@username, @password) and @service.gdata_version == '3.0'
+    successful
+  else
+    failed
+  end
+end
+
+def document_crud
+  puts "---Starting Document Test---"
+  @service = Service.new()
+  @service.authenticate(@username, @password)
+  
+  content = '<h1>test content</h1>'
+  content1 = '<b>new content</b>'
+  content_type = 'html'
+  title = 'Test title'
+  title1 = 'new title'
+  
+  puts "1. Create Document"  
+  doc = Document.new(@service)
+  doc.title = title
+  doc.content = content
+  doc.content_type = content_type
+  if doc.save and doc.title == title and doc.get_content('html').include? 'test content'
+    successful
+  else
+    failed
+  end
+  
+  puts "2. Update Document"  
+  doc.title = title1
+  doc.content = content1
+  doc.content_type = content_type
+  if doc.save and doc.title == title1 and doc.get_content('html').include? 'new content'
+    successful
+  else
+    failed
+  end
+  
+  puts "3. Delete Document"
+  if doc.delete
+    successful
+  else
+    failed
+  end
+end
+
+def find_document
+  puts "---Starting Query Test---"
+  puts "1. Create Document"  
+  doc = Document.new(@service)
+  doc.title = title
+  doc.content = content
+  doc.content_type = content_type
+  if doc.save and doc.title == title and doc.get_content('html').include? 'test content'
+    successful
+  else
+    failed
+  end
+  
+  puts "2. Find Document"
+  
+end
+
+def failed(m = nil)
+  puts "Test Failed"
+  puts m if m
+  exit()
+end
+
+def successful(m = nil)
+  puts "Test Successful"
+  puts m if m
+end
+
+tester

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gdocs4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mike Reich
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 +11:00
+date: 2010-05-16 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gdata4ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
-    version: 
+        segments: 
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+  type: :runtime
+  version_requirements: *id001
 description: GDocs4Ruby is a full featured wrapper for version 2.0 of the Google Documents API (aka DocList).  GDocs4Ruby provides the ability to create, update and delete google documents, metadata and content.  The gem also includes support for folders, modifying permissions for documents via ACL feeds, and much more.
 email: mike@seabourneconsulting.com
 executables: []
@@ -53,18 +62,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: gdocs4ruby
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A full featured wrapper for interacting with the Google Docs API