big_shift 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a10bb846e14565885a114bf9d5bfa6f366285e1
-  data.tar.gz: 0d77b0d53f60662df97b676b85f7ac3bba112137
+  metadata.gz: 23fd6d24d216c3453b6dabffd4b3f5bd17a3b68c
+  data.tar.gz: cfec79938ce528f75d886ab73aaa8d3eb67ca88e
 SHA512:
-  metadata.gz: 5218f828a2c52eaec483c198444e2cb3140ad4da03542656979ce90c3c590650e15c0074ded595b6f9ebc327fdf3bfa3134979050bff46637a8a74c3d77d3c3c
-  data.tar.gz: 9e8ec72267bfa7a045a165557163d78d5ccd0bb6130ea6787d1508ca6c674f7cc0297c406ca414e3f8fa92c0d137306665a63365b012702dd5feb3464bf3fad0
+  metadata.gz: c91709f44f4c26633c9d90b1caf732ab6631dffaccf21a33db50087a7344640273e900ea8af4c95b3131e540f3eb2a10fe86a660f9de9e4ba3dc221809413b0c
+  data.tar.gz: 0c25524a9db25f478091cde261052a7d3388e841b5aafc9dc82dcddd24b71d8e09b2d98d3c9212f6f8f6881842696ef837680ccc5ad5478e5488305b50abbb6b

data/README.md

@@ -1,7 +1,7 @@
 BigShift
 ========
 
