google_drive 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b4bb25ca507e0809ba9fc7a57f5a49667b61536
-  data.tar.gz: d6664ab492c6a12051d75890179eb06738df6821
+  metadata.gz: 63bf6efd4050300790543c7ed135632f86e61432
+  data.tar.gz: 481431da22d9bbebbf0a44067eaef26e7b05dc57
 SHA512:
-  metadata.gz: b0a978d591952834520f3c8832c6c795de5936893a492e885eff1589b422a60aa61b094bd52067258f3e7158b669d6fbd9152ee924100baddb629667c9e655dc
-  data.tar.gz: 14a9596a037ffbceb349c2f2c95bdb688ddbcbef68a5a1460d9426ecc10f52d82e415e3208991cd99ee18fa16469a32e7cd2462d29a6936f06ce9a0d8a1e9cec
+  metadata.gz: ff5e59d1b8b1a3bfcc59a6bda70d03b71f179d896e9dcb7c7cac836ce674569929a06dcfc5e792f19fac1d23398c4b043a64951b3597544acaae42a351a652d9
+  data.tar.gz: 77f7e1b096e71e4cfe7f3c4cb745f0efa9ce202fd41bfbbb38fb52a341ac7d4d1b3af55927d9cef7ec3eadf79ac41d7b5cef9a7a269af83554c2707308625835

data/README.rdoc

@@ -17,7 +17,7 @@ Ver. 1.0.x is not 100% backward compatible with 0.3.x. Some methods have been re
 
 = How to use
 
