bigquery 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72abb6272b9cd6cd208c7c2da3aa18482722377f
-  data.tar.gz: 64cb7f2129a24290541a2a10894ce3f9df310438
+  metadata.gz: 4801bae739335efd291f0b1bc7f40c24774d28ad
+  data.tar.gz: 7fc58959d20e1b2320fe668fa98ae2b19bda2a19
 SHA512:
-  metadata.gz: df3dd14bfefe8ec762d4577e57f2757429a251c68834193c0672544d42c9908f9c5c038ebbf55b6cbbeab8c357be47caabcda269d8ff1bbef8b938f1a2de1c12
-  data.tar.gz: 57073c1b5fb9e1f65481847c6ddcb9177410bb5f56c0771a32265465a14ef54816ec41d02b54af725974e4af33a36807d534e7e9c5046c7047690831c7a985b2
+  metadata.gz: 676d0d4c40351e00a645f68e37c0cfdc4b075beab86c74b31bf8717df3d9240a30973ca3b1fc7ccc8fe9b29088675b507d09e46a09a195131582f61905d73ccc
+  data.tar.gz: 0900f97212217ceecd258db6df7d0f4b365d5ab291bd0c19e3049355378b9266ca2c427bbabaaa8ee3b0d60df768ca847c6b197a9e391459a68be7d9677b30c3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.8.0
+* Allow media and parameters when inserting jobs #20
+* Add query options such as useQueryCache, dryRun, maxResults #22
+
 # 0.7.0
 * Adds support for passing string as key #18
 * Switch to Signet::OAuth2::Client for authorization #17

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    bigquery (0.7.0)
+    bigquery (0.8.0)
       google-api-client (~> 0.8.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.0)
+    activesupport (4.2.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.7)
+    addressable (2.3.8)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
@@ -27,24 +27,37 @@ GEM
     extlib (0.9.16)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    google-api-client (0.8.2)
+    google-api-client (0.8.6)
       activesupport (>= 3.2)
       addressable (~> 2.3)
       autoparse (~> 0.3)
       extlib (~> 0.9)
       faraday (~> 0.9)
+      googleauth (~> 0.3)
       launchy (~> 2.4)
       multi_json (~> 1.10)
       retriable (~> 1.4)
       signet (~> 0.6)
+    googleauth (0.4.1)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (= 1.11)
+      signet (~> 0.6)
     i18n (0.7.0)
     json (1.8.2)
-    jwt (1.2.1)
+    jwt (1.5.0)
     launchy (2.4.3)
       addressable (~> 2.3)
+    little-plugger (1.1.3)
+    logging (2.0.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    memoist (0.12.0)
     method_source (0.8.2)
     minitest (5.3.4)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     multipart-post (2.0.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
@@ -62,7 +75,7 @@ GEM
       jwt (~> 1.0)
       multi_json (~> 1.10)
     slop (3.5.0)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 

data/lib/big_query/client.rb

@@ -21,7 +21,11 @@ module BigQuery
         faraday_option: opts['faraday_option']
       )
 
-      key = Google::APIClient::PKCS12.load_key(opts['key'], 'notasecret')
+      begin
+        key = Google::APIClient::KeyUtils.load_from_pkcs12(opts['key'], 'notasecret')
+      rescue ArgumentError
+        key = Google::APIClient::KeyUtils.load_from_pem(opts['key'], 'notasecret')
+      end
 
       @client.authorization = Signet::OAuth2::Client.new(
         token_credential_uri: 'https://accounts.google.com/o/oauth2/token',

data/lib/big_query/client/jobs.rb

@@ -38,11 +38,15 @@ module BigQuery
 
       # Insert a job
       #
-      # @param options [Hash] hash of job options 
+      # @param options [Hash] hash of job options
+      # @param parameters [Hash] hash of parameters (uploadType, etc.)
+      # @param media [Google::APIClient::UploadIO] media upload
       # @return [Hash] json api response
-      def insert_job(opts)
+      def insert_job(opts, parameters = {}, media = nil)
         api(api_method: @bq.jobs.insert,
-            body_object: {configuration: opts})
+            parameters: parameters,
+            body_object: {configuration: opts},
+            media: media)
       end
     end
   end

data/lib/big_query/client/query.rb

@@ -5,14 +5,22 @@ module BigQuery
       #
       # @param given_query [String] query to perform
       # @param options [Hash] query options
-      # @option options [Integer] timeout (90 * 1000) timeout in miliseconds
+      # @option options [Integer] timeout or timeoutMs (90 * 1000) timeout in miliseconds
+      # @option options [Boolean] dryRun Don't actually run this job
+      # @option options [Integer] maxResults The maximum number of rows of data to return per page of results.
+      # @option options [Boolean] useQueryCache Whether to look for the result in the query cache.
       # @return [Hash] json api response
+      # @see https://cloud.google.com/bigquery/docs/reference/v2/jobs/query
       def query(given_query, options={})
-        timeout = options.fetch(:timeout, 90 * 1000)
+        body_object = { 'query' => given_query }
+        body_object['timeoutMs']     = options[:timeout] || options[:timeoutMs] || 90 * 1000
+        body_object['maxResults']    = options[:maxResults] if options[:maxResults]
+        body_object['dryRun']        = options[:dryRun] if options.has_key?(:dryRun)
+        body_object['useQueryCache'] = options[:useQueryCache] if options.has_key?(:useQueryCache)
+
         response = api(
           api_method: @bq.jobs.query,
-          body_object: { 'query' => given_query,
-                         'timeoutMs' => timeout}
+          body_object: body_object,
         )
 
         response

data/lib/big_query/version.rb

@@ -1,3 +1,3 @@
 module BigQuery
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/test/bigquery.rb

@@ -120,6 +120,19 @@ class BigQueryTest < MiniTest::Unit::TestCase
     assert_equal result['jobComplete'], true
   end
 
+  def test_for_query_useQueryCache
+    result = @bq.query("SELECT * FROM [#{config['dataset']}.test] LIMIT 1", useQueryCache: true)
+    result = @bq.query("SELECT * FROM [#{config['dataset']}.test] LIMIT 1", useQueryCache: true)
+
+    assert_equal result['cacheHit'], true
+  end
+
+  def test_for_query_dryRun
+    result = @bq.query("SELECT * FROM [#{config['dataset']}.test] LIMIT 1", dryRun: true)
+
+    assert_equal result['jobReference']['jobId'], nil
+  end
+
   def test_for_insert
     result = @bq.insert('test' ,"id" => 123, "type" => "Task")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigquery
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Adam Bronte
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A nice wrapper for Google Big Query