bq 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d6f83be99622d5d83bccd1e4dc7aed515e854f0
-  data.tar.gz: 2d883c8b12b36adafdb196456df78a7df327488a
+  metadata.gz: b1ab2f61b813ccc10f7bb45b14db0cbb4619b1c3
+  data.tar.gz: 728a9a4762d67894bae2378f6a471d25d2f5f918
 SHA512:
-  metadata.gz: 821fad029d3c6461471deaf4b3664b0fcd262fd9a0bb0094eb7891b43bee9d0c25a323fddaaabda25a8d21ce3802eb22bb681f8304ef2516062f93e81c9495c7
-  data.tar.gz: f68e29c7c725b9cce2190b3594208f3ec00032cf2f1585f1a5f2b97709414dafb42274b98d47552e9530ef1e456094af4b141817dab7632016fa23f09253025c
+  metadata.gz: 0828abac3d00b8dc16357c51149695616bdc8a437c702b49d6af462ef1bf39bf492ea14c001e4ca0fc308b3d77c1fae3be734ee2b13c8efbbf32dbca65367288
+  data.tar.gz: 373d61ba2f320ffbc8b5747759c7489ebf362c3f788faf9f9c9ba0759acca5c27834e3601ac2336f8a50c7007d183b6f3f620b6b27c9f58179edb1c566de4111

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+.bq_secret_token.json

data/README.md

@@ -19,15 +19,24 @@ Or install it yourself as:
 ## Usage
 
     require "bq"
-    
-    bq = Bq::InstalledApp.new
-    token = bq.authorize # please locate client_secrets.json in load path.
-    # save token into file or db or ...
-    
-    bq2 = Bq::InstalledApp.new(:token=>token, :project_id=>"your-project-id")
+
+    # authorize and store access-token to file.
+    bq = Bq::InstalledApp.new(:token_storage=>".bq_secret_token.json")
+    bq.authorize # please locate client_secrets.json in load path.
+
+    ...
+
+    # restore access-token from file.
+    bq2 = Bq::InstalledApp.new(:token_storage=>".bq_secret_token.json", :project_id=>"your-project-id")
+
+    # execute query
     pp bq2.datasets.to_hash
     pp bq2.query("SELECT 12345").to_hash
 
