protobuf 3.3.6 → 3.4.0

data/spec/functional/socket_server_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'spec/support/test/resource_service'
 
-describe 'Functional Socket Client' do
+RSpec.describe 'Functional Socket Client' do
   before(:all) do
     load "protobuf/socket.rb"
     @options = OpenStruct.new(:host => "127.0.0.1", :port => 9399, :backlog => 100, :threshold => 100)
@@ -16,7 +16,7 @@ describe 'Functional Socket Client' do
   end
 
   it 'runs fine when required fields are set' do
-    expect {
+    expect do
       client = ::Test::ResourceService.client
 
       client.find(:name => 'Test Name', :active => true) do |c|
@@ -26,10 +26,10 @@ describe 'Functional Socket Client' do
         end
 
         c.on_failure do |err|
-          raise err.inspect
+          fail err.inspect
         end
       end
-    }.to_not raise_error
+    end.to_not raise_error
   end
 
   it 'calls the on_failure callback when a message is malformed' do
@@ -38,11 +38,11 @@ describe 'Functional Socket Client' do
     client = ::Test::ResourceService.client
 
     client.find(request) do |c|
-      c.on_success { raise "shouldn't pass"}
-      c.on_failure {|e| error = e}
+      c.on_success { fail "shouldn't pass" }
+      c.on_failure { |e| error = e }
     end
 
-    expect(error.message).to match(/name.*required/)
+    expect(error.message).to match(/Required field.*does not have a value/)
   end
 
   it 'calls the on_failure callback when the request type is wrong' do
@@ -51,10 +51,9 @@ describe 'Functional Socket Client' do
     client = ::Test::ResourceService.client
 
     client.find(request) do |c|
-      c.on_success { raise "shouldn't pass"}
-      c.on_failure {|e| error = e}
+      c.on_success { fail "shouldn't pass" }
+      c.on_failure { |e| error = e }
     end
     expect(error.message).to match(/expected request.*ResourceFindRequest.*Resource instead/i)
   end
 end
-

data/spec/functional/zmq_server_spec.rb

@@ -3,15 +3,17 @@ require 'spec_helper'
 require 'spec/support/test/resource_service'
 require 'protobuf/rpc/service_directory'
 
-describe 'Functional ZMQ Client' do
+RSpec.describe 'Functional ZMQ Client' do
   before(:all) do
     load "protobuf/zmq.rb"
-    @runner = ::Protobuf::Rpc::ZmqRunner.new({ :host => "127.0.0.1",
-                                               :port => 9399,
-                                               :worker_port => 9408,
-                                               :backlog => 100,
-                                               :threshold => 100,
-                                               :threads => 5 })
+    @runner = ::Protobuf::Rpc::ZmqRunner.new(
+      :host => "127.0.0.1",
+      :port => 9399,
+      :worker_port => 9408,
+      :backlog => 100,
+      :threshold => 100,
+      :threads => 5,
+    )
     @server_thread = Thread.new(@runner) { |runner| runner.run }
     Thread.pass until @runner.running?
   end
@@ -22,7 +24,7 @@ describe 'Functional ZMQ Client' do
   end
 
   it 'runs fine when required fields are set' do
-    expect {
+    expect do
       client = ::Test::ResourceService.client
 
       client.find(:name => 'Test Name', :active => true) do |c|
@@ -32,15 +34,15 @@ describe 'Functional ZMQ Client' do
         end
 
         c.on_failure do |err|
-          raise err.inspect
+          fail err.inspect
         end
       end
-    }.to_not raise_error
+    end.to_not raise_error
   end
 
   it 'runs under heavy load' do
-    10.times do |x|
-      5.times.map do |y|
+    10.times do
+      5.times.map do
         Thread.new do
           client = ::Test::ResourceService.client
 
@@ -51,7 +53,7 @@ describe 'Functional ZMQ Client' do
             end
 
             c.on_failure do |err|
-              raise err.inspect
+              fail err.inspect
             end
           end
         end
@@ -66,10 +68,10 @@ describe 'Functional ZMQ Client' do
       client = ::Test::ResourceService.client
 
       client.find(request) do |c|
-        c.on_success { raise "shouldn't pass" }
-        c.on_failure {|e| error = e }
+        c.on_success { fail "shouldn't pass" }
+        c.on_failure { |e| error = e }
       end
-      expect(error.message).to match(/name.*required/)
+      expect(error.message).to match(/Required field.*does not have a value/)
     end
   end
 
@@ -80,8 +82,8 @@ describe 'Functional ZMQ Client' do
       client = ::Test::ResourceService.client
 
       client.find(request) do |c|
