protobuf 3.7.0.pre2 → 3.7.0.pre3

data/spec/lib/protobuf/rpc/connectors/base_spec.rb

@@ -8,6 +8,47 @@ RSpec.describe Protobuf::Rpc::Connectors::Base do
 
   subject { Protobuf::Rpc::Connectors::Base.new(options) }
 
+  context "API" do
+    specify { expect(subject.respond_to?(:any_callbacks?)).to be true }
+    specify { expect(subject.respond_to?(:request_caller)).to be true }
+    specify { expect(subject.respond_to?(:data_callback)).to be true }
+    specify { expect(subject.respond_to?(:error)).to be true }
+    specify { expect(subject.respond_to?(:failure)).to be true }
+    specify { expect(subject.respond_to?(:complete)).to be true }
+    specify { expect(subject.respond_to?(:parse_response)).to be true }
+    specify { expect(subject.respond_to?(:verify_options!)).to be true }
+    specify { expect(subject.respond_to?(:verify_callbacks)).to be true }
+  end
+
+  describe "#any_callbacks?" do
+    [:@complete_cb, :@success_cb, :@failure_cb].each do |cb|
+      it "returns true if #{cb} is provided" do
+        subject.instance_variable_set(cb, "something")
+        expect(subject.any_callbacks?).to be true
+      end
+    end
+
+    it "returns false when all callbacks are not provided" do
+      subject.instance_variable_set(:@complete_cb, nil)
+      subject.instance_variable_set(:@success_cb, nil)
+      subject.instance_variable_set(:@failure_cb, nil)
+
+      expect(subject.any_callbacks?).to be false
+    end
+  end
+
+  describe "#data_callback" do
+    it "changes state to use the data callback" do
+      subject.data_callback("data")
+      expect(subject.instance_variable_get(:@used_data_callback)).to be true
+    end
+
+    it "sets the data var when using the data_callback" do
+      subject.data_callback("data")
+      expect(subject.instance_variable_get(:@data)).to eq("data")
+    end
+  end
+
   describe "#send_request" do
     it "raising an error when 'send_request' is not overridden" do
       expect { subject.send_request }.to raise_error(RuntimeError, /inherit a Connector/)
@@ -47,4 +88,114 @@ RSpec.describe Protobuf::Rpc::Connectors::Base do
     end
   end
 
+  describe '#request_bytes' do
+    let(:service) { Test::ResourceService }
+    let(:method) { :find }
+    let(:request) { '' }
+    let(:client_host) { 'myhost.myservice.com' }
+    let(:options) do
+      {
+        :service => service,
+        :method => method,
+        :request => request,
+        :client_host => client_host,
+        :timeout => 60,
+      }
+    end
+
+    let(:expected) do
+      ::Protobuf::Socketrpc::Request.new(
+        :service_name => service.name,
+        :method_name => 'find',
+        :request_proto => '',
+        :caller => client_host,
+      )
+    end
+
+    before { allow(subject).to receive(:validate_request_type!).and_return(true) }
+    before { expect(subject).not_to receive(:failure) }
+
+    specify { expect(subject.request_bytes).to eq expected.encode }
+  end
+
+  describe '#request_caller' do
+    specify { expect(subject.request_caller).to eq ::Protobuf.client_host }
+
+    context 'when "client_host" option is given to initializer' do
+      let(:hostname) { 'myhost.myserver.com' }
+      let(:options) { { :client_host => hostname, :timeout => 60 } }
+
+      specify { expect(subject.request_caller).to_not eq ::Protobuf.client_host }
+      specify { expect(subject.request_caller).to eq hostname }
+    end
+  end
+
+  describe "#verify_callbacks" do
+    it "sets @failure_cb to #data_callback when no callbacks are defined" do
+      subject.verify_callbacks
+      expect(subject.instance_variable_get(:@failure_cb)).to eq(subject.method(:data_callback))
+    end
+
+    it "sets @success_cb to #data_callback when no callbacks are defined" do
+      subject.verify_callbacks
+      expect(subject.instance_variable_get(:@success_cb)).to eq(subject.method(:data_callback))
+    end
+
+    it "doesn't set @failure_cb when already defined" do
+      set_cb = -> { true }
+      subject.instance_variable_set(:@failure_cb, set_cb)
+      subject.verify_callbacks
+      expect(subject.instance_variable_get(:@failure_cb)).to eq(set_cb)
+      expect(subject.instance_variable_get(:@failure_cb)).to_not eq(subject.method(:data_callback))
+    end
+
+    it "doesn't set @success_cb when already defined" do
+      set_cb = -> { true }
+      subject.instance_variable_set(:@success_cb, set_cb)
+      subject.verify_callbacks
+      expect(subject.instance_variable_get(:@success_cb)).to eq(set_cb)
+      expect(subject.instance_variable_get(:@success_cb)).to_not eq(subject.method(:data_callback))
+    end
+
+  end
+
+  shared_examples "a ConnectorDisposition" do |meth, cb, *args|
+
+    it "calls #complete before exit" do
+      subject.stats = double("Object", :stop => true)
+
+      expect(subject).to receive(:complete)
+      subject.method(meth).call(*args)
+    end
+
+    it "calls the #{cb} callback when provided" do
+      stats = double("Object")
+      allow(stats).to receive(:stop).and_return(true)
+      subject.stats = stats
+      some_cb = double("Object")
+
+      subject.instance_variable_set("@#{cb}", some_cb)
+      expect(some_cb).to receive(:call).and_return(true)
+      subject.method(meth).call(*args)
+    end
+
+    it "calls the complete callback when provided" do
+      stats = double("Object")
+      allow(stats).to receive(:stop).and_return(true)
+      subject.stats = stats
+      comp_cb = double("Object")
+
+      subject.instance_variable_set(:@complete_cb, comp_cb)
+      expect(comp_cb).to receive(:call).and_return(true)
+      subject.method(meth).call(*args)
+    end
+
+  end
+
+  it_behaves_like("a ConnectorDisposition", :failure, "failure_cb", "code", "message")
+  it_behaves_like("a ConnectorDisposition", :failure, "complete_cb", "code", "message")
+  it_behaves_like("a ConnectorDisposition", :succeed, "complete_cb", "response")
+  it_behaves_like("a ConnectorDisposition", :succeed, "success_cb", "response")
+  it_behaves_like("a ConnectorDisposition", :complete, "complete_cb")
+
 end

data/spec/lib/protobuf/rpc/connectors/ping_spec.rb

@@ -55,14 +55,14 @@ require "protobuf/zmq"
 
   describe "#timeout" do
     it "uses the default value" do
-      expect(subject.timeout).to eq(5)
+      expect(subject.timeout).to eq(0.2)
     end
 
     context "when environment variable is set" do
-      before { ::ENV["PB_RPC_PING_PORT_TIMEOUT"] = "1" }
+      before { ::ENV["PB_RPC_PING_PORT_TIMEOUT"] = "100" }
 
       it "uses the environmet variable" do
-        expect(subject.timeout).to eq(1)
+        expect(subject.timeout).to eq(0.1)
       end
     end
   end

data/spec/lib/protobuf/rpc/connectors/socket_spec.rb

@@ -18,8 +18,6 @@ RSpec.describe Protobuf::Rpc::Connectors::Socket do
 
   it_behaves_like "a Protobuf Connector"
 
-  specify { expect(described_class.include?(Protobuf::Rpc::Connectors::Common)).to be true }
-
   context "#read_response" do
     let(:data) { "New data" }
 

data/spec/lib/protobuf/rpc/middleware/logger_spec.rb

@@ -21,13 +21,13 @@ RSpec.describe Protobuf::Rpc::Middleware::Logger do
   let(:request) { request_type.new(:name => 'required') }
   let(:request_type) { rpc_method.request_type }
   let(:request_wrapper) do