-First, follow "Create a client ID and client secret" in {this page}[https://developers.google.com/drive/web/auth/web-server] to get a client ID and client secret for OAuth. Set "Application type" to "Other" in the form to create a client ID if you use GoogleDrive.saved_session method as in the example below.
+First, follow Step 1 and 2 of "Authorizing requests with OAuth 2.0" in {this page}[https://developers.google.com/drive/v3/web/about-auth] to get a client ID and client secret for OAuth. Set "Application type" to "Other" in the form to create a client ID if you use GoogleDrive.saved_session method as in the example below.
 
 Next, create a file config.json which contains the client ID and crient secret you got above, which looks like:
 

data/lib/google_drive.rb

@@ -17,8 +17,8 @@ module GoogleDrive
     #   require "google/api_client"
     #   client = Google::APIClient.new
     #   auth = client.authorization
-    #   # Follow "Create a client ID and client secret" in
-    #   # https://developers.google.com/drive/web/auth/web-server] to get a client ID and client secret.
+    #   # Follow Step 1 and 2 of “Authorizing requests with OAuth 2.0” in
+    #   # https://developers.google.com/drive/v3/web/about-auth to get a client ID and client secret.
     #   auth.client_id = "YOUR CLIENT ID"
     #   auth.client_secret = "YOUR CLIENT SECRET"
     #   auth.scope =
@@ -105,9 +105,25 @@ module GoogleDrive
     #
     # If the file doesn't exist or client ID/secret are not given in the file, the default client
     # ID/secret embedded in the library is used.
+    #
+    # You can also provide a config object that must respond to:
+    #   client_id
+    #   client_secret
+    #   refesh_token
+    #   refresh_token=
+    #   scope
+    #   scope=
+    #   save
     def self.saved_session(
-        path = nil, proxy = nil, client_id = nil, client_secret = nil)
-      config = Config.new(path || ENV['HOME'] + '/.ruby_google_drive.token')
+        path_or_config = nil, proxy = nil, client_id = nil, client_secret = nil)
+      config = case path_or_config
+      when String
+        Config.new(path_or_config)
+      when nil
+        Config.new(ENV['HOME'] + '/.ruby_google_drive.token')
+      else
+        path_or_config
+      end
 
       config.scope ||= [
           'https://www.googleapis.com/auth/drive',

data/lib/google_drive/list.rb

@@ -15,18 +15,18 @@ module GoogleDrive
     # feed, not list feed. In this way, we can easily provide consistent API as
     # GoogleDrive::Worksheet using save()/reload().
     class List
-        
+
         include(Enumerable)
-        
+
         def initialize(worksheet) #:nodoc:
           @worksheet = worksheet
         end
-        
+
         # Number of non-empty rows in the worksheet excluding the first row.
         def size
           return @worksheet.num_rows - 1
         end
-        
+
         # Returns Hash-like object (GoogleDrive::ListRow) for the row with the
         # index. Keys of the object are colum names (the first row).
         # The second row has index 0.
@@ -36,7 +36,7 @@ module GoogleDrive
         def [](index)
           return ListRow.new(self, index)
         end
-        
+
         # Updates the row with the index with the given Hash object.
         # Keys of +hash+ are colum names (the first row).
         # The second row has index 0.
@@ -46,7 +46,7 @@ module GoogleDrive
         def []=(index, hash)
           self[index].replace(hash)
         end
-        
+
         # Iterates over Hash-like object (GoogleDrive::ListRow) for each row
         # (except for the first row).
         # Keys of the object are colum names (the first row).
@@ -55,13 +55,13 @@ module GoogleDrive
             yield(self[i])
           end
         end
-        
+
         # Column names i.e. the contents of the first row.
         # Duplicates are removed.
         def keys
           return (1..@worksheet.num_cols).map(){ |i| @worksheet[1, i] }.uniq()
         end
-        
+
         # Updates column names i.e. the contents of the first row.
         #
         # Note that update is not sent to the server until
@@ -74,7 +74,7 @@ module GoogleDrive
             @worksheet[1, i] = ""
           end
         end
-        
+
         # Adds a new row to the bottom.
         # Keys of +hash+ are colum names (the first row).
         # Returns GoogleDrive::ListRow for the new row.
@@ -86,34 +86,38 @@ module GoogleDrive
           row.update(hash)
           return row
         end
-        
+
         # Returns all rows (except for the first row) as Array of Hash.
         # Keys of Hash objects are colum names (the first row).
         def to_hash_array()
           return self.map(){ |r| r.to_hash() }
         end
-        
+
         def get(index, key) #:nodoc:
           return @worksheet[index + 2, key_to_col(key)]
         end
-        
+
         def numeric_value(index, key) #:nodoc:
           return @worksheet.numeric_value(index + 2, key_to_col(key))
         end
-        
+
+        def input_value(index, key) #:nodoc:
+          return @worksheet.input_value(index + 2, key_to_col(key))
+        end
+
         def set(index, key, value) #:nodoc:
           @worksheet[index + 2, key_to_col(key)] = value
         end
-        
+
       private
-        
+
         def key_to_col(key)
           key = key.to_s()
           col = (1..@worksheet.num_cols).find(){ |c| @worksheet[1, c] == key }
           raise(GoogleDrive::Error, "Column doesn't exist: %p" % key) if !col
           return col
         end
-        
+
     end
-    
+
 end

data/lib/google_drive/list_row.rb

@@ -11,59 +11,63 @@ module GoogleDrive
 
     # Hash-like object returned by GoogleDrive::List#[].
     class ListRow
-        
+
         include(Enumerable)
         extend(Forwardable)
-        
+
         def_delegators(:to_hash,
             :keys, :values, :each_key, :each_value, :each, :each_pair, :hash,
             :assoc, :fetch, :flatten, :key, :invert, :size, :length, :rassoc,
             :merge, :reject, :select, :sort, :to_a, :values_at)
-        
+
         def initialize(list, index) #:nodoc:
           @list = list
           @index = index
         end
-        
+
         def [](key)
           return @list.get(@index, key)
         end
-        
+
         def numeric_value(key)
           return @list.numeric_value(@index, key)
         end
-        
+
+        def input_value(key)
+          return @list.input_value(@index, key)
+        end
+
         def []=(key, value)
           @list.set(@index, key, value)
         end
-        
+
         def has_key?(key)
           return @list.keys.include?(key)
         end
-        
+
         alias include? has_key?
         alias key? has_key?
         alias member? has_key?
-        
+
         def update(hash)
           for k, v in hash
             self[k] = v
           end
         end
-        
+
         alias merge! update
-        
+
         def replace(hash)
           clear()
           update(hash)
         end
-        
+
         def clear()
           for key in @list.keys
             self[key] = ""
           end
         end
-        
+
         def to_hash()
           result = {}
           for key in @list.keys
@@ -71,18 +75,18 @@ module GoogleDrive
           end
           return result
         end
-        
+
         def ==(other)
           return self.class == other.class && self.to_hash() == other.to_hash()
         end
-        
+
         alias === ==
         alias eql? ==
-        
+
         def inspect
           return "\#<%p %p>" % [self.class, to_hash()]
         end
-        
+
     end
-    
+
 end

data/lib/google_drive/worksheet.rb

@@ -116,6 +116,7 @@ module GoogleDrive
         def []=(*args)
           (row, col) = parse_cell_args(args[0...-1])
           value = args[-1].to_s()
+          validate_cell_value(value)
           reload_cells() if !@cells
           @cells[[row, col]] = value
           @input_values[[row, col]] = value
@@ -244,6 +245,64 @@ module GoogleDrive
           return result.freeze()
         end
 
+        # Inserts rows.
+        #
+        # e.g.
+        #   # Inserts 2 empty rows before row 3.
+        #   worksheet.insert_rows(3, 2)
+        #   # Inserts 2 rows with values before row 3.
+        #   worksheet.insert_rows(3, [["a, "b"], ["c, "d"]])
+        #
+        # Note that this method is implemented by shifting all cells below the row.
+        # Its behavior is different from inserting rows on the web interface if the
+        # worksheet contains inter-cell reference.
+        def insert_rows(row_num, rows)
+
+          if rows.is_a?(Integer)
+            rows = Array.new(rows, [])
+          end
+
+          # Shifts all cells below the row.
+          self.max_rows += rows.size
+          r = self.num_rows
+          while r >= row_num
+            for c in 1..self.num_cols
+              self[r + rows.size, c] = self[r, c]
+            end
+            r -= 1
+          end
+
+          # Fills in the inserted rows.
+          num_cols = self.num_cols
+          rows.each_with_index() do |row, r|
+            for c in 0...[row.size, num_cols].max
+              self[row_num + r, 1 + c] = row[c] || ""
+            end
+          end
+
+        end
+
+        # Deletes rows.
+        #
+        # e.g.
+        #   # Deletes 2 rows starting from row 3 (i.e., deletes row 3 and 4).
+        #   worksheet.delete_rows(3, 2)
+        #
+        # Note that this method is implemented by shifting all cells below the row.
+        # Its behavior is different from deleting rows on the web interface if the
+        # worksheet contains inter-cell reference.
+        def delete_rows(row_num, rows)
+          if row_num + rows - 1 > self.max_rows
+            raise(ArgumentError, "The row number is out of range")
+          end
+          for r in row_num..(self.max_rows - rows)
+            for c in 1..self.num_cols
+              self[r, c] = self[r + rows, c]
+            end
+          end
+          self.max_rows -= rows
+        end
+
         # Reloads content of the worksheets from the server.
         # Note that changes you made by []= etc. is discarded if you haven't called save().
         def reload()
@@ -471,6 +530,12 @@ module GoogleDrive
           end
         end
         
+        def validate_cell_value(value)
+          if value.include?("\x1a")
+            raise(ArgumentError, "Contains invalid character \\x1a for xml: %p" % value)
+          end
+        end
+
     end
     
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_drive
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Hiroshi Ichikawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -112,6 +112,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
 description: A library to read/write files/spreadsheets in Google Drive/Docs.
 email:
 - gimite+github@gmail.com
@@ -161,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library to read/write files/spreadsheets in Google Drive/Docs.