protobuf 3.5.5 → 3.6.0

data/spec/support/{test → protos}/google_unittest_import.pb.rb

@@ -5,7 +5,13 @@
 #
 require 'protobuf/message'
 
-module GoogleUnittestImport
+
+##
+# Imports
+#
+require 'protos/google_unittest_import_public.pb'
+
+module Protobuf_unittest_import
 
   ##
   # Enum Classes
@@ -16,21 +22,22 @@ module GoogleUnittestImport
     define :IMPORT_BAZ, 9
   end
 
+  class ImportEnumForMap < ::Protobuf::Enum
+    define :UNKNOWN, 0
+    define :FOO, 1
+    define :BAR, 2
+  end
+
 
   ##
   # Message Classes
   #
-  class PublicImportMessage < ::Protobuf::Message; end
   class ImportMessage < ::Protobuf::Message; end
 
 
   ##
   # Message Fields
   #
-  class PublicImportMessage
-    optional :int32, :e, 1
-  end
-
   class ImportMessage
     optional :int32, :d, 1
   end

data/spec/support/{test → protos}/google_unittest_import.proto

@@ -1,6 +1,6 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// http://code.google.com/p/protobuf/
+// https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -34,23 +34,25 @@
 //
 // A proto file which is imported by unittest.proto to test importing.
 
+syntax = "proto2";
 
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
 // In test_util.h we do
 // "using namespace unittest_import = protobuf_unittest_import".
-package googleUnittestImport;
+package protobuf_unittest_import;
 
-//############################## Test public import
-// TODO: This will be supported in the next release of the 
-// compiler
-// import public "test/google_unittest_import_public.proto";
+option optimize_for = SPEED;
+option cc_enable_arenas = true;
 
-message PublicImportMessage {
-  optional int32 e = 1;
-}
+// Exercise the java_package option.
+option java_package = "com.google.protobuf.test";
+
+// Do not set a java_outer_classname here to verify that Proto2 works without
+// one.
 
-//###############################
+// Test public import
+import public "protos/google_unittest_import_public.proto";
 
 message ImportMessage {
   optional int32 d = 1;
@@ -62,3 +64,10 @@ enum ImportEnum {
   IMPORT_BAZ = 9;
 }
 
+
+// To use an enum in a map, it must has the first value as 0.
+enum ImportEnumForMap {
+  UNKNOWN = 0;
+  FOO = 1;
+  BAR = 2;
+}

data/spec/support/protos/google_unittest_import_public.pb.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf/message'
+
+module Protobuf_unittest_import
+
+  ##
+  # Message Classes
+  #
+  class PublicImportMessage < ::Protobuf::Message; end
+
+
+  ##
+  # Message Fields
+  #
+  class PublicImportMessage
+    optional :int32, :e, 1
+  end
+
+end
+

data/spec/support/{test → protos}/google_unittest_import_public.proto

@@ -1,6 +1,6 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// http://code.google.com/p/protobuf/
+// https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -30,9 +30,12 @@
 
 // Author: liujisi@google.com (Pherl Liu)
 
+syntax = "proto2";
 
-package googleUnittestImport;
+package protobuf_unittest_import;
 
-//message PublicImportMessage {
-//  optional int32 e = 1;
-//}
+option java_package = "com.google.protobuf.test";
+
+message PublicImportMessage {
+  optional int32 e = 1;
+}

data/spec/support/{test → protos}/multi_field_extensions.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package test;
 
 message Header {

data/spec/support/{test → protos}/resource.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package test;
 
 enum StatusType {

data/spec/support/{test/resource_service.rb → resource_service.rb}

@@ -1,4 +1,4 @@
-require ::File.expand_path('../resource.pb', __FILE__)
+require PROTOS_PATH.join('resource.pb')
 
 Test::ResourceService.class_eval do
   # request -> Test::ResourceFindRequest

data/spec/support/server.rb

@@ -2,13 +2,14 @@ require 'ostruct'
 
 require 'active_support/core_ext/hash/reverse_merge'
 
+require 'spec_helper'
 require 'protobuf/logging'
 require 'protobuf/rpc/server'
 require 'protobuf/rpc/servers/socket/server'
 require 'protobuf/rpc/servers/socket_runner'
 require 'protobuf/rpc/servers/zmq/server'
 require 'protobuf/rpc/servers/zmq_runner'
-require 'spec/support/test/resource_service'
+require SUPPORT_PATH.join('resource_service')
 
 # Want to abort if server dies?
 Thread.abort_on_exception = true

metadata

@@ -1,228 +1,186 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 3.6.0
 platform: ruby
 authors:
 - BJ Neilsen
 - Brandon Dewitt
 - Devin Christensen
 - Adam Hutchison
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '3.2'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: middleware
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: thor
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: thread_safe
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: ffi-rzmq
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '0'
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.34.2
-  type: :development
+        version: '3.0'
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rubocop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.34.2
-- !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.34.2
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
+  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: timecop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: yard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: varint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :development
 description: Google Protocol Buffers serialization and RPC implementation for Ruby.
 email:
 - bj.neilsen+protobuf@gmail.com
@@ -235,11 +193,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
+- .travis.yml
+- .yardopts
 - CHANGES.md
 - CONTRIBUTING.md
 - Gemfile
@@ -303,6 +261,7 @@ files:
 - lib/protobuf/rpc/connector.rb
 - lib/protobuf/rpc/connectors/base.rb
 - lib/protobuf/rpc/connectors/common.rb
+- lib/protobuf/rpc/connectors/ping.rb
 - lib/protobuf/rpc/connectors/socket.rb
 - lib/protobuf/rpc/connectors/zmq.rb
 - lib/protobuf/rpc/dynamic_discovery.pb.rb
@@ -346,8 +305,6 @@ files:
 - protobuf.gemspec
 - spec/benchmark/tasks.rb
 - spec/bin/protoc-gen-ruby_spec.rb
-- spec/data/data.bin
-- spec/data/types.bin
 - spec/encoding/all_types_spec.rb
 - spec/encoding/extreme_values_spec.rb
 - spec/functional/class_inheritance_spec.rb
@@ -376,6 +333,7 @@ files:
 - spec/lib/protobuf/rpc/connector_spec.rb
 - spec/lib/protobuf/rpc/connectors/base_spec.rb
 - spec/lib/protobuf/rpc/connectors/common_spec.rb
+- spec/lib/protobuf/rpc/connectors/ping_spec.rb
 - spec/lib/protobuf/rpc/connectors/socket_spec.rb
 - spec/lib/protobuf/rpc/connectors/zmq_spec.rb
 - spec/lib/protobuf/rpc/middleware/exception_handler_spec.rb
@@ -396,57 +354,52 @@ files:
 - spec/spec_helper.rb
 - spec/support/all.rb
 - spec/support/packed_field.rb
+- spec/support/protos/all_types.data.bin
+- spec/support/protos/all_types.data.txt
+- spec/support/protos/enum.pb.rb
+- spec/support/protos/enum.proto
+- spec/support/protos/extreme_values.data.bin
+- spec/support/protos/google_unittest.bin
+- spec/support/protos/google_unittest.pb.rb
+- spec/support/protos/google_unittest.proto
+- spec/support/protos/google_unittest_import.pb.rb
+- spec/support/protos/google_unittest_import.proto
+- spec/support/protos/google_unittest_import_public.pb.rb
+- spec/support/protos/google_unittest_import_public.proto
+- spec/support/protos/multi_field_extensions.pb.rb
+- spec/support/protos/multi_field_extensions.proto
+- spec/support/protos/resource.pb.rb
+- spec/support/protos/resource.proto
+- spec/support/resource_service.rb
 - spec/support/server.rb
-- spec/support/test/all_types.data.bin
-- spec/support/test/all_types.data.txt
-- spec/support/test/defaults.pb.rb
-- spec/support/test/defaults.proto
-- spec/support/test/enum.pb.rb
-- spec/support/test/enum.proto
-- spec/support/test/extended.pb.rb
-- spec/support/test/extended.proto
-- spec/support/test/extreme_values.data.bin
-- spec/support/test/google_unittest.pb.rb
-- spec/support/test/google_unittest.proto
-- spec/support/test/google_unittest_import.pb.rb
-- spec/support/test/google_unittest_import.proto
-- spec/support/test/google_unittest_import_public.pb.rb
-- spec/support/test/google_unittest_import_public.proto
-- spec/support/test/multi_field_extensions.pb.rb
-- spec/support/test/multi_field_extensions.proto
-- spec/support/test/resource.pb.rb
-- spec/support/test/resource.proto
-- spec/support/test/resource_service.rb
 - spec/support/test_app_file.rb
 homepage: https://github.com/localshred/protobuf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
 test_files:
 - spec/benchmark/tasks.rb
 - spec/bin/protoc-gen-ruby_spec.rb
-- spec/data/data.bin
-- spec/data/types.bin
 - spec/encoding/all_types_spec.rb
 - spec/encoding/extreme_values_spec.rb
 - spec/functional/class_inheritance_spec.rb
@@ -475,6 +428,7 @@ test_files:
 - spec/lib/protobuf/rpc/connector_spec.rb
 - spec/lib/protobuf/rpc/connectors/base_spec.rb
 - spec/lib/protobuf/rpc/connectors/common_spec.rb
+- spec/lib/protobuf/rpc/connectors/ping_spec.rb
 - spec/lib/protobuf/rpc/connectors/socket_spec.rb
 - spec/lib/protobuf/rpc/connectors/zmq_spec.rb
 - spec/lib/protobuf/rpc/middleware/exception_handler_spec.rb
@@ -495,26 +449,23 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/all.rb
 - spec/support/packed_field.rb
+- spec/support/protos/all_types.data.bin
+- spec/support/protos/all_types.data.txt
+- spec/support/protos/enum.pb.rb
+- spec/support/protos/enum.proto
+- spec/support/protos/extreme_values.data.bin
+- spec/support/protos/google_unittest.bin
+- spec/support/protos/google_unittest.pb.rb
+- spec/support/protos/google_unittest.proto
+- spec/support/protos/google_unittest_import.pb.rb
+- spec/support/protos/google_unittest_import.proto
+- spec/support/protos/google_unittest_import_public.pb.rb
+- spec/support/protos/google_unittest_import_public.proto
+- spec/support/protos/multi_field_extensions.pb.rb
+- spec/support/protos/multi_field_extensions.proto
+- spec/support/protos/resource.pb.rb
+- spec/support/protos/resource.proto
+- spec/support/resource_service.rb
 - spec/support/server.rb
-- spec/support/test/all_types.data.bin
-- spec/support/test/all_types.data.txt
-- spec/support/test/defaults.pb.rb
-- spec/support/test/defaults.proto
-- spec/support/test/enum.pb.rb
-- spec/support/test/enum.proto
-- spec/support/test/extended.pb.rb
-- spec/support/test/extended.proto
-- spec/support/test/extreme_values.data.bin
-- spec/support/test/google_unittest.pb.rb
-- spec/support/test/google_unittest.proto
-- spec/support/test/google_unittest_import.pb.rb
-- spec/support/test/google_unittest_import.proto
-- spec/support/test/google_unittest_import_public.pb.rb
-- spec/support/test/google_unittest_import_public.proto
-- spec/support/test/multi_field_extensions.pb.rb
-- spec/support/test/multi_field_extensions.proto
-- spec/support/test/resource.pb.rb
-- spec/support/test/resource.proto
-- spec/support/test/resource_service.rb
 - spec/support/test_app_file.rb
-has_rdoc: 
+has_rdoc: