protobuf 3.7.0.pre0 → 3.7.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49fd33e80978059efd20c7e085db8567e84b3bf4
-  data.tar.gz: c56d562e6ba4814d8b023a9761b14d5eef3d719f
+  metadata.gz: 2572788305cda35ff4cc6fde499167d9658d080b
+  data.tar.gz: 941f6a8239dbc36d8bc3e299dd07f37986c0bc11
 SHA512:
-  metadata.gz: 56a1dfac3b2e3db4eb26115ecae1ced9585797651551df00b13eabbb2ecaafa8e61ef7ee3e396f1ea9df1377e1c4180983fe79e698e7bcb402042307fed05dc8
-  data.tar.gz: a4cca36a18e7f24e2ed319323bbf0c41c61730d23555d3b52965b93eaf6baea0336af4beb66fe96422f78204d547684b642b74e4dd725e04e4c48b2825e756c9
+  metadata.gz: bc704397840f6e029fdc8b7a7cff5cc659ab077998e0f688f1babcbd55473155bf626e953ef7d88fdf17192b38d26256d571284c0c7e028e047b4c59131b138f
+  data.tar.gz: 684348b64a203f308076e1c41f6c76d4442cf7d5edd529a68016139f1cec83a98e37a71c854254fa8edef41a9cf536672708bb8cfb3e0acc4f99ceff108a66d2

data/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  DisplayCopNames: true
+
 Lint/EndAlignment:
   AlignWith: keyword
 
@@ -46,6 +49,9 @@ Style/IndentHash:
 Style/Semicolon:
   AllowAsExpressionSeparator: true
 
+Style/SingleLineBlockParams:
+  Enabled: false
+
 Style/TrailingBlankLines:
   Exclude:
     - '**/*.pb.rb'

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Stable (3.x)
 
+3.7.0 (pre1)
+-----------
+- BUG: Revert to old behavior for setting repeated fields to nil
+- BUG: Set binmode for protoc-gen-ruby STDIN and STDOUT to compile proto files on Windows
+- Make all things Optionable and fix requires
+
 3.7.0 (pre0)
 -----------
 - Add `PB_USE_RAW_RPC_NAMES` option to preserve raw RPC name (since #underscore can be lossy).

data/bin/protoc-gen-ruby

@@ -10,6 +10,12 @@ require 'protobuf'
 require 'protobuf/descriptors'
 require 'protobuf/code_generator'
 
+# Ensure that no encoding conversions are done on STDIN and STDOUT since
+# we are passing binary data back and forth. Otherwise these streams
+# will be mangled on Windows.
+STDIN.binmode
+STDOUT.binmode
+
 request_bytes = STDIN.read
 code_generator = ::Protobuf::CodeGenerator.new(request_bytes)
 response_bytes = code_generator.response_bytes

data/lib/protobuf.rb

@@ -9,7 +9,24 @@ require 'active_support/inflector'
 require 'active_support/json'
 require 'active_support/notifications'
 
+# All top-level run time code requires, ordered by necessity
+require 'protobuf/wire_type'
+
+require 'protobuf/varint_pure'
+require 'protobuf/varint'
+
+require 'protobuf/exceptions'
 require 'protobuf/deprecation'
+require 'protobuf/logging'
+
+require 'protobuf/encoder'
+require 'protobuf/decoder'
+
+require 'protobuf/optionable'
+require 'protobuf/field'
+require 'protobuf/enum'
+require 'protobuf/message'
+require 'protobuf/descriptors'
 
 module Protobuf
 

data/lib/protobuf/decoder.rb

@@ -1,6 +1,3 @@
-require 'protobuf/wire_type'
-require 'protobuf/exceptions'
-
 module Protobuf
   class Decoder
 

data/lib/protobuf/enum.rb

@@ -1,6 +1,4 @@
 require 'delegate'
-require 'protobuf/deprecation'
-require 'protobuf/optionable'
 
 ##
 # Adding extension to Numeric until
@@ -12,7 +10,7 @@ require 'protobuf/optionable'
 module Protobuf
   class Enum < SimpleDelegator
     # Public: Allows setting Options on the Enum class.
-    include ::Protobuf::Optionable
+    ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::EnumOptions }
 
     def self.aliases_allowed?
       get_option(:allow_alias)