-    Protobuf::Socketrpc::Request.new(
+    ::Protobuf::Socketrpc::Request.new(
       :service_name => service_name,
       :method_name => method_name.to_s,
       :request_proto => request,
     )
   end
-  let(:response_wrapper) { Protobuf::Socketrpc::Response.new(:response_proto => response) }
+  let(:response_wrapper) { ::Protobuf::Socketrpc::Response.new(:response_proto => response) }
   let(:response) { rpc_method.response_type.new(:name => 'required') }
   let(:rpc_method) { service_class.rpcs[method_name] }
   let(:rpc_service) { service_class.new(env) }

data/spec/lib/protobuf/rpc/middleware/request_decoder_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Protobuf::Rpc::Middleware::RequestDecoder do
   let(:request) { request_type.new(:name => 'required') }
   let(:request_type) { rpc_method.request_type }
   let(:request_wrapper) do
-    Protobuf::Socketrpc::Request.new(
+    ::Protobuf::Socketrpc::Request.new(
       :caller => client_host,
       :service_name => service_name,
       :method_name => method_name.to_s,
@@ -75,7 +75,7 @@ RSpec.describe Protobuf::Rpc::Middleware::RequestDecoder do
     end
 
     context "when decoding fails" do
-      before { allow(Protobuf::Socketrpc::Request).to receive(:decode).and_raise(RuntimeError) }
+      before { allow(::Protobuf::Socketrpc::Request).to receive(:decode).and_raise(RuntimeError) }
 
       it "raises a bad request data exception" do
         expect { subject.call(env) }.to raise_exception(Protobuf::Rpc::BadRequestData)
@@ -84,7 +84,7 @@ RSpec.describe Protobuf::Rpc::Middleware::RequestDecoder do
 
     context "when the RPC service is not defined" do
       let(:request_wrapper) do
-        Protobuf::Socketrpc::Request.new(
+        ::Protobuf::Socketrpc::Request.new(
           :caller => client_host,
           :service_name => 'Foo',
           :method_name => method_name.to_s,
@@ -99,7 +99,7 @@ RSpec.describe Protobuf::Rpc::Middleware::RequestDecoder do
 
     context "when RPC method is not defined" do
       let(:request_wrapper) do
-        Protobuf::Socketrpc::Request.new(
+        ::Protobuf::Socketrpc::Request.new(
           :caller => client_host,
           :service_name => service_name,
           :method_name => 'foo',

data/spec/lib/protobuf/rpc/middleware/response_encoder_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Protobuf::Rpc::Middleware::ResponseEncoder do
   end
   let(:encoded_response) { response_wrapper.encode }
   let(:response) { Test::Resource.new(:name => 'required') }
-  let(:response_wrapper) { Protobuf::Socketrpc::Response.new(:response_proto => response) }
+  let(:response_wrapper) { ::Protobuf::Socketrpc::Response.new(:response_proto => response) }
 
   subject { described_class.new(app) }
 
@@ -65,7 +65,7 @@ RSpec.describe Protobuf::Rpc::Middleware::ResponseEncoder do
     end
 
     context "when encoding fails" do
-      before { allow_any_instance_of(Protobuf::Socketrpc::Response).to receive(:encode).and_raise(RuntimeError) }
+      before { allow_any_instance_of(::Protobuf::Socketrpc::Response).to receive(:encode).and_raise(RuntimeError) }
 
       it "raises a bad request data exception" do
         expect { subject.call(env) }.to raise_exception(Protobuf::Rpc::PbError)

data/spec/lib/protobuf/rpc/service_dispatcher_spec.rb

@@ -16,7 +16,6 @@ RSpec.describe Protobuf::Rpc::ServiceDispatcher do
   let(:request_type) { service_class.rpcs[method_name].request_type }
   let(:response) { response_type.new(:name => 'required') }
   let(:response_type) { service_class.rpcs[method_name].response_type }
-
   let(:rpc_service) { service_class.new(env) }
   let(:service_class) { Test::ResourceService }
   let(:service_name) { service_class.to_s }
@@ -29,24 +28,8 @@ RSpec.describe Protobuf::Rpc::ServiceDispatcher do
     before { allow(rpc_service).to receive(:response).and_return(response) }
 
     it "dispatches the request" do
-      stack_env = subject.call(env)
+      stack_env = subject._call(env)
       expect(stack_env.response).to eq response
     end
-
-    context "when the given RPC method is not implemented" do
-      let(:method_name) { :find_not_implemented }
-
-      it "raises a method not found exception" do
-        expect { subject.call(env) }.to raise_exception(Protobuf::Rpc::MethodNotFound)
-      end
-    end
-
-    context "when the given RPC method is implemented and a NoMethodError is raised" do
-      before { allow(rpc_service).to receive(:callable_rpc_method).and_return(-> { rpc_service.__send__(:foo) }) }
-
-      it "raises the exeception" do
-        expect { subject.call(env) }.to raise_exception(NoMethodError)
-      end
-    end
   end
 end

data/spec/lib/protobuf/rpc/service_filters_spec.rb

@@ -362,7 +362,7 @@ RSpec.describe Protobuf::Rpc::ServiceFilters do
           :endpoint,
           :inner_around_bottom,
           :outer_around_bottom,
-        ]
+        ],
       )
     end
 
@@ -390,7 +390,7 @@ RSpec.describe Protobuf::Rpc::ServiceFilters do
             :outer_around_top,
             :inner_around,
             :outer_around_bottom,
-          ]
+          ],
         )
       end
 

data/spec/lib/protobuf/varint_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Protobuf::Varint do
     913_389 => "7d83",
     516_192_829_912_693 => "9eyMkpivdQ==",
     9_999_999_999_999_999_999 => "//+fz8jgyOOKAQ==",
-  }
+  }.freeze
 
   [defined?(::Varint) ? ::Varint : nil, Protobuf::VarintPure].compact.each do |klass|
     context "with #{klass}" do

