protobuf 2.8.13 → 3.0.0.rc1

data/spec/support/server.rb

@@ -12,7 +12,7 @@ Thread.abort_on_exception = true
 
 module StubProtobufServerFactory
   def self.build(delay)
-    new_server = Class.new(Protobuf::Rpc::Evented::Server) do
+    new_server = Class.new(Protobuf::Rpc::Socket::Server) do
       def self.sleep_interval
         @sleep_interval
       end
@@ -43,7 +43,7 @@ class StubServer
                                 :port => 9399,
                                 :worker_port => 9400,
                                 :delay => 0,
-                                :server => Protobuf::Rpc::Evented::Server }.merge(options))
+                                :server => Protobuf::Rpc::Socket::Server }.merge(options))
 
     start
     yield self
@@ -53,38 +53,23 @@ class StubServer
 
   def start
     case
-    when @options.server == Protobuf::Rpc::Evented::Server
-      start_em_server
     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}") }
-  rescue => ex
-    if ex =~ /no acceptor/ # Means EM didn't shutdown in the next_tick yet
-      stop
-      retry
-    end
-  end
-
-  def start_em_server
-    @server_handle = EventMachine.start_server(
-      @options.host,
-      @options.port,
-      StubProtobufServerFactory.build(@options.delay)
-    )
   end
 
   def start_socket_server
-    @sock_runner = ::Protobuf::Rpc::SocketRunner.new(opt)
+    @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
 
   def start_zmq_server
-    @zmq_runnger = ::Protobuf::Rpc::ZmqRunner.new(opt)
+    @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?
@@ -92,8 +77,6 @@ class StubServer
 
   def stop
     case
-    when @options.server == Protobuf::Rpc::Evented::Server then
-      EventMachine.stop_server(@server_handle) if @server_handle
     when @options.server == Protobuf::Rpc::Zmq::Server then
       @zmq_runner.try :stop
       @zmq_thread.join if @zmq_thread

data/spec/support/test/defaults.pb.rb

@@ -15,10 +15,10 @@ module Test
   # Message Fields
   #
   class Defaults
-    optional ::Protobuf::Field::BytesField, :escaped_bytes, 1, :default => "\000\001\007\010\014\n\r\t\013\\\\'\"\376"
-    optional ::Protobuf::Field::DoubleField, :infinity_default, 2, :default => ::Float::INFINITY
-    optional ::Protobuf::Field::FloatField, :neg_infinity_default, 3, :default => -::Float::INFINITY
-    optional ::Protobuf::Field::DoubleField, :nan_default, 4, :default => ::Float::NAN
+    optional :bytes, :escaped_bytes, 1, :default => "\000\001\007\010\014\n\r\t\013\\\\'\"\376"
+    optional :double, :infinity_default, 2, :default => ::Float::INFINITY
+    optional :float, :neg_infinity_default, 3, :default => -::Float::INFINITY
+    optional :double, :nan_default, 4, :default => ::Float::NAN
   end
 
 end

data/spec/support/test/enum.pb.rb

@@ -19,6 +19,15 @@ module Test
     define :TWO, 2
   end
 
+  class AliasedEnum < ::Protobuf::Enum
+    set_option :allow_alias
+
+    define :THREE, 3
+    define :TRES, 3
+    define :FOUR, 4
+    define :CUATRO, 4
+  end
+
 
   ##
   # Message Classes
@@ -33,6 +42,9 @@ module Test
     optional ::Test::EnumTestType, :non_default_enum, 1
     optional ::Test::EnumTestType, :default_enum, 2, :default => ::Test::EnumTestType::ONE
     repeated ::Test::EnumTestType, :repeated_enums, 3
+    optional ::Test::AliasedEnum, :alias_non_default_enum, 4
+    optional ::Test::AliasedEnum, :alias_default_enum, 5, :default => ::Test::AliasedEnum::CUATRO
+    repeated ::Test::AliasedEnum, :alias_repeated_enums, 6
   end
 
 
@@ -40,7 +52,7 @@ module Test
   # Extended Message Fields
   #
   class ::Test::Resource < ::Protobuf::Message
-    optional ::Protobuf::Field::Int32Field, :ext_other_file_defined_field, 200, :extension => true
+    optional :int32, :ext_other_file_defined_field, 200, :extension => true
   end
 
 end

data/spec/support/test/enum.proto

@@ -8,10 +8,25 @@ enum EnumTestType {
   TWO = 2;
 }
 
+// Uses aliases
+enum AliasedEnum {
+  option allow_alias = true;
+
+  THREE  = 3;
+  TRES   = 3;
+
+  FOUR   = 4;
+  CUATRO = 4;
+}
+
 message EnumTestMessage {
   optional EnumTestType non_default_enum = 1;
   optional EnumTestType default_enum = 2 [default=ONE];
   repeated EnumTestType repeated_enums = 3;
+
+  optional AliasedEnum alias_non_default_enum = 4;
+  optional AliasedEnum alias_default_enum = 5 [default=CUATRO];
+  repeated AliasedEnum alias_repeated_enums = 6;
 }
 
 extend test.Resource {

data/spec/support/test/extended.pb.rb

@@ -15,7 +15,7 @@ module Test
   # Extended Message Fields
   #
   class ::Test::Resource < ::Protobuf::Message
-    optional ::Protobuf::Field::Int64Field, :deleted_at, 300, :extension => true
+    optional :int64, :deleted_at, 300, :extension => true
   end
 
 end