protobuf 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e5a341fcb307dfd13d03e56530493f316dadff4
-  data.tar.gz: 1dde8b64fe387bd0bcd87e5823e02bec8322bf25
+  metadata.gz: 6806ad95dd3051a54c6bcae3940287187fd50239
+  data.tar.gz: 326e902f6a3c9c64cc5a40b60562a04536d4e37d
 SHA512:
-  metadata.gz: 5511c46d74eb0e669400ab394fef865e4e1a8c0a919a967a1d1b97fba19e0dcb8073c08155b9a4fada0043bafb803adaad1d3019f3f293e367c41d9873ba6c10
-  data.tar.gz: 9c5f985a0ab726096f1bb662e48b2a9fe78133a5d523421ccdb93b43aad6aabc1fd45cce0e7d9643c9176ff0bc2bf02f16b2b8ad82e3ab99a176539ce392acbf
+  metadata.gz: 22f3ac751be365b4d3a2efc6e14d2e9706049557558dae209b3c0abd0d9487b4f80c9abce743c6110721a0f1940f94c6635b7869559b8923a275e8ae2f05edaf
+  data.tar.gz: e2b52a93261a2577ab260afefb1ab1eea6263a9a2ad8caac31a3058253c5bf55b042403b70901c8202c276302d6270f04bf1d2d72a212c2512f4728da82588e8

data/lib/protobuf/field/base_field.rb

@@ -19,10 +19,7 @@ module Protobuf
       # Attributes
       #
 
-      attr_reader :default, :default_value, :deprecated, :extension,
-                  :getter_method_name, :message_class, :name, :optional,
-                  :packed, :repeated, :required, :rule, :setter_method_name,
-                  :tag, :type_class
+      attr_reader :message_class, :name, :options, :rule, :tag, :type_class
 
       ##
       # Class Methods
@@ -37,20 +34,13 @@ module Protobuf
       #
 
       def initialize(message_class, rule, type_class, name, tag, options)
-        @message_class, @rule, @type_class, @name, @tag = \
-          message_class, rule, type_class, name, tag
+        @message_class = message_class
+        @name          = name
+        @rule          = rule
+        @tag           = tag
+        @type_class    = type_class
+        @options       = options
 
-        set_rule_predicates
-
-        @getter_method_name = name
-        @setter_method_name = "#{name}="
-        @default   = options.delete(:default)
-        @extension = options.delete(:extension)
-        @packed    = repeated? && options.delete(:packed)
-        @deprecated = options.delete(:deprecated)
-
-        set_default_value
-        warn_excess_options(options) unless options.empty?
         validate_packed_field if packed?
         define_accessor
       end
@@ -67,18 +57,70 @@ module Protobuf
         value
       end
 
+      def decode(bytes)
+        raise NotImplementedError, "#{self.class.name}\#decode"
+      end
+
+      def default
+        options[:default]
+      end
+
+      def default_value
+        @default_value ||= case
+                           when repeated? then ::Protobuf::Field::FieldArray.new(self).freeze
+                           when required? then nil
+                           when optional? then typed_default_value
+                           end
+      end
+
+      def deprecated?
+        options.key?(:deprecated)
+      end
+
+      def encode(value)
+        raise NotImplementedError, "#{self.class.name}\#encode"
+      end
+
+      def extension?
+        options.key?(:extension)
+      end
+
       def enum?
         false
       end
 
+      def getter
+        name
+      end
+
       def message?
         false
       end
 
-      # Decode +bytes+ and pass to +message_instance+.
+      def optional?
+        rule == :optional
+      end
+
+      def packed?
+        repeated? && options.key?(:packed)
+      end
+
+      def repeated?
+        rule == :repeated
+      end
+
+      def repeated_message?
+        repeated? && message?
+      end
+
+      def required?
+        rule == :required
+      end
+
+      # FIXME need to cleanup (rename) this warthog of a method.
       def set(message_instance, bytes)
         if packed?
