bigbroda 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 018bda7792b890c29d878d4cc8704c60cbd09ba7
-  data.tar.gz: ef8f8184451a788e3e061ed00717fa79c2c63f9a
+  metadata.gz: 26a124f01089b56c69ba302ef201cfb34d758d69
+  data.tar.gz: 45592ad512c5a78941f8ffc1844b6462aaab8710
 SHA512:
-  metadata.gz: 2d2cc171199476855ce721a8c061134db405440789ddc55679a8df356e829a531fa8e0accbdba4515f1b96e7a03bf717e144a7cab58340a3fa3ed262c04ffade
-  data.tar.gz: a60fdbe72b3bfeda31c61e313085ae8ec5757e671560ab8225f3fc3efe9971c37522e9302d093abbc5266a4e784e7ba1b235aa67cedd1fba0f8c128e6129bc1f
+  metadata.gz: 9a85ed5f8a73a0c19dc3735add3edb714e0fa7f5dcb35a5c2354d2d5ac40c79d6da5f264eabfc05ef2b9ad4f7c75c3ecd4ad1e87ad03f68fdfc9f9934694581f
+  data.tar.gz: 70ea14ef513d18a3b7bb67f01578aced7b0164a970f2ffd52a193a08eb7776b7231ff529325fdae7381d30f690870d0753d71421b841b904ba67119e6fd3f8b6

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem "certified"
-gem "debugger"
+gem "debugger", platform: :ruby_19
 gem "pry"
 gem 'pry-remote'
 gem 'pry-nav'

data/README.md

@@ -31,12 +31,14 @@ Or generate a file in config/initializers/bigquery.rb with the following content
 GoogleBigquery::Config.setup do |config|
   config.pass_phrase = ["pass_phrase"]
   config.key_file    = ["key_file"]
-  config.client_id   = ["client_id"]
   config.scope       = ["scope"]
   config.email       = ["email"]
+  config.retries     = [retries]
 end
 ```
 
+retries indicates the number of times to retry on recoverable errors (no retries if set to one or not present)
+
 ### Active Record Adapter
 
 #### Connection
@@ -218,12 +220,14 @@ Note:
 GoogleBigquery::Config.setup do |config|
   config.pass_phrase = "notasecret"
   config.key_file    = /location/to_your/key_file.p12
-  config.client_id   = "XXXXX.apps.googleusercontent.com"
   config.scope       = "https://www.googleapis.com/auth/bigquery"
   config.email       = "XXXXXX@developer.gserviceaccount.com"
+  config.retries     = 1
 end
 ```
 
+retries indicates the number of times to retry on recoverable errors (no retries if set to one or not present)
+
   And authorize client:
 
 ```ruby

data/lib/generators/templates/bigquery.rb.erb

@@ -1,7 +1,7 @@
 GoogleBigquery::Config.setup do |config|
   #config.pass_phrase = "notasecret"
   #config.key_file    = Rails.root + "/config/XXXXkey_file.p12"
-  #config.client_id   = "XXXXX.apps.googleusercontent.com"
   #config.scope       = "https://www.googleapis.com/auth/bigquery"
   #config.email       = "XXXXXX@developer.gserviceaccount.com"
-end
+  #config.retries     = 1
+end

data/lib/google_bigquery/auth.rb

@@ -5,15 +5,16 @@ module GoogleBigquery
     cattr_accessor :api, :client
 
     def initialize
-      config = GoogleBigquery::Config
-      @key = Google::APIClient::PKCS12.load_key(config.key_file, config.pass_phrase)
-      @asserter = Google::APIClient::JWTAsserter.new( config.email, config.scope, @key)
+      @config = GoogleBigquery::Config
+      @key = Google::APIClient::KeyUtils.load_from_pkcs12(@config.key_file, @config.pass_phrase)
+      @asserter = Google::APIClient::JWTAsserter.new( @config.email, @config.scope, @key)
     end
 
     def authorize
-      @client = Google::APIClient.new()
-      @client.authorization = @asserter.authorize()
-      @api = @client.discovered_api("bigquery",'v2')
+      @client = Google::APIClient.new
+      @client.authorization = @asserter.authorize
+      @client.retries = @config.retries.to_i if @config.retries.to_i > 1
+      @api = @client.discovered_api('bigquery', 'v2')
       self.class.api = @api
       self.class.client = @client
     end

data/lib/google_bigquery/config.rb

@@ -9,9 +9,8 @@ module GoogleBigquery
 
     mattr_accessor  :pass_phrase,
                     :key_file,
-                    :client_id,
                     :scope,
-                    :profile_id,
-                    :email
+                    :email,
+                    :retries
   end
-end
+end

data/lib/google_bigquery/version.rb

@@ -1,3 +1,3 @@
 module GoogleBigquery
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/dummy/config/initializers/bigquery.rb

@@ -12,8 +12,7 @@ end
 GoogleBigquery::Config.setup do |config|
   config.pass_phrase = config_options["pass_phrase"]
   config.key_file    = config_options["key_file"]
-  config.client_id   = config_options["client_id"]
   config.scope       = config_options["scope"]
   config.profile_id  = config_options["profile_id"]
   config.email       = config_options["email"]
-end
+end

data/spec/fixtures/configs/account_config.yml-example

@@ -1,6 +1,5 @@
 pass_phrase: "notasecret"
 pem: XXXXXXX-privatekey.p12
-client_id: "XXXXXXXXX.apps.googleusercontent.com"
 scope: "https://www.googleapis.com/auth/bigquery"
 profile_id: "XXXXXX"
 email: "XXXXXXX@developer.gserviceaccount.com"

data/spec/functional/config_spec.rb

@@ -6,9 +6,7 @@ describe "Config class" do
     GoogleBigquery::Config.setup do |config|
       config.pass_phrase = config_options["pass_phrase"]
       config.key_file    = config_options["key_file"]
-      config.client_id   = config_options["client_id"]
       config.scope       = config_options["scope"]
-      config.profile_id  = config_options["profile_id"]
       config.email       =  config_options["email"]
     end
   end
@@ -17,7 +15,6 @@ describe "Config class" do
     GoogleBigquery::Config.pass_phrase.should_not be_empty
     GoogleBigquery::Config.key_file.should_not be_empty
     GoogleBigquery::Config.scope.should_not be_empty
-    GoogleBigquery::Config.profile_id.should_not be_empty
     GoogleBigquery::Config.email.should_not be_empty
   end
 

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
-require 'debugger'
+require 'debugger' if Gem.ruby_version < Gem::Version.new('2.0')
 require File.join(File.dirname(__FILE__), '../lib', 'google_bigquery')
 require 'stringio'
 require "pry"
@@ -36,12 +36,10 @@ RSpec.configure do |config|
     GoogleBigquery::Config.setup do |config|
       config.pass_phrase = config_options["pass_phrase"]
       config.key_file    = config_options["key_file"]
-      config.client_id   = config_options["client_id"]
       config.scope       = config_options["scope"]
-      config.profile_id  = config_options["profile_id"]
       config.email       =  config_options["email"]
+      config.retries     = config_options["retries"]
     end
-    GoogleBigquery::Config
     @project = config_options["options"]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigbroda
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - miguel michelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler