grpc 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea942edb7ba32af1cbb7114b26097b3c08c70b90
-  data.tar.gz: 434745623715052a46b4bcbe16166cc8dcc9d490
+  metadata.gz: 3fc4ef4584055918c9fb5118a4ae2be97fefd82b
+  data.tar.gz: b09b8e12d13fb1d46687a3738621ec863afa5abd
 SHA512:
-  metadata.gz: 7eccf1a3db3deadf530258d2c14dd541886dbe6f4ef7ab29e46919cac883f85b5ce223b23665ab2ebd576d0b4316c28e5991303176b81aa9090a2b03f7e6347a
-  data.tar.gz: 69d7a8a23039907725c62aed351208b2d45d3fc1b14b07971d3ff26c53854f0ee6417481547ed014dd07010397f4c4a46a90cd1b9880d87ada51edfaff0713f2
+  metadata.gz: b63ec97352b08405828884a32b6115c025b1507d0294b9553e5aa9bea6c9d6ff2d6f5651f13d85f50080a4888ee6976011a5b2e4c81147c93d1e08eead30d4a7
+  data.tar.gz: 9057402bc495a85cfd1970e1622a18031d089173cfbbfd82e691d56479cbbfddc34c3be6fe47c885c0383a1fa0e550129d7bad35415e8384789cd24aeb060ed2

data/.rspec

@@ -1 +1,2 @@
 -I.
+--require spec_helper

data/.rubocop_todo.yml

@@ -1,42 +1,30 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-01-16 02:30:04 -0800 using RuboCop version 0.28.0.
+# on 2015-04-17 14:43:27 -0700 using RuboCop version 0.30.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
-# Lint/UselessAssignment:
-#  Enabled: false
-
-# Offense count: 33
+# Offense count: 30
 Metrics/AbcSize:
-  Max: 39
+  Max: 40
 
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 231
-
-# Offense count: 2
-Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 184
 
-# Offense count: 36
+# Offense count: 35
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 37
+  Max: 36
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 8
 
-# Offense count: 2
-Metrics/PerceivedComplexity:
-  Max: 10
-
-# Offense count: 7
+# Offense count: 9
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Enabled: false
@@ -50,3 +38,7 @@ Style/Next:
 # Configuration parameters: Methods.
 Style/SingleLineBlockParams:
   Enabled: false
+
+# Offense count: 1
+Style/StructInheritance:
+  Enabled: false

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## 0.6.1 (2015-04-14)
+
+### Changes
+
+* Begins this ChangeLog ([@tbetbetbe][])
+* Updates to version 0.4 of googleauth. ([@tbetbetbe][])
+* Switch the extension to use the call API. ([@tbetbetbe][])
+* Refactor the C extension to avoid identifiers used by ruby ([@yugui][])
+
+[@tbetbetbe]: https://github.com/tbetbetbe
+[@yugui]: https://github.com/yugui

data/Rakefile

@@ -26,6 +26,7 @@ namespace :suite do
   SPEC_SUITES.each do |suite|
     desc "Run all specs in the #{suite[:title]} spec suite"
     RSpec::Core::RakeTask.new(suite[:id]) do |t|
+      ENV['COVERAGE_NAME'] = suite[:id].to_s
       spec_files = []
       suite[:files].each { |f| spec_files += Dir[f] } if suite[:files]
 

data/bin/apis/pubsub_demo.rb

@@ -71,7 +71,7 @@ end
 
 # Builds the metadata authentication update proc.
 def auth_proc(opts)
-  auth_creds = Google::Auth.get_application_default(opts.oauth_scope)
+  auth_creds = Google::Auth.get_application_default
   return auth_creds.updater_proc
 end
 
@@ -213,17 +213,14 @@ class NamedActions
 end
 
 # Args is used to hold the command line info.