data/spec/lib/protobuf_spec.rb

@@ -19,26 +19,23 @@ RSpec.describe ::Protobuf do
     end
   end
 
-  describe '.connector_type' do
-    before { described_class.instance_variable_set(:@connector_type, nil) }
-
-    it 'defaults to socket' do
-      expect(described_class.connector_type).to eq :socket
+  describe '.connector_type_class' do
+    it "defaults to Socket" do
+      described_class.connector_type_class = nil
+      expect(described_class.connector_type_class).to eq(::Protobuf::Rpc::Connectors::Socket)
     end
 
-    it 'accepts socket or zmq' do
-      [:socket, :zmq].each do |type|
-        described_class.connector_type = type
-        expect(described_class.connector_type).to eq type
-      end
+    it 'fails if fails to load the PB_CLIENT_TYPE' do
+      ENV['PB_CLIENT_TYPE'] = "something_to_autoload"
+      expect { load 'protobuf.rb' }.to raise_error(LoadError, /something_to_autoload/)
+      ENV.delete('PB_CLIENT_TYPE')
     end
 
-    it 'does not accept other types' do
-      [:hello, :world, :evented].each do |type|
-        expect do
-          described_class.connector_type = type
-        end.to raise_error(ArgumentError)
-      end
+    it 'loads the connector type class from PB_CLIENT_TYPE' do
+      ENV['PB_CLIENT_TYPE'] = "protobuf/rpc/connectors/zmq"
+      load 'protobuf.rb'
+      expect(::Protobuf.connector_type_class).to eq(::Protobuf::Rpc::Connectors::Zmq)
+      ENV.delete('PB_CLIENT_TYPE')
     end
   end
 

data/spec/support/packed_field.rb

@@ -12,11 +12,12 @@ if defined?(RSpec)
     end
 
     let(:field_name) { "#{field_klass.name.split('::').last.underscore}_packed_field".to_sym }
-    let(:message_instance) { PackableFieldTest.new(field_name => [100, 200, 300]) }
+    let(:value) { [100, 200, 300] }
+    let(:message_instance) { PackableFieldTest.new(field_name => value) }
 
     subject { PackableFieldTest.get_field(field_name) }
 
     specify { expect(subject).to be_packed }
-
+    specify { expect(PackableFieldTest.decode(message_instance.encode).send(field_name)).to eq value }
   end
 end

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

@@ -18,12 +18,13 @@ module Test
   # Enum Classes
   #
   class EnumTestType < ::Protobuf::Enum
+    define :ZERO, 0
     define :ONE, 1
     define :TWO, 2
   end
 
   class AliasedEnum < ::Protobuf::Enum
-    set_option :allow_alias
+    set_option :allow_alias, true
 
     define :THREE, 3
     define :TRES, 3

data/spec/support/protos/enum.proto

@@ -6,6 +6,7 @@ import 'protos/resource.proto';
 // Test extending another message from an imported file.
 
 enum EnumTestType {
+  ZERO = 0;
   ONE = 1;
   TWO = 2;
 }

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

@@ -25,7 +25,7 @@ module Protobuf_unittest
   end
 
   class TestEnumWithDupValue < ::Protobuf::Enum
-    set_option :allow_alias
+    set_option :allow_alias, true
 
     define :FOO1, 1
     define :BAR1, 2
@@ -175,6 +175,17 @@ module Protobuf_unittest
   class BarResponse < ::Protobuf::Message; end
 
 
+  ##
+  # File Options
+  #
+  set_option :java_outer_classname, "UnittestProto"
+  set_option :optimize_for, ::Google::Protobuf::FileOptions::OptimizeMode::SPEED
+  set_option :cc_generic_services, true
+  set_option :java_generic_services, true
+  set_option :py_generic_services, true
+  set_option :cc_enable_arenas, true
+
+
   ##
   # Message Fields
   #
