google_drive 0.3.2 → 0.3.3

data/lib/google_drive.rb

@@ -20,6 +20,13 @@ module GoogleDrive
 
     # Authenticates with given OAuth1 or OAuth2 token.
     #
+    # +access_token+ can be either OAuth2 access_token string, OAuth2::AccessToken or OAuth::AccessToken.
+    #
+    # +proxy+ can be nil or return value of Net::HTTP.Proxy. If +proxy+ is specified, all
+    # HTTP access in the session uses the proxy. If +proxy+ is nil, it uses the proxy
+    # specified by http_proxy environment variable if available. Otherwise it performs direct
+    # access.
+    #
     # OAuth2 code example:
     #
     #   client = OAuth2::Client.new(
@@ -36,14 +43,14 @@ module GoogleDrive
     #   # Redirect the user to auth_url and get authorization code from redirect URL.
     #   auth_token = client.auth_code.get_token(
     #       authorization_code, :redirect_uri => "http://example.com/")
-    #   session = GoogleDrive.login_with_oauth(auth_token)
+    #   session = GoogleDrive.login_with_oauth(auth_token.token)
     #
     # Or, from existing refresh token:
     #
-    #   access_token = OAuth2::AccessToken.from_hash(client,
+    #   auth_token = OAuth2::AccessToken.from_hash(client,
     #       {:refresh_token => refresh_token, :expires_at => expires_at})
-    #   access_token = access_token.refresh!
-    #   session = GoogleDrive.login_with_oauth(access_token)
+    #   auth_token = auth_token.refresh!
+    #   session = GoogleDrive.login_with_oauth(auth_token.token)
     #
     # If your app is not a Web app, use "urn:ietf:wg:oauth:2.0:oob" as redirect_url. Then
     # authorization code is shown after authorization.
@@ -68,8 +75,8 @@ module GoogleDrive
     # - http://code.google.com/apis/accounts/docs/OAuth2.html
     # - http://oauth.rubyforge.org/
     # - http://code.google.com/apis/accounts/docs/OAuth.html
-    def self.login_with_oauth(oauth_token)
-      return Session.login_with_oauth(oauth_token)
+    def self.login_with_oauth(access_token, proxy = nil)
+      return Session.login_with_oauth(access_token, proxy)
     end
 
     # Restores session using return value of auth_tokens method of previous session.

data/lib/google_drive/basic_fetcher.rb

@@ -0,0 +1,48 @@
+# Author: Hiroshi Ichikawa <http://gimite.net/>
+# The license of this source is "New BSD Licence"
+
+require "net/https"
+require "uri"
+Net::HTTP.version_1_2
+
+
+module GoogleDrive
+
+    class BasicFetcher #:nodoc:
+        
+        def initialize(proxy)
+          if proxy
+            @proxy = proxy
+          elsif ENV["http_proxy"] && !ENV["http_proxy"].empty?
+            proxy_url = URI.parse(ENV["http_proxy"])
+            @proxy = Net::HTTP.Proxy(proxy_url.host, proxy_url.port)
+          else
+            @proxy = Net::HTTP
+          end
+        end
+        
+        def request_raw(method, url, data, extra_header, auth)
+          uri = URI.parse(url)
+          http = @proxy.new(uri.host, uri.port)
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          http.start() do
+            path = uri.path + (uri.query ? "?#{uri.query}" : "")
+            header = auth_header(auth).merge(extra_header)
+            if method == :delete || method == :get
+              return http.__send__(method, path, header)
+            else
+              return http.__send__(method, path, data, header)
+            end
+          end
+        end
+        
+      private
+        
+        def auth_header(auth)
+          return {}
+        end
+
+    end
+    
+end

data/lib/google_drive/client_login_fetcher.rb

@@ -1,45 +1,20 @@
 # Author: Hiroshi Ichikawa <http://gimite.net/>
 # The license of this source is "New BSD Licence"
 
-require "net/https"
-require "uri"
-Net::HTTP.version_1_2
+require "google_drive/basic_fetcher"
 
 
 module GoogleDrive
 
-    class ClientLoginFetcher #:nodoc:
+    class ClientLoginFetcher < BasicFetcher #:nodoc:
         
         def initialize(auth_tokens, proxy)
+          super(proxy)
           @auth_tokens = auth_tokens
-          if proxy
-            @proxy = proxy
-          elsif ENV["http_proxy"] && !ENV["http_proxy"].empty?
-            proxy_url = URI.parse(ENV["http_proxy"])
-            @proxy = Net::HTTP.Proxy(proxy_url.host, proxy_url.port)
-          else
-            @proxy = Net::HTTP
-          end
         end
         
         attr_accessor(:auth_tokens)
         
-        def request_raw(method, url, data, extra_header, auth)
-          uri = URI.parse(url)
-          http = @proxy.new(uri.host, uri.port)
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          http.start() do
-            path = uri.path + (uri.query ? "?#{uri.query}" : "")
-            header = auth_header(auth).merge(extra_header)
-            if method == :delete || method == :get
-              return http.__send__(method, path, header)
-            else
-              return http.__send__(method, path, data, header)
-            end
-          end
-        end
-        
       private
         
         def auth_header(auth)

data/lib/google_drive/collection.rb

@@ -14,8 +14,7 @@ module GoogleDrive
 
         include(Util)
         
-        #:nodoc:
-        ROOT_URL = "#{DOCS_BASE_URL}/folder%3Aroot"
+        ROOT_URL = "#{DOCS_BASE_URL}/folder%3Aroot"  #:nodoc:
 
         alias collection_feed_url document_feed_url
         

data/lib/google_drive/oauth2_fetcher.rb

@@ -1,47 +1,24 @@
 # Author: Hiroshi Ichikawa <http://gimite.net/>
 # The license of this source is "New BSD Licence"
 
-require "rubygems"
-require "oauth2"
+require "google_drive/basic_fetcher"
 
 
 module GoogleDrive
 
-    class OAuth2Fetcher #:nodoc:
+    class OAuth2Fetcher < BasicFetcher #:nodoc:
         
-        class Response
-            
-            def initialize(raw_res)
-              @raw_res = raw_res
-            end
-            
-            def code
-              return @raw_res.status.to_s()
-            end
-            
-            def body
-              return @raw_res.body
-            end
-            
-            def [](name)
-              return @raw_res.headers[name]
-            end
-            
+        def initialize(auth_token, proxy)
+          super(proxy)
+          @auth_token = auth_token
         end
         
-        def initialize(oauth2_token)
-          @oauth2_token = oauth2_token
-        end
-        
-        def request_raw(method, url, data, extra_header, auth)
-          if method == :delete || method == :get
-            raw_res = @oauth2_token.request(method, url, {:headers => extra_header})
-          else
-            raw_res = @oauth2_token.request(method, url, {:headers => extra_header, :body => data})
-          end
-          return Response.new(raw_res)
+      private
+
+        def auth_header(auth)
+          return {"Authorization" => "Bearer %s" % @auth_token}
         end
-        
+
     end
     
 end

data/lib/google_drive/session.rb

@@ -6,6 +6,8 @@ require "stringio"
 
 require "rubygems"
 require "nokogiri"
+require "oauth"
+require "oauth2"
 
 require "google_drive/util"
 require "google_drive/client_login_fetcher"
@@ -38,15 +40,18 @@ module GoogleDrive
         end
 
         # The same as GoogleDrive.login_with_oauth.
-        def self.login_with_oauth(oauth_token)
-          case oauth_token
+        def self.login_with_oauth(access_token, proxy = nil)
+          case access_token
             when OAuth::AccessToken
-              fetcher = OAuth1Fetcher.new(oauth_token)
+              raise(GoogleDrive::Error, "proxy is not supported with OAuth1.") if proxy
+              fetcher = OAuth1Fetcher.new(access_token)
             when OAuth2::AccessToken