-[![Build Status](https://semaphoreci.com/api/v1/projects/a64ee96b-9362-4c5b-b59a-03cf638eca28/344206/badge.svg)](https://semaphoreci.com/awesomenesstv/big_shift)
+[![Build Status](https://semaphoreci.com/api/v1/projects/be4677b9-459a-4edb-b8a6-091746be4af3/460270/badge.svg)](https://semaphoreci.com/awesomenesstv/big_shift)
 
 BigShift uploads your data to BigQuery.
 

data/lib/big_shift/commands/base_command.rb

@@ -1,63 +1,68 @@
 module BigShift
   class BaseCommand
     class << self
-      private
-
-      def connection
-        Faraday.new(:url => base_url)
+      def execute(*args)
+        self.new(*args).execute
       end
+    end
 
-      def post
-        connection.post url, request_body, headers
-      end
+    def execute
+      @access_token = AccessTokenService.retrieve_token
+      @response = on_execute
+      scrub @response
+      @response
+    end
 
-      def headers
-        {
-          'Authorization' => "Bearer #{access_token}",
-          'Content-Type' => 'application/json',
-        }
-      end
+    private
 
-      def params
-        url_params.merge({
-          :key => access_token,
-        })
-      end
+    def connection
+      Faraday.new(:url => base_url)
+    end
 
-      def request_body
-        body.to_json
-      end
+    def post
+      connection.post url, request_body, headers
+    end
 
-      def base_url
-        'https://www.googleapis.com/bigquery/v2/projects/%s/datasets/%s' % [
-          project_id,
-          dataset_id,
-        ]
-      end
+    def url
+      connection.build_url endpoint, params
+    end
 
-      def url
-        connection.build_url endpoint, params
-      end
+    def base_url
+      'https://www.googleapis.com/bigquery/v2/projects/%s/datasets/%s' % [
+        project_id,
+        dataset_id,
+      ]
+    end
 
-      def url_params
-        {}
-      end
+    def request_body
+      body.to_json
+    end
 
-      def body
-        {}
-      end
+    def headers
+      {
+        'Content-Type' => 'application/json',
+        'Authorization' => "Bearer #{@access_token}",
+      }
+    end
 
-      def project_id
-        ENV['BIG_SHIFT_PROJECT_ID']
-      end
+    def params
+      {
+        :key => @access_token,
+      }
+    end
 
-      def dataset_id
-        ENV['BIG_SHIFT_DATASET_ID']
-      end
+    def project_id
+      ENV['BIG_SHIFT_PROJECT_ID']
+    end
 
-      def access_token
-        AccessTokenService.retrieve_token
-      end
+    def dataset_id
+      ENV['BIG_SHIFT_DATASET_ID']
+    end
+
+    def scrub(response)
+      response.scrub @access_token, 'ACCESS_TOKEN'
+      response.scrub project_id,   'PROJECT_ID'
+      response.scrub dataset_id,   'DATASET_ID'
     end
   end
 end

data/lib/big_shift/commands/base_table_command.rb

@@ -1,13 +1,11 @@
 module BigShift
   class BaseTableCommand < BaseCommand
-    class << self
-      attr_accessor :table_id
+    attr_accessor :table_id
 
-      private
+    private
 
-      def base_url
-        "#{super}/tables/#{table_id}"
-      end
+    def base_url
+      "#{super}/tables/#{table_id}"
     end
   end
 end

data/lib/big_shift/commands/create_table_command.rb

@@ -1,26 +1,27 @@
 module BigShift
   class CreateTableCommand < BaseCommand
-    class << self
-      def execute(schema)
-        @schema = schema
-        CreateTableResponse.new post
-      end
+    def initialize(schema)
+      @schema = schema
+    end
+
+    def on_execute
+      CreateTableResponse.new post
+    end
 
-      def endpoint
-        'tables'
-      end
+    def endpoint
+      'tables'
+    end
 
-      def body
-        {
-          'tableReference' => {
-            'projectId' => project_id,
-            'datasetId' => dataset_id,
-            'tableId'   => @schema.table_name,
-          },
+    def body
+      {
+        'tableReference' => {
+          'projectId' => project_id,
+          'datasetId' => dataset_id,
+          'tableId'   => @schema.table_name,
+        },
 
-          'schema' => @schema,
-        }
-      end
+        'schema' => @schema,
+      }
     end
   end
 end

data/lib/big_shift/commands/insert_rows_command.rb

@@ -1,26 +1,27 @@
 module BigShift
   class InsertRowsCommand < BaseTableCommand
-    class << self
-      def execute(table_name, rows)
-        @rows = rows
-        self.table_id = table_name
-        InsertRowsResponse.new post
-      end
+    def initialize(table_name, rows)
+      self.table_id = table_name
+      @rows         = rows
+    end
 
-      def endpoint
-        'insertAll'
-      end
+    def on_execute
+      InsertRowsResponse.new post
+    end
 
-      def body
-        { :rows => build_rows }
-      end
+    def endpoint
+      'insertAll'
+    end
+
+    def body
+      { :rows => build_rows }
+    end
 
-      private
+    private
 
-      def build_rows
-        @rows.map do |row|
-          {:json => row}
-        end
+    def build_rows
+      @rows.map do |row|
+        {:json => row}
       end
     end
   end

data/lib/big_shift/services/access_token_service.rb

@@ -2,13 +2,27 @@ module BigShift
   module AccessTokenService
     extend self
 
+    @@mutex = Mutex.new
+
     def retrieve_token
-      if !defined?(@token) or @token.expired?
-        response = GetAccessTokenCommand.execute
-        @token = response.data
+      @@mutex.synchronize do
+        if !defined?(@token) or @token.expired?
+          response = Toke.retrieve_token(params)
+          @token = response.data if response.success?
+        end
+
+        @token.token if defined?(@token)
       end
+    end
+
+    private
 
-      @token.access_token
+    def params
+      {
+        :refresh_token => ENV['BIG_SHIFT_REFRESH_TOKEN'],
+        :client_id     => ENV['BIG_SHIFT_GOOGLE_CLIENT_ID'],
+        :client_secret => ENV['BIG_SHIFT_GOOGLE_CLIENT_SECRET'],
+      }
     end
   end
 end

data/lib/big_shift.rb

@@ -2,6 +2,7 @@ require 'json'
 
 require 'faraday'
 require 'reverb'
+require 'toke'
 
 module BigShift
 end
@@ -11,14 +12,12 @@ require_relative 'big_shift/models/access_token'
 require_relative 'big_shift/models/table_field'
 require_relative 'big_shift/models/schema'
 
-require_relative 'big_shift/responses/get_access_token_response'
 require_relative 'big_shift/responses/create_table_response'
 require_relative 'big_shift/responses/insert_rows_response'
 
 require_relative 'big_shift/commands/base_command'
 require_relative 'big_shift/commands/base_table_command'
 require_relative 'big_shift/commands/create_table_command'
-require_relative 'big_shift/commands/get_access_token_command'
 require_relative 'big_shift/commands/insert_rows_command'
 
 require_relative 'big_shift/services/access_token_service'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_shift
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Travis Herrick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -31,28 +31,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: toke
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rake_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: gems
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +180,6 @@ files:
 - lib/big_shift/commands/base_command.rb
 - lib/big_shift/commands/base_table_command.rb
 - lib/big_shift/commands/create_table_command.rb
-- lib/big_shift/commands/get_access_token_command.rb
 - lib/big_shift/commands/insert_rows_command.rb
 - lib/big_shift/core.rb
 - lib/big_shift/models/access_token.rb
@@ -174,7 +187,6 @@ files:
 - lib/big_shift/models/schema.rb
 - lib/big_shift/models/table_field.rb
 - lib/big_shift/responses/create_table_response.rb
-- lib/big_shift/responses/get_access_token_response.rb
 - lib/big_shift/responses/insert_rows_response.rb
 - lib/big_shift/services/access_token_service.rb
 - license/gplv3.md
@@ -200,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: BigShift API interface

data/lib/big_shift/commands/get_access_token_command.rb

@@ -1,46 +0,0 @@
-module BigShift
-  class GetAccessTokenCommand < BaseCommand
-    class << self
-      def execute
-        GetAccessTokenResponse.new post
-      end
-
-      def headers
-        {
-          'Content-Type' => 'application/json',
-        }
-      end
-
-      def params
-        {
-          :client_id     => client_id,
-          :client_secret => client_secret,
-          :refresh_token => refresh_token,
-          :grant_type    => 'refresh_token',
-        }
-      end
-
-      def endpoint
-        'token'
-      end
-
-      private
-
-      def client_id
-        ENV['BIG_SHIFT_GOOGLE_CLIENT_ID']
-      end
-
-      def client_secret
-        ENV['BIG_SHIFT_GOOGLE_CLIENT_SECRET']
-      end
-
-      def refresh_token
-        ENV['BIG_SHIFT_REFRESH_TOKEN']
-      end
-
-      def base_url
-        'https://www.googleapis.com/oauth2/v3'
-      end
-    end
-  end
-end

data/lib/big_shift/responses/get_access_token_response.rb

@@ -1,7 +0,0 @@
-module BigShift
-  class GetAccessTokenResponse < Reverb::Response
-    def on_success
-      self.data = AccessToken.new(body)
-    end
-  end
-end