-          array = message_instance.__send__(getter_method_name)
+          array = message_instance.__send__(getter)
           method = \
             case wire_type
             when ::Protobuf::WireType::FIXED32 then :read_fixed32
@@ -93,57 +135,18 @@ module Protobuf
         else
           value = decode(bytes)
           if repeated?
-            message_instance.__send__(getter_method_name) << value
+            message_instance.__send__(getter) << value
           else
-            message_instance.__send__(setter_method_name, value)
+            message_instance.__send__(setter, value)
           end
         end
       end
 
-      # Decode +bytes+ and return a field value.
-      def decode(bytes)
-        raise NotImplementedError, "#{self.class.name}\#decode"
-      end
-
-      # Encode +value+ and return a byte string.
-      def encode(value)
-        raise NotImplementedError, "#{self.class.name}\#encode"
-      end
-
-      def extension?
-        !! extension
-      end
-
-      # Is this a repeated field?
-      def repeated?
-        !! repeated
-      end
-
-      # Is this a repeated message field?
-      def repeated_message?
-        repeated? && message?
-      end
-
-      # Is this a required field?
-      def required?
-        !! required
-      end
-
-      # Is this a optional field?
-      def optional?
-        !! optional
-      end
-
-      # Is this a deprecated field?
-      def deprecated?
-        !! deprecated
-      end
-
-      # Is this a packed repeated field?
-      def packed?
-        !! packed
+      def setter
+        @setter ||= "#{name}="
       end
 
