google_drive 0.3.4 → 0.3.5

data/lib/google_drive/collection.rb

@@ -116,11 +116,39 @@ module GoogleDrive
           return files_with_type("folder", params)
         end
         
+        # Returns a file (can be a spreadsheet, document, subcollection or other files) in the
+        # collection which exactly matches +title+ as GoogleDrive::File.
+        # Returns nil if not found. If multiple collections with the +title+ are found, returns
+        # one of them.
+        #
+        # If given an Array, does a recursive subcollection traversal.
+        def file_by_title(title)
+          return file_by_title_with_type(title, nil)
+        end
+        
         # Returns its subcollection whose title exactly matches +title+ as GoogleDrive::Collection.
         # Returns nil if not found. If multiple collections with the +title+ are found, returns
         # one of them.
+        #
+        # If given an Array, does a recursive subcollection traversal.
         def subcollection_by_title(title)
-          return subcollections("title" => title, "title-exact" => "true")[0]
+          return file_by_title_with_type(title, "folder")
+        end
+        
+      protected
+
+        def file_by_title_with_type(title, type)
+          if title.is_a?(Array)
+            rel_path = title
+            if rel_path.empty?
+              return self
+            else
+              parent = subcollection_by_title(rel_path[0...-1])
+              return parent && parent.file_by_title_with_type(rel_path[-1], type)
+            end
+          else
+            return files_with_type(type, "title" => title, "title-exact" => "true")[0]
+          end
         end
         
       private

data/lib/google_drive/session.rb

@@ -132,8 +132,15 @@ module GoogleDrive
         # Returns GoogleDrive::File or its subclass whose title exactly matches +title+.
         # Returns nil if not found. If multiple files with the +title+ are found, returns
         # one of them.
+        #
+        # If given an Array, traverses collections by title. e.g.
+        #   session.file_by_title(["myfolder", "mysubfolder/even/w/slash", "myfile"])
         def file_by_title(title)
-          return files("title" => title, "title-exact" => "true")[0]
+          if title.is_a?(Array)
+            return self.root_collection.file_by_title(title)
+          else
+            return files("title" => title, "title-exact" => "true")[0]
+          end
         end
 
         # Returns list of spreadsheets for the user as array of GoogleDrive::Spreadsheet.

data/lib/google_drive/spreadsheet.rb

@@ -1,6 +1,8 @@
 # Author: Hiroshi Ichikawa <http://gimite.net/>
 # The license of this source is "New BSD Licence"
 
+require "time"
+
 require "google_drive/util"
 require "google_drive/error"
 require "google_drive/worksheet"
@@ -173,9 +175,10 @@ module GoogleDrive
           result = []
           doc.css("entry").each() do |entry|
             title = entry.css("title").text
+            updated = Time.parse(entry.css("updated").text)
             url = entry.css(
               "link[rel='http://schemas.google.com/spreadsheets/2006#cellsfeed']")[0]["href"]
-            result.push(Worksheet.new(@session, self, url, title))
+            result.push(Worksheet.new(@session, self, url, title, updated))
           end
           return result.freeze()
         end

data/lib/google_drive/worksheet.rb

@@ -17,12 +17,13 @@ module GoogleDrive
 
         include(Util)
 
-        def initialize(session, spreadsheet, cells_feed_url, title = nil) #:nodoc:
+        def initialize(session, spreadsheet, cells_feed_url, title = nil, updated = nil) #:nodoc:
           
           @session = session
           @spreadsheet = spreadsheet
           @cells_feed_url = cells_feed_url
           @title = title
+          @updated = updated
 
           @cells = nil
           @input_values = nil
@@ -91,6 +92,13 @@ module GoogleDrive
           @modified.add([row, col])
           self.max_rows = row if row > @max_rows
           self.max_cols = col if col > @max_cols
+          if value.empty?
+            @num_rows = nil
+            @num_cols = nil
+          else
+            @num_rows = row if row > num_rows
+            @num_cols = col if col > num_cols
+          end
         end
 
         # Updates cells in a rectangle area by a two-dimensional Array.
@@ -140,13 +148,17 @@ module GoogleDrive
         # Row number of the bottom-most non-empty row.
         def num_rows
           reload() if !@cells
-          return @input_values.select(){ |(r, c), v| !v.empty? }.map(){ |(r, c), v| r }.max || 0
+          # Memoizes it because this can be bottle-neck.
+          # https://github.com/gimite/google-drive-ruby/pull/49
+          return @num_rows ||= @input_values.select(){ |(r, c), v| !v.empty? }.map(){ |(r, c), v| r }.max || 0
         end
 
         # Column number of the right-most non-empty column.
         def num_cols
           reload() if !@cells
-          return @input_values.select(){ |(r, c), v| !v.empty? }.map(){ |(r, c), v| c }.max || 0
+          # Memoizes it because this can be bottle-neck.
+          # https://github.com/gimite/google-drive-ruby/pull/49
+          return @num_cols ||= @input_values.select(){ |(r, c), v| !v.empty? }.map(){ |(r, c), v| c }.max || 0
         end
 
         # Number of rows including empty rows.
@@ -183,6 +195,12 @@ module GoogleDrive
           return @title
         end
 
+         # Date updated of the worksheet (shown as tab label in Web interface).
+        def updated
+          reload() if !@updated
+          return @updated
+        end
+
         # Updates title of the worksheet.
         # Note that update is not sent to the server until you call save().
         def title=(title)
@@ -217,6 +235,9 @@ module GoogleDrive
           @max_cols = doc.css("gs|colCount").text.to_i()
           @title = doc.css("feed > title")[0].text
 
+          @num_cols = nil
+          @num_rows = nil
+
           @cells = {}
           @input_values = {}
           @numeric_values = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_drive
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri