googletastic 0.0.5.1 → 0.0.5.2

data/README.textile

@@ -46,4 +46,6 @@ http://productideas.appspot.com/#15/e=220cb&t=cabc1
 # Publish the docs as plain text.
 # Textile and Markdown support
 # Better font support in PDF documents
-# Everything Should Be TAGGABLE
+# Everything Should Be TAGGABLE
+
+Takes about 5-10 minutes for google to update the feed so that "updated_at" < 1.day.ago if you just made a change.

data/Rakefile

@@ -39,6 +39,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency("activesupport", ">= 2.3.5")
   s.add_dependency("activerecord", ">= 2.3.5")
   s.add_dependency("gdata")
+  s.add_dependency("rspec")
 end
 
 desc "Create .gemspec file (useful for github)"

data/lib/googletastic.rb

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

data/lib/googletastic/base.rb

@@ -6,12 +6,13 @@ class Googletastic::Base < Hash
   include Googletastic::Mixins::Parsing
   include Googletastic::Mixins::Finders
   include Googletastic::Mixins::Actions
+  include Googletastic::Mixins::Pagination
   
   # ID's are specifically the hash key for each entry.
   # 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, :etag
+  attr_accessor :id, :etag, :head
   attr_accessor :acl
   attr_accessor :created_at, :updated_at
   attr_accessor :attachment_path # for docs, images...

data/lib/googletastic/document.rb

@@ -168,6 +168,7 @@ class Googletastic::Document < Googletastic::Base
     end
     
     def unmarshall(xml)
+      head    = unmarshall_head(xml)
       records = xml.xpath("//atom:entry", ns_tag("atom")).collect do |record|
         etag        = record["etag"].to_s
         kind = title = id = categories = value = nil # reset
@@ -191,7 +192,8 @@ class Googletastic::Document < Googletastic::Base
           :plain_id => plain_id,
           :ext => File.extname(title),
           :created_at => DateTime.parse(created_at),
-          :updated_at => DateTime.parse(updated_at)
+          :updated_at => DateTime.parse(updated_at),
+          :head => head
         )
       end
       records

data/lib/googletastic/head.rb

@@ -0,0 +1,30 @@
+class Googletastic::Head < Googletastic::Base
+  
+  attr_accessor :title, :total_results, :start_index, :per_page
+  
+  class << self
+    
+    def unmarshall(xml)
+      feed          = xml.xpath("atom:feed", ns_tag("atom")).first
+      return nil unless feed
+
+      id            = feed.xpath("atom:id", ns_tag("atom")).text
+      updated_at    = feed.xpath("atom:updated", ns_tag("atom")).text
+      title         = feed.xpath("atom:title", ns_tag("atom")).text
+      total_results = feed.xpath("openSearch:totalResults", ns_tag("openSearch")).text
+      start_index   = feed.xpath("openSearch:startIndex", ns_tag("openSearch")).text
+      per_page      = feed.xpath("openSearch:itemsPerPage", ns_tag("openSearch")).text
+      
+      head = Googletastic::Head.new(
+        :id => id,
+        :title => title,
+        :updated_at => DateTime.parse(updated_at),
+        :total_results => total_results,
+        :start_index => start_index,
+        :per_page => per_page
+      )
+    end
+    
+  end
+  
+end

data/lib/googletastic/mixins/finders.rb

@@ -5,6 +5,13 @@ module Googletastic::Mixins::Finders
   end
   
   module ClassMethods
+    
+    def head(*args)
+      options = args.extract_options!
+      result = find_by_api(options.merge(:limit => 1)).first
+      result.nil? ? nil : result.head
+    end
+    
     def first(*args)
       find(:first, *args)
     end

data/lib/googletastic/mixins/namespaces.rb

@@ -3,7 +3,7 @@ module Googletastic::Mixins::Namespaces
   NAMESPACES = {
     "gphoto" => "http://schemas.google.com/photos/2007",
     "media" => "http://search.yahoo.com/mrss",
-    "openSearch" => "http://a9.com/-/spec/opensearchrss/1.0/",
+    "openSearch" => "http://a9.com/-/spec/opensearch/1.1/",
     "docs" => "http://schemas.google.com/docs/2007",
     "atom" => "http://www.w3.org/2005/Atom",
     "gd" => "http://schemas.google.com/g/2005",

data/lib/googletastic/mixins/pagination.rb

@@ -0,0 +1,32 @@
+module Googletastic::Mixins::Pagination
+  
+  def self.included(base)
+    base.extend(ClassMethods)
+    base.class_eval do
+      include InstanceMethods
+    end
+  end
+  
+  module ClassMethods
+    
+    # needs to track category and such
+    def paginate(*args, &block)
+      options = args.extract_options!
+      
+      per_page = options[:per_page]
+      page     = options[:page] || 1
+      
+      
+    end
+    
+  end
+  
+  module InstanceMethods
+    
+    def total_results
+      self.head ? self.head.total_results : 1
+    end
+    
+  end
+  
+end

data/lib/googletastic/mixins/parsing.rb

@@ -29,6 +29,10 @@ module Googletastic::Mixins::Parsing
       @cache_result == true
     end
     
+    def unmarshall_head(xml)
+      Googletastic::Head.unmarshall(xml)
+    end
+    
     # implement in subclasses
     def unmarshall(xml_records)
       raise "Implemnent in subclasses"

data/lib/googletastic/mixins/requesting.rb

@@ -11,7 +11,7 @@ module Googletastic::Mixins::Requesting
     
     def valid_queries
       {
-        :limit => "max-result",
+        :limit => "max-results",
         :offset => "start-index",
         :start => "start-index",
         :end => "end-index",

data/lib/googletastic/row.rb

@@ -40,6 +40,7 @@ class Googletastic::Row < Googletastic::Base
     end
     
     def unmarshall(xml)
+      head    = unmarshall_head(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
@@ -66,7 +67,7 @@ class Googletastic::Row < Googletastic::Base
           :worksheet_id => worksheet_id,
           :data => data,
           :updated_at => DateTime.parse(updated_at),
-          :raw => record.to_xml
+          :head => head
         )
       end
       records

data/lib/googletastic/spreadsheet.rb

@@ -14,10 +14,16 @@ class Googletastic::Spreadsheet < Googletastic::Base
     @table ||= Googletastic::Table.first(:key => self.id)
   end
   
+  # some property on google
   def num_rows
     worksheet.num_rows
   end
   
+  # what you want
+  def total_rows
+    @total_rows ||= Googletastic::Row.head(:key => self.id, :worksheet_id => worksheet.id).total_results
+  end
+  
   def rows
     @rows ||= Googletastic::Row.all(:key => self.id, :worksheet_id => worksheet.id)
   end
@@ -52,6 +58,7 @@ class Googletastic::Spreadsheet < Googletastic::Base
     end
 
     def unmarshall(xml)
+      head    = unmarshall_head(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/", "")
@@ -69,7 +76,7 @@ class Googletastic::Spreadsheet < Googletastic::Base
           :title => title,
           :content => content,
           :updated_at => DateTime.parse(updated_at),
-          :raw => record.to_xml
+          :head => head
         )
       end
       records

data/lib/googletastic/worksheet.rb

@@ -20,6 +20,7 @@ class Googletastic::Worksheet < Googletastic::Base
     end
     
     def unmarshall(xml)
+      head    = unmarshall_head(xml)
       records = xml.xpath("//atom:entry", ns_tag("atom")).collect do |record|
         id                = record.xpath("atom:id", ns_tag("atom")).first.text
         ids               = id =~ /http:\/\/spreadsheets\.google\.com\/feeds\/worksheets\/([^\/]+)\/([^\/]+)/
@@ -39,7 +40,7 @@ class Googletastic::Worksheet < Googletastic::Base
           :num_rows => num_rows,
           :num_columns => num_columns,
           :updated_at => DateTime.parse(updated_at),
-          :raw => record.to_xml
+          :head => head
         )
 
         worksheet

data/spec/googletastic/spreadsheet_spec.rb

@@ -7,12 +7,25 @@ describe Googletastic::Spreadsheet do
     puts spreadsheet.inspect
     spreadsheet.should be_an_instance_of(Googletastic::Spreadsheet)
   end
+  
   it "should retrieve a list of spreadsheets" do
     spreadsheets = Googletastic::Spreadsheet.all
-    puts spreadsheets.inspect
-    spreadsheets.each do |sheet|
-      puts sheet.num_rows.inspect
-    end
+  end
+  
+  it "should get the head for a list of spreadsheets" do
+    spreadsheets = Googletastic::Spreadsheet.all
+    first = spreadsheets.first
+    first.head.should_not be_nil
+  end
+  
+  it "should be able to get a head by itself" do
+    head = Googletastic::Spreadsheet.head
+    head.should_not be_nil
+  end
+  
+  it "should get total number of rows" do
+    sheet = Googletastic::Spreadsheet.first
+    puts sheet.total_rows.inspect
   end
   
 =begin

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: googletastic
 version: !ruby/object:Gem::Version 
+  hash: 95
   prerelease: false
   segments: 
   - 0
   - 0
   - 5
-  - 1
-  version: 0.0.5.1
+  - 2
+  version: 0.0.5.2
 platform: ruby
 authors: 
 - Lance Pollard
@@ -22,9 +23,11 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -34,9 +37,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -48,9 +53,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -62,14 +69,30 @@ dependencies:
   name: gdata
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: "Googletastic: A New Way of Googling"
 email: lancejpollard@gmail.com
 executables: []
@@ -98,6 +121,7 @@ files:
 - lib/googletastic/ext.rb
 - lib/googletastic/form.rb
 - lib/googletastic/group.rb
+- lib/googletastic/head.rb
 - lib/googletastic/helpers/document.rb
 - lib/googletastic/helpers/event.rb
 - lib/googletastic/helpers/form.rb
@@ -107,6 +131,7 @@ files:
 - lib/googletastic/mixins/attributes.rb
 - lib/googletastic/mixins/finders.rb
 - lib/googletastic/mixins/namespaces.rb
+- lib/googletastic/mixins/pagination.rb
 - lib/googletastic/mixins/parsing.rb
 - lib/googletastic/mixins/requesting.rb
 - lib/googletastic/mixins.rb
@@ -170,23 +195,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: googletastic
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: More than Syncing Rails Apps with the Google Data API