gimite-google-spreadsheet-ruby 0.0.5 → 0.0.6

data/{README.txt → README.rdoc}

@@ -1,4 +1,4 @@
-This is a library to read/write Google Spreadsheet.
+This is a Ruby 1.8/1.9 library to read/write Google Spreadsheet.
 
 
 = How to install
@@ -51,6 +51,11 @@ http://github.com/gimite/google-spreadsheet-ruby/tree/master
 The license of this source is "New BSD Licence"
 
 
+= Supported environments
+
+Ruby 1.8.x and Ruby 1.9.x. Checked with Ruby 1.8.7 and Ruby 1.9.1.
+
+
 = Author
 
 Hiroshi Ichikawa - http://gimite.net/en/index.php?Contact

data/lib/google_spreadsheet.rb

@@ -10,6 +10,19 @@ require "hpricot"
 Net::HTTP.version_1_2
 
 
+if RUBY_VERSION < "1.9.0"
+  
+  class String
+      
+      def force_encoding(encoding)
+        return self
+      end
+      
+  end
+  
+end
+
+
 module GoogleSpreadsheet
     
     # Authenticates with given +mail+ and +password+, and returns GoogleSpreadsheet::Session
@@ -27,10 +40,18 @@ module GoogleSpreadsheet
     def self.saved_session(path = ENV["HOME"] + "/.ruby_google_spreadsheet.token")
       session = Session.new(File.exist?(path) ? File.read(path) : nil)
       session.on_auth_fail = proc() do
-        require "password"
-        $stderr.print("Mail: ")
-        mail = $stdin.gets().chomp()
-        password = Password.get()
+        begin
+          require "highline2"
+        rescue LoadError
+          raise(LoadError,
+            "GoogleSpreadsheet.saved_session requires Highline library.\n" +
+            "Run\n" +
+            "  \$ sudo gem install highline\n" +
+            "to install it.")
+        end
+        highline = HighLine.new()
+        mail = highline.ask("Mail: ")
+        password = highline.ask("Password: "){ |q| q.echo = false }
         session.login(mail, password)
         open(path, "w", 0600){ |f| f.write(session.auth_token) }
         true
@@ -78,6 +99,10 @@ module GoogleSpreadsheet
           return CGI.escapeHTML(str.to_s())
         end
         
+        def as_utf8(str)
+          str.force_encoding("UTF-8")
+        end
+        
     end
     
     
@@ -190,9 +215,9 @@ module GoogleSpreadsheet
           doc = get("http://spreadsheets.google.com/feeds/spreadsheets/private/full?#{query}")
           result = []
           for entry in doc.search("entry")
-            title = entry.search("title").text
-            url = entry.search(
-              "link[@rel='http://schemas.google.com/spreadsheets/2006#worksheetsfeed']")[0]["href"]
+            title = as_utf8(entry.search("title").text)
+            url = as_utf8(entry.search(
+              "link[@rel='http://schemas.google.com/spreadsheets/2006#worksheetsfeed']")[0]["href"])
             result.push(Spreadsheet.new(self, url, title))
           end
           return result
@@ -280,9 +305,9 @@ module GoogleSpreadsheet
           doc = @session.get(@worksheets_feed_url)
           result = []
           for entry in doc.search("entry")
-            title = entry.search("title").text
-            url = entry.search(
-              "link[@rel='http://schemas.google.com/spreadsheets/2006#cellsfeed']")[0]["href"]
+            title = as_utf8(entry.search("title").text)
+            url = as_utf8(entry.search(
+              "link[@rel='http://schemas.google.com/spreadsheets/2006#cellsfeed']")[0]["href"])
             result.push(Worksheet.new(@session, self, url, title))
           end
           return result.freeze()
@@ -299,8 +324,8 @@ module GoogleSpreadsheet
             </entry>
           EOS
           doc = @session.post(@worksheets_feed_url, xml)
-          url = doc.search(
-            "link[@rel='http://schemas.google.com/spreadsheets/2006#cellsfeed']")[0]["href"]
+          url = as_utf8(doc.search(
+            "link[@rel='http://schemas.google.com/spreadsheets/2006#cellsfeed']")[0]["href"])
           return Worksheet.new(@session, self, url, title)
         end
         
@@ -320,8 +345,8 @@ module GoogleSpreadsheet
 
         def initialize(session, entry) #:nodoc:
           @columns = {}
-          @worksheet_title = entry.search("gs:worksheet")[0]["name"]
-          @records_url = entry.search("content")[0]["src"]
+          @worksheet_title = as_utf8(entry.search("gs:worksheet")[0]["name"])
+          @records_url = as_utf8(entry.search("content")[0]["src"])
           @session = session
         end
         
@@ -357,8 +382,8 @@ module GoogleSpreadsheet
         
         def initialize(session, entry) #:nodoc:
           @session = session
-          for field in entry.search('gs:field')
-            self[field["name"]] = field.inner_text
+          for field in entry.search("gs:field")
+            self[as_utf8(field["name"])] = as_utf8(field.inner_text)
           end
         end
         
@@ -517,7 +542,7 @@ module GoogleSpreadsheet
           doc = @session.get(@cells_feed_url)
           @max_rows = doc.search("gs:rowCount").text.to_i()
           @max_cols = doc.search("gs:colCount").text.to_i()
-          @title = doc.search("title").text
+          @title = as_utf8(doc.search("title").text)
           
           @cells = {}
           @input_values = {}
@@ -525,8 +550,8 @@ module GoogleSpreadsheet
             cell = entry.search("gs:cell")[0]
             row = cell["row"].to_i()
             col = cell["col"].to_i()
-            @cells[[row, col]] = cell.inner_text
-            @input_values[[row, col]] = cell["inputValue"]
+            @cells[[row, col]] = as_utf8(cell.inner_text)
+            @input_values[[row, col]] = as_utf8(cell["inputValue"])
           end
           @modified.clear()
           @meta_modified = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gimite-google-spreadsheet-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Hiroshi Ichikawa
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-13 00:00:00 -07:00
+date: 2009-09-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,16 +30,17 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 files: 
-- README.txt
+- README.rdoc
 - lib/google_spreadsheet.rb
 has_rdoc: true
 homepage: http://github.com/gimite/google-spreadsheet-ruby/tree/master
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: This is a library to read/write Google Spreadsheet.