-Args = Struct.new(:host, :oauth_scope, :port, :action, :project_id, :topic_name,
+Args = Struct.new(:host, :port, :action, :project_id, :topic_name,
                   :sub_name)
 
 # validates the the command line options, returning them as an Arg.
 def parse_args
   args = Args.new('pubsub-staging.googleapis.com',
-                  'https://www.googleapis.com/auth/pubsub',
                    443, 'list_some_topics', 'stoked-keyword-656')
   OptionParser.new do |opts|
-    opts.on('--oauth_scope scope',
-            'Scope for OAuth tokens') { |v| args['oauth_scope'] = v }
     opts.on('--server_host SERVER_HOST', 'server hostname') do |v|
       args.host = v
     end
@@ -250,7 +247,7 @@ def parse_args
 end
 
 def _check_args(args)
-  %w(host port action oauth_scope).each do |a|
+  %w(host port action).each do |a|
     if args[a].nil?
       raise OptionParser::MissingArgument.new("please specify --#{a}")
     end

data/bin/interop/interop_client.rb

@@ -110,6 +110,11 @@ def create_stub(opts)
       end
     end
 
+    if opts.test_case == 'jwt_token_creds'  # don't use a scope
+      auth_creds = Google::Auth.get_application_default
+      stub_opts[:update_metadata] = auth_creds.updater_proc
+    end
+
     logger.info("... connecting securely to #{address}")
     Grpc::Testing::TestService::Stub.new(address, **stub_opts)
   else
@@ -131,12 +136,14 @@ class PingPongPlayer
   include Grpc::Testing::PayloadType
   attr_accessor :assertions # required by Minitest::Assertions
   attr_accessor :queue
+  attr_accessor :canceller_op
 
   # reqs is the enumerator over the requests
   def initialize(msg_sizes)
     @queue = Queue.new
     @msg_sizes = msg_sizes
     @assertions = 0  # required by Minitest::Assertions
+    @canceller_op = nil  # used to cancel after the first response
   end
 
   def each_item
@@ -150,12 +157,15 @@ class PingPongPlayer
                         response_parameters: [p_cls.new(size: resp_size)])
       yield req
       resp = @queue.pop
-      assert_equal(:COMPRESSABLE, resp.payload.type,
-                   'payload type is wrong')
+      assert_equal(:COMPRESSABLE, resp.payload.type, 'payload type is wrong')
       assert_equal(resp_size, resp.payload.body.length,
-                   'payload body #{i} has the wrong length')
+                   "payload body #{count} has the wrong length")
       p "OK: ping_pong #{count}"
       count += 1
+      unless @canceller_op.nil?
+        canceller_op.cancel
+        break
+      end
     end
   end
 end
@@ -201,6 +211,15 @@ class NamedTests
     p 'OK: service_account_creds'
   end
 
+  def jwt_token_creds
+    json_key = File.read(ENV[AUTH_ENV])
+    wanted_email = MultiJson.load(json_key)['client_email']
+    resp = perform_large_unary(fill_username: true)
+    assert_equal(wanted_email, resp.username,
+                 'service_account_creds: incorrect username')
+    p 'OK: jwt_token_creds'
+  end
+
   def compute_engine_creds
     resp = perform_large_unary(fill_username: true,
                                fill_oauth_scope: true)
@@ -246,6 +265,27 @@ class NamedTests
     p 'OK: ping_pong'
   end
 
+  def cancel_after_begin
+    msg_sizes = [27_182, 8, 1828, 45_904]
+    reqs = msg_sizes.map do |x|
+      req = Payload.new(body: nulls(x))
+      StreamingInputCallRequest.new(payload: req)
+    end
+    op = @stub.streaming_input_call(reqs, return_op: true)
+    op.cancel
+    assert_raises(GRPC::Cancelled) { op.execute }
+    p 'OK: cancel_after_begin'
+  end
+
+  def cancel_after_first_response
+    msg_sizes = [[27_182, 31_415], [8, 9], [1828, 2653], [45_904, 58_979]]
+    ppp = PingPongPlayer.new(msg_sizes)
+    op = @stub.full_duplex_call(ppp.each_item, return_op: true)
+    ppp.canceller_op = op  # causes ppp to cancel after the 1st message
+    assert_raises(GRPC::Cancelled) { op.execute.each { |r| ppp.queue.push(r) } }
+    p 'OK: cancel_after_first_response'
+  end
+
   def all
     all_methods = NamedTests.instance_methods(false).map(&:to_s)
     all_methods.each do |m|

data/bin/interop/interop_server.rb

@@ -185,7 +185,7 @@ def main
     logger.info("... running insecurely on #{host}")
   end
   s.handle(TestTarget)
-  s.run
+  s.run_till_terminated
 end
 
 main

data/bin/math_server.rb

@@ -183,7 +183,7 @@ def main
   end
 
   s.handle(Calculator)
-  s.run
+  s.run_till_terminated
 end
 
 main

data/bin/noproto_server.rb

@@ -105,7 +105,7 @@ def main
   end
 
   s.handle(NoProto)
-  s.run
+  s.run_till_terminated
 end
 
 main

data/ext/grpc/rb_byte_buffer.c

@@ -39,203 +39,29 @@
 #include <grpc/support/slice.h>
 #include "rb_grpc.h"
 
