fusion_tables 0.4.0 → 0.4.1

data/README.md

@@ -4,10 +4,15 @@ 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. 
+upgrading to current (v0.4)
+--------------------------
+Thanks to DerekEder's work, v0.4 supports the new Fusion Tables JSON API rather than the now defunct CSV API. This has introduced some small (but possibly breaking) changes:
 
+1. Geometry is returned as GeoJSON rather than KML.
+2. Null values are returned as empty strings (the FT API does this, so we're a bit stuck here).
+3. You need to supply an api_key to use the service. You can get an API key from your Google API console. 
+
+See the example below and tests for more.
 
 Demo and examples
 ------------------
@@ -140,4 +145,4 @@ Largely based on Tom Verbeure's [work for MTBGuru](http://code.google.com/p/mtbg
 * jmannau
 * tomykaira
 * fallanic
-* derekeder
+* derekeder

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/fusion_tables.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fusion_tables"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simon Tokumine", "Tom Verbeure"]
-  s.date = "2013-01-14"
+  s.date = "2013-01-17"
   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 = [

data/lib/fusion_tables/client/fusion_tables.rb

@@ -27,19 +27,21 @@ module GData
       end
 
       def sql_encode(sql)
-        # puts sql
         "sql=" + CGI::escape(sql)
       end
 
       def sql_get(sql)
+        raise ArgumentError, "need api key" if @api_key.nil?
         resp = self.get(SERVICE_URL + "?" + sql_encode(sql) + "&key=#{@api_key}")
       end
 
       def sql_post(sql)
+        raise ArgumentError, "need api key" if @api_key.nil?
         resp = self.post(SERVICE_URL, sql_encode(sql) + "&key=#{@api_key}")
       end
 
       def sql_put(sql)
+        raise ArgumentError, "need api key" if @api_key.nil?
         resp = self.put(SERVICE_URL, sql_encode(sql) + "&key=#{@api_key}")
       end
                   

data/lib/fusion_tables/ext/fusion_tables.rb

@@ -21,7 +21,10 @@ module GData
         http_req = sql.upcase.match(/^(DESCRIBE|SHOW|SELECT)/) ? :sql_get : :sql_post
         json_resp = JSON.parse(self.send(http_req, sql).body)
         
-        # probably a much cleaner way to do this
+        if json_resp['rows'].nil?
+          return []
+        end
+
         rows = json_resp['rows']
         columns = json_resp['columns']
         correlated = []

data/test/test_client.rb

@@ -18,5 +18,12 @@ class TestClient < Test::Unit::TestCase
       assert_equal "fusiontables", @ft.auth_handler.service
       assert @ft.auth_handler.token
     end
+
+    should "raise ArgumentError if no api key supplied" do
+      @ft.set_api_key(nil)
+      assert_raise ArgumentError do
+        @ft.sql_get "SHOW TABLES" 
+      end
+    end
   end
 end

data/test/test_sql.rb

@@ -66,6 +66,11 @@ class TestTable < Test::Unit::TestCase
       
       assert_equal 1, ret.first[:"count()"].to_i  
     end    
+
+    should "return empty array if no results found" do 
+      ret = @ft.execute "SELECT * FROM #{@table.id} WHERE firstname = 0;"
+      assert_equal [], ret
+    end
     
     # should "be able to query geographic data" do
     #   @table = @ft.create_table "test", [{:name  => 'name',      :type => 'string'},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fusion_tables
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda