google-spreadsheet-ruby 0.1.0 → 0.1.1

data/lib/google_spreadsheet.rb

@@ -192,7 +192,7 @@ module GoogleSpreadsheet
         #   session.spreadsheets("title" => "hoge")
         def spreadsheets(params = {})
           query = encode_query(params)
-          doc = request(:get, "http://spreadsheets.google.com/feeds/spreadsheets/private/full?#{query}")
+          doc = request(:get, "https://spreadsheets.google.com/feeds/spreadsheets/private/full?#{query}")
           result = []
           for entry in doc.search("entry")
             title = as_utf8(entry.search("title").text)
@@ -209,7 +209,7 @@ module GoogleSpreadsheet
         #   # http://spreadsheets.google.com/ccc?key=pz7XtlQC-PYx-jrVMJErTcg&hl=ja
         #   session.spreadsheet_by_key("pz7XtlQC-PYx-jrVMJErTcg")
         def spreadsheet_by_key(key)
-          url = "http://spreadsheets.google.com/feeds/worksheets/#{key}/private/full"
+          url = "https://spreadsheets.google.com/feeds/worksheets/#{key}/private/full"
           return Spreadsheet.new(self, url)
         end
         
@@ -221,7 +221,7 @@ module GoogleSpreadsheet
         #   session.spreadsheet_by_url(
         #     "http://spreadsheets.google.com/ccc?key=pz7XtlQC-PYx-jrVMJErTcg&hl=en")
         #   session.spreadsheet_by_url(
-        #     "http://spreadsheets.google.com/feeds/worksheets/pz7XtlQC-PYx-jrVMJErTcg/private/full")
+        #     "https://spreadsheets.google.com/feeds/worksheets/pz7XtlQC-PYx-jrVMJErTcg/private/full")
         def spreadsheet_by_url(url)
           # Tries to parse it as URL of human-readable spreadsheet.
           uri = URI.parse(url)
@@ -250,7 +250,7 @@ module GoogleSpreadsheet
         #   session.create_spreadsheet("My new sheet")
         def create_spreadsheet(
             title = "Untitled",
-            feed_url = "http://docs.google.com/feeds/documents/private/full")
+            feed_url = "https://docs.google.com/feeds/documents/private/full")
           xml = <<-"EOS"
             <atom:entry xmlns:atom="http://www.w3.org/2005/Atom" xmlns:docs="http://schemas.google.com/docs/2007">
               <atom:category scheme="http://schemas.google.com/g/2005#kind"
@@ -266,7 +266,8 @@ module GoogleSpreadsheet
         end
         
         def request(method, url, params = {}) #:nodoc:
-          uri = URI.parse(url)
+          # Always uses HTTPS.
+          uri = URI.parse(url.gsub(%r{^http://}, "https://"))
           data = params[:data]
           auth = params[:auth] || :wise
           if params[:header]
@@ -279,16 +280,16 @@ module GoogleSpreadsheet
           if @oauth_token
             
             if method == :delete || method == :get
-              response = @oauth_token.__send__(method, url)
+              response = @oauth_token.__send__(method, url, add_header)
             else
-              response = @oauth_token.__send__(method, url, data)
+              response = @oauth_token.__send__(method, url, data, add_header)
             end
             return convert_response(response, response_type)
             
           else
             
             http = Net::HTTP.new(uri.host, uri.port)
-            http.use_ssl = uri.scheme == "https"
+            http.use_ssl = true
             http.verify_mode = OpenSSL::SSL::VERIFY_NONE
             http.start() do
               while true
@@ -366,7 +367,7 @@ module GoogleSpreadsheet
         # Key of the spreadsheet.
         def key
           if !(@worksheets_feed_url =~
-              %r{http://spreadsheets.google.com/feeds/worksheets/(.*)/private/full})
+              %r{^https?://spreadsheets.google.com/feeds/worksheets/(.*)/private/full$})
             raise(GoogleSpreadsheet::Error,
               "worksheets feed URL is in unknown format: #{@worksheets_feed_url}")
           end
@@ -375,21 +376,21 @@ module GoogleSpreadsheet
         
         # Tables feed URL of the spreadsheet.
         def tables_feed_url
-          return "http://spreadsheets.google.com/feeds/#{self.key}/tables"
+          return "https://spreadsheets.google.com/feeds/#{self.key}/tables"
         end
         
         # URL of feed used in document list feed API.
         def document_feed_url
-          return "http://docs.google.com/feeds/documents/private/full/spreadsheet%3A#{self.key}"
+          return "https://docs.google.com/feeds/documents/private/full/spreadsheet%3A#{self.key}"
         end
         
         # Creates copy of this spreadsheet with the given name.
         def duplicate(new_name = nil)
           new_name ||= (@title ? "Copy of " + @title : "Untitled")
-          get_url = "http://spreadsheets.google.com/feeds/download/spreadsheets/Export?key=#{key}&exportFormat=ods"
+          get_url = "https://spreadsheets.google.com/feeds/download/spreadsheets/Export?key=#{key}&exportFormat=ods"
           ods = @session.request(:get, get_url, :response_type => :raw)
           
-          url = "http://docs.google.com/feeds/documents/private/full"
+          url = "https://docs.google.com/feeds/documents/private/full"
           header = {
             "Content-Type" => "application/x-vnd.oasis.opendocument.spreadsheet",
             "Slug" => URI.encode(new_name),
@@ -527,18 +528,18 @@ module GoogleSpreadsheet
           # Probably it would be cleaner to keep worksheet feed URL and get cells feed URL
           # from it.
           if !(@cells_feed_url =~
-              %r{^http://spreadsheets.google.com/feeds/cells/(.*)/(.*)/private/full$})
+              %r{^https?://spreadsheets.google.com/feeds/cells/(.*)/(.*)/private/full$})
             raise(GoogleSpreadsheet::Error,
               "cells feed URL is in unknown format: #{@cells_feed_url}")
           end
-          return "http://spreadsheets.google.com/feeds/worksheets/#{$1}/private/full/#{$2}"
+          return "https://spreadsheets.google.com/feeds/worksheets/#{$1}/private/full/#{$2}"
         end
         
         # GoogleSpreadsheet::Spreadsheet which this worksheet belongs to.
         def spreadsheet
           if !@spreadsheet
             if !(@cells_feed_url =~
-                %r{^http://spreadsheets.google.com/feeds/cells/(.*)/(.*)/private/full$})
+                %r{^https?://spreadsheets.google.com/feeds/cells/(.*)/(.*)/private/full$})
               raise(GoogleSpreadsheet::Error,
                 "cells feed URL is in unknown format: #{@cells_feed_url}")
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: google-spreadsheet-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Hiroshi Ichikawa
@@ -9,12 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 +09:00
+date: 2010-01-31 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  type: :development
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -24,7 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: oauth
-  type: :development
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: