protobuf 3.7.0.pre2 → 3.7.0.pre3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.7.0.pre2
+  version: 3.7.0.pre3
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,16 +87,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -117,14 +117,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,7 @@ files:
 - lib/protobuf/generators/file_generator.rb
 - lib/protobuf/generators/group_generator.rb
 - lib/protobuf/generators/message_generator.rb
+- lib/protobuf/generators/option_generator.rb
 - lib/protobuf/generators/printable.rb
 - lib/protobuf/generators/service_generator.rb
 - lib/protobuf/lifecycle.rb
@@ -314,9 +315,7 @@ files:
 - lib/protobuf/optionable.rb
 - lib/protobuf/rpc/buffer.rb
 - lib/protobuf/rpc/client.rb
-- 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
@@ -332,6 +331,7 @@ files:
 - lib/protobuf/rpc/middleware/response_encoder.rb
 - lib/protobuf/rpc/middleware/runner.rb
 - lib/protobuf/rpc/rpc.pb.rb
+- lib/protobuf/rpc/rpc_method.rb
 - lib/protobuf/rpc/server.rb
 - lib/protobuf/rpc/servers/socket/server.rb
 - lib/protobuf/rpc/servers/socket/worker.rb
@@ -364,18 +364,29 @@ files:
 - spec/encoding/all_types_spec.rb
 - spec/encoding/extreme_values_spec.rb
 - spec/functional/class_inheritance_spec.rb
+- spec/functional/code_generator_spec.rb
 - spec/functional/socket_server_spec.rb
 - spec/functional/zmq_server_spec.rb
 - spec/lib/protobuf/cli_spec.rb
 - spec/lib/protobuf/code_generator_spec.rb
 - spec/lib/protobuf/enum_spec.rb
 - spec/lib/protobuf/field/bool_field_spec.rb
+- spec/lib/protobuf/field/double_field_spec.rb
 - spec/lib/protobuf/field/enum_field_spec.rb
 - spec/lib/protobuf/field/field_array_spec.rb
+- spec/lib/protobuf/field/fixed32_field_spec.rb
+- spec/lib/protobuf/field/fixed64_field_spec.rb
 - spec/lib/protobuf/field/float_field_spec.rb
 - spec/lib/protobuf/field/int32_field_spec.rb
+- spec/lib/protobuf/field/int64_field_spec.rb
 - spec/lib/protobuf/field/message_field_spec.rb
+- spec/lib/protobuf/field/sfixed32_field_spec.rb
+- spec/lib/protobuf/field/sfixed64_field_spec.rb
+- spec/lib/protobuf/field/sint32_field_spec.rb
+- spec/lib/protobuf/field/sint64_field_spec.rb
 - spec/lib/protobuf/field/string_field_spec.rb
+- spec/lib/protobuf/field/uint32_field_spec.rb
+- spec/lib/protobuf/field/uint64_field_spec.rb
 - spec/lib/protobuf/field_spec.rb
 - spec/lib/protobuf/generators/base_spec.rb
 - spec/lib/protobuf/generators/enum_generator_spec.rb
@@ -388,9 +399,7 @@ files:
 - spec/lib/protobuf/message_spec.rb
 - spec/lib/protobuf/optionable_spec.rb
 - spec/lib/protobuf/rpc/client_spec.rb
-- 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
@@ -420,6 +429,9 @@ files:
 - spec/support/protos/google_unittest.bin
 - spec/support/protos/google_unittest.pb.rb
 - spec/support/protos/google_unittest.proto
+- spec/support/protos/google_unittest_custom_options.bin
+- spec/support/protos/google_unittest_custom_options.pb.rb
+- spec/support/protos/google_unittest_custom_options.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
@@ -451,7 +463,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
@@ -461,18 +473,29 @@ test_files:
 - spec/encoding/all_types_spec.rb
 - spec/encoding/extreme_values_spec.rb
 - spec/functional/class_inheritance_spec.rb
+- spec/functional/code_generator_spec.rb
 - spec/functional/socket_server_spec.rb
 - spec/functional/zmq_server_spec.rb
 - spec/lib/protobuf/cli_spec.rb
 - spec/lib/protobuf/code_generator_spec.rb
 - spec/lib/protobuf/enum_spec.rb
 - spec/lib/protobuf/field/bool_field_spec.rb
+- spec/lib/protobuf/field/double_field_spec.rb
 - spec/lib/protobuf/field/enum_field_spec.rb
 - spec/lib/protobuf/field/field_array_spec.rb
+- spec/lib/protobuf/field/fixed32_field_spec.rb
+- spec/lib/protobuf/field/fixed64_field_spec.rb
 - spec/lib/protobuf/field/float_field_spec.rb
 - spec/lib/protobuf/field/int32_field_spec.rb
+- spec/lib/protobuf/field/int64_field_spec.rb
 - spec/lib/protobuf/field/message_field_spec.rb
+- spec/lib/protobuf/field/sfixed32_field_spec.rb
+- spec/lib/protobuf/field/sfixed64_field_spec.rb
+- spec/lib/protobuf/field/sint32_field_spec.rb
+- spec/lib/protobuf/field/sint64_field_spec.rb
 - spec/lib/protobuf/field/string_field_spec.rb
+- spec/lib/protobuf/field/uint32_field_spec.rb
+- spec/lib/protobuf/field/uint64_field_spec.rb
 - spec/lib/protobuf/field_spec.rb
 - spec/lib/protobuf/generators/base_spec.rb
 - spec/lib/protobuf/generators/enum_generator_spec.rb
@@ -485,9 +508,7 @@ test_files:
 - spec/lib/protobuf/message_spec.rb
 - spec/lib/protobuf/optionable_spec.rb
 - spec/lib/protobuf/rpc/client_spec.rb
-- 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
@@ -517,6 +538,9 @@ test_files:
 - spec/support/protos/google_unittest.bin
 - spec/support/protos/google_unittest.pb.rb
 - spec/support/protos/google_unittest.proto
+- spec/support/protos/google_unittest_custom_options.bin
+- spec/support/protos/google_unittest_custom_options.pb.rb
+- spec/support/protos/google_unittest_custom_options.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
@@ -528,4 +552,3 @@ test_files:
 - spec/support/resource_service.rb
 - spec/support/server.rb
 - spec/support/test_app_file.rb
-has_rdoc: 

data/lib/protobuf/rpc/connector.rb

@@ -1,19 +0,0 @@
-require 'protobuf'
-
-module Protobuf
-  module Rpc
-    class Connector
-
-      # Returns a connector class for the pre-defined connector_type.
-      def self.connector_for_client
-        case ::Protobuf.connector_type
-        when :zmq then
-          ::Protobuf::Rpc::Connectors::Zmq
-        else
-          ::Protobuf::Rpc::Connectors::Socket
-        end
-      end
-
-    end
-  end
-end

data/lib/protobuf/rpc/connectors/common.rb

