fusion_tables 0.2.2 → 0.2.3

data/.gitignore

@@ -16,9 +16,11 @@ tmtags
 ## PROJECT::GENERAL
 coverage
 rdoc
+examples/credentials.yml
 
 ## PROJECT::TEST
 test/test_config.yml
 
+
 ## PROJECT::SPECIFIC
 

data/CHANGELOG

@@ -0,0 +1,16 @@
+== 0.2.3 (03/06/11)
+
+* all tests pass
+* readme simplified
+* count now returns 0 for empty tables
+* truncate table, or delete all rows (sikachu)
+* fix up the single update row method (sikachu)
+* if value is nil, insert empty string (wynst)
+* fixes to exception handling and tests (troy)
+
+== 0.2.2
+
+* 1.9.2 compatibility through gdata_19 gem
+* examples updated for 1.9.2
+* datetime columns now include time
+

data/README.md

@@ -0,0 +1,122 @@
+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/).
+
+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/)
+
+Installation
+-------------
+
+``` bash
+gem install fusion_tables
+```
+
+**Gem Dependencies**
+
+* gdata_19 >= 1.1.2
+
+**Rubies**
+
+* 1.8.7
+* 1.9.2
+
+Usage 
+------
+``` ruby
+require 'fusion_tables'
+	
+# Connect to service	
+@ft = GData::Client::FusionTables.new      
+@ft.clientlogin(username, password)
+
+# Browse existing tables
+@ft.show_tables
+ # => [table_1, table_2] 
+
+# Getting table id suitable for using with google maps (see more below)
+table_1.id #=> 42342 (the table's google id)
+
+# Count data
+table_1.count #=> 1
+
+# Select data
+table_1.select 
+ #=> data
+
+# Select data with conditions
+table_1.select "name", "WHERE x=n"
+ #=> data
+
+# Select ROWIDs
+row_ids = table_1.select "ROWID"
+
+# Drop tables
+@ft.drop table_1.id                    # table id
+@ft.drop [table_1.id, table_2.id]     # arrays of table ids
+@ft.drop /yacht/                      # regex on table name
+
+# Creating a table
+cols = [{:name => "friend name",    :type => 'string' },
+        {:name => "age",            :type => 'number' },
+        {:name => "meeting time",   :type => 'datetime' },
+        {:name => "where",          :type => 'location' }]
+
+new_table = @ft.create_table "My upcoming meetings", cols
+
+# Inserting rows (auto chunks every 500)
+data = [{"friend name" 	=> "Eric Wimp", 
+         "age"          => 25, 
+         "meeting time" => Time.utc(2010,"aug",10,20,15,1),
+         "where"        => "29 Acacia Road, Nuttytown"}]
+new_table.insert data
+
+# Delete row
+new_table.delete row_id
+```
+
+Currently only single row UPDATE query is implemented.
+
+``` 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	
+```
+
+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
+------------------------------
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  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.
+
+
+
+Contributors
+-------------
+
+Largely based on Tom Verbeure's [work for MTBGuru](http://code.google.com/p/mtbguru-fusiontables/)
+
+* tokumine
+* sikachu
+* troy
+* wynst
+

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.files.exclude 'pkg'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/examples/boris_bikes.rb

