fusion_tables_api 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788fd708130a4c637e396d204f146ff45e516532
-  data.tar.gz: 80fcf67122e80b21dc0444a44d04f2a723fc7ba2
+  metadata.gz: 6535c59c29b723d30f3d724554b419edb37355a3
+  data.tar.gz: 7d5d43b0346b487ac7350e45b6e6dc03867c57e4
 SHA512:
-  metadata.gz: e2bf5ccec320972e4d87ddf6deb95673970702bf24dfcba928df116dcadb0064ba820b95a2d69b2eb5dc6addffebee2306156ffdcdff3ca18d8268a6943f62b8
-  data.tar.gz: c25eaad1e965cace106a9ec16208f03fdf00b0a161097f66801e8255b40512fde47f882729ecf427e984a31f546c7e6efc483d48f1dc26c9a008d5654c481e98
+  metadata.gz: cac9e478a44ff75087134019e3cbb05cd7bc64a3f0818f92515b99a1db28a3089f791b2be06709e4c88e3a135cb30ed73e65fb9ac93037dd39e0ef646da06e22
+  data.tar.gz: 5a886e78e9acf7a6a19907e2ad1ac054ab267fe9c08fb855ad233a63751a1cd573d2bc44a58614629bd64fb9f27897134aa3f9588c90b12ff4dbcaa564c4a4fc

data/HISTORY.md

@@ -1,3 +1,7 @@
+## Version 0.0.3 (04-30-2013)
+* Basic functionality
+* Can create table
+
 ## Version 0.0.2 (04-30-2013)
 * Pushed up a small fix
 

data/README.md

@@ -29,13 +29,22 @@ Or install it yourself as:
       refresh_token: "refresh-token-would-be-useful-too"
     }
 
-    ft = FusionTablesAPI.new(cred, tokens)
-    ft.get_table_list
+    google_api_client_options {
+     application_name: "AppName"
+     application_version: "1.0awesome"
+    }
+
+    ft = FusionTablesAPI.new(cred, tokens, google_api_client_options)
+    jj ft.get_table_list
 
 OR
 
-    ft = FusionTablesAPI.new("google_oauth_credentials.yml", "google_access_token.yml")
-    ft.get_table_list
+    ft = FusionTablesAPI.new("google_oauth_credentials.yml", "google_access_token.yml", google_api_client_options)
+    jj ft.get_table_list
+
+Generating a table:
+
+    ft.generate_table("the_name_of_csv_file.csv")
 
 **TODO: Finish this....**
 
@@ -47,7 +56,7 @@ OR
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-# License
+##  License
 Copyright (c) 2013 Michael Villena
 
 MIT License

data/lib/fusion_tables_api/authorization.rb

@@ -32,7 +32,6 @@ 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
@@ -44,6 +43,7 @@ class FusionTablesAPI
   end
 
   # Authorization
+  # TODO Need to test this out
   def initial_authorization
     puts "1) Copy and paste the url below into your browser:" 
     authorize = @client.authorization.authorization_uri
@@ -57,7 +57,7 @@ class FusionTablesAPI
     code = gets.chomp.strip
 
     @client.authorization.code = code
-    # TODO Need to this one below
+    # TODO Need to test this one below
     @authorization_tokens ||= @client.authorization.fetch_access_token!
 
     File.open(GOOGLE_OAUTH_TOKEN_FILE, 'w+') { |f| f.write(oauth_authorization.to_yaml)}

data/lib/fusion_tables_api/table.rb

@@ -1,6 +1,6 @@
 require 'csv'
 
-# TODO May need to change this
+# TODO Will need to change this
 class String
   def is_i?
     !!(self =~/^[-+]?[0-9]+$/)
@@ -13,11 +13,8 @@ class FusionTablesAPI
 
   def get_table_list
     result = @client.execute(api_method: @fusion_tables_api.table.list)
-    # if @client.authorization.access_token != @access_token
-    #   store_new_access_token
-    # end
-
-    jj JSON.parse(result.body)
+    store_new_access_token if @authorization_tokens && 
+      @client.authorization.access_token != @authorization_tokens['access_token']
     JSON.parse(result.body)
   end
 
@@ -33,29 +30,30 @@ 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 != @authorization_tokens['access_token']
-
-    puts "#### \nCreate Table Response:\n#{result.body}\n####\n"
-    parsed_result # return
+    store_new_access_token if @authorization_tokens && 
+      @client.authorization.access_token != @authorization_tokens['access_token']
+    JSON.parse(result.body)
   end
 
   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
+    params = { 
+      tableId: table_id, 
+      startLine: start_line, 
+      isStrict: false  # May need to set isStrict to false
+    } 
     request_body = File.read(filename)
     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 )
-    jj result.data
-
-    true # return
+    result.data
   end
 
   def generate_table(filename, start_line= 0)