+      # FIXME add packed, deprecated, extension options to to_s output
       def to_s
         "#{rule} #{type_class} #{name} = #{tag} #{default ? "[default=#{default.inspect}]" : ''}"
       end
@@ -159,6 +162,10 @@ module Protobuf
         end
       end
 
+      def wire_type
+        ::Protobuf::WireType::VARINT
+      end
+
       private
 
       ##
@@ -178,7 +185,7 @@ module Protobuf
       def define_array_getter
         field = self
         message_class.class_eval do
-          define_method(field.getter_method_name) do
+          define_method(field.getter) do
             field.warn_if_deprecated
             @values[field.name] ||= ::Protobuf::Field::FieldArray.new(field)
           end
@@ -188,7 +195,7 @@ module Protobuf
       def define_array_setter
         field = self
         message_class.class_eval do
-          define_method(field.setter_method_name) do |val|
+          define_method(field.setter) do |val|
             field.warn_if_deprecated
 
             if val.is_a?(Array)
@@ -214,7 +221,7 @@ module Protobuf
       def define_getter
         field = self
         message_class.class_eval do
-          define_method(field.getter_method_name) do
+          define_method(field.getter) do
             field.warn_if_deprecated
             @values.fetch(field.name, field.default_value)
           end
@@ -224,7 +231,7 @@ module Protobuf
       def define_setter
         field = self
         message_class.class_eval do
-          define_method(field.setter_method_name) do |val|
+          define_method(field.setter) do |val|
             field.warn_if_deprecated
 
             if val.nil? || (val.respond_to?(:empty?) && val.empty?)
@@ -238,28 +245,6 @@ module Protobuf
         end
       end
 
-      def set_default_value
-        @default_value = case
-                         when repeated? then ::Protobuf::Field::FieldArray.new(self).freeze
-                         when required? then nil
-                         when optional? then typed_default_value
-                         end
-      end
-
-      def set_rule_predicates
-        case rule
-        when :repeated then
-          @required = @optional = false
-          @repeated = true
-        when :required then
-          @repeated = @optional = false
-          @required = true
-        when :optional then
-          @repeated = @required = false
-          @optional = true
-        end
-      end
-
       def typed_default_value
         if default.nil?
           self.class.default
@@ -274,10 +259,6 @@ module Protobuf
         end
       end
 
-      def warn_excess_options(options)
-        warn "WARNING: Invalid options: #{options.inspect} (in #{message_class.name}##{name})"
-      end
-
     end
   end
 end

data/lib/protobuf/field/bool_field.rb

@@ -40,7 +40,7 @@ module Protobuf
 
         field = self
         message_class.class_eval do
-          define_method("#{field.getter_method_name}?") do
+          define_method("#{field.getter}?") do
             field.warn_if_deprecated
             @values.fetch(field.name, field.default_value)
           end

data/lib/protobuf/field/bytes_field.rb

@@ -8,7 +8,7 @@ module Protobuf
       # Constants
       #
 
-      BYTES_ENCODING = "ASCII-8BIT".freeze
+      BYTES_ENCODING = Encoding::BINARY
 
       ##
       # Class Methods
@@ -54,7 +54,7 @@ module Protobuf
       def define_setter
         field = self
         message_class.class_eval do
-          define_method(field.setter_method_name) do |val|
+          define_method(field.setter) do |val|
             begin
               field.warn_if_deprecated
               val = "#{val}" if val.is_a?(Symbol)

data/lib/protobuf/field/enum_field.rb

@@ -4,6 +4,14 @@ module Protobuf
   module Field
     class EnumField < VarintField
 
+      ##
+      # Class Methods
+      #
+
+      def self.default
+        raise NoMethodError, "#{self}.#{__method__} must be called on an instance"
+      end
+
       ##
       # Public Instance Methods
       #
@@ -53,7 +61,7 @@ module Protobuf
         if default.is_a?(Symbol)
           type_class.const_get(default)
         else
-          self.class.default
+          type_class.fetch(default) || type_class.enums.first
         end
       end
 

data/lib/protobuf/field/string_field.rb

@@ -8,7 +8,7 @@ module Protobuf
       # Constants
       #
 
-      ENCODING = 'UTF-8'.freeze
+      ENCODING = Encoding::UTF_8
 
       ##
       # Public Instance Methods

data/lib/protobuf/message.rb

@@ -62,7 +62,7 @@ module Protobuf
     #
     def each_field
       self.class.all_fields.each do |field|
-        value = __send__(field.name)
+        value = __send__(field.getter)
         yield(field, value)
       end
     end
@@ -71,7 +71,7 @@ module Protobuf
       self.class.all_fields.each do |field|
         next unless field_must_be_serialized?(field)
 
-        value = @values[field.name]
+        value = @values[field.getter]
 
         if value.nil?
           raise ::Protobuf::SerializationError, "Required field #{self.class.name}##{field.name} does not have a value."
@@ -129,13 +129,13 @@ module Protobuf
 
     def [](name)
       if field = self.class.get_field(name, true)
-        __send__(field.name)
+        __send__(field.getter)
       end
     end
 
     def []=(name, value)
       if field = self.class.get_field(name, true)
-        __send__(field.setter_method_name, value) unless value.nil?
+        __send__(field.setter, value) unless value.nil?
       else
         unless ::Protobuf.ignore_unknown_fields?
           raise ::Protobuf::FieldNotDefinedError, name

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

data/protobuf.gemspec

@@ -21,7 +21,6 @@ require "protobuf/version"
 
   s.add_dependency 'activesupport', '>= 3.2'
   s.add_dependency 'middleware'
-  s.add_dependency 'multi_json'
   s.add_dependency 'thor'
 
   s.add_development_dependency 'ffi-rzmq'

data/spec/bin/protoc-gen-ruby_spec.rb

@@ -11,7 +11,7 @@ describe 'protoc-gen-ruby' do
   it 'reads the serialized request bytes and outputs serialized response bytes' do
     ::IO.popen(binpath, 'w+') do |pipe|
       pipe.write(request_bytes)
-      pipe.read(expected_response_bytes.size).should eq expected_response_bytes
+      expect(pipe.read(expected_response_bytes.size)).to eq expected_response_bytes
     end
   end
 end

data/spec/lib/protobuf/cli_spec.rb

@@ -128,7 +128,7 @@ describe ::Protobuf::CLI do
 
           it 'sets the deprecation warning flag to true' do
             described_class.start(args)
-            expect(::Protobuf.print_deprecation_warnings?).to be_truthy
+            expect(::Protobuf.print_deprecation_warnings?).to be true
           end
         end
 
@@ -138,7 +138,7 @@ describe ::Protobuf::CLI do
 
           it 'sets the deprecation warning flag to false ' do
             described_class.start(args)
-            expect(::Protobuf.print_deprecation_warnings?).to be_falsey
+            expect(::Protobuf.print_deprecation_warnings?).to be false
           end
         end
       end
@@ -148,7 +148,7 @@ describe ::Protobuf::CLI do
 
         it 'sets the deprecation warning flag to true' do
           described_class.start(args)
-          expect(::Protobuf.print_deprecation_warnings?).to be_truthy
+          expect(::Protobuf.print_deprecation_warnings?).to be true
         end
       end
 
@@ -157,7 +157,7 @@ describe ::Protobuf::CLI do
 
         it 'sets the deprecation warning flag to false' do
           described_class.start(args)
-          expect(::Protobuf.print_deprecation_warnings?).to be_falsey
+          expect(::Protobuf.print_deprecation_warnings?).to be false
         end
       end
     end
@@ -200,7 +200,7 @@ describe ::Protobuf::CLI do
 
         it 'is activated by the --workers_only switch' do
           expect(runner).to receive(:new) do |options|
-            expect(options[:workers_only]).to be_truthy
+            expect(options[:workers_only]).to be true
           end.and_return(zmq_runner)
 
           described_class.start(args)
@@ -209,7 +209,7 @@ describe ::Protobuf::CLI do
         it 'is activated by PB_WORKERS_ONLY=1 ENV variable' do
           ENV['PB_WORKERS_ONLY'] = "1"
           expect(runner).to receive(:new) do |options|
-            expect(options[:workers_only]).to be_truthy
+            expect(options[:workers_only]).to be true
           end.and_return(zmq_runner)
 
           described_class.start(args)

data/spec/lib/protobuf/enum_spec.rb

@@ -21,8 +21,8 @@ describe Protobuf::Enum do
     end
 
     describe '.aliases_allowed?' do
-      it 'is false when the option is not set' do
-        expect(Test::EnumTestType.aliases_allowed?).to be_falsey
+      it 'is nil when the option is not set' do
+        expect(Test::EnumTestType.aliases_allowed?).to be nil
       end
     end
 
@@ -155,15 +155,15 @@ describe Protobuf::Enum do
 
     describe '.valid_tag?' do
       context 'when tag is defined' do
-        specify { expect(Test::EnumTestType.valid_tag?(tag)).to be_truthy }
+        specify { expect(Test::EnumTestType.valid_tag?(tag)).to be true }
       end
 
       context 'when tag is not defined' do
-        specify { expect(Test::EnumTestType.valid_tag?(300)).to be_falsey }
+        specify { expect(Test::EnumTestType.valid_tag?(300)).to be false }
       end
 
       context 'is true for aliased enums' do
-        specify { expect(EnumAliasTest.valid_tag?(1)).to be_truthy }
+        specify { expect(EnumAliasTest.valid_tag?(1)).to be true }
       end
     end
 
@@ -230,7 +230,7 @@ describe Protobuf::Enum do
 
   context 'when coercing from enum' do
     subject { Test::StatusType::PENDING }
-    it { should eq(0) }
+    it { is_expected.to eq(0) }
   end
 
   context 'when coercing from integer' do

data/spec/lib/protobuf/logger_spec.rb

@@ -104,13 +104,13 @@ describe Protobuf::Logger do
 
       subject { MyTestClass.new }
 
-      it { should respond_to(:log_debug) }
-      it { should respond_to(:log_info) }
-      it { should respond_to(:log_warn) }
-      it { should respond_to(:log_error) }
-      it { should respond_to(:log_fatal) }
-      it { should respond_to(:log_add) }
-      it { should respond_to(:log_log) }
+      it { is_expected.to respond_to(:log_debug) }
+      it { is_expected.to respond_to(:log_info) }
+      it { is_expected.to respond_to(:log_warn) }
+      it { is_expected.to respond_to(:log_error) }
+      it { is_expected.to respond_to(:log_fatal) }
+      it { is_expected.to respond_to(:log_add) }
+      it { is_expected.to respond_to(:log_log) }
 
       context '#log_exception' do
         it 'logs the exception message as an error and backtrace as debug' do

data/spec/lib/protobuf/message_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Protobuf::Message do
@@ -126,9 +128,14 @@ describe Protobuf::Message do
   end
 
   describe '#initialize' do
-    it "initializes the enum getter to 0" do
+    it "defaults to the first value listed in the enum's type definition" do
       test_enum = Test::EnumTestMessage.new
-      expect(test_enum.non_default_enum).to eq(0)
+      expect(test_enum.non_default_enum).to eq(1)
+    end
+
+    it "defaults to a a value with a name" do
+      test_enum = Test::EnumTestMessage.new
+      expect(test_enum.non_default_enum.name).to eq(:ONE)
     end
 
     it "exposes the enum getter raw value through ! method" do
@@ -217,21 +224,21 @@ describe Protobuf::Message do
       end
 
       it "keeps utf-8 when utf-8 is input for string fields" do
-        name = "my name\xC3"
-        name.force_encoding("UTF-8")
+        name = 'my name💩'
+        name.force_encoding(Encoding::UTF_8)
 
         message = ::Test::Resource.new(:name => name)
         new_message = ::Test::Resource.decode(message.encode)
-        expect(new_message.name == name).to be_truthy
+        expect(new_message.name == name).to be true
       end
 
       it "trims binary when binary is input for string fields" do
         name = "my name\xC3"
-        name.force_encoding("ASCII-8BIT")
+        name.force_encoding(Encoding::BINARY)
 
         message = ::Test::Resource.new(:name => name)
         new_message = ::Test::Resource.decode(message.encode)
-        expect(new_message.name == "my name").to be_truthy
+        expect(new_message.name == "my name").to be true
       end
     end
 
@@ -283,16 +290,16 @@ describe Protobuf::Message do
   describe "boolean predicate methods" do
     subject { Test::ResourceFindRequest.new(:name => "resource") }
 
-    it { should respond_to(:active?) }
+    it { is_expected.to respond_to(:active?) }
 
     it "sets the predicate to true when the boolean value is true" do
       subject.active = true
-      expect(subject.active?).to be_truthy
+      expect(subject.active?).to be true
     end
 
     it "sets the predicate to false when the boolean value is false" do
       subject.active = false
-      expect(subject.active?).to be_falsey
+      expect(subject.active?).to be false
     end
 
     it "does not put predicate methods on non-boolean fields" do
@@ -304,11 +311,11 @@ describe Protobuf::Message do
     subject { Test::EnumTestMessage.new(:non_default_enum => 2) }
 
     it "is false when the message does not have the field" do
-      expect(subject.respond_to_and_has?(:other_field)).to be_falsey
+      expect(subject.respond_to_and_has?(:other_field)).to be false
     end
 
     it "is true when the message has the field" do
-      expect(subject.respond_to_and_has?(:non_default_enum)).to be_truthy
+      expect(subject.respond_to_and_has?(:non_default_enum)).to be true
     end
   end
 
@@ -316,25 +323,25 @@ describe Protobuf::Message do
     subject { Test::EnumTestMessage.new(:non_default_enum => 2) }
 
     it "is false when the message does not have the field" do
-      expect(subject.respond_to_and_has_and_present?(:other_field)).to be_falsey
+      expect(subject.respond_to_and_has_and_present?(:other_field)).to be false
     end
 
     it "is false when the field is repeated and a value is not present" do
-      expect(subject.respond_to_and_has_and_present?(:repeated_enums)).to be_falsey
+      expect(subject.respond_to_and_has_and_present?(:repeated_enums)).to be false
     end
 
     it "is false when the field is repeated and the value is empty array" do
       subject.repeated_enums = []
-      expect(subject.respond_to_and_has_and_present?(:repeated_enums)).to be_falsey
+      expect(subject.respond_to_and_has_and_present?(:repeated_enums)).to be false
     end
 
     it "is true when the field is repeated and a value is present" do
       subject.repeated_enums = [2]
-      expect(subject.respond_to_and_has_and_present?(:repeated_enums)).to be_truthy
+      expect(subject.respond_to_and_has_and_present?(:repeated_enums)).to be true
     end
 
     it "is true when the message has the field" do
-      expect(subject.respond_to_and_has_and_present?(:non_default_enum)).to be_truthy
+      expect(subject.respond_to_and_has_and_present?(:non_default_enum)).to be true
     end
 
     context "#API" do

data/spec/lib/protobuf/optionable_spec.rb

@@ -20,7 +20,7 @@ describe 'Optionable' do
 
     it 'defaults the value to true' do
       OptionableSetOptionTest.set_option(:baz_enabled)
-      expect(OptionableSetOptionTest.get_option(:baz_enabled)).to be_truthy
+      expect(OptionableSetOptionTest.get_option(:baz_enabled)).to be true
     end
   end
 

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

@@ -15,15 +15,15 @@ describe Protobuf::Rpc::Connectors::Common do
   subject { @subject ||= common_class.new(subject_options) }
 
   context "API" do
-    specify { expect(subject.respond_to?(:any_callbacks?)).to be_truthy }
-    specify { expect(subject.respond_to?(:request_caller)).to be_truthy }
-    specify { expect(subject.respond_to?(:data_callback)).to be_truthy }
-    specify { expect(subject.respond_to?(:error)).to be_truthy }
-    specify { expect(subject.respond_to?(:fail)).to be_truthy }
-    specify { expect(subject.respond_to?(:complete)).to be_truthy }
-    specify { expect(subject.respond_to?(:parse_response)).to be_truthy }
-    specify { expect(subject.respond_to?(:verify_options!)).to be_truthy }
-    specify { expect(subject.respond_to?(:verify_callbacks)).to be_truthy }
+    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?(:fail)).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
@@ -31,7 +31,7 @@ describe Protobuf::Rpc::Connectors::Common 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_truthy
+        expect(subject.any_callbacks?).to be true
       end
     end
 
