ft 0.0.1 → 0.0.2

data/Rakefile

@@ -0,0 +1,15 @@
+task :default => :test
+
+desc "Run all tests"
+task :test do
+  require "cutest"
+
+  files = Dir["./test/*.rb"]
+
+  if !files.include?("./test/private.rb")
+    $stderr.puts("Couldn't find a test/private.rb file, so skipping tests that require authentication.\nIf you want to run them, take a look at test/private.example.rb")
+    files.delete("./test/authenticated.rb")
+  end
+
+  Cutest.run(files)
+end

data/ft.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "ft"
-  s.version           = "0.0.1"
+  s.version           = "0.0.2"
   s.summary           = "Low-level interface to Google's Fusion Tables + CLI tool"
   s.authors           = ["Damian Janowski"]
   s.email             = ["djanowski@dimaion.com"]
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir[
     "*.gemspec",
+    "CHANGELOG.*",
     "LICENSE",
     "README*",
     "Rakefile",

data/lib/ft.rb

@@ -1,5 +1,6 @@
 require "csv"
 require "net/http/persistent"
+require "net/https"
 
 class FusionTables
   Error = Class.new(RuntimeError)
@@ -13,15 +14,16 @@ class FusionTables
       end
     end
 
+    # Queries the Fusion Tables API with the given SQL and returns an
+    # array of arrays for rows and columns.
     def query(sql)
-      url = URL.dup
-
-      url.query = "sql=#{URI.escape(sql)}"
-      res = http.request(url)
+      res = process_sql(sql)
 
       case res
       when Net::HTTPOK
         CSV.parse(res.body.force_encoding(Encoding::UTF_8))
+      when Net::HTTPFound
+        raise Error.new("Authentication required. See #{self.class}#authenticate")
       when Net::HTTPBadRequest
         message = CGI.unescapeHTML(res.body[%r[<title>(.*)</title>]i, 1])
         raise Error.new("#{message}. SQL was: #{sql}")
@@ -29,5 +31,71 @@ class FusionTables
         raise "Got #{res.class}: #{res.body}"
       end
     end
+
+    # Authenticates against Google using your email and password.
+    #
+    # Note that this method uses the ClientLogin mechanism and it
+    # only stores the resulting token as an instance variable.  Your
+    # credentials are discarded after the authentication process.
+    def authenticate(email, password)
+      uri = URI.parse("https://www.google.com/accounts/ClientLogin")
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+      request = Net::HTTP::Post.new(uri.request_uri)
+
+      request.set_form_data({
+        "accountType" => "GOOGLE",
+        "Email" => email,
+        "Passwd" => password,
+        "service" => "fusiontables"
+      })
+
+      response = http.request(request)
+
+      case response
+      when Net::HTTPOK
+        @token = response.body[/^Auth=(.*)$/, 1]
+        return true
+      else
+        @token = nil
+        return false
+      end
+    end
+
+    # Prevents any authorization tokens from being exposed in error logs
+    # and the like.
+    def inspect
+      "#<#{self.class}>"
+    end
+
+    # Safely quotes a value.
+    def self.quote(value)
+      "'#{value.to_s.gsub("'", "\\\\'")}'"
+    end
+
+  protected
+
+    # Takes SQL and queries the Fusion Tables API.
+    def process_sql(sql)
+      url = URL.dup
+
+      if @token
+        http.headers["Authorization"] = "GoogleLogin auth=#{@token}"
+      end
+
+      if sql =~ /^select/i
+        url.query = "sql=#{URI.escape(sql)}"
+        res = http.request(url)
+      else
+        req = Net::HTTP::Post.new(url.path)
+        req.set_form_data(sql: sql)
+        res = http.request(url, req)
+      end
+
+      res
+    end
   end
 end

data/test/authenticated.rb

@@ -0,0 +1,48 @@
+require "cutest"
+require "./lib/ft"
+require "./test/private"
+
+setup do
+  [FusionTables::Connection.new, ENV["EMAIL"], ENV["PASSWORD"], ENV["PRIVATE_TABLE_ID"]]
+end
+
+test "authenticated SELECTs" do |conn, email, password, table_id|
+  conn.authenticate(email, password)
+
+  result = conn.query("SELECT Client, Invoice FROM #{table_id}")
+
+  assert_equal result, [
+    ["Client", "Invoice"],
+    ["Madalyn Streich", "1"],
+    ["Mr. Vincenza Bailey", "2"]
+  ]
+
+  assert conn.inspect !~ /token/
+end
+
+test "INSERT" do |conn, email, password, table_id|
+  conn.authenticate(email, password)
+
+  begin
+    result = conn.query("INSERT INTO #{table_id} (Client) VALUES ('Foo')")
+
+    assert_equal result[0][0], "rowid"
+    assert result[1][0] =~ /^\d+$/
+  ensure
+    conn.query("DELETE FROM #{table_id} WHERE ROWID = '#{result[1][0]}'") if result
+  end
+end
+
+test "DELETE" do |conn, email, password, table_id|
+  conn.authenticate(email, password)
+
+  result = conn.query("INSERT INTO #{table_id} (Client) VALUES ('Foo')")
+
+  rowid = result[1][0]
+
+  conn.query("DELETE FROM #{table_id} WHERE ROWID = '#{rowid}'")
+
+  result = conn.query("SELECT ROWID FROM #{table_id} WHERE ROWID = '#{rowid}'")
+
+  assert_equal result[1], nil
+end

data/test/ft.rb

@@ -16,3 +16,13 @@ test "raises errors" do |conn|
     conn.query("SELECT foo FROM 1310767")
   end
 end
+
+test "raises on authentication errors" do |conn|
+  assert_raise FusionTables::Error do
+    conn.query("INSERT INTO 1310767 (Name) VALUES ('Foo')")
+  end
+end
+
+test "quoting" do |conn|
+  assert_equal FusionTables::Connection.quote("C'mon"), %q{'C\'mon'}
+end

data/test/private.example.rb

@@ -0,0 +1,8 @@
+# This example works with OS X's keychain, but you can set the variables
+# as you please.
+#
+
+# ENV["EMAIL"] = "<your google account email>" # If not already in your shell.
+ENV["PASSWORD"] = `security 2>&1 find-internet-password -g -s www.google.com -a #{ENV["EMAIL"]}`[/^password: "(.*)"/, 1]
+
+ENV["PRIVATE_TABLE_ID"] = "<your private table id>"

data/test/private.rb

@@ -0,0 +1,3 @@
+ENV["EMAIL"] = "damian.janowski@gmail.com"
+ENV["PASSWORD"] = `security 2>&1 find-internet-password -g -s www.google.com -a #{ENV["EMAIL"]}`[/^password: "(.*)"/, 1]
+ENV["PRIVATE_TABLE_ID"] = "1340856"

metadata

@@ -2,7 +2,7 @@
 name: ft
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Damian Janowski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-18 00:00:00 -03:00
+date: 2011-08-26 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,10 +57,14 @@ extra_rdoc_files: []
 
 files: 
 - ft.gemspec
+- Rakefile
 - bin/ft
 - lib/ft.rb
+- test/authenticated.rb
 - test/cli.rb
 - test/ft.rb
+- test/private.example.rb
+- test/private.rb
 has_rdoc: true
 homepage: http://github.com/djanowski/ft
 licenses: []