-/* grpc_rb_byte_buffer wraps a grpc_byte_buffer.  It provides a peer ruby
- * object, 'mark' to minimize copying when a byte_buffer is created from
- * ruby. */
-typedef struct grpc_rb_byte_buffer {
-  /* Holder of ruby objects involved in constructing the status */
-  VALUE mark;
-  /* The actual status */
-  grpc_byte_buffer *wrapped;
-} grpc_rb_byte_buffer;
-
-/* Destroys ByteBuffer instances. */
-static void grpc_rb_byte_buffer_free(void *p) {
-  grpc_rb_byte_buffer *bb = NULL;
-  if (p == NULL) {
-    return;
-  };
-  bb = (grpc_rb_byte_buffer *)p;
-
-  /* Deletes the wrapped object if the mark object is Qnil, which indicates
-   * that no other object is the actual owner. */
-  if (bb->wrapped != NULL && bb->mark == Qnil) {
-    grpc_byte_buffer_destroy(bb->wrapped);
-  }
-
-  xfree(p);
-}
-
-/* Protects the mark object from GC */
-static void grpc_rb_byte_buffer_mark(void *p) {
-  grpc_rb_byte_buffer *bb = NULL;
-  if (p == NULL) {
-    return;
-  }
-  bb = (grpc_rb_byte_buffer *)p;
-
-  /* If it's not already cleaned up, mark the mark object */
-  if (bb->mark != Qnil && BUILTIN_TYPE(bb->mark) != T_NONE) {
-    rb_gc_mark(bb->mark);
-  }
+grpc_byte_buffer* grpc_rb_s_to_byte_buffer(char *string, size_t length) {
+  gpr_slice slice = gpr_slice_from_copied_buffer(string, length);
+  grpc_byte_buffer *buffer = grpc_byte_buffer_create(&slice, 1);
+  gpr_slice_unref(slice);
+  return buffer;
 }
 
-/* id_source is the name of the hidden ivar the preserves the original
- * byte_buffer source string */
-static ID id_source;
-
-/* Allocates ByteBuffer instances.
-
-   Provides safe default values for the byte_buffer fields. */
-static VALUE grpc_rb_byte_buffer_alloc(VALUE cls) {
-  grpc_rb_byte_buffer *wrapper = ALLOC(grpc_rb_byte_buffer);
-  wrapper->wrapped = NULL;
-  wrapper->mark = Qnil;
-  return Data_Wrap_Struct(cls, grpc_rb_byte_buffer_mark,
-                          grpc_rb_byte_buffer_free, wrapper);
-}
-
-/* Clones ByteBuffer instances.
-
-   Gives ByteBuffer a consistent implementation of Ruby's object copy/dup
-   protocol. */
-static VALUE grpc_rb_byte_buffer_init_copy(VALUE copy, VALUE orig) {
-  grpc_rb_byte_buffer *orig_bb = NULL;
-  grpc_rb_byte_buffer *copy_bb = NULL;
-
-  if (copy == orig) {
-    return copy;
-  }
-
-  /* Raise an error if orig is not a metadata object or a subclass. */
-  if (TYPE(orig) != T_DATA ||
-      RDATA(orig)->dfree != (RUBY_DATA_FUNC)grpc_rb_byte_buffer_free) {
-    rb_raise(rb_eTypeError, "not a %s", rb_obj_classname(rb_cByteBuffer));
-  }
-
-  Data_Get_Struct(orig, grpc_rb_byte_buffer, orig_bb);
-  Data_Get_Struct(copy, grpc_rb_byte_buffer, copy_bb);
-
-  /* use ruby's MEMCPY to make a byte-for-byte copy of the metadata wrapper
-   * object. */
-  MEMCPY(copy_bb, orig_bb, grpc_rb_byte_buffer, 1);
-  return copy;
-}
-
-/* id_empty is used to return the empty string from to_s when necessary. */
-static ID id_empty;
-
-static VALUE grpc_rb_byte_buffer_to_s(VALUE self) {
-  grpc_rb_byte_buffer *wrapper = NULL;
-  grpc_byte_buffer *bb = NULL;
-  grpc_byte_buffer_reader *reader = NULL;
-  char *output = NULL;
+VALUE grpc_rb_byte_buffer_to_s(grpc_byte_buffer *buffer) {
   size_t length = 0;
+  char *string = NULL;
   size_t offset = 0;
-  VALUE output_obj = Qnil;
+  grpc_byte_buffer_reader *reader = NULL;
   gpr_slice next;
+  if (buffer == NULL) {
+    return Qnil;
 
-  Data_Get_Struct(self, grpc_rb_byte_buffer, wrapper);
-  output_obj = rb_ivar_get(wrapper->mark, id_source);
-  if (output_obj != Qnil) {
-    /* From ruby, ByteBuffers are immutable so if a source is set, return that
-     * as the to_s value */
-    return output_obj;
-  }
-
-  /* Read the bytes. */
-  bb = wrapper->wrapped;
-  if (bb == NULL) {
-    return rb_id2str(id_empty);
-  }
-  length = grpc_byte_buffer_length(bb);
-  if (length == 0) {
-    return rb_id2str(id_empty);
   }
-  reader = grpc_byte_buffer_reader_create(bb);
-  output = xmalloc(length);
+  length = grpc_byte_buffer_length(buffer);
+  string = xmalloc(length + 1);
+  reader = grpc_byte_buffer_reader_create(buffer);
   while (grpc_byte_buffer_reader_next(reader, &next) != 0) {
-    memcpy(output + offset, GPR_SLICE_START_PTR(next), GPR_SLICE_LENGTH(next));
+    memcpy(string + offset, GPR_SLICE_START_PTR(next), GPR_SLICE_LENGTH(next));
     offset += GPR_SLICE_LENGTH(next);
   }
-  output_obj = rb_str_new(output, length);
-
-  /* Save a references to the computed string in the mark object so that the
-   * calling to_s does not do any allocations. */
-  wrapper->mark = rb_class_new_instance(0, NULL, rb_cObject);
-  rb_ivar_set(wrapper->mark, id_source, output_obj);
-
-  return output_obj;
-}
-
-/* Initializes ByteBuffer instances. */
-static VALUE grpc_rb_byte_buffer_init(VALUE self, VALUE src) {
-  gpr_slice a_slice;
-  grpc_rb_byte_buffer *wrapper = NULL;
-  grpc_byte_buffer *byte_buffer = NULL;
-
-  if (TYPE(src) != T_STRING) {
-    rb_raise(rb_eTypeError, "bad byte_buffer arg: got <%s>, want <String>",
-             rb_obj_classname(src));
-    return Qnil;
-  }
-  Data_Get_Struct(self, grpc_rb_byte_buffer, wrapper);
-  a_slice = gpr_slice_malloc(RSTRING_LEN(src));
-  memcpy(GPR_SLICE_START_PTR(a_slice), RSTRING_PTR(src), RSTRING_LEN(src));
-  byte_buffer = grpc_byte_buffer_create(&a_slice, 1);
-  gpr_slice_unref(a_slice);
-
-  if (byte_buffer == NULL) {
-    rb_raise(rb_eArgError, "could not create a byte_buffer, not sure why");
-    return Qnil;
-  }
-  wrapper->wrapped = byte_buffer;
-
-  /* Save a references to the original string in the mark object so that the
-   * pointers used there is valid for the lifetime of the object. */
-  wrapper->mark = rb_class_new_instance(0, NULL, rb_cObject);
-  rb_ivar_set(wrapper->mark, id_source, src);
-
-  return self;
-}
-
-/* rb_cByteBuffer is the ruby class that proxies grpc_byte_buffer. */
-VALUE rb_cByteBuffer = Qnil;
-
-void Init_grpc_byte_buffer() {
-  rb_cByteBuffer =
-      rb_define_class_under(rb_mGrpcCore, "ByteBuffer", rb_cObject);
-
-  /* Allocates an object managed by the ruby runtime */
-  rb_define_alloc_func(rb_cByteBuffer, grpc_rb_byte_buffer_alloc);
-
-  /* Provides a ruby constructor and support for dup/clone. */
-  rb_define_method(rb_cByteBuffer, "initialize", grpc_rb_byte_buffer_init, 1);
-  rb_define_method(rb_cByteBuffer, "initialize_copy",
-                   grpc_rb_byte_buffer_init_copy, 1);
-
-  /* Provides a to_s method that returns the buffer value */
-  rb_define_method(rb_cByteBuffer, "to_s", grpc_rb_byte_buffer_to_s, 0);
-
-  id_source = rb_intern("__source");
-  id_empty = rb_intern("");
-}
-
-VALUE grpc_rb_byte_buffer_create_with_mark(VALUE mark, grpc_byte_buffer *bb) {
-  grpc_rb_byte_buffer *byte_buffer = NULL;
-  if (bb == NULL) {
-    return Qnil;
-  }
-  byte_buffer = ALLOC(grpc_rb_byte_buffer);
-  byte_buffer->wrapped = bb;
-  byte_buffer->mark = mark;
-  return Data_Wrap_Struct(rb_cByteBuffer, grpc_rb_byte_buffer_mark,
-                          grpc_rb_byte_buffer_free, byte_buffer);
-}
-
-/* Gets the wrapped byte_buffer from the ruby wrapper */
-grpc_byte_buffer *grpc_rb_get_wrapped_byte_buffer(VALUE v) {
-  grpc_rb_byte_buffer *wrapper = NULL;
-  Data_Get_Struct(v, grpc_rb_byte_buffer, wrapper);
-  return wrapper->wrapped;
+  return rb_str_new(string, length);
 }