google-gax 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed0b03acfdc65e94f59a9de7d9ef17c82d8de2c
-  data.tar.gz: b49bdf5c29d4abea509227477aebe0ad2242ee5d
+  metadata.gz: ec76cdd33b0b9fa99cacf500fe8dfdffb3d74a38
+  data.tar.gz: ab2e1c9b639932dc661876970be636890339a2bf
 SHA512:
-  metadata.gz: 8fd2ba9b1d30101302aae49b74160fc00d509dd065b20e2416e962a8a28c42008694f67ec30e6cc13ff7dc526bb34b8b2a879857ea5dd584525b34999e8e0de0
-  data.tar.gz: e632150cec07b9861a0ffe258f3d994cb3f047be303acbcae91844f331afbbc37e311b1c47cd540746b3790efddc4e972fd00ce8dee0af54abac2e11e6ab01ae
+  metadata.gz: 641d4a0082acdff4c9d33e22e9e6ce06686863c913d3401fb8204dc0ecaaa5bce4ae2d20296557f6e4f6ce160d64ad9653db9762af31913347de04d3d1152548
+  data.tar.gz: da6bf4c3bdb36641c935ebd0e9bf23254927d23d2a117ed6d07d5330ee28ad272f887503de9ced775b0161d8d19304c94091e6be6a6308108a74fe5a95d0a80f

data/lib/google/gax/operation.rb

@@ -32,6 +32,7 @@ require 'time'
 # These must be loaded separate from google/gax to avoid circular dependency.
 require 'google/gax/constants'
 require 'google/gax/settings'
+require 'google/protobuf/well_known_types'
 
 module Google
   module Gax
@@ -135,7 +136,7 @@ module Google
       def results
         return nil unless done?
         return @grpc_op.error if error?
-        unpack(@grpc_op.response, @result_type)
+        @grpc_op.response.unpack(@result_type)
       end
 
       # Returns the metadata of an operation. If a type is provided,
@@ -150,7 +151,7 @@ module Google
       #   The metadata of the operation. Can be nil.
       def metadata
         return nil if @grpc_op.metadata.nil?
-        unpack(@grpc_op.metadata, @metadata_type)
+        @grpc_op.metadata.unpack(@metadata_type)
       end
 
       # Checks if the operation is done. This does not send a new api call,
@@ -238,16 +239,6 @@ module Google
           @callbacks.push(block)
         end
       end
-
-      # TODO: This is from google/protobuf/well_known_types.rb.
-      # Using google/protobuf in gax-ruby is currently causing a dependency
-      # conflict with grpc. When grpc depends on google-protobuf v3.1.0
-      # remove this function and use Google::Protobuf::Any#unpack.
-      def unpack(any_pb, klass)
-        type_name = any_pb.type_url.split('/')[-1]
-        return klass.decode(any_pb.value) if type_name == klass.descriptor.name
-      end
-      private :unpack
     end
   end
 end

data/lib/google/gax/version.rb

@@ -29,6 +29,6 @@
 
 module Google
   module Gax
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.7.1'.freeze
   end
 end

data/spec/google/gax/operation_spec.rb

@@ -33,6 +33,7 @@ require 'google/gax/operation'
 require 'google/gax/settings'
 require 'google/gax/constants'
 require 'google/protobuf/any_pb'
+require 'google/protobuf/well_known_types'
 require 'google/rpc/status_pb'
 require 'google/longrunning/operations_pb'
 
@@ -56,26 +57,13 @@ class MockLroClient
   end
 end
 
-# TODO: This is from google/protobuf/well_known_types.rb.
-# Using google/protobuf in gax-ruby is currently causing a dependency
-# conflict with grpc. When grpc depends on google-protobuf v3.1.0
-# remove this function and use Google::Protobuf::Any#pack.
-def pack(any_pb, msg, type_url_prefix = 'type.googleapis.com/')
-  if type_url_prefix.empty? || type_url_prefix[-1] != '/'
-    any_pb.type_url = "#{type_url_prefix}/#{msg.class.descriptor.name}"
-  else
-    any_pb.type_url = "#{type_url_prefix}#{msg.class.descriptor.name}"
-  end
-  any_pb.value = msg.to_proto
-end
-
 RESULT_ANY = Google::Protobuf::Any.new
 RESULT = Google::Rpc::Status.new(code: 1, message: 'Result')
-pack(RESULT_ANY, RESULT)
+RESULT_ANY.pack(RESULT)
 
 METADATA_ANY = Google::Protobuf::Any.new
 METADATA = Google::Rpc::Status.new(code: 2, message: 'Metadata')
-pack(METADATA_ANY, METADATA)
+METADATA_ANY.pack(METADATA)
 
 DONE_GET_METHOD = proc do
   GrpcOp.new(done: true, response: RESULT_ANY, metadata: METADATA_ANY)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-gax
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Google API Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rly
   requirement: !ruby/object:Gem::Requirement