@@ -0,0 +1,159 @@
+# This library creates a FT and posts data from the Boris Bikes API to it every minute
+#
+# Add photos to infowindow
+# Add fusion table graphs to the inside of the infowindows too
+
+
+require 'net/http'
+require 'uri'
+require 'rubygems'
+require 'geo_ruby'
+require 'fusion_tables'
+require 'time'
+require 'json'
+require 'yaml'
+require 'ap'
+include GeoRuby
+include SimpleFeatures
+
+class Object
+  def try(method, *args, &block)
+    send(method, *args, &block)
+  end
+end
+
+def color max, number_to_color, min=0, opacity=80
+  color = ["FFFFB2", "FFFFB2", "FEB24C", "FD8D3C", "F03B20", "BD0026"]
+  #color = %w(FEE0D2 FCBBA1 FC9272 FB6A4A EF3B2C CB181D A50F15 67000D)
+  color.reverse!
+  #color = ["FFFFCC", "D9F0A3", "ADDD8E", "78C679", "31A354", "31A354"] #<- greens
+  chunk = (max-min)/color.size
+  index = (number_to_color/chunk).floor
+  "#{color[index]}#{opacity}"
+end
+
+def to_google(x,y)
+  a = `echo "#{x} #{y}" | cs2cs + +init=epsg:4326 +to +init=epsg:3785 -f "%.12f"`
+  a = a.split(" ")
+  {:x => a[0], :y => a[1]}
+end
+
+def from_google(x,y)
+  a = `echo "#{x} #{y}" | cs2cs + +init=epsg:3785 +to +init=epsg:4326 -f "%.12f"`
+  a = a.split(" ")
+  {:x => a[0], :y => a[1]}
+end
+
+
+def buffer(center_x, center_y, radius, quality = 4, precision = 12)
+  points = []
+  radians = Math::PI / 180
+  
+  coords = to_google(center_x, center_y)
+  center_x = coords[:x].to_f
+  center_y = coords[:y].to_f
+  
+  0.step(360, quality) do |i|
+    x = center_x + (radius * Math.cos(i * radians))
+    y = center_y + (radius * Math.sin(i * radians))
+    coords = from_google(x,y)
+    points << Point.from_x_y(round(coords[:x].to_f, precision), round(coords[:y].to_f, precision))
+  end
+  points
+end
+
+
+def round number, precision = 12
+  (number * 10**precision).round.to_f / 10**precision
+end  
+
+# Configure settings
+config = YAML::load_file(File.join(File.dirname(__FILE__), 'credentials.yml'))
+DEFAULT_SRID = 4328
+
+
+# Configure fusion tables
+ft = GData::Client::FusionTables.new
+ft.clientlogin(config["google_username"], config["google_password"])
+table_name = "Boris Bikes"
+cols = [
+  {:name => 'name',         :type => 'string'},  
+  {:name => 'created_at',   :type => 'datetime'},
+  {:name => 'updated_at',   :type => 'datetime'},
+  {:name => 'boris_id',     :type => 'number'},
+  {:name => 'temporary',    :type => 'number'},
+  {:name => 'installed',    :type => 'number'},
+  {:name => 'locked',       :type => 'number'},
+  {:name => 'nb_empty_docs',:type => 'number'},
+  {:name => 'nb_bikes',     :type => 'number'},
+  {:name => 'nb_docs',      :type => 'number'},
+  {:name => 'image',        :type => 'string'},
+  {:name => 'geom',         :type => 'location'},  
+  {:name => 'geom_fill',    :type => 'string'},  
+  {:name => 'geom_border',  :type => 'string'},  
+]
+
+# Create FT if it doesn't exist
+tables = ft.show_tables
+table  = tables.select{|t| t.name == table_name}.first
+table  = ft.create_table(table_name, cols) if !table
+
+while true do
+  bikes = JSON.parse(Net::HTTP.get(URI.parse('http://borisapi.heroku.com/stations.json')))  
+  
+  # get largest bike rack to calibrate buffer
+  max = 0
+  bikes.each do |b|
+    slots = b["nb_empty_docks"] + b["nb_bikes"]
+    max = slots if slots > max
+  end  
+  
+  # loop through data constructing fusion table date
+  data = []
+  max_radius = 150.0 #in meters
+  buffer_chunk = max_radius / max
+  
+  bikes.each do |b|
+    if b["lat"].to_f > 50 #ignore non geographic ones
+      docs = (b["nb_bikes"] + b["nb_empty_docks"])    
+      geom = Polygon.from_points [buffer(b["long"].to_f, b["lat"].to_f, docs*buffer_chunk)]    
+      #geom = Point.from_x_y b["long"].to_f, b["lat"].to_f
+      
+      data << {
+        "name"          => b["name"],
+        "created_at"    => Time::parse(b["created_at"]),
+        "updated_at"    => Time::parse(b["updated_at"]),
+        "boris_id"      => b["id"],
+        "temporary"     => (b["temporary"] ? 1 : 0), 
+        "installed"     => (b["installed"] ? 1 : 0),
+        "locked"        => (b["locked"]    ? 1 : 0),
+        "nb_empty_docs" => b["nb_empty_docks"],
+        "nb_bikes"      => b["nb_bikes"],
+        "nb_docs"       => docs,
+        "image"         => "",
+        "geom"          => geom.as_kml,
+        "geom_fill"     => color(max,b["nb_bikes"]),
+        "geom_border"   => color(max,b["nb_bikes"],0,"FF"),
+      }
+      puts "packing data for #{b["name"]}"
+    end  
+  end       
+  
+  # get current number of rows ready to delete
+  row_ids = table.select "ROWID"
+  
+  # put new data up
+  puts "sending bikes to fusion tables..."
+  table.insert data
+  
+  # remove old data
+  puts "deleting old rows"
+  row_ids.each do |id|
+    table.delete id[:rowid]
+  end
+    
+  # Be nice and wait
+  puts "...done! sleeping..."
+  sleep 500
+end
+

