googletastic 0.0.5 → 0.0.5.1

data/Rakefile

@@ -68,7 +68,7 @@ end
 
 desc "Install the gem locally"
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{spec.name}-#{spec.version} --no-ri --no-rdoc}
+  sh %{gem install pkg/#{spec.name}-#{spec.version} --no-ri --no-rdoc}
 end
 
 desc "Publish gem to rubygems"
@@ -102,4 +102,8 @@ task :default => :spec
 desc "Run Googletastic Benchmarks"
 task :benchmark do
   files("spec/benchmarks/*") {|file| system("ruby #{file}") }
+end
+
+task :yank do
+  `gem yank #{spec.name} -v #{spec.version}`
 end

data/lib/googletastic.rb

@@ -59,7 +59,7 @@ end
 
 module Googletastic
   # :stopdoc:
-  VERSION = '0.0.5'
+  VERSION = '0.0.5.1'
   # :startdoc
   class << self; attr_accessor :keys, :clients, :options; end
 

data/lib/googletastic/base.rb

@@ -11,7 +11,7 @@ class Googletastic::Base < Hash
   # They don't include the url for finding the document,
   # which can be inferred from the "action" you're taking on it,
   # and the general api.
-  attr_accessor :id
+  attr_accessor :id, :etag
   attr_accessor :acl
   attr_accessor :created_at, :updated_at
   attr_accessor :attachment_path # for docs, images...

data/lib/googletastic/document.rb

@@ -25,7 +25,7 @@ class Googletastic::Document < Googletastic::Base
   PPT = "application/vnd.ms-powerpoint" unless defined?(PPT)
   PPS = "application/vnd.ms-powerpoint" unless defined?(PPS)
   
-  attr_accessor :title, :kind, :categories, :resource_id, :ext
+  attr_accessor :title, :kind, :categories, :plain_id, :ext
   
   def has_access?(email)
     self.class.first(:url => update_url)
@@ -112,12 +112,12 @@ class Googletastic::Document < Googletastic::Base
     end
     
     # docid (all lowercase)
-    def show_url(id)
+    def get_url(id)
       "http://docs.google.com/View?docID=#{id}&revision=_latest"
     end
     
-    def get_url(id)
-      "https://docs.google.com/feeds/default/private/full/#{id}"
+    def show_url(id)
+      "https://docs.google.com/feeds/documents/private/full/#{id}"
     end
     
     def edit_url(id)
@@ -163,13 +163,13 @@ class Googletastic::Document < Googletastic::Base
     def build_url(options)
       base = options.has_key?(:url) ? options[:url] : self.index_url
       base.gsub!(/full$/, "expandAcl") if options.has_key?(:include) and options[:include].index(:acl)
-      base << "/#{options[:id]}" if options.has_key?(:id)
       options[:url] = base
       super(options)
     end
     
     def unmarshall(xml)
       records = xml.xpath("//atom:entry", ns_tag("atom")).collect do |record|
+        etag        = record["etag"].to_s
         kind = title = id = categories = value = nil # reset
         title       = record.xpath("atom:title", ns_tag("atom")).text
         categories  = record.xpath("atom:category", ns_tag("atom")).collect do |category|
@@ -177,17 +177,18 @@ class Googletastic::Document < Googletastic::Base
           kind = value if !kind and valid_kind?(value)
           value
         end
-        resource_id = record.xpath("gd:resourceId", ns_tag("gd")).text
-        id          = resource_id.gsub(/#{kind}:/, "")
+        id          = record.xpath("gd:resourceId", ns_tag("gd")).text
+        plain_id    = id.gsub(/#{kind}:/, "")
         created_at  = record.xpath("atom:published", ns_tag("atom")).text
         updated_at  = record.xpath("atom:updated", ns_tag("atom")).text
-        puts "UPDATED AT: #{updated_at.inspect}"
+
         Googletastic::Document.new(
           :id => id,
           :title => title,
           :categories => categories,
+          :etag => etag,
           :kind => kind,
-          :resource_id => resource_id,
+          :plain_id => plain_id,
           :ext => File.extname(title),
           :created_at => DateTime.parse(created_at),
           :updated_at => DateTime.parse(updated_at)
@@ -201,7 +202,7 @@ class Googletastic::Document < Googletastic::Base
         xml.entry(ns_xml("atom", "exif", "openSearch")) {
           if record.id
             xml.id_ {
-              xml.text get_url(record.resource_id)
+              xml.text get_url(record.id)
             }
           end
           record.categories.each do |category|

data/lib/googletastic/row.rb

@@ -1,6 +1,6 @@
 class Googletastic::Row < Googletastic::Base
   
-  attr_accessor :data, :worksheet_id, :spreadsheet_id, :title, :etag
+  attr_accessor :data, :worksheet_id, :spreadsheet_id, :title
   
   def get_url
     self.class.get_url(File.join(self.spreadsheet_id, self.worksheet_id), self.id)
@@ -41,7 +41,7 @@ class Googletastic::Row < Googletastic::Base
     
     def unmarshall(xml)
       records = xml.xpath("//atom:entry", ns_tag("atom")).collect do |record|
-        etag              = record["etag"]
+        etag              = record["etag"].to_s
         id                = record.xpath("atom:id", ns_tag("atom")).first.text
         ids               = id =~ /http:\/\/spreadsheets\.google\.com\/feeds\/list\/([^\/]+)\/([^\/]+)\/([^\/]+)/
         spreadsheet_id    = $1

data/lib/googletastic/spreadsheet.rb

@@ -14,6 +14,10 @@ class Googletastic::Spreadsheet < Googletastic::Base
     @table ||= Googletastic::Table.first(:key => self.id)
   end
   
+  def num_rows
+    worksheet.num_rows
+  end
+  
   def rows
     @rows ||= Googletastic::Row.all(:key => self.id, :worksheet_id => worksheet.id)
   end
@@ -49,6 +53,7 @@ class Googletastic::Spreadsheet < Googletastic::Base
 
     def unmarshall(xml)
       records = xml.xpath("//atom:entry", ns_tag("atom")).collect do |record|
+        etag              = record["etag"].to_s
         id                = record.xpath("atom:id", ns_tag("atom")).first.text.gsub("http://spreadsheets.google.com/feeds/spreadsheets/", "")
         edit_id           = record.xpath("atom:link[@rel='alternate']", ns_tag("atom")).first
         edit_id           = edit_id["href"].gsub("http://spreadsheets.google.com/ccc?key=", "") if edit_id
@@ -59,6 +64,7 @@ class Googletastic::Spreadsheet < Googletastic::Base
         
         Googletastic::Spreadsheet.new(
           :id => id,
+          :etag => etag,
           :edit_id => edit_id,
           :title => title,
           :content => content,

data/lib/googletastic/worksheet.rb

@@ -1,6 +1,6 @@
 class Googletastic::Worksheet < Googletastic::Base
   
-  attr_accessor :title, :content, :spreadsheet_id
+  attr_accessor :title, :content, :spreadsheet_id, :num_rows, :num_columns
   
   # Time.now.xmlschema
   class << self
@@ -28,12 +28,16 @@ class Googletastic::Worksheet < Googletastic::Base
         title             = record.xpath("atom:title", ns_tag("atom")).first.text
         content           = record.xpath("atom:content", ns_tag("atom")).first.text
         updated_at        = record.xpath("atom:updated", ns_tag("atom")).text
+        num_rows          = record.xpath("gs:rowCount", ns_tag("gs")).text.to_i
+        num_columns       = record.xpath("gs:colCount", ns_tag("gs")).text.to_i
         
         worksheet = Googletastic::Worksheet.new(
           :id => id,
           :spreadsheet_id => spreadsheet_id,
           :title => title,
           :content => content,
+          :num_rows => num_rows,
+          :num_columns => num_columns,
           :updated_at => DateTime.parse(updated_at),
           :raw => record.to_xml
         )

data/spec/googletastic/document_spec.rb

@@ -5,7 +5,7 @@ describe Googletastic::Document do
   
   before(:all) do
     @doc = Document.new
-    @id = "0AT1-fvkm5vJPZGN2NzR3bmJfMGZiMnh3N2R0"
+    @id = "document:0AT1-fvkm5vJPZGN2NzR3bmJfMGZiMnh3N2R0"
   end
   
   # FIND METHODS
@@ -63,7 +63,7 @@ describe Googletastic::Document do
     
     it "should have a valid 'kind'" do
       @doc.kind.should_not == nil
-      Googletastic::Document.valid_category?(@doc.kind).should == true
+      Googletastic::Document.valid_kind?(@doc.kind).should == true
     end
     
     it "should have an array of categories" do
@@ -93,7 +93,6 @@ describe Googletastic::Document do
     
     it "should marshall the document into an entry feed with at least a 'title' and 'id'" do
       xml = Nokogiri::XML(@xml)
-      xml.xpath("//atom:id", {"atom" => NS['atom']}).first.text.should == "#{@doc.index_url.gsub('http', 'https').gsub('documents', 'default')}/#{@doc.resource_id}"
       xml.xpath("//atom:title", {"atom" => NS['atom']}).first.text.should == @doc.title
     end
   end

data/spec/googletastic/spreadsheet_spec.rb

@@ -7,11 +7,15 @@ describe Googletastic::Spreadsheet do
     puts spreadsheet.inspect
     spreadsheet.should be_an_instance_of(Googletastic::Spreadsheet)
   end
-=begin
   it "should retrieve a list of spreadsheets" do
-    Googletastic::Spreadsheet.all
+    spreadsheets = Googletastic::Spreadsheet.all
+    puts spreadsheets.inspect
+    spreadsheets.each do |sheet|
+      puts sheet.num_rows.inspect
+    end
   end
   
+=begin
   it "should retrieve a spreadsheets worksheet" do
     Googletastic::Spreadsheet.first.worksheet.should_not be_nil
   end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 5
-  version: 0.0.5
+  - 1
+  version: 0.0.5.1
 platform: ruby
 authors: 
 - Lance Pollard