@@ -213,10 +224,10 @@ module Protobuf_unittest
     optional ::Protobuf_unittest::TestAllTypes::NestedEnum, :optional_nested_enum, 21
     optional ::Protobuf_unittest::ForeignEnum, :optional_foreign_enum, 22
     optional ::Protobuf_unittest_import::ImportEnum, :optional_import_enum, 23
-    optional :string, :optional_string_piece, 24
-    optional :string, :optional_cord, 25
+    optional :string, :optional_string_piece, 24, :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
+    optional :string, :optional_cord, 25, :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
     optional ::Protobuf_unittest_import::PublicImportMessage, :optional_public_import_message, 26
-    optional ::Protobuf_unittest::TestAllTypes::NestedMessage, :optional_lazy_message, 27
+    optional ::Protobuf_unittest::TestAllTypes::NestedMessage, :optional_lazy_message, 27, :lazy => true
     repeated :int32, :repeated_int32, 31
     repeated :int64, :repeated_int64, 32
     repeated :uint32, :repeated_uint32, 33
@@ -239,9 +250,9 @@ module Protobuf_unittest
     repeated ::Protobuf_unittest::TestAllTypes::NestedEnum, :repeated_nested_enum, 51
     repeated ::Protobuf_unittest::ForeignEnum, :repeated_foreign_enum, 52
     repeated ::Protobuf_unittest_import::ImportEnum, :repeated_import_enum, 53
-    repeated :string, :repeated_string_piece, 54
-    repeated :string, :repeated_cord, 55
-    repeated ::Protobuf_unittest::TestAllTypes::NestedMessage, :repeated_lazy_message, 57
+    repeated :string, :repeated_string_piece, 54, :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
+    repeated :string, :repeated_cord, 55, :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
+    repeated ::Protobuf_unittest::TestAllTypes::NestedMessage, :repeated_lazy_message, 57, :lazy => true
     optional :int32, :default_int32, 61, :default => 41
     optional :int64, :default_int64, 62, :default => 42
     optional :uint32, :default_uint32, 63, :default => 43
@@ -260,8 +271,8 @@ module Protobuf_unittest
     optional ::Protobuf_unittest::TestAllTypes::NestedEnum, :default_nested_enum, 81, :default => ::Protobuf_unittest::TestAllTypes::NestedEnum::BAR
     optional ::Protobuf_unittest::ForeignEnum, :default_foreign_enum, 82, :default => ::Protobuf_unittest::ForeignEnum::FOREIGN_BAR
     optional ::Protobuf_unittest_import::ImportEnum, :default_import_enum, 83, :default => ::Protobuf_unittest_import::ImportEnum::IMPORT_BAR
-    optional :string, :default_string_piece, 84, :default => "abc"
-    optional :string, :default_cord, 85, :default => "123"
+    optional :string, :default_string_piece, 84, :default => "abc", :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
+    optional :string, :default_cord, 85, :default => "123", :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
     optional :uint32, :oneof_uint32, 111
     optional ::Protobuf_unittest::TestAllTypes::NestedMessage, :oneof_nested_message, 112
     optional :string, :oneof_string, 113
@@ -307,10 +318,10 @@ module Protobuf_unittest
     optional ::Protobuf_unittest::TestAllTypes::NestedEnum, :".protobuf_unittest.optional_nested_enum_extension", 21, :extension => true
     optional ::Protobuf_unittest::ForeignEnum, :".protobuf_unittest.optional_foreign_enum_extension", 22, :extension => true
     optional ::Protobuf_unittest_import::ImportEnum, :".protobuf_unittest.optional_import_enum_extension", 23, :extension => true
-    optional :string, :".protobuf_unittest.optional_string_piece_extension", 24, :extension => true
-    optional :string, :".protobuf_unittest.optional_cord_extension", 25, :extension => true
+    optional :string, :".protobuf_unittest.optional_string_piece_extension", 24, :extension => true, :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
+    optional :string, :".protobuf_unittest.optional_cord_extension", 25, :extension => true, :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
     optional ::Protobuf_unittest_import::PublicImportMessage, :".protobuf_unittest.optional_public_import_message_extension", 26, :extension => true
