fusion_tables 0.3.1 → 0.3.2

data/.gitignore

@@ -13,10 +13,14 @@ tmtags
 ## VIM
 *.swp
 
+## Aptana
+.project
+
 ## PROJECT::GENERAL
 coverage
 rdoc
 examples/credentials.yml
+pkg/*
 
 ## PROJECT::TEST
 test/test_config.yml

data/README.md

@@ -132,3 +132,6 @@ Largely based on Tom Verbeure's [work for MTBGuru](http://code.google.com/p/mtbg
 * troy
 * wynst
 * sdball
+* jmannau
+* tomykaira
+* fallanic

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/fusion_tables.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fusion_tables}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   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-08-21}
+  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.extra_rdoc_files = [
@@ -17,8 +17,7 @@ Gem::Specification.new do |s|
      "README.md"
   ]
   s.files = [
-    ".document",
-     ".gitignore",
+    ".gitignore",
      "CHANGELOG",
      "LICENSE",
      "README.md",

data/lib/fusion_tables/data/table.rb

@@ -111,21 +111,12 @@ module GData
           data.inject([]) do |ar,h|
             ret = {}
             h.each do |key, value|              
-              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
+              ret["'#{key}'"] = encode_value(get_datatype(key), value)
             end
             ar << ret
             ar      
           end
-        end  
+        end
                         
         # 
         # Returns datatype of given column name
@@ -138,6 +129,42 @@ module GData
           end            
           raise ArgumentError, "The column doesn't exist"
         end      
+
+        private
+        def encode_value_as_numeric(value)
+          value.to_s
+        end
+
+        def encode_value_as_datetime(value)
+          encode_value_as_string(value.strftime("%m-%d-%Y %H:%M:%S"))
+        end
+
+        def encode_value_as_string(value)
+          quoted = value.to_s.gsub(/\\/, '\&\&').gsub(/'/, "''")
+          "'#{quoted}'"
+        end
+
+        def encode_value type, value
+          if value.nil?
+            #empty string for nils
+            "''"
+          else
+            case type
+            when "number"
+              encode_value_as_numeric(value)
+            when "datetime"
+              encode_value_as_datetime(value)
+            when "location"
+              if value.is_a?(Numeric)
+                encode_value_as_numeric(value)
+              else
+                encode_value_as_string(value)
+              end
+            else
+              encode_value_as_string(value)
+            end
+          end
+        end
       end
     end
   end

data/lib/fusion_tables/ext/fusion_tables.rb

@@ -14,89 +14,92 @@
 
 module GData
   module Client
-    class FusionTables < Base    
-                     
+    class FusionTables < Base
+
       # Helper method to run FT SQL and return FT data object
-      def execute(sql)        
+      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                                                   
-                          
+        GData::Client::FusionTables::Data.parse(self.send(http_req, sql)).body
+      end
+
       # Show a list of fusion tables
-      def show_tables 
+      def show_tables
         data = self.execute "SHOW TABLES"
-        
+
         data.inject([]) do |x, row|
-          x << GData::Client::FusionTables::Table.new(self, row)        
+          x << GData::Client::FusionTables::Table.new(self, row)
           x
-        end  
+        end
       end
-            
+
       # Create a new table. Return the corresponding table
-      # 
+      #
       # Columns specified as [{:name => 'my_col_name', :type => 'my_type'}]
       #
       # Type must be one of:
-      # 
-      # * number 
-      # * string 
+      #
+      # * number
+      # * string
       # * location
       # * datetime
       #
       def create_table(table_name, columns)
-        
+
         # Sanity check name
         table_name = table_name.strip.gsub(/ /,'_')
-        
+
         # ensure all column types are valid
         columns.each do |col|
+          col[:name] = col[:name].to_s
+          col[:type] = col[:type].to_s
+
           if !DATATYPES.include? col[:type].downcase
             raise ArgumentError, "Ensure input types are: 'number', 'string', 'location' or 'datetime'"
-          end  
+          end
         end
-        
+
         # generate sql
         fields = columns.map{ |col| "'#{col[:name]}': #{col[:type].upcase}" }.join(", ")
         sql = "CREATE TABLE #{table_name} (#{fields})"
-        
-        # create table        
+
+        # create table
         resp = self.sql_post(sql)
         raise "unknown column type" if resp.body == "Unknown column type."
-        
-        # construct table object and return        
-        table_id = resp.body.split("\n")[1].chomp.to_i
+
+        # construct table object and return
+        table_id = resp.body.split("\n")[1].chomp
         table = GData::Client::FusionTables::Table.new(self, :table_id => table_id, :name => table_name)
         table.get_headers
         table
       end
-      
+
       # Drops Fusion Tables
       #
       # options can be:
       #
-      # * an integer for single drop 
+      # * an integer for single drop
       # * array of integers for multi drop
-      # * a regex against table_name for flexible multi_drop 
+      # * a regex against table_name for flexible multi_drop
       #
       def drop(options)
         # collect ids
         ids = []
         ids << options  if options.class == Integer || options.class == String || Fixnum
         ids =  options  if options.class == Array
-        
+
         if options.class == Regexp
           tables = show_tables
           ids = tables.map { |table| table.id if options =~ table.name }.compact
-        end       
-        
-        # drop tables  
+        end
+
+        # drop tables
         delete_count = 0
-        ids.each do |id|  
-          resp = self.sql_post("DROP TABLE #{id}") 
-          delete_count += 1 if resp.body.strip.downcase == 'ok'          
+        ids.each do |id|
+          resp = self.sql_post("DROP TABLE #{id}")
+          delete_count += 1 if resp.body.strip.downcase == 'ok'
         end
-        delete_count      
-      end        
+        delete_count
+      end
     end
   end
 end

data/test/test_ext.rb

@@ -1,58 +1,70 @@
 require 'helper'
 
 class TestExt < Test::Unit::TestCase
- 
+
   context "The Fusion Tables helper functions" do
-    setup do 
+    setup do
       init_config
-      @ft = GData::Client::FusionTables.new      
+      @ft = GData::Client::FusionTables.new
       @ft.clientlogin(username, password)
     end
-  
-    
+
+    teardown do
+      @ft.drop(@table.id) if @table and @table.id
+    end
+
     should "raise ArgumentError if supply unknown types to it" do
       assert_raise ArgumentError do
         @ft.create_table "test table", [{:name => "test_col", :type => "billys birthday" }]
       end
-    end  
-  
+    end
+
     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 GData::Client::FusionTables::Table, table.class
-      @ft.drop(table.id)
+      @table = @ft.create_table "test_table", [{:name => "test_col", :type => "string" }]
+      assert_equal GData::Client::FusionTables::Table, @table.class
+      assert @table.id.is_a? String
+    end
+
+    should "accept symbol for name and type" do
+      @table = @ft.create_table "test_table", [{:name => :test_col, :type => :string }]
+      first_column = @table.describe[0]
+      assert_equal 'test_col', first_column[:name]
+      assert_equal 'string', first_column[:type]
     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 "test_table", table.name
-      @ft.drop(table.id)
+      @table = @ft.create_table "test table", [{:name => "test col", :type => "string" }]
+      assert_equal "test_table", @table.name
     end
-    
+
     should "return you a list of your fusion tables" do
+      @table = @ft.create_table "test_table", [{:name => "test col", :type => "string" }]
       resp = @ft.show_tables
-      assert_equal GData::Client::FusionTables::Table, resp.first.class if resp.first
+      assert resp.any? { |t| t.name == 'test_table' }
     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 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 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 2, @ft.drop(/^test_/)
     end
-       
+
     should "return zero if passed a silly id" do
-      assert_equal 0, @ft.drop(235243875629384756)
-    end    
+      assert_raise GData::Client::BadRequestError do
+        assert_equal 0, @ft.drop(235243875629384756)
+      end
+    end
   end
 
 end

data/test/test_sql.rb

@@ -12,6 +12,10 @@ class TestTable < Test::Unit::TestCase
                                          {:name  => 'dob',        :type => 'datetime'},
                                          {:name  => 'house',      :type => 'location'}]
     end
+
+    teardown do
+      @ft.drop(@table.id)
+    end
     
     should "be able to SHOW TABLES" do
       ret = @ft.execute "SHOW TABLES"      

data/test/test_table.rb

@@ -12,6 +12,10 @@ class TestTable < Test::Unit::TestCase
                                          {:name  => 'dob',        :type => 'datetime'},
                                          {:name  => 'house',      :type => 'location'}]
     end
+
+    teardown do
+      @ft.drop(@table.id)
+    end
    
     should "format data and prep for upload" do
       data = @table.encode [{:firstname => "\\bob's piz\za", 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Simon Tokumine
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-21 00:00:00 +01:00
+date: 2012-11-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .document
 - .gitignore
 - CHANGELOG
 - LICENSE

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE