protobuffy 3.6.0 → 4.0.0

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

@@ -0,0 +1,55 @@
+# encoding: utf-8
+
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf'
+
+
+##
+# Imports
+#
+require 'protos/google_unittest_import_public.pb'
+
+module Protobuf_unittest_import
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
+
+  ##
+  # Enum Classes
+  #
+  class ImportEnum < ::Protobuf::Enum
+    define :IMPORT_FOO, 7
+    define :IMPORT_BAR, 8
+    define :IMPORT_BAZ, 9
+  end
+
+  class ImportEnumForMap < ::Protobuf::Enum
+    define :UNKNOWN, 0
+    define :FOO, 1
+    define :BAR, 2
+  end
+
+
+  ##
+  # Message Classes
+  #
+  class ImportMessage < ::Protobuf::Message; end
+
+
+  ##
+  # File Options
+  #
+  set_option :java_package, "com.google.protobuf.test"
+  set_option :optimize_for, ::Google::Protobuf::FileOptions::OptimizeMode::SPEED
+  set_option :cc_enable_arenas, true
+
+
+  ##
+  # Message Fields
+  #
+  class ImportMessage
+    optional :int32, :d, 1
+  end
+
+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,31 @@
+# encoding: utf-8
+
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf'
+
+module Protobuf_unittest_import
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
+
+  ##
+  # Message Classes
+  #
+  class PublicImportMessage < ::Protobuf::Message; end
+
+
+  ##
+  # File Options
+  #
+  set_option :java_package, "com.google.protobuf.test"
+
+
+  ##
+  # 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.pb.rb

@@ -1,9 +1,12 @@
+# encoding: utf-8
+
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 module Test
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
 
   ##
   # Message Classes
@@ -35,7 +38,7 @@ module Test
     required ::Test::Header::Type, :type, 1
     # Extension Fields
     extensions 100...536870912
-    optional ::Test::PayloadA, :payload, 100, :extension => true
+    optional ::Test::PayloadA, :".test.PayloadA.payload", 100, :extension => true
   end
 
   class PayloadA

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.pb.rb

@@ -1,19 +1,32 @@
+# encoding: utf-8
+
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 require 'protobuf/rpc/service'
 
+
+##
+# Imports
+#
+require 'google/protobuf/descriptor.pb'
+
 module Test
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
 
   ##
   # Enum Classes
   #
   class StatusType < ::Protobuf::Enum
+    set_option :allow_alias, true
+    set_option :".test.enum_option", -789
+
     define :PENDING, 0
     define :ENABLED, 1
     define :DISABLED, 2
     define :DELETED, 3
+    define :ALIASED, 3
   end
 
 
@@ -44,6 +57,13 @@ module Test
 
 
 
+  ##
+  # File Options
+  #
+  set_option :cc_generic_services, true
+  set_option :".test.file_option", 9876543210
+
+
   ##
   # Message Fields
   #
@@ -59,17 +79,17 @@ module Test
   end
 
   class Resource
-    required :string, :name, 1
+    required :string, :name, 1, :ctype => ::Google::Protobuf::FieldOptions::CType::CORD, :".test.field_option" => 8765432109
     optional :int64, :date_created, 2
     optional ::Test::StatusType, :status, 3
     repeated ::Test::StatusType, :repeated_enum, 4
     # Extension Fields
     extensions 100...536870912
-    optional :bool, :ext_is_searchable, 100, :extension => true
-    optional :bool, :ext_is_hidden, 101, :extension => true
-    optional ::Test::Searchable::SearchType, :ext_search_type, 102, :default => ::Test::Searchable::SearchType::FLAT, :extension => true
-    optional :bool, :ext_nested_in_level_one, 105, :extension => true
-    optional :bool, :ext_dup_field, 106, :extension => true
+    optional :bool, :".test.Searchable.ext_is_searchable", 100, :extension => true
+    optional :bool, :".test.Searchable.ext_is_hidden", 101, :extension => true
+    optional ::Test::Searchable::SearchType, :".test.Searchable.ext_search_type", 102, :default => ::Test::Searchable::SearchType::FLAT, :extension => true
+    optional :bool, :".test.Nested.NestedLevelOne.ext_nested_in_level_one", 105, :extension => true
+    optional :bool, :".test.Nested.NestedLevelOne.ext_dup_field", 106, :extension => true
   end
 
   class ResourceWithRequiredField
@@ -88,8 +108,8 @@ module Test
       optional :bool, :level_one, 1, :default => true
       # Extension Fields
       extensions 100...102
-      optional :bool, :ext_nested_level_one_outer, 101, :extension => true
-      optional :bool, :ext_nested_level_one, 100, :extension => true
+      optional :bool, :".test.ext_nested_level_one_outer", 101, :extension => true
+      optional :bool, :".test.Nested.ext_nested_level_one", 100, :extension => true
     end
 
     optional :string, :name, 1
@@ -98,8 +118,24 @@ module Test
     optional ::Test::StatusType, :status, 4
     # Extension Fields
     extensions 100...111
-    optional :string, :foo, 100, :extension => true
-    optional :int64, :bar, 101, :extension => true
+    optional :string, :".test.foo", 100, :extension => true
+    optional :int64, :".test.bar", 101, :extension => true
+  end
+
+
+  ##
+  # Extended Message Fields
+  #
+  class ::Google::Protobuf::FileOptions < ::Protobuf::Message
+    optional :uint64, :".test.file_option", 9585869, :extension => true
+  end
+
+  class ::Google::Protobuf::FieldOptions < ::Protobuf::Message
+    optional :uint64, :".test.field_option", 858769, :extension => true
+  end
+
+  class ::Google::Protobuf::EnumOptions < ::Protobuf::Message
+    optional :int64, :".test.enum_option", 590284, :extension => true
   end
 
 

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

@@ -1,10 +1,33 @@
+syntax = "proto2";
+
+import "google/protobuf/descriptor.proto";
+
 package test;
 
+option cc_generic_services = true;
+option (file_option) = 9876543210;
+
+extend google.protobuf.FileOptions {
+  optional uint64 file_option = 9585869;
+}
+
+extend google.protobuf.FieldOptions {
+  optional uint64 field_option = 858769;
+}
+
+extend google.protobuf.EnumOptions {
+  optional int64 enum_option = 590284;
+}
+
 enum StatusType {
+  option allow_alias = true;
+  option (enum_option) = -789;
+
   PENDING = 0;
   ENABLED = 1;
   DISABLED = 2;
   DELETED = 3;
+  ALIASED = 3;
 }
 
 message ResourceFindRequest {
@@ -21,7 +44,7 @@ message ResourceSleepRequest {
 message Resource {
   extensions 100 to max;
 
-  required string name = 1;
+  required string name = 1 [(field_option) = 8765432109, ctype = CORD];
   optional int64 date_created = 2;
   optional StatusType status = 3;
   repeated StatusType repeated_enum = 4;

data/spec/support/resource_service.rb

@@ -0,0 +1,23 @@
+require PROTOS_PATH.join('resource.pb')
+
+Test::ResourceService.class_eval do
+  # request -> Test::ResourceFindRequest
+  # response -> Test::Resource
+  def find
+    response.name = request.name
+    response.status = request.active ? 1 : 0
+  end
+
+  # request -> Test::ResourceSleepRequest
+  # response -> Test::Resource
+  def find_with_sleep
+    sleep(request.sleep || 1)
+    response.name = 'Request should have timed out'
+  end
+
+  # request -> Test::ResourceFindRequest
+  # response -> Test::Resource
+  def find_with_rpc_failed
+    rpc_failed('Find failed')
+  end
+end

data/spec/support/server.rb

@@ -1,91 +1,62 @@
 require 'ostruct'
-require 'protobuf/logger'
+
+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
 
-module StubProtobufServerFactory
-  def self.build(delay)
-    new_server = Class.new(Protobuf::Rpc::Socket::Server) do
-      def self.sleep_interval
-        @sleep_interval
-      end
+class StubServer
+  include Protobuf::Logging
 
-      def self.sleep_interval=(si)
-        @sleep_interval = si
-      end
+  private
 
-      def post_init
-        sleep self.class.sleep_interval
-        super
-      end
-    end
+  attr_accessor :options, :runner, :runner_thread
 
-    new_server.sleep_interval = delay
-    return new_server
-  end
-end
-
-class StubServer
-  include Protobuf::Logger::LogMethods
-
-  attr_accessor :options
+  public
 
   def initialize(options = {})
-    @running = true
-    @options = OpenStruct.new({ :host => "127.0.0.1",
-                                :port => 9399,
-                                :worker_port => 9400,
-                                :delay => 0,
-                                :server => Protobuf::Rpc::Socket::Server }.merge(options))
+    self.options = OpenStruct.new(
+      options.reverse_merge(
+        :host => '127.0.0.1',
+        :port => 9399,
+        :worker_port => 9400,
+        :delay => 0,
+        :server => Protobuf::Rpc::Socket::Server
+      )
+    )
 
     start
     yield self
   ensure
-    stop if @running
+    stop
   end
 
   def start
-    case
-    when @options.server == Protobuf::Rpc::Zmq::Server
-      start_zmq_server
-    else
-      start_socket_server
-    end
-    log_debug { sign_message("Server started #{@options.host}:#{@options.port}") }
-  end
+    runner_class = {
+      ::Protobuf::Rpc::Zmq::Server => ::Protobuf::Rpc::ZmqRunner,
+      ::Protobuf::Rpc::Socket::Server => ::Protobuf::Rpc::SocketRunner,
+    }.fetch(options.server)
 
-  def start_socket_server
-    @sock_runner = ::Protobuf::Rpc::SocketRunner.new(options)
-    @sock_thread = Thread.new(@sock_runner) { |runner| runner.run }
-    @sock_thread.abort_on_exception = true # Set for testing purposes
-    Thread.pass until @sock_runner.running?
-  end
+    self.runner = runner_class.new(options)
+    self.runner_thread = Thread.new(runner, &:run)
+    runner_thread.abort_on_exception = true # Set for testing purposes
+    Thread.pass until runner.running?
 
-  def start_zmq_server
-    @zmq_runner = ::Protobuf::Rpc::ZmqRunner.new(options)
-    @zmq_thread = Thread.new(@zmq_runner) { |runner| runner.run }
-    @zmq_thread.abort_on_exception = true # Set for testing purposes
-    Thread.pass until @zmq_runner.running?
+    logger.debug { sign_message("Server started #{options.host}:#{options.port}") }
   end
 
   def stop
-    case
-    when @options.server == Protobuf::Rpc::Zmq::Server then
-      @zmq_runner.try :stop
-      @zmq_thread.join if @zmq_thread
-    else
-      @sock_runner.stop
-      @sock_thread.join if @sock_thread
-    end
-
-    @running = false
+    runner.stop
+    runner_thread.join
   end
 
   def log_signature