-        c.on_success { raise "shouldn't pass" }
-        c.on_failure {|e| error = e}
+        c.on_success { fail "shouldn't pass" }
+        c.on_failure { |e| error = e }
       end
       expect(error.message).to match(/expected request.*ResourceFindRequest.*Resource instead/i)
     end
@@ -93,7 +95,7 @@ describe 'Functional ZMQ Client' do
       client = ::Test::ResourceService.client(:timeout => 1)
 
       client.find_with_sleep(:sleep => 2) do |c|
-        c.on_success { raise "shouldn't pass" }
+        c.on_success { fail "shouldn't pass" }
         c.on_failure { |e| error = e }
       end
       expect(error.message).to match(/The server repeatedly failed to respond/)

data/spec/lib/protobuf/cli_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 require 'protobuf/cli'
 
-describe ::Protobuf::CLI do
+RSpec.describe ::Protobuf::CLI do
 
   let(:app_file) do
     File.expand_path('../../../support/test_app_file.rb', __FILE__)
   end
 
-  let(:sock_runner) {
+  let(:sock_runner) do
     runner = double("SocketRunner", :register_signals => nil)
     allow(runner).to receive(:run).and_return(::ActiveSupport::Notifications.publish("after_server_bind"))
     runner
-  }
+  end
 
-  let(:zmq_runner) {
-    runner = double "ZmqRunner", register_signals: nil
+  let(:zmq_runner) do
+    runner = double("ZmqRunner", :register_signals => nil)
     allow(runner).to receive(:run).and_return(::ActiveSupport::Notifications.publish("after_server_bind"))
     runner
-  }
+  end
 
   around(:each) do |example|
     logger = ::Protobuf::Logging.logger
@@ -31,12 +31,12 @@ describe ::Protobuf::CLI do
   end
 
   describe '#start' do
-    let(:base_args) { [ 'start', app_file ] }
+    let(:base_args) { ['start', app_file] }
     let(:test_args) { [] }
     let(:args) { base_args + test_args }
 
     context 'host option' do
-      let(:test_args) { [ '--host=123.123.123.123' ] }
+      let(:test_args) { ['--host=123.123.123.123'] }
 
       it 'sends the host option to the runner' do
         expect(::Protobuf::Rpc::SocketRunner).to receive(:new) do |options|
@@ -47,7 +47,7 @@ describe ::Protobuf::CLI do
     end
 
     context 'port option' do
-      let(:test_args) { [ '--port=12345' ] }
+      let(:test_args) { ['--port=12345'] }
 
       it 'sends the port option to the runner' do
         expect(::Protobuf::Rpc::SocketRunner).to receive(:new) do |options|
@@ -58,7 +58,7 @@ describe ::Protobuf::CLI do
     end
 
     context 'threads option' do
-      let(:test_args) { [ '--threads=500' ] }
+      let(:test_args) { ['--threads=500'] }
 
       it 'sends the threads option to the runner' do
         expect(::Protobuf::Rpc::SocketRunner).to receive(:new) do |options|
@@ -69,7 +69,7 @@ describe ::Protobuf::CLI do
     end
 
     context 'backlog option' do
-      let(:test_args) { [ '--backlog=500' ] }
+      let(:test_args) { ['--backlog=500'] }
 
       it 'sends the backlog option to the runner' do
         expect(::Protobuf::Rpc::SocketRunner).to receive(:new) do |options|
@@ -80,7 +80,7 @@ describe ::Protobuf::CLI do
     end
 
     context 'threshold option' do
-      let(:test_args) { [ '--threshold=500' ] }
+      let(:test_args) { ['--threshold=500'] }
 
       it 'sends the backlog option to the runner' do
         expect(::Protobuf::Rpc::SocketRunner).to receive(:new) do |options|
@@ -91,7 +91,7 @@ describe ::Protobuf::CLI do
     end
 
     context 'log options' do
-      let(:test_args) { [ '--log=mylog.log', '--level=0' ] }
+      let(:test_args) { ['--log=mylog.log', '--level=0'] }
 
       it 'sends the log file and level options to the runner' do
         expect(::Protobuf::Logging).to receive(:initialize_logger) do |file, level|
@@ -115,7 +115,7 @@ describe ::Protobuf::CLI do
 
       unless defined?(JRUBY_VERSION)
         context 'request pausing' do
-          let(:test_args) { [ '--gc_pause_request' ] }
+          let(:test_args) { ['--gc_pause_request'] }
 
           it 'sets the configuration option to GC pause server request' do
             described_class.start(args)
@@ -150,7 +150,7 @@ describe ::Protobuf::CLI do
       end
 
       context 'when enabled' do
-        let(:test_args) { [ '--print_deprecation_warnings' ] }
+        let(:test_args) { ['--print_deprecation_warnings'] }
 
         it 'sets the deprecation warning flag to true' do
           described_class.start(args)
@@ -159,7 +159,7 @@ describe ::Protobuf::CLI do
       end
 
       context 'when disabled' do
-        let(:test_args) { [ '--no-print_deprecation_warnings' ] }
+        let(:test_args) { ['--no-print_deprecation_warnings'] }
 
         it 'sets the deprecation warning flag to false' do
           described_class.start(args)
@@ -171,7 +171,7 @@ describe ::Protobuf::CLI do
     context 'run modes' do
 
       context 'socket' do
-        let(:test_args) { [ '--socket' ] }
+        let(:test_args) { ['--socket'] }
         let(:runner) { ::Protobuf::Rpc::SocketRunner }
 
         before do
@@ -197,7 +197,7 @@ describe ::Protobuf::CLI do
       end
 
       context 'zmq workers only' do
-        let(:test_args) { [ '--workers_only', '--zmq' ] }
+        let(:test_args) { ['--workers_only', '--zmq'] }
         let(:runner) { ::Protobuf::Rpc::ZmqRunner }
 
         before do
@@ -224,7 +224,7 @@ describe ::Protobuf::CLI do
       end
 
       context 'zmq worker port' do
-        let(:test_args) { [ '--worker_port=1234', '--zmq' ] }
+        let(:test_args) { ['--worker_port=1234', '--zmq'] }
         let(:runner) { ::Protobuf::Rpc::ZmqRunner }
 
         before do
@@ -241,7 +241,7 @@ describe ::Protobuf::CLI do
       end
 
       context 'zmq' do
-        let(:test_args) { [ '--zmq' ] }
+        let(:test_args) { ['--zmq'] }
         let(:runner) { ::Protobuf::Rpc::ZmqRunner }
 
         before do

data/spec/lib/protobuf/code_generator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 require 'protobuf/code_generator'
 
-describe ::Protobuf::CodeGenerator do
+RSpec.describe ::Protobuf::CodeGenerator do
 
   # Some constants to shorten things up
   DESCRIPTOR = ::Google::Protobuf
@@ -19,11 +19,11 @@ describe ::Protobuf::CodeGenerator do
     let(:file_generator2) { double('file generator 2', :generate_output_file => output_file2) }
 
     let(:request_bytes) do
-      COMPILER::CodeGeneratorRequest.encode(:proto_file => [ input_file1, input_file2 ])
+      COMPILER::CodeGeneratorRequest.encode(:proto_file => [input_file1, input_file2])
     end
 
     let(:expected_response_bytes) do
-      COMPILER::CodeGeneratorResponse.encode(:file => [ output_file1, output_file2 ])
+      COMPILER::CodeGeneratorResponse.encode(:file => [output_file1, output_file2])
     end
 
     before do
@@ -40,11 +40,11 @@ describe ::Protobuf::CodeGenerator do
   context 'class-level printing methods' do
     describe '.fatal' do
       it 'raises a CodeGeneratorFatalError error' do
-        expect {
+        expect do
           described_class.fatal("something is wrong")
-        }.to raise_error(
+        end.to raise_error(
           ::Protobuf::CodeGenerator::CodeGeneratorFatalError,
-          "something is wrong"
+          "something is wrong",
         )
       end
     end

data/spec/lib/protobuf/enum_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Protobuf::Enum do
+RSpec.describe Protobuf::Enum do
 
   describe 'class dsl' do
     let(:name) { :THREE }
@@ -40,40 +40,43 @@ describe Protobuf::Enum do
         end
 
         it 'allows defining enums with the same tag number' do
-          expect {
+          expect do
             DefineEnumAlias.define(:FOO, 1)
             DefineEnumAlias.define(:BAR, 1)
-          }.not_to raise_error
+          end.not_to raise_error
         end
       end
     end
 
     describe '.enums' do
       it 'provides an array of defined Enums' do
-        expect(Test::EnumTestType.enums).to eq([
-          Test::EnumTestType::ONE,
-          Test::EnumTestType::TWO,
-          Test::EnumTestType::MINUS_ONE,
-          Test::EnumTestType::THREE
-        ])
+        expect(Test::EnumTestType.enums).to eq(
+          [
+            Test::EnumTestType::ONE,
+            Test::EnumTestType::TWO,
+            Test::EnumTestType::MINUS_ONE,
+            Test::EnumTestType::THREE,
+          ],
+        )
       end
 
       context 'when enum allows aliases' do
         it 'treats aliased enums as valid' do
-          expect(EnumAliasTest.enums).to eq([
-            EnumAliasTest::FOO,
-            EnumAliasTest::BAR,
-            EnumAliasTest::BAZ
-          ])
+          expect(EnumAliasTest.enums).to eq(
+            [
+              EnumAliasTest::FOO,
+              EnumAliasTest::BAR,
+              EnumAliasTest::BAZ,
+            ],
+          )
         end
       end
     end
 
-
     describe '.enums_for_tag' do
       it 'returns an array of Enums for the given tag, if any' do
-        expect(EnumAliasTest.enums_for_tag(1)).to eq([ EnumAliasTest::FOO, EnumAliasTest::BAR ])
-        expect(EnumAliasTest.enums_for_tag(2)).to eq([ EnumAliasTest::BAZ ])
+        expect(EnumAliasTest.enums_for_tag(1)).to eq([EnumAliasTest::FOO, EnumAliasTest::BAR])
+        expect(EnumAliasTest.enums_for_tag(2)).to eq([EnumAliasTest::BAZ])
         expect(EnumAliasTest.enums_for_tag(3)).to eq([])
       end
     end
@@ -174,21 +177,26 @@ describe Protobuf::Enum do
     end
 
     describe '.values' do
+      around do |example|
+        # this method is deprecated
+        ::Protobuf.deprecator.silence(&example)
+      end
+
       it 'provides a hash of defined Enums' do
-        expect(Test::EnumTestType.values).to eq({
+        expect(Test::EnumTestType.values).to eq(
           :MINUS_ONE => Test::EnumTestType::MINUS_ONE,
           :ONE       => Test::EnumTestType::ONE,
           :TWO       => Test::EnumTestType::TWO,
-          :THREE     => Test::EnumTestType::THREE
-        })
+          :THREE     => Test::EnumTestType::THREE,
+        )
       end
 
       it 'contains aliased Enums' do
-        expect(EnumAliasTest.values).to eq({
+        expect(EnumAliasTest.values).to eq(
           :FOO => EnumAliasTest::FOO,
           :BAR => EnumAliasTest::BAR,
-          :BAZ => EnumAliasTest::BAZ
-        })
+          :BAZ => EnumAliasTest::BAZ,
+        )
       end
     end
 
@@ -200,15 +208,24 @@ describe Protobuf::Enum do
     end
   end
 
-	subject { Test::EnumTestType::ONE }
+  subject { Test::EnumTestType::ONE }
   specify { expect(subject.class).to eq(Fixnum) }
   specify { expect(subject.parent_class).to eq(Test::EnumTestType) }
-	specify { expect(subject.name).to eq(:ONE) }
-	specify { expect(subject.tag).to eq(1) }
-	specify { expect(subject.value).to eq(1) }
-	specify { expect(subject.to_hash_value).to eq(1) }
-	specify { expect(subject.to_s).to eq("1") }
-	specify { expect(subject.inspect).to eq('#<Protobuf::Enum(Test::EnumTestType)::ONE=1>') }
+  specify { expect(subject.name).to eq(:ONE) }
+  specify { expect(subject.tag).to eq(1) }
+
+  context 'deprecated' do
+    around do |example|
+      # this method is deprecated
+      ::Protobuf.deprecator.silence(&example)
+    end
+
+    specify { expect(subject.value).to eq(1) }
+  end
+
+  specify { expect(subject.to_hash_value).to eq(1) }
+  specify { expect(subject.to_s).to eq("1") }
+  specify { expect(subject.inspect).to eq('#<Protobuf::Enum(Test::EnumTestType)::ONE=1>') }
   specify { expect(subject.to_s(:tag)).to eq("1") }
   specify { expect(subject.to_s(:name)).to eq("ONE") }
 
@@ -222,7 +239,16 @@ describe Protobuf::Enum do
     specify { expect(subject.try(:class)).to eq(subject.class) }
     specify { expect(subject.try(:name)).to eq(subject.name) }
     specify { expect(subject.try(:tag)).to eq(subject.tag) }
-    specify { expect(subject.try(:value)).to eq(subject.value) }
+
+    context 'deprecated' do
+      around do |example|
+        # this method is deprecated
+        ::Protobuf.deprecator.silence(&example)
+      end
+
+      specify { expect(subject.try(:value)).to eq(subject.value) }
+    end
+
     specify { expect(subject.try(:to_i)).to eq(subject.to_i) }
     specify { expect(subject.try(:to_int)).to eq(subject.to_int) }
     specify { subject.try { |yielded| expect(yielded).to eq(subject) } }