reckoner_cdp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 676a986296672d387afef2efff263bd3c510f673680a3e587ef9ea269959e007
-  data.tar.gz: 1bc6122596c19978a39aa9584e30f4be00ac0ae9541fcaec835fbc4302211a54
+  metadata.gz: 0d661170c1f5f49339573266a3ee9f0c6ce0c10d95f9d0a909bbf7b47cc94136
+  data.tar.gz: fddb7bcd553bef9b659a99902565387b4812ce2847eecbdf86bd31f6de2d463b
 SHA512:
-  metadata.gz: 8fe63a5a7c0d15a253fb89a0782b48347e627731a0dfa74647a7e8e8f1810e7dc10788c28b051b15c0c8f5062f8e6d95bce027f6e247234cf3bcec9745e3e61c
-  data.tar.gz: 18b8e6341a8ff2d72503c03bfd7ffe27127adb7fe49c4e6d866d7645dd2b1636a5cfe7d4efc63bb1abc040ea5afc4647d59c8c63ba41084e1d0e4c503f12a03c
+  metadata.gz: b99403da1390b0336f99c93c2f6d3970486cdcc026e86a57e3827dbf7719bee265df7a25399ed039d691240e891f8b6ad367e069ad647835edc35e72be41734b
+  data.tar.gz: 20dc1d1c5615a41c17e1a87bbd52c454ecd088b8354255fc5095e47ac381ba77f6f307c4db011f37602a89d372bddcba008a59ce9cea9be368261bed7162da6f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reckoner_cdp (0.1.1)
+    reckoner_cdp (0.1.2)
       faraday_middleware (~> 0.12)
       google-api-client (~> 0.34)
       msgpack (~> 1.2)
@@ -11,22 +11,23 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    declarative (0.0.10)
+    declarative (0.0.20)
     declarative-option (0.1.0)
     diff-lcs (1.3)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    google-api-client (0.39.0)
+    google-api-client (0.48.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
+      rexml
       signet (~> 0.12)
-    googleauth (0.12.0)
+    googleauth (0.14.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -34,20 +35,21 @@ GEM
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
     httpclient (2.8.3)
-    jwt (2.2.1)
+    jwt (2.2.2)
     memoist (0.16.2)
     mini_mime (1.0.2)
     msgpack (1.3.3)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
-    os (1.1.0)
-    public_suffix (4.0.4)
+    os (1.1.1)
+    public_suffix (4.0.6)
     rake (10.5.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    rexml (3.2.4)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)

data/lib/reckoner/cdp/api/streaming_core.rb

@@ -18,11 +18,11 @@ module Reckoner
           server_error: 500..599,
         }.freeze
 
-        def initialize(json_key_path, endpoint, client_id, connection)
-          @json_key_path = json_key_path
+        def initialize(token, endpoint, client_id, connection)
           @endpoint = endpoint || Reckoner::Cdp::STREAMING_ENDPOINT
           @client_id = client_id || Reckoner::Cdp::STREAMING_CLIENT_ID
           @connection = connection || default_connection
+          @token = token || ""
         end
 
         private
@@ -34,7 +34,7 @@ module Reckoner
             req.options.open_timeout = 5
             req.headers['Date'] = Time.now.httpdate
             req.headers['Content-Type'] = 'application/json'
-            req.headers['Authorization'] = authorization_header(req)
+            req.headers['Authorization'] = 'Bearer ' + @token
           end
           check_error(res)
           res.body
@@ -66,24 +66,6 @@ module Reckoner
           end
         end
 
-        def authorization_header(req)
-          iamcredentials = Google::Apis::IamcredentialsV1
-          service = iamcredentials::IAMCredentialsService.new
-
-          scopes =  ['https://www.googleapis.com/auth/iam', 'https://www.googleapis.com/auth/cloud-platform']
-          service.authorization = Google::Auth::ServiceAccountCredentials.make_creds(
-            json_key_io: File.open(@json_key_path, "r"),
-            scope: scopes
-          )
-
-          email = File.open(@json_key_path, "r") { |file| JSON.parse(file.read)["client_email"]}
-          resource = 'projects/-/serviceAccounts/' + email
-          req = iamcredentials::GenerateIdTokenRequest.new(audience: @client_id, include_email: true)
-          service.generate_service_account_id_token(resource, req) do |result, err|
-            return 'Bearer ' + result.token
-          end
-        end
-
       end
     end
   end

data/lib/reckoner/cdp/client.rb

@@ -3,8 +3,8 @@ require_relative 'api/streaming_core'
 module Reckoner
   module Cdp
     class Client
-      def initialize(json_key_path, endpoint: nil, client_id: nil, connection: nil)
-        @json_key_path = json_key_path
+      def initialize(token, endpoint: nil, client_id: nil, connection: nil)
+        @token = token
         @endpoint = endpoint
         @client_id = client_id
         @connection = connection
@@ -18,7 +18,7 @@ module Reckoner
 
       def streaming_api
         @streaming_api ||= Reckoner::Cdp::API::StreamingCore.new(
-          @json_key_path,
+          @token,
           @endpoint,
           @client_id,
           @connection

data/lib/reckoner/cdp/version.rb

@@ -1,5 +1,5 @@
 module Reckoner
   module Cdp
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reckoner_cdp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ms03
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: writer to reckoner-cdp