-    optional ::Protobuf_unittest::TestAllTypes::NestedMessage, :".protobuf_unittest.optional_lazy_message_extension", 27, :extension => true
+    optional ::Protobuf_unittest::TestAllTypes::NestedMessage, :".protobuf_unittest.optional_lazy_message_extension", 27, :extension => true, :lazy => true
     repeated :int32, :".protobuf_unittest.repeated_int32_extension", 31, :extension => true
     repeated :int64, :".protobuf_unittest.repeated_int64_extension", 32, :extension => true
     repeated :uint32, :".protobuf_unittest.repeated_uint32_extension", 33, :extension => true
@@ -333,9 +344,9 @@ module Protobuf_unittest
     repeated ::Protobuf_unittest::TestAllTypes::NestedEnum, :".protobuf_unittest.repeated_nested_enum_extension", 51, :extension => true
     repeated ::Protobuf_unittest::ForeignEnum, :".protobuf_unittest.repeated_foreign_enum_extension", 52, :extension => true
     repeated ::Protobuf_unittest_import::ImportEnum, :".protobuf_unittest.repeated_import_enum_extension", 53, :extension => true
-    repeated :string, :".protobuf_unittest.repeated_string_piece_extension", 54, :extension => true
-    repeated :string, :".protobuf_unittest.repeated_cord_extension", 55, :extension => true
-    repeated ::Protobuf_unittest::TestAllTypes::NestedMessage, :".protobuf_unittest.repeated_lazy_message_extension", 57, :extension => true
+    repeated :string, :".protobuf_unittest.repeated_string_piece_extension", 54, :extension => true, :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
+    repeated :string, :".protobuf_unittest.repeated_cord_extension", 55, :extension => true, :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
+    repeated ::Protobuf_unittest::TestAllTypes::NestedMessage, :".protobuf_unittest.repeated_lazy_message_extension", 57, :extension => true, :lazy => true
     optional :int32, :".protobuf_unittest.default_int32_extension", 61, :default => 41, :extension => true
     optional :int64, :".protobuf_unittest.default_int64_extension", 62, :default => 42, :extension => true
     optional :uint32, :".protobuf_unittest.default_uint32_extension", 63, :default => 43, :extension => true
@@ -354,8 +365,8 @@ module Protobuf_unittest
     optional ::Protobuf_unittest::TestAllTypes::NestedEnum, :".protobuf_unittest.default_nested_enum_extension", 81, :default => ::Protobuf_unittest::TestAllTypes::NestedEnum::BAR, :extension => true
     optional ::Protobuf_unittest::ForeignEnum, :".protobuf_unittest.default_foreign_enum_extension", 82, :default => ::Protobuf_unittest::ForeignEnum::FOREIGN_BAR, :extension => true
     optional ::Protobuf_unittest_import::ImportEnum, :".protobuf_unittest.default_import_enum_extension", 83, :default => ::Protobuf_unittest_import::ImportEnum::IMPORT_BAR, :extension => true
-    optional :string, :".protobuf_unittest.default_string_piece_extension", 84, :default => "abc", :extension => true
-    optional :string, :".protobuf_unittest.default_cord_extension", 85, :default => "123", :extension => true
+    optional :string, :".protobuf_unittest.default_string_piece_extension", 84, :default => "abc", :extension => true, :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
+    optional :string, :".protobuf_unittest.default_cord_extension", 85, :default => "123", :extension => true, :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
     optional :uint32, :".protobuf_unittest.oneof_uint32_extension", 111, :extension => true
     optional ::Protobuf_unittest::TestAllTypes::NestedMessage, :".protobuf_unittest.oneof_nested_message_extension", 112, :extension => true
     optional :string, :".protobuf_unittest.oneof_string_extension", 113, :extension => true
@@ -455,11 +466,11 @@ module Protobuf_unittest
   end
 
   class TestEagerMessage
-    optional ::Protobuf_unittest::TestAllTypes, :sub_message, 1
+    optional ::Protobuf_unittest::TestAllTypes, :sub_message, 1, :lazy => false
   end
 
   class TestLazyMessage
-    optional ::Protobuf_unittest::TestAllTypes, :sub_message, 1
+    optional ::Protobuf_unittest::TestAllTypes, :sub_message, 1, :lazy => true
   end
 
   class TestNestedMessageHasBits
@@ -476,14 +487,14 @@ module Protobuf_unittest
     optional :string, :StringField, 2
     optional ::Protobuf_unittest::ForeignEnum, :EnumField, 3
     optional ::Protobuf_unittest::ForeignMessage, :MessageField, 4