data/lib/protobuf/field/base_field.rb

@@ -1,12 +1,9 @@
-require 'protobuf/deprecation'
 require 'protobuf/field/field_array'
-require 'protobuf/logging'
-require 'protobuf/wire_type'
-
 module Protobuf
   module Field
     class BaseField
       include ::Protobuf::Logging
+      ::Protobuf::Optionable.inject(self, false) { ::Google::Protobuf::FieldOptions }
 
       ##
       # Constants
@@ -185,7 +182,7 @@ module Protobuf
 
         message_class.class_eval do
           define_method(simple_field_name) { self[fully_qualified_field_name] }
-          define_method("#{simple_field_name}=") { |v| self[fully_qualified_field_name] = v }
+          define_method("#{simple_field_name}=") { |v| set_field(fully_qualified_field_name, v, false) }
         end
 
         return unless deprecated?

data/lib/protobuf/generators/file_generator.rb

@@ -29,6 +29,7 @@ module Protobuf
           print_import_requires
 
           print_package do
+            inject_optionable
             group = GroupGenerator.new(current_indent)
             group.add_enums(descriptor.enum_type, :namespace => [descriptor.package])
             group.add_message_declarations(descriptor.message_type)
@@ -104,7 +105,7 @@ module Protobuf
       end
 
       def print_generic_requires
-        print_require("protobuf/message")
+        print_require("protobuf")
         print_require("protobuf/rpc/service") if descriptor.service.count > 0
         puts
       end
@@ -123,6 +124,9 @@ module Protobuf
 
       def print_package(&block)
         namespaces = descriptor.package.split('.')
+        if namespaces.empty? && ENV.key?('PB_ALLOW_DEFAULT_PACKAGE_NAME')
+          namespaces = [File.basename(descriptor.name).sub('.proto', '')]
+        end
         namespaces.reverse.reduce(block) do |previous, namespace|
           -> { print_module(namespace, &previous) }
         end.call
@@ -138,6 +142,10 @@ module Protobuf
         token[0] == '.'
       end
 
+      def inject_optionable
+        return if descriptor.package.empty? && !ENV.key?('PB_ALLOW_DEFAULT_PACKAGE_NAME')
+        puts "::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }"
+      end
     end
   end
 end

data/lib/protobuf/message.rb

@@ -1,7 +1,3 @@
-require 'protobuf/field'
-require 'protobuf/deprecation'
-require 'protobuf/enum'
-require 'protobuf/exceptions'
 require 'protobuf/message/fields'
 require 'protobuf/message/serialization'
 
@@ -25,6 +21,7 @@ module Protobuf
 
     extend ::Protobuf::Message::Fields
     include ::Protobuf::Message::Serialization
+    ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::MessageOptions }
 
     ##
     # Class Methods
@@ -41,7 +38,7 @@ module Protobuf
     def initialize(fields = {})
       @values = {}
       fields.to_hash.each do |name, value|
-        self[name] = value
+        set_field(name, value, true)
       end
 
       yield self if block_given?
@@ -163,8 +160,37 @@ module Protobuf
     end
 
     def []=(name, value)
+      set_field(name, value, true)
+    end
+
+    ##
+    # Instance Aliases
+    #
+    alias_method :to_hash_value, :to_hash
+    alias_method :to_proto_hash, :to_hash
+    alias_method :responds_to_has?, :respond_to_has?
+    alias_method :respond_to_and_has?, :respond_to_has?
+    alias_method :responds_to_and_has?, :respond_to_has?
+    alias_method :respond_to_has_present?, :respond_to_has_and_present?
+    alias_method :respond_to_and_has_present?, :respond_to_has_and_present?
+    alias_method :respond_to_and_has_and_present?, :respond_to_has_and_present?
+    alias_method :responds_to_has_present?, :respond_to_has_and_present?
+    alias_method :responds_to_and_has_present?, :respond_to_has_and_present?
+    alias_method :responds_to_and_has_and_present?, :respond_to_has_and_present?
+
+    ##
+    # Private Instance Methods
+    #
+
+    private
+
+    def set_field(name, value, ignore_nil_for_repeated)
       if (field = self.class.get_field(name, true))
         if field.repeated?