@@ -40,7 +40,7 @@ describe Protobuf::Rpc::Connectors::Common do
       subject.instance_variable_set(:@success_cb, nil)
       subject.instance_variable_set(:@failure_cb, nil)
 
-      expect(subject.any_callbacks?).to be_falsey
+      expect(subject.any_callbacks?).to be false
     end
 
   end
@@ -60,7 +60,7 @@ describe Protobuf::Rpc::Connectors::Common do
   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_truthy
+      expect(subject.instance_variable_get(:@used_data_callback)).to be true
     end
 
     it "sets the data var when using the data_callback" do

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

@@ -6,10 +6,10 @@ shared_examples "a Protobuf Connector" do
 
   context "API" do
     # Check the API
-    specify { expect(subject.respond_to?(:send_request, true)).to be_truthy }
-    specify { expect(subject.respond_to?(:post_init, true)).to be_truthy }
-    specify { expect(subject.respond_to?(:close_connection, true)).to be_truthy }
-    specify { expect(subject.respond_to?(:error?, true)).to be_truthy }
+    specify { expect(subject.respond_to?(:send_request, true)).to be true }
+    specify { expect(subject.respond_to?(:post_init, true)).to be true }
+    specify { expect(subject.respond_to?(:close_connection, true)).to be true }
+    specify { expect(subject.respond_to?(:error?, true)).to be true }
   end
 end
 
@@ -18,7 +18,7 @@ describe Protobuf::Rpc::Connectors::Socket do
 
   it_behaves_like "a Protobuf Connector"
 
-  specify { expect(described_class.include?(Protobuf::Rpc::Connectors::Common)).to be_truthy }
+  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/connectors/zmq_spec.rb

@@ -79,7 +79,7 @@ describe ::Protobuf::Rpc::Connectors::Zmq do
       end
 
       it "returns true" do
-        expect(subject.send(:host_alive?, "yip.yip")).to be_truthy
+        expect(subject.send(:host_alive?, "yip.yip")).to be true
       end
 
       it "does not attempt a connection" do
@@ -95,19 +95,19 @@ describe ::Protobuf::Rpc::Connectors::Zmq do
 
       it "returns true when the connection succeeds" do
         expect(TCPSocket).to receive(:new).with("huzzah.com", 3307).and_return(double(:close => nil))
-        expect(subject.send(:host_alive?, "huzzah.com")).to be_truthy
+        expect(subject.send(:host_alive?, "huzzah.com")).to be true
       end
 
       it "returns false when the connection fails" do
         expect(TCPSocket).to receive(:new).with("hayoob.com", 3307).and_raise(Errno::ECONNREFUSED)
-        expect(subject.send(:host_alive?, "hayoob.com")).to be_falsey
+        expect(subject.send(:host_alive?, "hayoob.com")).to be false
       end
 
       it "closes the socket" do
         socket = double("TCPSocket")
         expect(socket).to receive(:close)
         expect(TCPSocket).to receive(:new).with("absorbalof.com", 3307).and_return(socket)
