fusion_tables 0.2.4 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.3.0 (05/06/11)
+
+* simple SQL interface API
+
+== 0.2.4 (03/06/11)
+
+* bugfixes
+
 == 0.2.3 (03/06/11)
 
 * all tests pass

data/README.md

@@ -1,14 +1,16 @@
 fusion-tables
 ==============
 
-This gem lets you easily interact with [Google Fusion Tables](http://www.google.com/fusiontables/Home) from your Ruby application. Read more in this [Blog post](http://www.tokumine.com/2010/08/10/fusion-tables-gem/).
+This gem lets you easily interact with [Google Fusion Tables](http://www.google.com/fusiontables/Home) from your Ruby application. There is a plain SQL interface, or an object orientated interface available. 
 
 Demo and examples
 ------------------
 
-* Twitter [demo](http://tables.googlelabs.com/DataSource?snapid=73106) / [code](http://github.com/tokumine/fusion-tables/blob/master/examples/compare_tweets.rb)
-* Boris bike [demo](http://tables.googlelabs.com/DataSource?snapid=78314) / [code](http://github.com/tokumine/fusion-tables/blob/master/examples/boris_bikes.rb) 
-* [Tests](http://github.com/tokumine/fusion-tables/tree/master/test/)
+* Twitter [demo](http://tables.googlelabs.com/DataSource?snapid=73106) / [code](http://github.com/tokumine/fusion_tables/blob/master/examples/compare_tweets.rb) /
+[blog](http://www.tokumine.com/2010/08/10/fusion-tables-gem/)
+* Boris bike [demo](http://tables.googlelabs.com/DataSource?snapid=78314) / [code](http://github.com/tokumine/fusion_tables/blob/master/examples/boris_bikes.rb) 
+* [Tests](http://github.com/tokumine/fusion_tables/tree/master/test/)
+
 
 Installation
 -------------
@@ -31,10 +33,21 @@ Usage
 ``` ruby
 require 'fusion_tables'
 	
+	
 # Connect to service	
 @ft = GData::Client::FusionTables.new      
 @ft.clientlogin(username, password)
 
+
+# 1. Simple SQL interface
+# =========================
+@ft.execute "SHOW TABLES" 
+@ft.execute "INSERT INTO #{my_table_id} (name, geo) VALUES ('tokyo', '35.6894 139.6917');"
+@ft.execute "SELECT count() FROM #{my_table_id};"
+
+
+# 2. basic ORM interface
+# ========================
 # Browse existing tables
 @ft.show_tables
  # => [table_1, table_2] 
@@ -76,21 +89,17 @@ data = [{"friend name" 	=> "Eric Wimp",
          "where"        => "29 Acacia Road, Nuttytown"}]
 new_table.insert data
 
-# Delete row
-new_table.delete row_id
-```
+# Currently FT API only supports single row UPDATE.
+new_table.update 1, [{"friend name"	=> "Bananaman"}]
 
-Currently only single row UPDATE query is implemented.
+# Delete row
+new_table.delete 1
 
-``` ruby
-row_id = 1
-data = [{"friend name" 	=> "Eric Wimp", 
-         "age"          => 25, 
-         "meeting time" => Time.utc(2010,"aug",10,20,15,1),
-         "where"        => "29 Acacia Road, Nuttytown"}]
-new_table.update row_id, data	
+# Delete all rows
+new_table.truncate!
 ```
 
+
 Known Issues
 -------------
 

data/{TODO → TODO.md}

@@ -1,6 +1,13 @@
-Areas of improvement:
+Gem
+====
+* YARD docs
 
-* response format json/xml
+
+
+API wishlist
+=============	
+* Bulk UPDATE
+* response format in json/xml
 * "create table" should return name
 * describe table should include name
 * multiple batch statements for all actions (only insert now). Need on all other commands. Better SQL.

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/fusion_tables.gemspec

@@ -1,60 +1,50 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{fusion_tables}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simon Tokumine", "Tom Verbeure"]
-  s.date = %q{2011-06-03}
+  s.date = %q{2011-06-05}
   s.description = %q{A simple Google Fusion Tables API wrapper. Supports bulk inserts and most API functions}
   s.email = %q{simon@tinypla.net}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md",
-     "TODO"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "examples/boris_bikes.rb",
-     "examples/compare_tweets.rb",
-     "examples/credentials.example.yml",
-     "fusion_tables.gemspec",
-     "lib/fusion_tables.rb",
-     "lib/fusion_tables/client/fusion_tables.rb",
-     "lib/fusion_tables/data/data.rb",
-     "lib/fusion_tables/data/table.rb",
-     "lib/fusion_tables/ext/fusion_tables.rb",
-     "test/README",
-     "test/helper.rb",
-     "test/test_client.rb",
-     "test/test_config.yml.sample",
-     "test/test_ext.rb",
-     "test/test_table.rb"
+    "CHANGELOG",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "TODO.md",
+    "VERSION",
+    "examples/boris_bikes.rb",
+    "examples/compare_tweets.rb",
+    "examples/credentials.example.yml",
+    "fusion_tables.gemspec",
+    "lib/fusion_tables.rb",
+    "lib/fusion_tables/client/fusion_tables.rb",
+    "lib/fusion_tables/data/data.rb",
+    "lib/fusion_tables/data/table.rb",
+    "lib/fusion_tables/ext/fusion_tables.rb",
+    "test/README",
+    "test/helper.rb",
+    "test/test_client.rb",
+    "test/test_config.yml.sample",
+    "test/test_ext.rb",
+    "test/test_sql.rb",
+    "test/test_table.rb"
   ]
   s.homepage = %q{http://github.com/tokumine/fusion_tables}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Google Fusion Tables API wrapper}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_client.rb",
-     "test/test_ext.rb",
-     "test/test_table.rb",
-     "examples/boris_bikes.rb",
-     "examples/compare_tweets.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/fusion_tables/client/fusion_tables.rb

@@ -20,28 +20,27 @@ module GData
       DATATYPES  = %w(number string location datetime)
       
       def initialize(options = {})
-          options[:clientlogin_service] ||= 'fusiontables'
-          options[:headers] = { 'Content-Type' => 'application/x-www-form-urlencoded' }
-          super(options)
+        options[:clientlogin_service] ||= 'fusiontables'
+        options[:headers] = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+        super(options)
       end
 
       def sql_encode(sql)
-          "sql=" + CGI::escape(sql)
+        "sql=" + CGI::escape(sql)
       end
 
       def sql_get(sql)
-          resp = self.get(SERVICE_URL + "?" + sql_encode(sql))
+        resp = self.get(SERVICE_URL + "?" + sql_encode(sql))
       end
 
       def sql_post(sql)
-          resp = self.post(SERVICE_URL, sql_encode(sql))
+        resp = self.post(SERVICE_URL, sql_encode(sql))
       end
 
       def sql_put(sql)
-          resp = self.put(SERVICE_URL, sql_encode(sql))
+        resp = self.put(SERVICE_URL, sql_encode(sql))
       end
-         
-      
+                  
       # Overrides auth_handler= so if the authentication changes,
       # the session cookie is cleared.
       def auth_handler=(handler)

data/lib/fusion_tables/data/table.rb

@@ -30,11 +30,10 @@ module GData
           @name = options[:name]
         end
 
-
         # Sets up data types from google
         #
         def describe
-          GData::Client::FusionTables::Data.parse(@client.sql_get("DESCRIBE #{@id}")).body
+          @client.execute "DESCRIBE #{@id}"
         end
                 
         # Runs select and returns data obj
@@ -46,8 +45,7 @@ module GData
         # use columns=ROWID to select row ids
         #
         def select columns="*", conditions=nil
-          sql = "SELECT #{columns} FROM #{@id} #{conditions}"
-          GData::Client::FusionTables::Data.parse(@client.sql_get(sql)).body
+          @client.execute "SELECT #{columns} FROM #{@id} #{conditions}"
         end
         
         # Returns a count of rows. SQL conditions optional
@@ -92,19 +90,17 @@ module GData
         def update row_id, data          
           data = encode([data]).first
           data = data.to_a.map{|x| x.join("=")}.join(", ")
-          sql = "UPDATE #{@id} SET #{data} WHERE ROWID = '#{row_id}'"
-          GData::Client::FusionTables::Data.parse(@client.sql_post(sql)).body
+          @client.execute "UPDATE #{@id} SET #{data} WHERE ROWID = '#{row_id}'"
         end
         
         # delete row
         def delete row_id
-          sql = "DELETE FROM #{@id} WHERE rowid='#{row_id}'"
-          GData::Client::FusionTables::Data.parse(@client.sql_post(sql)).body
+          @client.execute "DELETE FROM #{@id} WHERE rowid='#{row_id}'"
         end
         
         # delete all rows
         def truncate!
-          GData::Client::FusionTables::Data.parse(@client.sql_post("DELETE FROM #{@id}")).body
+          @client.execute "DELETE FROM #{@id}"
         end
         
         def get_headers
@@ -130,7 +126,7 @@ module GData
             ar      
           end
         end  
-                
+                        
         # 
         # Returns datatype of given column name
         #

data/lib/fusion_tables/ext/fusion_tables.rb

@@ -15,16 +15,22 @@
 module GData
   module Client
     class FusionTables < Base    
+                     
+      # Helper method to run FT SQL and return FT data object
+      def execute(sql)        
+        http_req = sql.upcase.match(/^(DESCRIBE|SHOW|SELECT)/) ? :sql_get : :sql_post
+        GData::Client::FusionTables::Data.parse(self.send(http_req, sql)).body                    
+      end                                                   
                           
       # Show a list of fusion tables
       def show_tables 
-        data = GData::Client::FusionTables::Data.parse(self.sql_get("SHOW TABLES"))
+        data = self.execute "SHOW TABLES"
+        
         data.inject([]) do |x, row|
           x << GData::Client::FusionTables::Table.new(self, row)        
           x
         end  
       end
-
             
       # Create a new table. Return the corresponding table
       # 

data/test/test_sql.rb

@@ -0,0 +1,80 @@
+require 'helper'
+
+class TestTable < Test::Unit::TestCase
+  
+  context "testing plain SQL" do
+    setup do 
+      init_config
+      @ft = GData::Client::FusionTables.new      
+      @ft.clientlogin(username, password)
+      @table = @ft.create_table "test", [{:name  => 'firstname',  :type => 'string'},
+                                         {:name  => 'phone',      :type => 'number'},
+                                         {:name  => 'dob',        :type => 'datetime'},
+                                         {:name  => 'house',      :type => 'location'}]
+    end
+    
+    should "be able to SHOW TABLES" do
+      ret = @ft.execute "SHOW TABLES"      
+      assert !ret.empty?
+      assert_equal Array, ret.class
+    end  
+    
+    should "be able to DESCRIBE a table" do
+      ret = @ft.execute("DESCRIBE #{@table.id}")      
+      expected = [{:column_id=>"col0", :name=>"firstname", :type=>"string"},
+                  {:column_id=>"col1", :name=>"phone", :type=>"number"},
+                  {:column_id=>"col2", :name=>"dob", :type=>"datetime"},
+                  {:column_id=>"col3", :name=>"house", :type=>"location"}]
+      assert_equal expected, ret                 
+    end
+    
+    should "be able to INSERT a row" do
+      ret = @ft.execute "INSERT INTO #{@table.id} (firstname) VALUES ('eric');"
+      assert_equal 1, ret.first[:rowid].to_i
+    end  
+    
+    should "be able to SELECT a row" do
+      @ft.execute "INSERT INTO #{@table.id} (firstname) VALUES ('eric');"      
+      ret = @ft.execute "SELECT ROWID, firstname FROM #{@table.id}"
+      assert_equal [{:rowid=>"1", :firstname=>"eric"}], ret
+    end  
+    
+    should "be able to UPDATE a row" do
+      @ft.execute "INSERT INTO #{@table.id} (firstname) VALUES ('eric');"      
+      
+      ret = @ft.execute "SELECT ROWID, firstname FROM #{@table.id}"
+      assert_equal [{:rowid=>"1", :firstname=>"eric"}], ret
+      
+      ret = @ft.execute "UPDATE #{@table.id} SET firstname='simon' WHERE ROWID = '#{ret.first[:rowid]}'"
+      ret = @ft.execute "SELECT ROWID, firstname FROM #{@table.id}"
+      assert_equal [{:rowid=>"1", :firstname=>"simon"}], ret      
+    end
+    
+    should "be able to DELETE a row" do
+      @ft.execute "INSERT INTO #{@table.id} (firstname) VALUES ('eric');"
+      @ft.execute "INSERT INTO #{@table.id} (firstname) VALUES ('eric');"
+            
+      ret = @ft.execute "SELECT ROWID FROM #{@table.id};"      
+      @ft.execute "DELETE FROM #{@table.id} WHERE ROWID = '#{ret.first[:rowid]}';"      
+      
+      ret = @ft.execute "SELECT count() FROM #{@table.id};"
+      
+      assert_equal 1, ret.first[:"count()"].to_i  
+    end    
+    
+    # should "be able to query geographic data" do
+    #   @table = @ft.create_table "test", [{:name  => 'name',      :type => 'string'},
+    #                                      {:name  => 'geo',       :type => 'location'}]
+    #       
+    #   @ft.execute "INSERT INTO #{@table.id} (name, geo) VALUES ('tokyo',   '35.6894 139.6917');
+    #                INSERT INTO #{@table.id} (name, geo) VALUES ('osaka',   '34.6937 135.5021');
+    #                INSERT INTO #{@table.id} (name, geo) VALUES ('fukuoka', '33.5903 130.4017');
+    #                INSERT INTO #{@table.id} (name, geo) VALUES ('kyoto',   '35.0116 135.7680');
+    #                INSERT INTO #{@table.id} (name, geo) VALUES ('nagoya',  '35.1814 136.9063');"
+    #   
+    #   # get cities nearest to Nara
+    #   res = @ft.execute "SELECT * FROM #{@table.id} ORDER BY ST_DISTANCE(geo, LATLNG(35.6894,139.6917)) LIMIT 10"
+    #   puts res.inspect
+    # end 
+  end  
+end    

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fusion_tables
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Simon Tokumine
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 +01:00
+date: 2011-06-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -41,11 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
         version: 1.1.2
   type: :runtime
   version_requirements: *id002
@@ -58,15 +45,13 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.md
-- TODO
 files: 
 - .document
-- .gitignore
 - CHANGELOG
 - LICENSE
 - README.md
 - Rakefile
-- TODO
+- TODO.md
 - VERSION
 - examples/boris_bikes.rb
 - examples/compare_tweets.rb
@@ -82,14 +67,15 @@ files:
 - test/test_client.rb
 - test/test_config.yml.sample
 - test/test_ext.rb
+- test/test_sql.rb
 - test/test_table.rb
 has_rdoc: true
 homepage: http://github.com/tokumine/fusion_tables
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -97,30 +83,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Google Fusion Tables API wrapper
-test_files: 
-- test/helper.rb
-- test/test_client.rb
-- test/test_ext.rb
-- test/test_table.rb
-- examples/boris_bikes.rb
-- examples/compare_tweets.rb
+test_files: []
+

data/.gitignore

@@ -1,26 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-examples/credentials.yml
-
-## PROJECT::TEST
-test/test_config.yml
-
-
-## PROJECT::SPECIFIC
-