-    optional :string, :StringPieceField, 5
-    optional :string, :CordField, 6
+    optional :string, :StringPieceField, 5, :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
+    optional :string, :CordField, 6, :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
     repeated :int32, :RepeatedPrimitiveField, 7
     repeated :string, :RepeatedStringField, 8
     repeated ::Protobuf_unittest::ForeignEnum, :RepeatedEnumField, 9
     repeated ::Protobuf_unittest::ForeignMessage, :RepeatedMessageField, 10
-    repeated :string, :RepeatedStringPieceField, 11
-    repeated :string, :RepeatedCordField, 12
+    repeated :string, :RepeatedStringPieceField, 11, :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
+    repeated :string, :RepeatedCordField, 12, :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
   end
 
   class TestFieldOrderings
@@ -528,8 +539,8 @@ module Protobuf_unittest
     optional :string, :cpp_trigraph, 20, :default => "? ? ?? ?? ??? ??/ ??-"
     optional :string, :string_with_zero, 23, :default => "hello"
     optional :bytes, :bytes_with_zero, 24, :default => "wor\000ld"
-    optional :string, :string_piece_with_zero, 25, :default => "abc"
-    optional :string, :cord_with_zero, 26, :default => "123"
+    optional :string, :string_piece_with_zero, 25, :default => "abc", :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
+    optional :string, :cord_with_zero, 26, :default => "123", :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
     optional :string, :replacement_string, 27, :default => "${unknown}"
   end
 
@@ -610,17 +621,17 @@ module Protobuf_unittest
 
     optional :int32, :foo_int, 1
     optional :string, :foo_string, 2
-    optional :string, :foo_cord, 3
-    optional :string, :foo_string_piece, 4
+    optional :string, :foo_cord, 3, :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
+    optional :string, :foo_string_piece, 4, :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
     optional :bytes, :foo_bytes, 5
     optional ::Protobuf_unittest::TestOneof2::NestedEnum, :foo_enum, 6
     optional ::Protobuf_unittest::TestOneof2::NestedMessage, :foo_message, 7
     optional ::Protobuf_unittest::TestOneof2::FooGroup, :foogroup, 8
-    optional ::Protobuf_unittest::TestOneof2::NestedMessage, :foo_lazy_message, 11
+    optional ::Protobuf_unittest::TestOneof2::NestedMessage, :foo_lazy_message, 11, :lazy => true
     optional :int32, :bar_int, 12, :default => 5
     optional :string, :bar_string, 13, :default => "STRING"
-    optional :string, :bar_cord, 14, :default => "CORD"
-    optional :string, :bar_string_piece, 15, :default => "SPIECE"
+    optional :string, :bar_cord, 14, :default => "CORD", :ctype => ::Google::Protobuf::FieldOptions::CType::CORD
+    optional :string, :bar_string_piece, 15, :default => "SPIECE", :ctype => ::Google::Protobuf::FieldOptions::CType::STRING_PIECE
     optional :bytes, :bar_bytes, 16, :default => "BYTES"
     optional ::Protobuf_unittest::TestOneof2::NestedEnum, :bar_enum, 17, :default => ::Protobuf_unittest::TestOneof2::NestedEnum::BAR
     optional :int32, :baz_int, 18
@@ -655,20 +666,20 @@ module Protobuf_unittest
   end
 
   class TestUnpackedTypes
-    repeated :int32, :unpacked_int32, 90
-    repeated :int64, :unpacked_int64, 91
-    repeated :uint32, :unpacked_uint32, 92
-    repeated :uint64, :unpacked_uint64, 93
-    repeated :sint32, :unpacked_sint32, 94
-    repeated :sint64, :unpacked_sint64, 95
-    repeated :fixed32, :unpacked_fixed32, 96
-    repeated :fixed64, :unpacked_fixed64, 97
-    repeated :sfixed32, :unpacked_sfixed32, 98
-    repeated :sfixed64, :unpacked_sfixed64, 99
-    repeated :float, :unpacked_float, 100
-    repeated :double, :unpacked_double, 101
-    repeated :bool, :unpacked_bool, 102
-    repeated ::Protobuf_unittest::ForeignEnum, :unpacked_enum, 103
+    repeated :int32, :unpacked_int32, 90, :packed => false
+    repeated :int64, :unpacked_int64, 91, :packed => false
+    repeated :uint32, :unpacked_uint32, 92, :packed => false
+    repeated :uint64, :unpacked_uint64, 93, :packed => false
+    repeated :sint32, :unpacked_sint32, 94, :packed => false
+    repeated :sint64, :unpacked_sint64, 95, :packed => false
+    repeated :fixed32, :unpacked_fixed32, 96, :packed => false
+    repeated :fixed64, :unpacked_fixed64, 97, :packed => false
+    repeated :sfixed32, :unpacked_sfixed32, 98, :packed => false
+    repeated :sfixed64, :unpacked_sfixed64, 99, :packed => false
+    repeated :float, :unpacked_float, 100, :packed => false
+    repeated :double, :unpacked_double, 101, :packed => false
+    repeated :bool, :unpacked_bool, 102, :packed => false
+    repeated ::Protobuf_unittest::ForeignEnum, :unpacked_enum, 103, :packed => false
   end
 
   class TestPackedExtensions