-        expect(subject.send(:host_alive?, "absorbalof.com")).to be_truthy
+        expect(subject.send(:host_alive?, "absorbalof.com")).to be true
       end
     end
   end

data/spec/lib/protobuf/rpc/servers/zmq/server_spec.rb

@@ -22,12 +22,12 @@ describe Protobuf::Rpc::Zmq::Server do
   describe '.running?' do
     it 'returns true if running' do
       subject.instance_variable_set(:@running, true)
-      expect(subject.running?).to be_truthy
+      expect(subject.running?).to be true
     end
 
     it 'returns false if not running' do
       subject.instance_variable_set(:@running, false)
-      expect(subject.running?).to be_falsey
+      expect(subject.running?).to be false
     end
   end
 
@@ -35,7 +35,7 @@ describe Protobuf::Rpc::Zmq::Server do
     it 'sets running to false' do
       subject.instance_variable_set(:@workers, [])
       subject.stop
-      expect(subject.instance_variable_get(:@running)).to be_falsey
+      expect(subject.instance_variable_get(:@running)).to be false
     end
   end
 end

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

@@ -85,13 +85,13 @@ describe Protobuf::Rpc::Service do
 
       context 'when given name is a pre-defined rpc method' do
         it 'returns true' do
-          expect(subject.rpc_method?(:delete)).to be_truthy
+          expect(subject.rpc_method?(:delete)).to be true
         end
       end
 
       context 'when given name is not a pre-defined rpc method' do
         it 'returns false' do
-          expect(subject.rpc_method?(:zoobaboo)).to be_falsey
+          expect(subject.rpc_method?(:zoobaboo)).to be false
         end
       end
     end

data/spec/lib/protobuf_spec.rb

@@ -9,13 +9,13 @@ describe ::Protobuf do
     subject { ::Protobuf.client_host }
 
     context 'when client_host is not pre-configured' do
-      it { should eq `hostname`.chomp }
+      it { is_expected.to eq `hostname`.chomp }
     end
 
     context 'when client_host is pre-configured' do
       let(:hostname) { 'override.myhost.com' }
       before { ::Protobuf.client_host = hostname }
-      it { should eq hostname }
+      it { is_expected.to eq hostname }
     end
   end
 
@@ -46,12 +46,12 @@ describe ::Protobuf do
     before { described_class.instance_variable_set(:@_gc_pause_server_request, nil) }
 
     it 'defaults to a false value' do
-      expect(described_class.gc_pause_server_request?).to be_falsey
+      expect(described_class.gc_pause_server_request?).to be false
     end
 
     it 'is settable' do
       described_class.gc_pause_server_request = true
-      expect(described_class.gc_pause_server_request?).to be_truthy
+      expect(described_class.gc_pause_server_request?).to be true
     end
   end
 
@@ -59,18 +59,18 @@ describe ::Protobuf do
     before { described_class.instance_variable_set(:@_print_deprecation_warnings, nil) }
 
     it 'defaults to a true value' do