-    response = create_table(filename)
-    import_rows(filename, response["tableId"], start_line)
+    create_response = create_table(filename)
+    import_response = import_rows(filename, create_response["tableId"], start_line)
+    [create_response, import_response]
   end
 
   def add_rows_to_existing_table(filename)

data/lib/fusion_tables_api/version.rb

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

data/lib/fusion_tables_api.rb

@@ -8,11 +8,17 @@ require 'yaml'
 
 class FusionTablesAPI
   GOOGLE_OAUTH_TOKEN_FILE = 'google_access_token.yml'
+  attr_reader :client
 
-  # Need a hash with :client_id, :client_secret or filename that contains the oauth_credentials 'client_id', 'client_secret'
-  def initialize(oauth_cred, access_tokens = nil)
-    @client = Google::APIClient.new
-    @fusion_tables_api = @client.discovered_api('fusiontables')
+  # @oauth_cred - Accepts hash with :client_id, :client_secret, or 
+  # filename of file that contains the oauth credentials 'client_id', 'client_secret'
+  # @google_api_client_options - Accepts options for the google_api_client, e.g. :application_name, :application_version
+  # See here https://github.com/google/google-api-ruby-client/blob/master/lib/google/api_client.rb
+  # @access_tokens - Accepts hash with :access_token, :refresh_token, or 
+  # filename of file that contains the oauth tkens 'access_token', 'refresh_token'
+  def initialize(oauth_cred, access_tokens = nil, google_api_client_options = {})
+    @client = Google::APIClient.new(google_api_client_options)
+    @fusion_tables_api = @client.discovered_api('fusiontables') # Should comment this out when testing
 
     load_authorization_credentials(oauth_cred)
     load_oauth_tokens(access_tokens) if access_tokens

data/spec/fusion_tables_api_spec.rb

@@ -0,0 +1,74 @@
+# fusion_tables_api.spec
+require 'spec_helper'
+
+describe FusionTablesAPI do
+  before do 
+    @client_cred = { client_id: "FaKE-1D", client_secret: "s3EkR1t" }
+    @oauth_tokens = { access_token: "SuM-C0mb0-04-th15", refresh_token: "jUs7_a5-Wld" }
+    @google_api_client_options = { 
+      application_name: "Test", 
+      application_version: "1.0alpha"
+    }
+  end
+  
+  describe "when initializing FusionTablesAPI" do 
+    it "should raise an ArgumentError error if no parameters passed" do
+      expect { FusionTablesAPI.new }.to raise_error(ArgumentError)
+    end
+
+    it "should not raise an error if the client credentials are passed" do
+      expect { FusionTablesAPI.new(@client_cred, @google_api_client_options) }.to_not raise_error
+    end 
+  end
+
+  before { @ft_no_tokens = FusionTablesAPI.new(@client_cred, nil, @google_api_client_options) }
+
+  subject { @ft_no_tokens }
+  it { should respond_to(:client) }
+
+  describe "after being initialized without access_tokens" do
+    let(:authorization) { @ft_no_tokens.client.authorization }
+    it "should have its client id set" do
+      authorization.client_id.should equal(@client_cred[:client_id])
+    end
+
+    it "should have its client secret set" do
+      authorization.client_secret.should equal(@client_cred[:client_secret])
+    end
+
+    it "should not have an access token set" do
+      authorization.access_token.should be_nil
+    end
+  end
+
+
+  before { @ft_with_tokens = FusionTablesAPI.new(@client_cred,  @oauth_tokens, @google_api_client_options) }
+
+  describe "after being initialized with tokens" do 
+    let(:authorization) { @ft_with_tokens.client.authorization }
+    it "should have its client id set" do
+      authorization.client_id.should equal(@client_cred[:client_id])
+    end
+
+    it "should have its client secret set" do
+      authorization.client_secret.should equal(@client_cred[:client_secret])
+    end
+
+    it "should not have an access token set" do
+      authorization.access_token.should equal(@oauth_tokens[:access_token])
+    end
+
+    it "should not have an access token set" do
+      authorization.refresh_token.should equal(@oauth_tokens[:refresh_token])
+    end
+  end
+
+  describe "when initialized without GoogleAPI Client options" do
+    it "should not raise an error" do
+     expect { FusionTablesAPI.new(@client_cred) }.to_not raise_error
+    end
+    it "should not raise an error when access_token in argument as well" do
+     expect { FusionTablesAPI.new(@client_cred, @oauth_tokens) }.to_not raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH << File.join(File.dirname(__FILE__))
+
+require 'rubygems'
+require 'rspec'
+require 'fusion_tables_api'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusion_tables_api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael Villena
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -85,6 +85,8 @@ files:
 - lib/fusion_tables_api/table.rb
 - lib/fusion_tables_api/version.rb
 - spec/.gitkeep
+- spec/fusion_tables_api_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -111,3 +113,5 @@ specification_version: 4
 summary: Create tables in Google Fusion Tables via its API
 test_files:
 - spec/.gitkeep
+- spec/fusion_tables_api_spec.rb
+- spec/spec_helper.rb