fusion_tables 0.3.2 → 0.4.0

data/README.md

@@ -4,7 +4,10 @@ fusion_tables
 
 This gem lets you easily interact with [Google Fusion Tables API](http://www.google.com/fusiontables/Home) from your Ruby application via a plain SQL interface, or an object orientated interface.
 
- 
+v0.4 updates
+------------
+Note that v0.4 onwards of this gem returns geometry as GeoJSON rather than KML by default. 
+
 
 Demo and examples
 ------------------
@@ -39,7 +42,8 @@ require 'fusion_tables'
 	
 # Connect to service	
 @ft = GData::Client::FusionTables.new      
-@ft.clientlogin(username, password)
+@ft.clientlogin(username, password) 
+@ft.set_api_key(api_key) # obtained from the google api console
 
 
 # 1. SQL interface
@@ -109,6 +113,7 @@ Known Issues
 * The Google gdata_19 gem conflicts with the GData2 gem. Only current fix is to uninstall GData2.
 * You have to make a table public before you can display it on a map. This can only be done via FT web interface. 
 
+
 Note on Patches/Pull Requests
 ------------------------------
  
@@ -118,7 +123,7 @@ Note on Patches/Pull Requests
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+* Send me a pull request. 
 
 
 
@@ -135,3 +140,4 @@ Largely based on Tom Verbeure's [work for MTBGuru](http://code.google.com/p/mtbg
 * jmannau
 * tomykaira
 * fallanic
+* derekeder

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["Simon Tokumine", "Tom Verbeure"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.add_dependency "gdata_19", ">= 1.1.2"
+    gem.add_dependency "json", ">= 1.7.6"
     gem.files.exclude 'pkg'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
@@ -44,7 +45,7 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/fusion_tables.gemspec

@@ -1,75 +1,66 @@
 # 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.3.2"
+  s.name = "fusion_tables"
+  s.version = "0.4.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{2012-11-20}
-  s.description = %q{A simple Google Fusion Tables API wrapper. Supports bulk inserts and most API functions}
-  s.email = %q{simon@tinypla.net}
+  s.date = "2013-01-14"
+  s.description = "A simple Google Fusion Tables API wrapper. Supports bulk inserts and most API functions"
+  s.email = "simon@tinypla.net"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "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.3.6}
-  s.summary = %q{Google Fusion Tables API wrapper}
-  s.test_files = [
+    "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_ext.rb",
-     "test/test_sql.rb",
-     "test/test_table.rb",
-     "examples/boris_bikes.rb",
-     "examples/compare_tweets.rb"
+    "test/test_client.rb",
+    "test/test_config.yml.sample",
+    "test/test_ext.rb",
+    "test/test_sql.rb",
+    "test/test_table.rb"
   ]
+  s.homepage = "http://github.com/tokumine/fusion_tables"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Google Fusion Tables API wrapper"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<gdata_19>, [">= 1.1.2"])
+      s.add_runtime_dependency(%q<json>, [">= 1.7.6"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<gdata_19>, [">= 1.1.2"])
+      s.add_dependency(%q<json>, [">= 1.7.6"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<gdata_19>, [">= 1.1.2"])
+    s.add_dependency(%q<json>, [">= 1.7.6"])
   end
 end
 

data/lib/fusion_tables.rb

@@ -1,5 +1,6 @@
 require 'csv'
 require 'gdata'
+require 'json'
 require 'fusion_tables/client/fusion_tables'
 require 'fusion_tables/ext/fusion_tables'
 require 'fusion_tables/data/data'

data/lib/fusion_tables/client/fusion_tables.rb

@@ -16,29 +16,31 @@ module GData
   module Client
     class FusionTables < Base
 
-      SERVICE_URL = "https://tables.googlelabs.com/api/query"
+      #SERVICE_URL = "https://www.google.com/fusiontables/api/query"
+      SERVICE_URL = "https://www.googleapis.com/fusiontables/v1/query"
       DATATYPES  = %w(number string location datetime)
       
       def initialize(options = {})
         options[:clientlogin_service] ||= 'fusiontables'
-        options[:headers] = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+        options[:headers] = { 'Content-Type' => 'application/x-www-form-urlencoded'}
         super(options)
       end
 
       def sql_encode(sql)
+        # puts 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) + "&key=#{@api_key}")
       end
 
       def sql_post(sql)
-        resp = self.post(SERVICE_URL, sql_encode(sql))
+        resp = self.post(SERVICE_URL, sql_encode(sql) + "&key=#{@api_key}")
       end
 
       def sql_put(sql)
-        resp = self.put(SERVICE_URL, sql_encode(sql))
+        resp = self.put(SERVICE_URL, sql_encode(sql) + "&key=#{@api_key}")
       end
                   
       # Overrides auth_handler= so if the authentication changes,

data/lib/fusion_tables/ext/fusion_tables.rb

@@ -19,7 +19,26 @@ module GData
       # 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
+        json_resp = JSON.parse(self.send(http_req, sql).body)
+        
+        # probably a much cleaner way to do this
+        rows = json_resp['rows']
+        columns = json_resp['columns']
+        correlated = []
+        (0...rows.length).each do|row|
+          h = {}
+          (0...columns.length).each do|column|
+            h[columns[column].gsub(/\s+/, "_").downcase.to_sym] = rows[row][column]
+          end
+          correlated << h
+        end
+        # puts correlated.inspect
+
+        correlated
+      end
+
+      def set_api_key(api_key)
+        @api_key = api_key
       end
 
       # Show a list of fusion tables
@@ -67,7 +86,8 @@ module GData
         raise "unknown column type" if resp.body == "Unknown column type."
 
         # construct table object and return
-        table_id = resp.body.split("\n")[1].chomp
+        json_resp = JSON.parse(resp.body)
+        table_id = json_resp['rows'][0][0]
         table = GData::Client::FusionTables::Table.new(self, :table_id => table_id, :name => table_name)
         table.get_headers
         table
@@ -96,7 +116,7 @@ module GData
         delete_count = 0
         ids.each do |id|
           resp = self.sql_post("DROP TABLE #{id}")
-          delete_count += 1 if resp.body.strip.downcase == 'ok'
+          delete_count += 1 if resp.status_code == 200
         end
         delete_count
       end

data/test/helper.rb

@@ -31,4 +31,8 @@ class Test::Unit::TestCase
   def table_name
     @config_file['table_name']
   end  
+
+  def api_key
+    @config_file['api_key']
+  end 
 end

data/test/test_config.yml.sample

@@ -1,3 +1,4 @@
 username: test
 password: test
-table_name: "test_table"
+table_name: "test_table"
+api_key: "your API key (don't forget to enable FT in your Google API console)"

data/test/test_ext.rb

@@ -7,6 +7,7 @@ class TestExt < Test::Unit::TestCase
       init_config
       @ft = GData::Client::FusionTables.new
       @ft.clientlogin(username, password)
+      @ft.set_api_key(api_key)
     end
 
     teardown do
@@ -27,7 +28,7 @@ class TestExt < Test::Unit::TestCase
 
     should "accept symbol for name and type" do
       @table = @ft.create_table "test_table", [{:name => :test_col, :type => :string }]
-      first_column = @table.describe[0]
+      first_column = @table.describe.first
       assert_equal 'test_col', first_column[:name]
       assert_equal 'string', first_column[:type]
     end

data/test/test_sql.rb

@@ -7,6 +7,7 @@ class TestTable < Test::Unit::TestCase
       init_config
       @ft = GData::Client::FusionTables.new      
       @ft.clientlogin(username, password)
+      @ft.set_api_key(api_key)
       @table = @ft.create_table "test", [{:name  => 'firstname',  :type => 'string'},
                                          {:name  => 'phone',      :type => 'number'},
                                          {:name  => 'dob',        :type => 'datetime'},
@@ -69,13 +70,13 @@ class TestTable < Test::Unit::TestCase
     # 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

data/test/test_table.rb

@@ -7,6 +7,7 @@ class TestTable < Test::Unit::TestCase
       init_config
       @ft = GData::Client::FusionTables.new      
       @ft.clientlogin(username, password)
+      @ft.set_api_key(api_key)
       @table = @ft.create_table "test", [{:name  => 'firstname',  :type => 'string'},
                                          {:name  => 'phone',      :type => 'number'},
                                          {:name  => 'dob',        :type => 'datetime'},
@@ -73,7 +74,7 @@ class TestTable < Test::Unit::TestCase
                }
     
         @table.insert data
-        assert_equal [{:firstname=>"Person-0", :phone=>"12", :dob=>"08-10-2010 20:15:01", :house=>"<Point><coordinates>1,1,0</coordinates></Point>"}, {:firstname=>"Person-1", :phone=>"12", :dob=>"08-10-2010 20:15:01", :house=>"<Point><coordinates>1,1,0</coordinates></Point>"}], @table.select
+        assert_equal [{:firstname=>"Person-0", :phone=>"12", :dob=>"08-10-2010 20:15:01", :house=>{"geometry"=>{"type"=>"Point", "coordinates"=>[1.0, 1.0, 0.0]}}}, {:firstname=>"Person-1", :phone=>"12", :dob=>"08-10-2010 20:15:01", :house=>{"geometry"=>{"type"=>"Point", "coordinates"=>[1.0, 1.0, 0.0]}}}], @table.select
     end
         
     should "be able to truncate all rows and start again" do

metadata

@@ -1,60 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fusion_tables
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Simon Tokumine
 - Tom Verbeure
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-20 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: gdata_19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.6
   type: :runtime
-  version_requirements: *id002
-description: A simple Google Fusion Tables API wrapper. Supports bulk inserts and most API functions
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.6
+description: A simple Google Fusion Tables API wrapper. Supports bulk inserts and
+  most API functions
 email: simon@tinypla.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
-- .gitignore
+files:
 - CHANGELOG
 - LICENSE
 - README.md
@@ -77,41 +91,28 @@ files:
 - 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
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 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_sql.rb
-- test/test_table.rb
-- examples/boris_bikes.rb
-- examples/compare_tweets.rb
+test_files: []

data/.gitignore

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