data/examples/compare_tweets.rb

@@ -49,7 +49,7 @@ places = {
 # Configure fusion tables
 ft = GData::Client::FusionTables.new
 ft.clientlogin(config["google_username"], config["google_password"])
-table_name = "twitter_fusion_test"
+table_name = "TwitterFusion"
 cols = [
   {:name => 'screen_name',  :type => 'string'},  
   {:name => 'avatar',       :type => 'string'},

data/fusion_tables.gemspec

@@ -5,26 +5,28 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fusion_tables}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simon Tokumine", "Tom Verbeure"]
-  s.date = %q{2010-09-02}
+  s.date = %q{2011-06-03}
   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.textile",
+     "README.md",
      "TODO"
   ]
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGELOG",
      "LICENSE",
-     "README.textile",
+     "README.md",
      "Rakefile",
      "TODO",
      "VERSION",
+     "examples/boris_bikes.rb",
      "examples/compare_tweets.rb",
      "examples/credentials.example.yml",
      "fusion_tables.gemspec",
@@ -33,12 +35,6 @@ Gem::Specification.new do |s|
      "lib/fusion_tables/data/data.rb",
      "lib/fusion_tables/data/table.rb",
      "lib/fusion_tables/ext/fusion_tables.rb",
-     "pkg/fusion_tables-0.1.0.gem",
-     "pkg/fusion_tables-0.1.1.gem",
-     "pkg/fusion_tables-0.1.2.gem",
-     "pkg/fusion_tables-0.2.0.gem",
-     "pkg/fusion_tables-0.2.1.gem",
-     "pkg/fusion_tables-0.2.2.gem",
      "test/README",
      "test/helper.rb",
      "test/test_client.rb",
@@ -49,18 +45,18 @@ Gem::Specification.new do |s|
   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.7}
+  s.rubygems_version = %q{1.4.1}
   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
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/fusion_tables/data/table.rb

@@ -52,8 +52,10 @@ module GData
         
         # Returns a count of rows. SQL conditions optional
         #
+        # Note: handles odd FT response: when table has 0 rows, returns empty array.
         def count conditions=nil
-          select("count()", conditions).first.values.first.to_i
+          result = select("count()", conditions)
+          result.empty? ? 0 : result.first[:"count()"].to_i          
         end
         
         
@@ -66,7 +68,8 @@ module GData
         # Fields are escaped and formatted for FT based on type
         #
         def insert data
-          
+          data = [data] unless data.respond_to?(:to_ary)
+
           # encode values to insert
           data = encode data
           
@@ -85,26 +88,24 @@ module GData
           end
         end                
 
-        # Runs update on rows and return data obj
-        # No bulk update, so may aswell drop table and start again
-        #
-        # TODO: FIXME
-        #
-        #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
-        #end
+        # Runs update on row specified and return data obj
+        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
+        end
         
         # delete row
-        # no bulk delete so may aswell drop table and start again
         def delete row_id
           sql = "DELETE FROM #{@id} WHERE rowid='#{row_id}'"
           GData::Client::FusionTables::Data.parse(@client.sql_post(sql)).body
         end
         
+        # delete all rows
+        def truncate!
+          GData::Client::FusionTables::Data.parse(@client.sql_post("DELETE FROM #{@id}")).body
+        end
         
         def get_headers
           @headers ||= describe
@@ -114,10 +115,15 @@ module GData
           data.inject([]) do |ar,h|
             ret = {}
             h.each do |key, value|              
-              ret["'#{key.to_s}'"] = case get_datatype(key)
-                when "number"   then  "#{value}"
-                when "datetime" then  "'#{value.strftime("%m-%d-%Y %H:%M:%S")}'"
-                else                  "'#{value.gsub(/\\/, '\&\&').gsub(/'/, "''")}'"                            
+              if value.nil?
+                #empty string for nils
+                ret["'#{key.to_s}'"] = "''"
+              else
+                ret["'#{key.to_s}'"] = case get_datatype(key)
+                  when "number"   then  "#{value}"
+                  when "datetime" then  "'#{value.strftime("%m-%d-%Y %H:%M:%S")}'"
+                  else                  "'#{value.gsub(/\\/, '\&\&').gsub(/'/, "''")}'"                            
+                end
               end
             end
             ar << ret