@@ -693,20 +704,20 @@ module Protobuf_unittest
   class TestUnpackedExtensions
     # Extension Fields
     extensions 1...536870912
-    repeated :int32, :".protobuf_unittest.unpacked_int32_extension", 90, :extension => true
-    repeated :int64, :".protobuf_unittest.unpacked_int64_extension", 91, :extension => true
-    repeated :uint32, :".protobuf_unittest.unpacked_uint32_extension", 92, :extension => true
-    repeated :uint64, :".protobuf_unittest.unpacked_uint64_extension", 93, :extension => true
-    repeated :sint32, :".protobuf_unittest.unpacked_sint32_extension", 94, :extension => true
-    repeated :sint64, :".protobuf_unittest.unpacked_sint64_extension", 95, :extension => true
-    repeated :fixed32, :".protobuf_unittest.unpacked_fixed32_extension", 96, :extension => true
-    repeated :fixed64, :".protobuf_unittest.unpacked_fixed64_extension", 97, :extension => true
-    repeated :sfixed32, :".protobuf_unittest.unpacked_sfixed32_extension", 98, :extension => true
-    repeated :sfixed64, :".protobuf_unittest.unpacked_sfixed64_extension", 99, :extension => true
-    repeated :float, :".protobuf_unittest.unpacked_float_extension", 100, :extension => true
-    repeated :double, :".protobuf_unittest.unpacked_double_extension", 101, :extension => true
-    repeated :bool, :".protobuf_unittest.unpacked_bool_extension", 102, :extension => true
-    repeated ::Protobuf_unittest::ForeignEnum, :".protobuf_unittest.unpacked_enum_extension", 103, :extension => true
+    repeated :int32, :".protobuf_unittest.unpacked_int32_extension", 90, :extension => true, :packed => false
+    repeated :int64, :".protobuf_unittest.unpacked_int64_extension", 91, :extension => true, :packed => false
+    repeated :uint32, :".protobuf_unittest.unpacked_uint32_extension", 92, :extension => true, :packed => false
+    repeated :uint64, :".protobuf_unittest.unpacked_uint64_extension", 93, :extension => true, :packed => false
+    repeated :sint32, :".protobuf_unittest.unpacked_sint32_extension", 94, :extension => true, :packed => false
+    repeated :sint64, :".protobuf_unittest.unpacked_sint64_extension", 95, :extension => true, :packed => false
+    repeated :fixed32, :".protobuf_unittest.unpacked_fixed32_extension", 96, :extension => true, :packed => false
+    repeated :fixed64, :".protobuf_unittest.unpacked_fixed64_extension", 97, :extension => true, :packed => false
+    repeated :sfixed32, :".protobuf_unittest.unpacked_sfixed32_extension", 98, :extension => true, :packed => false
+    repeated :sfixed64, :".protobuf_unittest.unpacked_sfixed64_extension", 99, :extension => true, :packed => false
+    repeated :float, :".protobuf_unittest.unpacked_float_extension", 100, :extension => true, :packed => false
+    repeated :double, :".protobuf_unittest.unpacked_double_extension", 101, :extension => true, :packed => false
+    repeated :bool, :".protobuf_unittest.unpacked_bool_extension", 102, :extension => true, :packed => false
+    repeated ::Protobuf_unittest::ForeignEnum, :".protobuf_unittest.unpacked_enum_extension", 103, :extension => true, :packed => false
   end
 
   class TestDynamicExtensions