@@ -1,176 +0,0 @@
-require 'protobuf'
-
-module Protobuf
-  module Rpc
-    module Connectors
-      module Common
-
-        attr_reader :error
-
-        def any_callbacks?
-          [@complete_cb, @failure_cb, @success_cb].any?
-        end
-
-        def request_caller
-          @options[:client_host] || ::Protobuf.client_host
-        end
-
-        def complete
-          @stats.stop
-          logger.info { @stats.to_s }
-          logger.debug { sign_message('Response proceessing complete') }
-          @complete_cb.call(self) unless @complete_cb.nil?
-        rescue => e
-          logger.error { sign_message('Complete callback error encountered') }
-          log_exception(e)
-          raise
-        end
-
-        def data_callback(data)
-          logger.debug { sign_message('Using data_callback') }
-          @used_data_callback = true
-          @data = data
-        end
-
-        # All failures should be routed through this method.
-        #
-        # @param [Symbol] code The code we're using (see ::Protobuf::Socketrpc::ErrorReason)
-        # @param [String] message The error message
-        def failure(code, message)
-          @error = ClientError.new
-          @error.code = Protobuf::Socketrpc::ErrorReason.fetch(code)
-          @error.message = message
-          logger.debug { sign_message("Server failed request (invoking on_failure): #{@error.inspect}") }
-
-          @failure_cb.call(@error) unless @failure_cb.nil?
-        rescue => e
-          logger.error { sign_message("Failure callback error encountered") }
-          log_exception(e)
-          raise
-        ensure
-          complete
-        end
-
-        def initialize_stats
-          @stats = ::Protobuf::Rpc::Stat.new(:CLIENT)
-          @stats.server = [@options[:port], @options[:host]]
-          @stats.service = @options[:service].name
-          @stats.method_name = @options[:method].to_s
-        rescue => ex
-          log_exception(ex)
-          failure(:RPC_ERROR, "Invalid stats configuration. #{ex.message}")
-        end
-
-        def log_signature
-          @_log_signature ||= "[client-#{self.class}]"
-        end
-
-        def parse_response
-          # Close up the connection as we no longer need it
-          close_connection
-
-          logger.debug { sign_message("Parsing response from server (connection closed)") }
-
-          # Parse out the raw response
-          @stats.response_size = @response_data.size unless @response_data.nil?
-          response_wrapper = Protobuf::Socketrpc::Response.decode(@response_data)
-
-          # Determine success or failure based on parsed data
-          if response_wrapper.field?(:error_reason)
-            logger.debug { sign_message("Error response parsed") }
-
-            # fail the call if we already know the client is failed
-            # (don't try to parse out the response payload)
-            failure(response_wrapper.error_reason, response_wrapper.error)
-          else
-            logger.debug { sign_message("Successful response parsed") }
-
-            # Ensure client_response is an instance
-            parsed = @options[:response_type].decode(response_wrapper.response_proto.to_s)
-
-            if parsed.nil? && !response_wrapper.field?(:error_reason)
-              failure(:BAD_RESPONSE_PROTO, 'Unable to parse response from server')
-            else
-              verify_callbacks
-              succeed(parsed)
-              return @data if @used_data_callback
-            end
-          end
-        end
-
-        def post_init
-          send_data unless error?
-        rescue => e
-          failure(:RPC_ERROR, "Connection error: #{e.message}")
-        end
-
-        def request_bytes
-          validate_request_type!
-          fields = { :service_name => @options[:service].name,
-                     :method_name => @options[:method].to_s,
-                     :request_proto => @options[:request],
-                     :caller => request_caller }
-
-          return ::Protobuf::Socketrpc::Request.encode(fields)
-        rescue => e
-          failure(:INVALID_REQUEST_PROTO, "Could not set request proto: #{e.message}")
-        end
-
-        def setup_connection
-          initialize_stats
-          @request_data = request_bytes
-          @stats.request_size = request_bytes.size
-        end
-
-        def succeed(response)
-          logger.debug { sign_message("Server succeeded request (invoking on_success)") }
-          @success_cb.call(response) unless @success_cb.nil?
-        rescue => e
-          logger.error { sign_message("Success callback error encountered") }
-          log_exception(e)
-          failure(:RPC_ERROR, "An exception occurred while calling on_success: #{e.message}")
-        ensure
-          complete
-        end
-
-        def timeout
-          if options[:timeout]
-            options[:timeout]
-          else
-            300 # seconds
-          end
-        end
-
-        # Wrap the given block in a timeout of the configured number of seconds.
-        #
-        def timeout_wrap(&block)
-          ::Timeout.timeout(timeout, &block)
-        rescue ::Timeout::Error
-          failure(:RPC_FAILED, "The server took longer than #{timeout} seconds to respond")
-        end
-
-        def validate_request_type!
-          unless @options[:request].class == @options[:request_type]
-            expected = @options[:request_type].name
-            actual = @options[:request].class.name
-            failure(:INVALID_REQUEST_PROTO, "Expected request type to be type of #{expected}, got #{actual} instead")
-          end
-        end
-
-        def verify_callbacks
-          unless any_callbacks?
-            logger.debug { sign_message("No callbacks set, using data_callback") }
-            @success_cb = @failure_cb = method(:data_callback)
-          end
-        end
-
-        def verify_options!
-          # Verify the options that are necessary and merge them in
-          [:service, :method, :host, :port].each do |opt|
-            failure(:RPC_ERROR, "Invalid client connection configuration. #{opt} must be a defined option.") if @options[opt].nil?
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-require 'spec_helper'
-require 'protobuf/socket'
-require 'protobuf/zmq'
-
-RSpec.describe ::Protobuf::Rpc::Connector do
-
-  describe '.connector_for_client(true)' do
-    subject { described_class.connector_for_client }
-
-    context 'Protobuf.connector_type is socket' do
-      before { ::Protobuf.connector_type = :socket }
-      specify { expect(subject).to eq ::Protobuf::Rpc::Connectors::Socket }
-    end
-
-    context 'Protobuf.connector_type is not a known value' do
-      before { allow(::Protobuf).to receive(:connector_type).and_return(:foo) }
-      specify { expect(subject).to eq(::Protobuf::Rpc::Connectors::Socket) }
-    end
-
-    context 'Protobuf.connector_type is zmq' do
-      before { ::Protobuf.connector_type = :zmq }
-      specify { expect(subject).to eq(::Protobuf::Rpc::Connectors::Zmq) }
-    end
-  end
-
-end

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

@@ -1,170 +0,0 @@
-require 'spec_helper'
-require 'protobuf/rpc/service'
-
-RSpec.describe Protobuf::Rpc::Connectors::Common do
-  let(:common_class) do
-    Class.new(Protobuf::Rpc::Connectors::Base) do
-      include Protobuf::Rpc::Connectors::Common
-      attr_accessor :options
-      attr_accessor :stats
-    end
-  end
-
-  let(:subject_options) { {} }
-
-  subject { @subject ||= common_class.new(subject_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 '#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(:subject_options) { { :client_host => hostname } }
-
-      specify { expect(subject.request_caller).to_not eq ::Protobuf.client_host }
-      specify { expect(subject.request_caller).to eq hostname }
-    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 '#request_bytes' do
-    let(:service) { Test::ResourceService }
-    let(:method) { :find }
-    let(:request) { '' }
-    let(:client_host) { 'myhost.myservice.com' }
-    let(:subject_options) do
-      {
-        :service => service,
-        :method => method,
-        :request => request,
-        :client_host => client_host,
-      }
-    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 "#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