-      expect(described_class.print_deprecation_warnings?).to be_truthy
+      expect(described_class.print_deprecation_warnings?).to be true
     end
 
     it 'is settable' do
       described_class.print_deprecation_warnings = false
-      expect(described_class.print_deprecation_warnings?).to be_falsey
+      expect(described_class.print_deprecation_warnings?).to be false
     end
 
     context 'when ENV["PB_IGNORE_DEPRECATIONS"] present' do
       it 'defaults to a false value' do
         ENV['PB_IGNORE_DEPRECATIONS'] = '1'
-        expect(described_class.print_deprecation_warnings?).to be_falsey
+        expect(described_class.print_deprecation_warnings?).to be false
       end
     end
   end

data/spec/spec_helper.rb

@@ -28,7 +28,6 @@ end
 ENV.delete("PB_IGNORE_DEPRECATIONS")
 
 ::RSpec.configure do |c|
-  c.include(::Sander6::CustomMatchers)
   c.mock_with :rspec
 
   c.before(:suite) do

data/spec/support/all.rb

@@ -1,5 +1,4 @@
 require 'support/packed_field'
-require 'support/tolerance_matcher'
 require 'support/server'
 
 def now

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -41,20 +41,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -368,7 +354,6 @@ files:
 - spec/support/test/resource.proto
 - spec/support/test/resource_service.rb
 - spec/support/test_app_file.rb
-- spec/support/tolerance_matcher.rb
 homepage: https://github.com/localshred/protobuf
 licenses:
 - WTFPL
@@ -465,5 +450,4 @@ test_files:
 - spec/support/test/resource.proto
 - spec/support/test/resource_service.rb
 - spec/support/test_app_file.rb
-- spec/support/tolerance_matcher.rb
 has_rdoc: 

data/spec/support/tolerance_matcher.rb

@@ -1,40 +0,0 @@
-#
-# courtesy of sander 6
-# - http://github.com/sander6/custom_matchers/blob/master/lib/matchers/tolerance_matchers.rb
-#
-module Sander6
-  module CustomMatchers
-
-    class ToleranceMatcher
-      def initialize(tolerance)
-        @tolerance = tolerance
-        @target = 0
-      end
-
-      def of(target)
-        @target = target
-        self
-      end
-
-      def matches?(value)
-        @value = value
-        ((@target - @tolerance)..(@target + @tolerance)).include?(@value)
-      end
-
-      def failure_message
-        "Expected #{@value.inspect} to be within #{@tolerance.inspect} of #{@target.inspect}, but it wasn't.\n" +
-          "Difference: #{@value - @target}"
-          end
-
-      def negative_failure_message
-        "Expected #{@value.inspect} not to be within #{@tolerance.inspect} of #{@target.inspect}, but it was.\n" +
-          "Difference: #{@value - @target}"
-          end
-    end
-
-    def be_within(value)
-      Sander6::CustomMatchers::ToleranceMatcher.new(value)
-    end
-
-  end
-end