-              fetcher = OAuth2Fetcher.new(oauth_token)
+              fetcher = OAuth2Fetcher.new(access_token.token, proxy)
+            when String
+              fetcher = OAuth2Fetcher.new(access_token, proxy)
             else
               raise(GoogleDrive::Error,
-                  "oauth_token is neither OAuth::Token nor OAuth2::Token: %p" % oauth_token)
+                  "access_token is neither String, OAuth2::Token nor OAuth::Token: %p" % access_token)
           end
           return Session.new(nil, fetcher)
         end
@@ -241,7 +246,7 @@ module GoogleDrive
             # Looks like a URL of human-readable collection page. Converts to collection feed URL.
             url = "#{DOCS_BASE_URL}/folder%3A#{$1}"
           end
-          return Collection.new(self, url)
+          return Collection.new(self, to_v3_url(url))
         end
 
         # Creates new spreadsheet and returns the new GoogleDrive::Spreadsheet.
@@ -307,7 +312,7 @@ module GoogleDrive
         #   session.upload_from_file("/path/to/hoge.tsv", "Hoge")
         #   session.upload_from_file("/path/to/hoge.csv", "Hoge")
         #   session.upload_from_file("/path/to/hoge", "Hoge", :content_type => "text/tab-separated-values")
-        #   session.upload_from_file("/path/to/hoge", "Hoge", :content_type => "text/tsv")
+        #   session.upload_from_file("/path/to/hoge", "Hoge", :content_type => "text/csv")
         def upload_from_file(path, title = nil, params = {})
           file_name = ::File.basename(path)
           params = {:file_name => file_name}.merge(params)

data/lib/google_drive/spreadsheet.rb

@@ -154,6 +154,14 @@ module GoogleDrive
           end
         end
         
+        def download_to_io(io, params = {})
+          # General downloading API doesn't work for spreadsheets because it requires a different
+          # authorization token, and it has a bug that it downloads PDF when text/html is
+          # requested.
+          raise(NotImplementedError,
+              "Use export_as_file or export_as_string instead for GoogleDrive::Spreadsheet.")
+        end
+        
         # Returns worksheets of the spreadsheet as array of GoogleDrive::Worksheet.
         def worksheets
           doc = @session.request(:get, @worksheets_feed_url)

data/lib/google_drive/worksheet.rb

@@ -272,7 +272,7 @@ module GoogleDrive
                 "&min-col=#{cols.min}&max-col=#{cols.max}")
             doc = @session.request(:get, url)
 
-            doc.css("entry").each() do |entry|
+            for entry in doc.css("entry")
               row = entry.css("gs|cell")[0]["row"].to_i()
               col = entry.css("gs|cell")[0]["col"].to_i()
               cell_entries[[row, col]] = entry
@@ -280,7 +280,7 @@ module GoogleDrive
 
             # Updates cell values using batch operation.
             # If the data is large, we split it into multiple operations, otherwise batch may fail.
-            @modified.each_slice(250) do |chunk|
+            @modified.each_slice(25) do |chunk|
 
               xml = <<-EOS
                 <feed xmlns="http://www.w3.org/2005/Atom"
@@ -310,7 +310,7 @@ module GoogleDrive
 
               batch_url = concat_url(@cells_feed_url, "/batch")
               result = @session.request(:post, batch_url, :data => xml)
-              result.css("atom|entry").each() do |entry|
+              for entry in result.css("atom|entry")
                 interrupted = entry.css("batch|interrupted")[0]
                 if interrupted
                   raise(GoogleDrive::Error, "Update has failed: %s" %

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_drive
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -87,22 +87,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A library to read/write files/spreadsheets in Google Drive/Docs.
 email:
 - gimite+github@gmail.com
@@ -131,11 +115,13 @@ files:
 - lib/google_drive/authentication_error.rb
 - lib/google_drive/util.rb
 - lib/google_drive/list.rb
+- lib/google_drive/basic_fetcher.rb
 - lib/google_drive/record.rb
 - doc_src/google_drive/acl.rb
 - doc_src/google_drive/acl_entry.rb
 homepage: https://github.com/gimite/google-drive-ruby
-licenses: []
+licenses:
+- New BSD
 post_install_message: 
 rdoc_options:
 - --main