+          if value.nil? && ignore_nil_for_repeated
+            ::Protobuf.deprecator.deprecation_warning("#{self.class}#[#{name}]=nil", "use an empty array instead of nil")
+            return
+          end
           if value.is_a?(Array)
             value = value.compact
           else
@@ -196,27 +222,6 @@ module Protobuf
       end
     end
 
-    ##
-    # Instance Aliases
-    #
-    alias_method :to_hash_value, :to_hash
-    alias_method :to_proto_hash, :to_hash
-    alias_method :responds_to_has?, :respond_to_has?
-    alias_method :respond_to_and_has?, :respond_to_has?
-    alias_method :responds_to_and_has?, :respond_to_has?
-    alias_method :respond_to_has_present?, :respond_to_has_and_present?
-    alias_method :respond_to_and_has_present?, :respond_to_has_and_present?
-    alias_method :respond_to_and_has_and_present?, :respond_to_has_and_present?
-    alias_method :responds_to_has_present?, :respond_to_has_and_present?
-    alias_method :responds_to_and_has_present?, :respond_to_has_and_present?
-    alias_method :responds_to_and_has_and_present?, :respond_to_has_and_present?
-
-    ##
-    # Private Instance Methods
-    #
-
-    private
-
     def copy_to(object, method)
       duplicate = proc do |obj|
         case obj

data/lib/protobuf/optionable.rb

@@ -1,17 +1,36 @@
-require 'active_support/concern'
-
 module Protobuf
   module Optionable
-    extend ::ActiveSupport::Concern
-
     module ClassMethods
       def get_option(name)
-        @_optionable_options.try(:[], name)
+        name = name.to_s
+        option = optionable_descriptor_class.get_field(name, true)
+        fail ArgumentError, "invalid option=#{name}" unless option
+        unless option.fully_qualified_name.to_s == name
+          # Eventually we'll deprecate the use of simple names of fields completely, but for now make sure people
+          # are accessing options correctly. We allow simple names in other places for backwards compatibility.
+          fail ArgumentError, "must access option using its fully qualified name: #{option.fully_qualified_name.inspect}"
+        end
+        if @_optionable_options.try(:key?, name)
+          value = @_optionable_options[name]
+        else
+          value = option.default_value
+        end
+        if option.type_class < ::Protobuf::Message
+          option.type_class.new(value)
+        else
+          value
+        end
+      end
+
+      def get_option!(name)
+        get_option(name) if @_optionable_options.try(:key?, name.to_s)
       end
 
+      private
+
       def set_option(name, value = true)
         @_optionable_options ||= {}
-        @_optionable_options[name] = value
+        @_optionable_options[name.to_s] = value
       end
     end
 
@@ -19,5 +38,33 @@ module Protobuf
       self.class.get_option(name)
     end
 
+    def get_option!(name)
+      self.class.get_option!(name)
+    end
+
+    def self.inject(base_class, extend_class = true, &block)
+      unless block_given?
+        fail ArgumentError, 'missing option class block (e.g: ::Google::Protobuf::MessageOptions)'
+      end
+      if extend_class
+        # Check if optionable_descriptor_class is already defined and short circuit if so.
+        # File options are injected per module, and since a module can be defined more than once,
+        # we will get a warning if we try to define optionable_descriptor_class twice.
+        if base_class.respond_to?(:optionable_descriptor_class)
+          if base_class.optionable_descriptor_class != block.call
+            fail 'A class is being defined with two different descriptor classes, something is very wrong'
+          else
+            return # Don't define optionable_descriptor_class twice
+          end
+        end
+
+        base_class.extend(ClassMethods)
+        base_class.__send__(:include, self)
+        base_class.define_singleton_method(:optionable_descriptor_class, block)
+      else
+        base_class.__send__(:include, ClassMethods)
+        base_class.module_eval { define_method(:optionable_descriptor_class, block) }
+      end
+    end
   end
 end

data/lib/protobuf/rpc/service.rb

@@ -1,6 +1,5 @@
-require 'active_support/core_ext/class'
-
 require 'protobuf/logging'
+require 'protobuf/message'
 require 'protobuf/rpc/client'
 require 'protobuf/rpc/error'
 require 'protobuf/rpc/service_filters'
@@ -14,6 +13,7 @@ module Protobuf
     class Service
       include ::Protobuf::Logging
       include ::Protobuf::Rpc::ServiceFilters
+      ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::ServiceOptions }
 
       DEFAULT_HOST = '127.0.0.1'.freeze
       DEFAULT_PORT = 9399

data/lib/protobuf/varint.rb

@@ -1,5 +1,3 @@
-require 'protobuf/varint_pure'
-
 module Protobuf
   class Varint
     if defined?(::Varint)

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.7.0.pre0'
+  VERSION = '3.7.0.pre1'
 end

data/protobuf.gemspec

@@ -27,7 +27,8 @@ require "protobuf/version"
   s.add_development_dependency 'ffi-rzmq'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '>= 3.0'
-  s.add_development_dependency 'rubocop', '0.34.2'
+  s.add_development_dependency "rubocop", "~> 0.35.0"
+  s.add_development_dependency "parser", "2.3.0.6" # Locked this down since 2.3.0.7 causes issues. https://github.com/bbatsov/rubocop/pull/2984
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'yard'

data/spec/lib/protobuf/enum_spec.rb

@@ -22,8 +22,8 @@ RSpec.describe Protobuf::Enum do
     end
 
     describe '.aliases_allowed?' do
-      it 'is nil when the option is not set' do
-        expect(Test::EnumTestType.aliases_allowed?).to be nil
+      it 'is false when the option is not set' do
+        expect(Test::EnumTestType.aliases_allowed?).to be false
       end
     end
 
@@ -57,7 +57,7 @@ RSpec.describe Protobuf::Enum do
             Test::EnumTestType::TWO,
             Test::EnumTestType::MINUS_ONE,
             Test::EnumTestType::THREE,
-          ],
+          ]
         )
       end
 
@@ -68,7 +68,7 @@ RSpec.describe Protobuf::Enum do
               EnumAliasTest::FOO,
               EnumAliasTest::BAR,
               EnumAliasTest::BAZ,
-            ],
+            ]
           )
         end
       end

data/spec/lib/protobuf/generators/file_generator_spec.rb

@@ -29,4 +29,37 @@ RSpec.describe ::Protobuf::Generators::FileGenerator do
 
   end
 
+  describe '#compile' do
+    it 'generates the file contents' do
+      subject.compile
+      expect(subject.to_s).to eq <<EOF
+# encoding: utf-8
+
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf'
+
+EOF
+    end
+
+    it 'generates the file contents using default package name' do
+      allow(ENV).to receive(:key?).with('PB_ALLOW_DEFAULT_PACKAGE_NAME')
+        .and_return(true)
+      subject.compile
+      expect(subject.to_s).to eq <<EOF
+# encoding: utf-8
+
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf'
+
+module Foo
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
+end
+
+EOF
+    end
+  end
 end

data/spec/lib/protobuf/message_spec.rb

@@ -181,6 +181,12 @@ RSpec.describe Protobuf::Message do
       test_enum = Test::EnumTestMessage.new { |p| p.non_default_enum = 2 }
       expect(test_enum.non_default_enum).to eq(2)
     end
+
+    # to be deprecated
+    it "allows you to pass nil to repeated fields" do
+      test = Test::Resource.new(:repeated_enum => nil)
+      expect(test.repeated_enum).to eq([])
+    end
   end
 
   describe '#encode' do
@@ -444,6 +450,10 @@ RSpec.describe Protobuf::Message do
       expect { subject.name = 1 }.to raise_error(/name/)
     end
 
+    it 'does not allow a repeated field is set to nil' do
+      expect { subject.repeated_enum = nil }.to raise_error(TypeError)
+    end
+
     context '#{simple_field_name}!' do
       it 'returns value of set field' do
         expect(::Test::Resource.new(:name => "Joe").name!).to eq("Joe")