+## Example
+
+    bq_project_id=your-project-id bundle exec ruby examples/bq_example.rb
+
 ## Contributing
 
 1. Fork it ( https://github.com/takeru/bq/fork )

data/bq.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'google-api-client'
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "terminal-table"
 end

data/examples/bq_example.rb

@@ -0,0 +1,50 @@
+require "pp"
+require "json"
+require "bq"
+require "terminal-table"
+
+project_id = nil
+project_id ||= ENV["bq_project_id"]
+raise "please set your project_id" unless project_id
+token_file = ".bq_secret_token.json"
+
+bq = Bq::InstalledApp.new(:project_id=>project_id, :token_storage=>token_file)
+unless bq.authorized?
+  unless bq.authorize
+    raise "failed to authorize."
+  end
+end
+q = DATA.read.strip
+result = bq.query(q).to_hash
+
+if result["error"] || result["rows"].nil?
+  pp result
+  exit
+end
+
+["kind","jobReference","totalRows","totalBytesProcessed","jobComplete","cacheHit"].each do |k|
+  puts "%20s : %s" % [k, result[k]]
+end
+
+# pp [result["rows"], result["schema"]]
+rows   = result["rows"]
+fields = result["schema"]["fields"]
+headings = [""] + fields.map{|f| f["name"] + "\n" + f["type"] + "\n" + f["mode"] }
+table = Terminal::Table.new :headings=>headings do |t|
+  rows.each_with_index do |r,i|
+    t.add_row [i] + r['f'].map{|hash| hash['v'] }
+  end
+end
+table.align_column(0, :right)
+fields.each_with_index do |s,i|
+  if %w(INTEGER FLOAT).include?(s["type"])
+    table.align_column(i+1, :right)
+  end
+end
+puts table
+
+__END__
+--- SELECT weight_pounds, state, year, gestation_weeks FROM publicdata:samples.natality ORDER BY weight_pounds DESC LIMIT 10;
+--- SELECT word FROM publicdata:samples.shakespeare WHERE word="huzzah";
+--- SELECT corpus FROM publicdata:samples.shakespeare GROUP BY corpus;
+SELECT corpus, sum(word_count) AS wordcount FROM publicdata:samples.shakespeare GROUP BY corpus ORDER BY wordcount DESC;

data/lib/bq.rb

@@ -2,31 +2,50 @@ require "bq/version"
 require 'google/api_client'
 require 'google/api_client/client_secrets'
 require 'google/api_client/auth/installed_app'
+require 'google/api_client/auth/file_storage'
 require 'json'
 
 module Bq
   class Base
-    attr_reader :token
     attr_accessor :project_id
 
     def initialize(opts={})
       @project_id         = opts[:project_id]
       application_name    = opts[:application_name]    || "Bq"
-      application_version = opts[:application_version] || "0.0.1"
+      application_version = opts[:application_version] || Bq::VERSION
 
       @client = Google::APIClient.new(
         :application_name    => application_name,
         :application_version => application_version
       )
-      self.token = opts[:token] if opts[:token]
-      @bq_client = @client.discovered_api('bigquery', 'v2')
+
+      self.token_storage = opts[:token_storage] if opts[:token_storage]
+      if @token_storage && @token_storage.authorization
+        @client.authorization = @token_storage.authorization
+      elsif opts[:token]
+        @client.authorization = opts[:token]
+      end
+
+      @bq_client            = @client.discovered_api('bigquery', 'v2')
+    end
+
+    def token_storage=(storage)
+      if storage.kind_of?(String)
+        storage = Google::APIClient::FileStorage.new(storage)
+      end
+      if storage.respond_to?(:load_credentials) && storage.respond_to?(:write_credentials)
+        @token_storage = storage
+      else
+        raise "invalid storage"
+      end
+    end
+
+    def token
+      @client.authorization
     end
-    def token=(token)
-      @client.authorization.client_id     = token["client_id"]
-      @client.authorization.client_secret = token["client_secret"]
-      @client.authorization.scope         = token["scope"]
-      @client.authorization.refresh_token = token["refresh_token"]
-      @client.authorization.access_token  = token["access_token"]
+
+    def authorized?
+      !@client.authorization.access_token.nil?
     end
   end
 
@@ -41,25 +60,17 @@ module Bq
         :client_secret => credential.client_secret,
         :scope         => ['https://www.googleapis.com/auth/bigquery']
       )
-      @client.authorization = flow.authorize
+      @client.authorization = flow.authorize(@token_storage)
       # Here, will be opened authorization web page.
       # Click [Authorize] button, and I see "Error: redirect_uri_mismatch".
       # But it may be succeed, authorize arguments is available.
 
       unless @client.authorization
         puts "failed to authorize. Canceled?"
-        return nil
+        return false
       end
 
-      @token = {
-        "scope"         => @client.authorization.scope,
-        "client_id"     => @client.authorization.client_id,
-        "client_secret" => @client.authorization.client_secret,
-        "access_token"  => @client.authorization.access_token,
-        "refresh_token" => @client.authorization.refresh_token
-      }.freeze
-
-      return @token
+      return true
     end
 
     def datasets
@@ -97,20 +108,16 @@ if __FILE__ == $0
       "datasets",             # list datasets
       "query:"                # execute query
     )
+    bq = Bq::InstalledApp.new(:token_storage=>token_file)
     if opts["authorize"]
       puts "will be open authorization page in web browser..."
-      bq = Bq::InstalledApp.new
       bq.authorize(opts["client_secrets_json"])
-      open(token_file,'w') do |f|
-        JSON.dump(bq.token,f)
-      end
-      puts "wrote access token to file: .bq_secret_token.json"
+      puts "wrote access token to file: #{token_file}"
     end
 
     project_id = opts["project_id"]
     raise "project_id missing." unless project_id
-    token = JSON.parse File.read(token_file)
-    bq = Bq::InstalledApp.new(:token=>token, :project_id=>project_id)
+    bq.project_id = project_id
 
     if opts["datasets"]
       pp bq.datasets.to_hash

data/lib/bq/version.rb

@@ -1,3 +1,3 @@
 module Bq
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bq
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - sasaki takeru
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - sasaki.takeru@gmail.com
@@ -65,6 +79,7 @@ files:
 - README.md
 - Rakefile
 - bq.gemspec
+- examples/bq_example.rb
 - lib/bq.rb
 - lib/bq/version.rb
 homepage: ''