@@ -134,9 +140,9 @@ module GData
           @headers.each do |h|
             return h[:type] if h[:name] == column_name.to_s
           end            
-          raise ArgumentError "The column doesn't exist"
+          raise ArgumentError, "The column doesn't exist"
         end      
       end
     end
   end
-end
+end

data/test/test_client.rb

@@ -10,12 +10,12 @@ class TestClient < Test::Unit::TestCase
     end
 
     should "be properly setup" do      
-      assert_equal @ft.clientlogin_service, "fusiontables"      
-      assert_equal @ft.headers["Content-Type"], "application/x-www-form-urlencoded"
+      assert_equal "fusiontables", @ft.clientlogin_service
+      assert_equal "application/x-www-form-urlencoded", @ft.headers["Content-Type"]
     end
     
     should "be able to authenticate with the google services" do
-      assert_equal @ft.auth_handler.service, "fusiontables"
+      assert_equal "fusiontables", @ft.auth_handler.service
       assert @ft.auth_handler.token
     end
   end

data/test/test_ext.rb

@@ -18,40 +18,40 @@ class TestExt < Test::Unit::TestCase
   
     should "let you create a table if you get everything right" do
       table = @ft.create_table "test_table", [{:name => "test_col", :type => "string" }]
-      assert_equal table.class, GData::Client::FusionTables::Table
+      assert_equal GData::Client::FusionTables::Table, table.class
       @ft.drop(table.id)
     end
-
+    
     should "correct your table name to a certain degree on create" do
       table = @ft.create_table "test table", [{:name => "test col", :type => "string" }]
-      assert_equal table.name, "test_table"
+      assert_equal "test_table", table.name
       @ft.drop(table.id)
     end
-
+    
     should "return you a list of your fusion tables" do
       resp = @ft.show_tables
-      assert_equal resp.first.class, GData::Client::FusionTables::Table if resp.first       
+      assert_equal GData::Client::FusionTables::Table, resp.first.class if resp.first
     end
     
     should "be possible to delete a table with an id" do
       table = @ft.create_table "test_table", [{:name => "test col", :type => "string" }]
-      assert_equal @ft.drop(table.id), 1
+      assert_equal 1, @ft.drop(table.id)
     end
-
+    
     should "be possible to delete tables with an array of ids" do
       table1 = @ft.create_table "test_table", [{:name => "test col", :type => "string" }]
       table2 = @ft.create_table "test_table", [{:name => "test col", :type => "string" }]
-      assert_equal @ft.drop([table1.id, table2.id]), 2
+      assert_equal 2, @ft.drop([table1.id, table2.id])
     end
- 
+     
     should "be possible to delete multiple tables with a regex" do
       table1 = @ft.create_table "test_table", [{:name => "test col", :type => "string" }]
       table2 = @ft.create_table "test_table", [{:name => "test col", :type => "string" }]
-      assert_equal @ft.drop(/^test_/), 2      
+      assert_equal 2, @ft.drop(/^test_/)
     end
-   
+       
     should "return zero if passed a silly id" do
-      assert_equal @ft.drop(235243875629384756), 0      
+      assert_equal 0, @ft.drop(235243875629384756)
     end    
   end
 

data/test/test_table.rb

@@ -18,12 +18,11 @@ class TestTable < Test::Unit::TestCase
                              :phone => 12, 
                              :dob => Time.utc(2010,"aug",10,20,15,1), 
                              :house => "POINT(1,1)"}]
-      
       row = data.first
-      assert_equal row[:firstname], "'\\\\bob''s pizza'"
-      assert_equal row[:phone],     "#{12}"
-      assert_equal row[:dob],       "'08-10-2010'"
-      assert_equal row[:house],     "'POINT(1,1)'"
+      assert_equal "'\\\\bob''s pizza'",      row["'firstname'"]
+      assert_equal "#{12}",                   row["'phone'"] 
+      assert_equal "'08-10-2010 20:15:01'",   row["'dob'"]
+      assert_equal "'POINT(1,1)'",            row["'house'"]
     end
     
     should "be able to insert 1 row of data" do
@@ -33,7 +32,7 @@ class TestTable < Test::Unit::TestCase
                      :dob => Time.utc(2010,"aug",10,20,15,1), 
                      :house => '<Point><coordinates>-74.006393,40.714172,0</coordinates></Point>'}
              }
-
+    
       @table.insert data       
     end
         
@@ -47,8 +46,8 @@ class TestTable < Test::Unit::TestCase
       
       @table.insert data       
     end    
-
-
+    
+    
     should "be able to count the number of rows" do
        data = 2.times.inject([]) { |a,i|
                  a << {:firstname => "Person-#{i}", 
@@ -56,9 +55,9 @@ class TestTable < Test::Unit::TestCase
                        :dob => Time.utc(2010,"aug",10,20,15,1), 
                        :house => "<Point><coordinates>#{180-rand(360)},#{90-rand(180)},0</coordinates></Point>"}
                }
-
+    
         @table.insert data
-        assert_equal @table.count, 2
+        assert_equal 2, @table.count
     end
     
     should "be able to select the rows" do
@@ -68,9 +67,25 @@ class TestTable < Test::Unit::TestCase
                        :dob => Time.utc(2010,"aug",10,20,15,1), 
                        :house => "<Point><coordinates>1,1,0</coordinates></Point>"}
                }
-
+    
         @table.insert data
-        assert_equal @table.select, [{:firstname=>"Person-0", :phone=>"12", :dob=>"08-10-2010", :house=>"<Point><coordinates>1,1,0</coordinates></Point>"}, {:firstname=>"Person-1", :phone=>"12", :dob=>"08-10-2010", :house=>"<Point><coordinates>1,1,0</coordinates></Point>"}]        
+        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
     end
+        
+    should "be able to truncate all rows and start again" do
+       data = 2.times.inject([]) { |a,i|
+                 a << {:firstname => "Person-#{i}", 
+                       :phone => 12, 
+                       :dob => Time.utc(2010,"aug",10,20,15,1), 
+                       :house => "<Point><coordinates>#{180-rand(360)},#{90-rand(180)},0</coordinates></Point>"}
+               }
+    
+        @table.insert data
+        assert_equal 2, @table.count
+        @table.truncate!
+        assert_equal 0, @table.count
+        @table.insert data        
+        assert_equal 2, @table.count
+    end    
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fusion_tables
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Simon Tokumine
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +01:00
+date: 2011-06-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -39,6 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 1
@@ -54,16 +57,18 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.textile
+- README.md
 - TODO
 files: 
 - .document
 - .gitignore
+- CHANGELOG
 - LICENSE
-- README.textile
+- README.md
 - Rakefile
 - TODO
 - VERSION
+- examples/boris_bikes.rb
 - examples/compare_tweets.rb
 - examples/credentials.example.yml
 - fusion_tables.gemspec
@@ -72,12 +77,6 @@ files:
 - lib/fusion_tables/data/data.rb
 - lib/fusion_tables/data/table.rb
 - lib/fusion_tables/ext/fusion_tables.rb
-- pkg/fusion_tables-0.1.0.gem
-- pkg/fusion_tables-0.1.1.gem
-- pkg/fusion_tables-0.1.2.gem
-- pkg/fusion_tables-0.2.0.gem
-- pkg/fusion_tables-0.2.1.gem
-- pkg/fusion_tables-0.2.2.gem
 - test/README
 - test/helper.rb
 - test/test_client.rb
@@ -98,6 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -106,13 +106,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Google Fusion Tables API wrapper
@@ -121,4 +122,5 @@ test_files:
 - test/test_client.rb
 - test/test_ext.rb
 - test/test_table.rb
+- examples/boris_bikes.rb
 - examples/compare_tweets.rb

data/README.textile