@@ -723,6 +733,17 @@ RSpec.describe Protobuf::Message do
         instance[100] = true
         expect(instance[:ext_is_searchable]).to eq(true)
       end
+
+      # to be deprecated
+      it 'does nothing when sent an empty array' do
+        instance[:repeated_enum] = nil
+        expect(instance[:repeated_enum]).to eq([])
+        instance[:repeated_enum] = [1, 2]
+        expect(instance[:repeated_enum]).to eq([1, 2])
+        instance[:repeated_enum] = nil
+        # Yes this is very silly, but backwards compatible
+        expect(instance[:repeated_enum]).to eq([1, 2])
+      end
     end
 
     context 'throwing TypeError' do

data/spec/lib/protobuf/optionable_spec.rb

@@ -1,46 +1,169 @@
 require 'spec_helper'
 require 'protobuf/optionable'
+require 'protobuf/field/message_field'
 
 RSpec.describe 'Optionable' do
+  describe '.{get,get!}_option' do
+    before do
+      stub_const("OptionableGetOptionTest", Class.new(::Protobuf::Message) do
+        set_option :deprecated, true
+        set_option :".package.message_field", :field => 33
 
-  describe '.set_option' do
-    before(:all) do
-      OptionableSetOptionTest = ::Class.new do
-        include ::Protobuf::Optionable
-      end
+        optional :int32, :field, 1
+      end)
+    end
+
+    it '.get_option retrieves the option as a symbol' do
+      expect(OptionableGetOptionTest.get_option(:deprecated)).to be(true)
+    end
+
+    it '.get_option returns the default value for unset options' do
+      expect(OptionableGetOptionTest.get_option(:message_set_wire_format)).to be(false)
+    end
+
+    it '.get_option retrieves the option as a string' do
+      expect(OptionableGetOptionTest.get_option('deprecated')).to be(true)
+    end
+
+    it '.get_option errors if the option does not exist' do
+      expect { OptionableGetOptionTest.get_option(:baz) }.to raise_error(ArgumentError)
+    end
+
+    it '.get_option errors if the option is not accessed by its fully qualified name' do
+      message_field = ::Protobuf::Field::MessageField.new(
+        OptionableGetOptionTest, :optional, OptionableGetOptionTest, '.package.message_field', 2, '.message_field', {})
+      allow(::Google::Protobuf::MessageOptions).to receive(:get_field).and_return(message_field)
+      expect { OptionableGetOptionTest.get_option(message_field.name) }.to raise_error(ArgumentError)
+    end
+
+    it '.get_option can return an option representing a message' do
+      message_field = ::Protobuf::Field::MessageField.new(
+        OptionableGetOptionTest, :optional, OptionableGetOptionTest, '.package.message_field', 2, 'message_field', {})
+      allow(::Google::Protobuf::MessageOptions).to receive(:get_field).and_return(message_field)
+      expect(OptionableGetOptionTest.get_option(message_field.fully_qualified_name)).to eq(OptionableGetOptionTest.new(:field => 33))
+    end
+
+    it '.get_option! retrieves explicitly an set option' do
+      expect(OptionableGetOptionTest.get_option!(:deprecated)).to be(true)
+    end
+
+    it '.get_option! returns nil for unset options' do
+      expect(OptionableGetOptionTest.get_option!(:message_set_wire_format)).to be(nil)
+    end
+
+    it '.get_option! errors if the option does not exist' do
+      expect { OptionableGetOptionTest.get_option(:baz) }.to raise_error(ArgumentError)
+    end
+
+    it '#get_option retrieves the option as a symbol' do
+      expect(OptionableGetOptionTest.new.get_option(:deprecated)).to be(true)
+    end
+
+    it '#get_option returns the default value for unset options' do
+      expect(OptionableGetOptionTest.new.get_option(:message_set_wire_format)).to be(false)
     end
 
