fusion_tables_api 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6457a099c117c227e0d8df8c6e0a34fd0a7986e5
-  data.tar.gz: 3daee24939615fa42853800d3db11186a168c915
+  metadata.gz: 788fd708130a4c637e396d204f146ff45e516532
+  data.tar.gz: 80fcf67122e80b21dc0444a44d04f2a723fc7ba2
 SHA512:
-  metadata.gz: 86c36ae4a06b359428e41f9e69cbcf7e59dcb06fdafa9c37d719e8c09497895d1b6fe8ed61538352f145e53073d4d37093c9295aeb5eff94cb8ae2df2d645fab
-  data.tar.gz: 304c0371f04161c141f92333b86997bdb1b42bb35cffe1476ddffdce10917283eafaf8514a69cdcad0c964bd3c84e7f7689f7886f26b5d26abbb45743ef98d30
+  metadata.gz: e2bf5ccec320972e4d87ddf6deb95673970702bf24dfcba928df116dcadb0064ba820b95a2d69b2eb5dc6addffebee2306156ffdcdff3ca18d8268a6943f62b8
+  data.tar.gz: c25eaad1e965cace106a9ec16208f03fdf00b0a161097f66801e8255b40512fde47f882729ecf427e984a31f546c7e6efc483d48f1dc26c9a008d5654c481e98

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 *.vim
 *.yml
 ft_script_test.rb
+*.csv

data/HISTORY.md

@@ -1,4 +1,7 @@
-# Version 0.0.1 (04-30-2013)
+## Version 0.0.2 (04-30-2013)
+* Pushed up a small fix
+
+## Version 0.0.1 (04-30-2013)
 * First release
 * Get table list is known to work
 * Truthfully, I was just trying to claim the name for the gem on RubyGems

data/README.md

@@ -19,7 +19,25 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+    cred = {
+      client_id: "check-your-google-api-console-for-this",
+      client_secret: "same-thing-as-above"
+    }
+
+    tokens = {
+      access_token: "if-you-have-the-access-token-then-use-it",
+      refresh_token: "refresh-token-would-be-useful-too"
+    }
+
+    ft = FusionTablesAPI.new(cred, tokens)
+    ft.get_table_list
+
+OR
+
+    ft = FusionTablesAPI.new("google_oauth_credentials.yml", "google_access_token.yml")
+    ft.get_table_list
+
+**TODO: Finish this....**
 
 ## Contributing
 

data/lib/fusion_tables_api/authorization.rb

@@ -11,9 +11,8 @@ class FusionTablesAPI
   end
 
   def store_new_access_token
-      @access_token = @client.authorization.access_token
-      @oauth_authorization['access_token'] = @access_token 
-      File.open(GOOGLE_OAUTH_FILENAME, 'w+') { |f| f.write(@oauth_authorization.to_yaml)}
+      @authorization_tokens['access_token'] = @client.authorization.access_token 
+      File.open(GOOGLE_OAUTH_TOKEN_FILE, 'w+') { |f| f.write(@authorization_tokens.to_yaml)}
   end
 
   # Takes hash or file and loads oauth credentials
@@ -33,12 +32,13 @@ class FusionTablesAPI
 
   def load_oauth_tokens(oauth_tokens)
     if oauth_tokens.is_a?(Hash)
+      # TODO Need to involve instance variable authorization_tokens
       set_access_token(oauth_tokens[:access_token])
       set_refresh_token(oauth_tokens[:refresh_token])
     else
-      tokens = YAML.load_file(oauth_tokens)
-      set_access_token(tokens['access_token'])
-      set_refresh_token(tokens['refresh_token'])
+      @authorization_tokens = YAML.load_file(oauth_tokens)
+      set_access_token(@authorization_tokens['access_token'])
+      set_refresh_token(@authorization_tokens['refresh_token'])
     end
     true
   end
@@ -57,7 +57,8 @@ class FusionTablesAPI
     code = gets.chomp.strip
 
     @client.authorization.code = code
-    oauth_authorization ||= @client.authorization.fetch_access_token!
+    # TODO Need to this one below
+    @authorization_tokens ||= @client.authorization.fetch_access_token!
 
     File.open(GOOGLE_OAUTH_TOKEN_FILE, 'w+') { |f| f.write(oauth_authorization.to_yaml)}
     puts "Google OAuth Tokens written to #{GOOGLE_OAUTH_TOKEN_FILE}"

data/lib/fusion_tables_api/table.rb

@@ -1,3 +1,12 @@
+require 'csv'
+
+# TODO May need to change this
+class String
+  def is_i?
+    !!(self =~/^[-+]?[0-9]+$/)
+  end
+end
+
 class FusionTablesAPI
   # TODO Might eventually want to create a table class
   ### FusionTables API Table methods ###
@@ -25,13 +34,13 @@ class FusionTablesAPI
     request_body = { "columns" => column_names, "isExportable" => false, "name" => File.basename(filename, ".csv") }
     result = @client.execute(api_method: @fusion_tables_api.table.insert, headers: headers, body: request_body.to_json)
     parsed_result = JSON.parse(result.body)
-    store_new_access_token if @client.authorization.access_token != @access_token
+    store_new_access_token if @client.authorization.access_token != @authorization_tokens['access_token']
 
     puts "#### \nCreate Table Response:\n#{result.body}\n####\n"
     parsed_result # return
   end
 
-  def import_rows(filename, table_id, start_line= nil)
+  def import_rows(filename, table_id, start_line= 0)
     headers = Hash.new
     headers[:content_type] = 'application/octet-stream'
     params = { tableId: table_id, startLine: start_line, isStrict: false } # May need to set isStrict to false
@@ -39,13 +48,12 @@ class FusionTablesAPI
     import_row_url = "https://www.googleapis.com/upload/fusiontables/v1/tables/tableId/import"
 
     result = @client.execute(uri: import_row_url, http_method: :post, body: request_body, headers: headers, parameters: params )
-    update_fusion_table_row_count(File.basename(filename, '.csv'), result.data["numRowsReceived"].to_i)
     jj result.data
 
     true # return
   end
 
-  def generate_table(filename, start_line= nil)
+  def generate_table(filename, start_line= 0)
     response = create_table(filename)
     import_rows(filename, response["tableId"], start_line)
   end

data/lib/fusion_tables_api/version.rb

@@ -1,3 +1,3 @@
 class FusionTablesAPI
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fusion_tables_api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michael Villena