@@ -1,144 +0,0 @@
-h1. fusion-tables
-
-This gem lets you easily interact with Google Fusion Tables from your Ruby application. Here are some "example maps and charts":http://www.tokumine.com/2010/08/10/fusion-tables-gem/.
-
-h2. Gem Dependencies
-
-* gdata_19 >= 1.1.2
-
-h2. Installation
-
-bc. gem install fusion_tables
-
-h2. Rubies
-
-Tested on:
-
-* 1.8.7
-* 1.9.2-p0
-
-h2. To Use
-
-bc. require 'fusion_tables'
-
-or in Rails 2.3.x
-
-bc. config.gem 'fusion_tables'
-
-h2. API examples
- 
-Please explore the "worked twitter example":http://github.com/tokumine/fusion-tables/blob/master/examples/compare_tweets.rb and the "tests":http://github.com/tokumine/fusion-tables/tree/master/test/. Here is a brief rundown:
-
-<pre><code># Connect to service	
-@ft = GData::Client::FusionTables.new      
-@ft.clientlogin(username, password)
-
-# Browse existing tables
-@ft.show_tables
- # => [table_1, table_2] 
-
-# Getting table id suitable for using with google maps (see more below)
-table_1.id #=> 42342 (the table's google id)
-
-# Count data
-table_1.count #=> 1
-
-# Select data
-table_1.select 
- #=> data
-
-# Select data with conditions
-table_1.select "name", "WHERE x=n"
- #=> data
-
-# Select ROWIDs
-row_ids = table_1.select "ROWID"
-
-# Drop tables
-@ft.drop table_1.id                    # table id
-@ft.drop [table_1.id, table_2.id]     # arrays of table ids
-@ft.drop /yacht/                      # regex on table name
-
-# Creating a table
-cols = [{:name => "friend name",    :type => 'string' },
-        {:name => "age",            :type => 'number' },
-        {:name => "meeting time",   :type => 'datetime' },
-        {:name => "where",          :type => 'location' }]
-
-new_table = @ft.create_table "My upcoming meetings", cols
-
-# Inserting rows (auto chunks every 500)
-data = [{"friend name" 	=> "Eric Wimp", 
-         "age"          => 25, 
-         "meeting time" => Time.utc(2010,"aug",10,20,15,1),
-         "where"        => "29 Acacia Road, Nuttytown"}]
-new_table.insert data
-
-# Delete row
-new_table.delete row_id
-</code></pre>
-
-h2. Fusion Tables secret Geospatial Sauce
-
-*"Geolocated Tweets example":http://tables.googlelabs.com/DataSource?snapid=73106*
-
-Fusion Tables is a labs product from Google. You can "read more here":http://tables.googlelabs.com/, but the key thing is that it gives you *access to the google tile mill for fast generation of google map layers across large datasets* 
-
-Fusion Tables supports the following geometry types:
-
-* lat/long
-* addresses (automatically geocodes them for you)
-* KML (point, polyline, polygon, multipolygon)
-
-h2. Integrate with google maps v3
-
-Adding a fusion tables datalayer with many points/polygons to your v3 map is as simple as:
-
-bc. layer = new google.maps.FusionTablesLayer(139529);
-
-That's it
-
-You can also refine the tiles by SQL, and can even do so dynamically:
-
-<pre><code>
-layer = new google.maps.FusionTablesLayer(198945, {
-  query: "SELECT address FROM 198945 WHERE ridership > 5000"}
-);
-</code></pre>
-
-Finally, fusion tables also lets you make Heatmaps
-
-<pre><code>
-layer = new google.maps.FusionTablesLayer(136705, {
-  heatmap: true
-});
-</code></pre>
-
-You can also export your data (filtered and geocoded) to KML. As an example, here are "all the Gasoline filling stations in the UK":http://tables.googlelabs.com/exporttable?query=select+col0%2Ccol1%2Ccol2%2Ccol3%2Ccol4%2Ccol5%2Ccol6%2Ccol12%2Ccol13%2Ccol14%2Ccol15%2Ccol16%2Ccol17%2Ccol18%2Ccol19%2Ccol20%2Ccol21+from+214045+&o=kmllink&g=col0
-
-read "more here":http://code.google.com/apis/maps/documentation/javascript/overlays.html#FusionTables
-
-h2. A few words of warning...
-
-# The API is still very young and *will probably change* 
-# Currently you have to make a table public before you can display it on a map, unfortunately, this can only be done on the web interface. A suggested workaround is to put all your data in 1 big public table, and then query for the data you want to display based off a key/flag column
-
-h2. Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  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.
-
-h2. Copyright
-
-Largely based on Tom Verbeure's work for MTBGuru: http://code.google.com/p/mtbguru-fusiontables/
-
-Copyright (c) 2010 Tom Verbeure, Simon Tokumine. See LICENSE for details.
-
-
-
-