-    it 'stores the given option and value' do
-      expect(OptionableSetOptionTest).to respond_to(:set_option)
-      expect(OptionableSetOptionTest.method(:set_option).arity).to eq(-2)
-      expect do
-        OptionableSetOptionTest.set_option(:foo, :bar)
-      end.to_not raise_error
+    it '#get_option retrieves the option as a string' do
+      expect(OptionableGetOptionTest.new.get_option('deprecated')).to be(true)
     end
 
-    it 'defaults the value to true' do
-      OptionableSetOptionTest.set_option(:baz_enabled)
-      expect(OptionableSetOptionTest.get_option(:baz_enabled)).to be true
+    it '#get_option errors if the option is not accessed by its fully qualified name' do
+      message_field = ::Protobuf::Field::MessageField.new(
+        OptionableGetOptionTest, :optional, OptionableGetOptionTest, '.package.message_field', 2, 'message_field', {})
+      allow(::Google::Protobuf::MessageOptions).to receive(:get_field).and_return(message_field)
+      expect { OptionableGetOptionTest.new.get_option(message_field.name) }.to raise_error(ArgumentError)
+    end
+
+    it '#get_option can return an option representing a message' do
+      message_field = ::Protobuf::Field::MessageField.new(
+        OptionableGetOptionTest, :optional, OptionableGetOptionTest, '.package.message_field', 2, 'message_field', {})
+      allow(::Google::Protobuf::MessageOptions).to receive(:get_field).and_return(message_field)
+      expect(OptionableGetOptionTest.new.get_option(message_field.fully_qualified_name)).to eq(OptionableGetOptionTest.new(:field => 33))
+    end
+
+    it '#get_option errors if the option does not exist' do
+      expect { OptionableGetOptionTest.new.get_option(:baz) }.to raise_error(ArgumentError)
+    end
+
+    it '#get_option! retrieves explicitly an set option' do
+      expect(OptionableGetOptionTest.new.get_option!(:deprecated)).to be(true)
+    end
+
+    it '#get_option! returns nil for unset options' do
+      expect(OptionableGetOptionTest.new.get_option!(:message_set_wire_format)).to be(nil)
+    end
+
+    it '#get_option! errors if the option does not exist' do
+      expect { OptionableGetOptionTest.new.get_option(:baz) }.to raise_error(ArgumentError)
     end
   end
 
-  describe '.get_option' do
-    before(:all) do
-      OptionableGetOptionTest = ::Class.new do
-        include ::Protobuf::Optionable
-        set_option :foo, :bar
+  describe '.inject' do
+    let(:klass) { Class.new }
+
+    it 'adds klass.{set,get}_option' do
+      expect { klass.get_option(:deprecated) }.to raise_error(NoMethodError)
+      expect { klass.__send__(:set_option, :deprecated, true) }.to raise_error(NoMethodError)
+      ::Protobuf::Optionable.inject(klass) { ::Google::Protobuf::MessageOptions }
+      expect(klass.get_option(:deprecated)).to eq(false)
+      expect { klass.set_option(:deprecated, true) }.to raise_error(NoMethodError)
+      klass.__send__(:set_option, :deprecated, true)
+      expect(klass.get_option(:deprecated)).to eq(true)
+    end
+
+    it 'adds klass#get_option' do
+      expect { klass.new.get_option(:deprecated) }.to raise_error(NoMethodError)
+      ::Protobuf::Optionable.inject(klass) { ::Google::Protobuf::MessageOptions }
+      expect(klass.new.get_option(:deprecated)).to eq(false)
+    end
+
+    it 'adds klass.optionable_descriptor_class' do
+      expect { klass.optionable_descriptor_class }.to raise_error(NoMethodError)
+      ::Protobuf::Optionable.inject(klass) { ::Google::Protobuf::MessageOptions }
+      expect(klass.optionable_descriptor_class).to eq(::Google::Protobuf::MessageOptions)
+    end
+
+    it 'does not add klass.optionable_descriptor_class twice' do
+      expect(klass).to receive(:define_singleton_method).once
+      ::Protobuf::Optionable.inject(klass) { ::Google::Protobuf::MessageOptions }
+      klass.instance_eval do
+        def optionable_descriptor_class
+          ::Google::Protobuf::MessageOptions
+        end
       end
+      ::Protobuf::Optionable.inject(klass) { ::Google::Protobuf::MessageOptions }
     end
 
-    it 'retrieves the option for the given name, if any' do
-      expect(OptionableGetOptionTest.get_option(:foo)).to eq(:bar)
-      expect(OptionableGetOptionTest.get_option(:baz)).to be_nil
+    it 'throws error when klass.optionable_descriptor_class defined twice with different args' do
+      ::Protobuf::Optionable.inject(klass) { ::Google::Protobuf::MessageOptions }
+      expect { ::Protobuf::Optionable.inject(klass) { ::Google::Protobuf::FileOptions } }
+        .to raise_error('A class is being defined with two different descriptor classes, something is very wrong')
     end
 
-    it 'retrieves the option in the context of an instance' do
-      expect(OptionableGetOptionTest.new.get_option(:foo)).to eq(:bar)
-      expect(OptionableGetOptionTest.new.get_option(:baz)).to be_nil
+    context 'extend_class = false' do
+      let(:object) { klass.new }
+      it 'adds object.{get,set}_option' do
+        expect { object.get_option(:deprecated) }.to raise_error(NoMethodError)
+        expect { object.__send__(:set_option, :deprecated, true) }.to raise_error(NoMethodError)
+        ::Protobuf::Optionable.inject(klass, false) { ::Google::Protobuf::MessageOptions }
+        expect(object.get_option(:deprecated)).to eq(false)
+        expect { object.set_option(:deprecated, true) }.to raise_error(NoMethodError)
+        object.__send__(:set_option, :deprecated, true)
+        expect(object.get_option(:deprecated)).to eq(true)
+      end
+
+      it 'does not add klass.{get,set}_option' do
+        expect { object.get_option(:deprecated) }.to raise_error(NoMethodError)
+        ::Protobuf::Optionable.inject(klass, false) { ::Google::Protobuf::MessageOptions }
+        expect { klass.get_option(:deprecated) }.to raise_error(NoMethodError)
+        expect { klass.__send__(:set_option, :deprecated) }.to raise_error(NoMethodError)
+      end
+
+      it 'creates an instance method optionable_descriptor_class' do
+        expect { object.optionable_descriptor_class }.to raise_error(NoMethodError)
+        ::Protobuf::Optionable.inject(klass, false) { ::Google::Protobuf::MessageOptions }
+        expect(object.optionable_descriptor_class).to eq(::Google::Protobuf::MessageOptions)
+      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/support/protos/enum.pb.rb

@@ -3,7 +3,7 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 
 ##
@@ -12,6 +12,7 @@ require 'protobuf/message'
 require 'protos/resource.pb'
 
 module Test
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
 
   ##
   # Enum Classes

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

@@ -3,7 +3,7 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 require 'protobuf/rpc/service'
 
 
@@ -13,6 +13,7 @@ require 'protobuf/rpc/service'
 require 'protos/google_unittest_import.pb'
 
 module Protobuf_unittest
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
 
   ##
   # Enum Classes

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

@@ -3,7 +3,7 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 
 ##
@@ -12,6 +12,7 @@ require 'protobuf/message'
 require 'protos/google_unittest_import_public.pb'
 
 module Protobuf_unittest_import
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
 
   ##
   # Enum Classes

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

@@ -3,9 +3,10 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 module Protobuf_unittest_import
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
 
   ##
   # Message Classes

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

@@ -3,9 +3,10 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 module Test
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
 
   ##
   # Message Classes

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

@@ -3,10 +3,11 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 require 'protobuf/rpc/service'
 
 module Test
+  ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
 
   ##
   # Enum Classes

data/spec/support/server.rb

@@ -31,7 +31,7 @@ class StubServer
         :worker_port => 9400,
         :delay => 0,
         :server => Protobuf::Rpc::Socket::Server,
-      ),
+      )
     )
 
     start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.7.0.pre0
+  version: 3.7.0.pre1
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -113,18 +113,32 @@ dependencies:
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.35.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.35.0
+- !ruby/object:Gem::Dependency
+  name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 2.3.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 2.3.0.6
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -437,7 +451,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.