protobuf 3.4.4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8039705f02dc03d0ecc6415c8a6ef2d7114b96c5
-  data.tar.gz: 1978cec9ab539484b2d299c5a109e78af267c7fe
+  metadata.gz: 556fc7a33947258f727c68a829cda7f010c17a4a
+  data.tar.gz: 7c2844002d64904f5ba995c16704704966a53296
 SHA512:
-  metadata.gz: 6d0c733b3656fe080337232cdfbf68b996541add9206b1f621bbb6cd6df8d116296ceded1d797c1e3743314dd8b7f27761c8882d7e66c64427600990e26ba5ef
-  data.tar.gz: a44e9cff6f284880bcfaf6aaa29cc5dc12d16a35e5808e45a3a6510fb34db23ca8e76d0187fa3d1acbc2ea8593115b3b3d1dbdc7d755c04384607ac26ef28b40
+  metadata.gz: a68b0800fe406544487ec2f2ae1cccc81c21e5f9a59c3f970ef84a0a5023f057a523ad5c6f598b9dfe7ad57acf47a22aa12a4a73c218ec0443149d0ff5a7fc7f
+  data.tar.gz: 0832c9afbfc335acf6fd8517a0713efa4d347e48f6eaa00ea0575134b17e19e3d1648fe1936aabfc9b5422ceed63394b449426018d22a6616849148e5f0ebf44

data/.travis.yml

@@ -1,7 +1,7 @@
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y libzmq3-dev
-  - sudo ./install-protobuf.sh
+  - sudo -E ./install-protobuf.sh
 language: ruby
 rvm:
   - 1.9.3
@@ -9,9 +9,13 @@ rvm:
   - 2.1
   - jruby
   - rbx-2
+env:
+  - PROTOBUF_VERSION=2.6.1
+  - PROTOBUF_VERSION=3.0.0-alpha-2
 matrix:
   allow_failures:
     - rvm: rbx-2
+    - env: PROTOBUF_VERSION=3.0.0-alpha-2
 notifications:
   webhooks:
     urls:

data/README.md

@@ -3,6 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/protobuf.svg)](http://badge.fury.io/rb/protobuf)
 [![Build Status](https://secure.travis-ci.org/localshred/protobuf.svg?branch=master)](https://travis-ci.org/localshred/protobuf)
 [![Gitter chat](https://badges.gitter.im/localshred/protobuf.svg)](https://gitter.im/localshred/protobuf)
+[![protobuf API Documentation](https://www.omniref.com/ruby/gems/protobuf.png)](https://www.omniref.com/ruby/gems/protobuf)
 
 Protobuf is an implementation of [Google's protocol buffers][google-pb] in ruby, version 2.5.0 is currently supported.
 

data/install-protobuf.sh

@@ -1,8 +1,28 @@
+#!/usr/bin/env sh
+
 set -ex
 
-basename=protobuf-2.6.0
-tarball=$basename.tar.bz2
+gdie() {
+    echo "$@" >&2
+    exit 1
+}
+
+test -n "$PROTOBUF_VERSION" || die "PROTOBUF_VERSION env var is undefined"
+
+case "$PROTOBUF_VERSION" in
+2*)
+    basename=protobuf-$PROTOBUF_VERSION
+    ;;
+3*)
+    basename=protobuf-cpp-$PROTOBUF_VERSION
+    ;;
+*)
+    die "unknown protobuf version: $PROTOBUF_VERSION"
+    ;;
+esac
+
+curl -sL https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/$basename.tar.gz | tar zx
+
+cd protobuf-$PROTOBUF_VERSION
 
-wget https://protobuf.googlecode.com/svn/rc/$tarball
-tar -xvf $tarball
-cd $basename && ./configure --prefix=/usr && make && make install
+./configure --prefix=/usr && make -j2 && make install

data/lib/protobuf/field/bool_field.rb

@@ -17,7 +17,17 @@ module Protobuf
       # #
 
       def acceptable?(val)
-        [true, false].include?(val)
+        [true, false].include?(val) || %w(true false).include?(val)
+      end
+
+      def coerce!(val)
+        if val == 'true'
+          true
+        elsif val == 'false'
+          false
+        else
+          val
+        end
       end
 
       def decode(value)

data/lib/protobuf/field/field_array.rb

@@ -66,6 +66,8 @@ module Protobuf
 
         if field.is_a?(::Protobuf::Field::EnumField)
           field.type_class.fetch(value)
+        elsif field.is_a?(::Protobuf::Field::MessageField) && value.is_a?(field.type_class)
+          value
         elsif field.is_a?(::Protobuf::Field::MessageField) && value.respond_to?(:to_hash)
           field.type_class.new(value.to_hash)
         else

data/lib/protobuf/field/message_field.rb

@@ -9,7 +9,7 @@ module Protobuf
       #
 
       def acceptable?(val)
-        unless val.instance_of?(type_class) || val.respond_to?(:to_hash)
+        unless val.is_a?(type_class) || val.respond_to?(:to_hash)
           fail TypeError, "Expected value of type '#{type_class}' for field #{name}, but got '#{val.class}'"
         end
 

data/lib/protobuf/field/varint_field.rb

@@ -37,11 +37,17 @@ module Protobuf
       #
 
       def acceptable?(val)
-        (val > self.class.min || val < self.class.max)
+        int_val = coerce!(val)
+        int_val >= self.class.min && int_val <= self.class.max
       rescue
         false
       end
 
+      def coerce!(val)
+        return val.to_i if val.is_a?(Numeric)
+        Integer(val, 10)
+      end
+
       def decode(value)
         value
       end

data/lib/protobuf/message.rb

@@ -28,10 +28,11 @@ module Protobuf
 
     def initialize(fields = {})
       @values = {}
-
       fields.to_hash.each_pair do |name, value|
         self[name] = value
       end
+
+      yield self if block_given?
     end
 
     ##

data/lib/protobuf/rpc/servers/zmq_runner.rb

@@ -41,7 +41,7 @@ module Protobuf
             logger.info do
               <<-THREAD_TRACE
                 #{thread.inspect}:
-                  #{thread.backtrace.join($INPUT_RECORD_SEPARATOR)}"
+                  #{thread.backtrace.try(:join, $INPUT_RECORD_SEPARATOR)}"
               THREAD_TRACE
             end
           end

data/lib/protobuf/rpc/service_directory.rb

@@ -82,6 +82,7 @@ module Protobuf
 
       def all_listings_for(service)
         if running? && @listings_by_service.key?(service.to_s)
+          start_listener_thread if listener_dead?
           @listings_by_service[service.to_s].entries.shuffle
         else
           []
@@ -89,15 +90,19 @@ module Protobuf
       end
 
       def each_listing(&block)
+        start_listener_thread if listener_dead?
         @listings_by_uuid.each_value(&block)
       end
 
       def lookup(service)
-        if running?
-          if @listings_by_service.key?(service.to_s)
-            @listings_by_service[service.to_s].entries.sample
-          end
-        end
+        return unless running?
+        start_listener_thread if listener_dead?
+        return unless @listings_by_service.key?(service.to_s)
+        @listings_by_service[service.to_s].entries.sample
+      end
+
+      def listener_dead?
+        @thread.nil? || !@thread.alive?
       end
 
       def restart
@@ -106,22 +111,29 @@ module Protobuf
       end
 
       def running?
-        !!@thread.try(:alive?)
+        !!@running
       end
 
       def start
         unless running?
           init_socket
           logger.info { sign_message("listening to udp://#{self.class.address}:#{self.class.port}") }
-          @thread = Thread.new { send(:run) }
+          @running = true
         end
 
+        start_listener_thread if listener_dead?
         self
       end
 
+      def start_listener_thread
+        return if @thread.try(:alive?)
+        @thread = Thread.new { send(:run) }
+      end
+
       def stop
         logger.info { sign_message("Stopping directory") }
 
+        @running = false
         @thread.try(:kill).try(:join)
         @socket.try(:close)
 

data/lib/protobuf/rpc/service_filters.rb

@@ -94,10 +94,10 @@ module Protobuf
         # if the filter should not be invoked, true if invocation should occur.
         #
         def invoke_filter?(rpc_method, filter)
-          invoke_via_only?(rpc_method, filter) \
-            && invoke_via_except?(rpc_method, filter) \
-            && invoke_via_if?(rpc_method, filter) \
-            && invoke_via_unless?(rpc_method, filter)
+          invoke_via_only?(rpc_method, filter) &&
+            invoke_via_except?(rpc_method, filter) &&
+            invoke_via_if?(rpc_method, filter) &&
+            invoke_via_unless?(rpc_method, filter)
         end
 
         # If the target rpc endpoint method is listed under an :except option,

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.4.4'
+  VERSION = '3.5.0'
 end

data/spec/lib/protobuf/field/bool_field_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+RSpec.describe Protobuf::Field::Int32Field do
+
+  class SomeBoolMessage < ::Protobuf::Message
+    optional :bool, :some_bool, 1
+  end
+
+  let(:instance) { SomeBoolMessage.new }
+
+  describe '#define_setter' do
+    subject { instance.some_bool = value; instance.some_bool }
+
+    [true, false].each do |val|
+      context "when set with #{val}" do
+        let(:value) { val }
+
+        it 'is readable as a bool' do
+          expect(subject).to eq(val)
+        end
+      end
+    end
+
+    [['true', true], ['false', false]].each do |val, expected|
+      context "when set with a string of #{val}" do
+        let(:value) { val }
+
+        it 'is readable as a bool' do
+          expect(subject).to eq(expected)
+        end
+      end
+    end
+
+    context 'when set with a non-bool string' do
+      let(:value) { "aaaa" }
+
+      it 'throws an error' do
+        expect { subject }.to raise_error(TypeError)
+      end
+    end
+
+    context 'when set with something that is not a bool' do
+      let(:value) { [1, 2, 3] }
+
+      it 'throws an error' do
+        expect { subject }.to raise_error(TypeError)
+      end
+    end
+  end
+
+end

data/spec/lib/protobuf/field/field_array_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+RSpec.describe Protobuf::Field::FieldArray do
+
+  class SomeBasicMessage < ::Protobuf::Message
+    optional :string, :field, 1
+  end
+
+  class MoreComplexMessage < SomeBasicMessage
+  end
+
+  class OtherBasicMessage < ::Protobuf::Message
+    optional :string, :other_field, 1
+  end
+
+  class SomeRepeatMessage < ::Protobuf::Message
+    optional :string, :some_string, 1
+    repeated :string, :multiple_strings, 2
+    repeated SomeBasicMessage, :multiple_basic_msgs, 3
+  end
+
+  let(:instance) { SomeRepeatMessage.new }
+
+  %w(<< push).each do |method|
+    describe "\##{method}" do
+      context 'when applied to a string field array' do
+        it 'adds a string' do
+          expect(instance.multiple_strings).to be_empty
+          instance.multiple_strings.send(method, 'string 1')
+          expect(instance.multiple_strings).to eq(['string 1'])
+          instance.multiple_strings.send(method, 'string 2')
+          expect(instance.multiple_strings).to eq(['string 1', 'string 2'])
+        end
+
+        it 'fails if not adding a string' do
+          expect { instance.multiple_strings.send(method, 100.0) }.to raise_error(TypeError)
+        end
+      end
+
+      context 'when applied to a MessageField field array' do
+        it 'adds a MessageField object' do
+          expect(instance.multiple_basic_msgs).to be_empty
+          basic_msg1 = SomeBasicMessage.new
+          instance.multiple_basic_msgs.send(method, basic_msg1)
+          expect(instance.multiple_basic_msgs).to eq([basic_msg1])
+          basic_msg2 = SomeBasicMessage.new
+          instance.multiple_basic_msgs.send(method, basic_msg2)
+          expect(instance.multiple_basic_msgs).to eq([basic_msg1, basic_msg2])
+        end
+
+        it 'adds a Hash from a MessageField object' do
+          expect(instance.multiple_basic_msgs).to be_empty
+          basic_msg1 = SomeBasicMessage.new
+          basic_msg1.field = 'my value'
+          instance.multiple_basic_msgs.send(method, basic_msg1.to_hash)
+          expect(instance.multiple_basic_msgs).to eq([basic_msg1])
+        end
+
+        it 'does not downcast a MessageField' do
+          expect(instance.multiple_basic_msgs).to be_empty
+          basic_msg1 = MoreComplexMessage.new
+          instance.multiple_basic_msgs.send(method, basic_msg1)
+          expect(instance.multiple_basic_msgs).to eq([basic_msg1])
+          expect(instance.multiple_basic_msgs.first).to be_a(MoreComplexMessage)
+        end
+      end
+    end
+  end
+end

data/spec/lib/protobuf/field/int32_field_spec.rb

@@ -4,4 +4,86 @@ RSpec.describe Protobuf::Field::Int32Field do
 
   it_behaves_like :packable_field, described_class
 
+  class SomeInt32Message < ::Protobuf::Message
+    optional :int32, :some_int, 1
+  end
+
+  let(:instance) { SomeInt32Message.new }
+
+  describe '#define_setter' do
+    subject { instance.some_int = value; instance.some_int }
+
+    context 'when set with an int' do
+      let(:value) { 100 }
+
+      it 'is readable as an int' do
+        expect(subject).to eq(100)
+      end
+    end
+
+    context 'when set with a float' do
+      let(:value) { 100.1 }
+
+      it 'is readable as an int' do
+        expect(subject).to eq(100)
+      end
+    end
+
+    context 'when set with a string of an int' do
+      let(:value) { "101" }
+
+      it 'is readable as an int' do
+        expect(subject).to eq(101)
+      end
+    end
+
+    context 'when set with a negative representation of an int as string' do
+      let(:value) { "-101" }
+
+      it 'is readable as a negative int' do
+        expect(subject).to eq(-101)
+      end
+    end
+
+    context 'when set with a non-numeric string' do
+      let(:value) { "aaaa" }
+
+      it 'throws an error' do
+        expect { subject }.to raise_error(TypeError)
+      end
+    end
+
+    context 'when set with a string of an int in hex format' do
+      let(:value) { "0x101" }
+
+      it 'throws an error' do
+        expect { subject }.to raise_error(TypeError)
+      end
+    end
+
+    context 'when set with a string of an int larger than int32 max' do
+      let(:value) { (described_class.max + 1).to_s }
+
+      it 'throws an error' do
+        expect { subject }.to raise_error(TypeError)
+      end
+    end
+
+    context 'when set with something that is not an int' do
+      let(:value) { [1, 2, 3] }
+
+      it 'throws an error' do
+        expect { subject }.to raise_error(TypeError)
+      end
+    end
+
+    context 'when set with a timestamp' do
+      let(:value) { Time.now }
+
+      it 'throws an error' do
+        expect { subject }.to raise_error(TypeError)
+      end
+    end
+  end
+
 end

data/spec/lib/protobuf/message_spec.rb

@@ -175,6 +175,11 @@ RSpec.describe Protobuf::Message do
       expect(test_enum.non_default_enum).to eq(2)
     end
 
+    it "initializes with an object with a block" do
+      test_enum = Test::EnumTestMessage.new { |p| p.non_default_enum = 2 }
+      expect(test_enum.non_default_enum).to eq(2)
+    end
+
     context 'ignoring unknown fields' do
       before { ::Protobuf.ignore_unknown_fields = true }
 
@@ -401,7 +406,7 @@ RSpec.describe Protobuf::Message do
 
       it 'does not populate default values' do
         hash = Test::EnumTestMessage.new.to_hash
-        expect(hash).to eq(Hash.new)
+        expect(hash).to eq({})
       end
 
       it 'converts repeated enum fields to an array of the tags' do

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

@@ -57,9 +57,7 @@ RSpec.describe ::Protobuf::Rpc::ServiceDirectory do
 
   def expect_event_trigger(event)
     expect(::ActiveSupport::Notifications).to receive(:instrument)
-      .with(event, hash_including(
-        :listing => an_instance_of(::Protobuf::Rpc::ServiceDirectory::Listing),
-      )).once
+      .with(event, hash_including(:listing => an_instance_of(::Protobuf::Rpc::ServiceDirectory::Listing))).once
   end
 
   def send_beacon(type, server)

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

@@ -65,9 +65,9 @@ RSpec.describe Protobuf::Rpc::Service do
         client = double('client')
         expect(::Protobuf::Rpc::Client).to receive(:new)
           .with(hash_including(
-            :service => subject,
-            :host => subject.host,
-            :port => subject.port,
+                  :service => subject,
+                  :host => subject.host,
+                  :port => subject.port,
           )).and_return(client)
         expect(subject.client).to eq client
       end

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

@@ -5,9 +5,7 @@ require 'active_support/core_ext/numeric/time'
 RSpec.describe ::Protobuf::Rpc::Stat do
 
   before(:all) do
-    unless defined?(BarService)
-      class BarService < ::Struct.new(:method_name); end
-    end
+    BarService = ::Struct.new(:method_name) unless defined?(BarService)
   end
 
   describe 'server mode' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.5.0
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -340,6 +340,8 @@ files:
 - 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/field_array_spec.rb
 - spec/lib/protobuf/field/float_field_spec.rb
 - spec/lib/protobuf/field/int32_field_spec.rb
 - spec/lib/protobuf/field/string_field_spec.rb
@@ -419,80 +421,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
-test_files:
-- spec/benchmark/tasks.rb
-- spec/bin/protoc-gen-ruby_spec.rb
-- spec/data/data.bin
-- spec/data/types.bin
-- spec/encoding/all_types_spec.rb
-- spec/encoding/extreme_values_spec.rb
-- spec/functional/class_inheritance_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/float_field_spec.rb
-- spec/lib/protobuf/field/int32_field_spec.rb
-- spec/lib/protobuf/field/string_field_spec.rb
-- spec/lib/protobuf/field_spec.rb
-- spec/lib/protobuf/generators/base_spec.rb
-- spec/lib/protobuf/generators/enum_generator_spec.rb
-- spec/lib/protobuf/generators/extension_generator_spec.rb
-- spec/lib/protobuf/generators/field_generator_spec.rb
-- spec/lib/protobuf/generators/file_generator_spec.rb
-- spec/lib/protobuf/generators/message_generator_spec.rb
-- spec/lib/protobuf/generators/service_generator_spec.rb
-- spec/lib/protobuf/lifecycle_spec.rb
-- 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/socket_spec.rb
-- spec/lib/protobuf/rpc/connectors/zmq_spec.rb
-- spec/lib/protobuf/rpc/middleware/exception_handler_spec.rb
-- spec/lib/protobuf/rpc/middleware/logger_spec.rb
-- spec/lib/protobuf/rpc/middleware/request_decoder_spec.rb
-- spec/lib/protobuf/rpc/middleware/response_encoder_spec.rb
-- spec/lib/protobuf/rpc/servers/socket_server_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/server_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
-- spec/lib/protobuf/rpc/service_directory_spec.rb
-- spec/lib/protobuf/rpc/service_dispatcher_spec.rb
-- spec/lib/protobuf/rpc/service_filters_spec.rb
-- spec/lib/protobuf/rpc/service_spec.rb
-- spec/lib/protobuf/rpc/stat_spec.rb
-- spec/lib/protobuf_spec.rb
-- spec/spec_helper.rb
-- spec/support/all.rb
-- spec/support/packed_field.rb
-- spec/support/server.rb
-- spec/support/test/all_types.data.bin
-- spec/support/test/all_types.data.txt
-- spec/support/test/defaults.pb.rb
-- spec/support/test/defaults.proto
-- spec/support/test/enum.pb.rb
-- spec/support/test/enum.proto
-- spec/support/test/extended.pb.rb
-- spec/support/test/extended.proto
-- spec/support/test/extreme_values.data.bin
-- spec/support/test/google_unittest.pb.rb
-- spec/support/test/google_unittest.proto
-- spec/support/test/google_unittest_import.pb.rb
-- spec/support/test/google_unittest_import.proto
-- spec/support/test/google_unittest_import_public.pb.rb
-- spec/support/test/google_unittest_import_public.proto
-- spec/support/test/multi_field_extensions.pb.rb
-- spec/support/test/multi_field_extensions.proto
-- spec/support/test/resource.pb.rb
-- spec/support/test/resource.proto
-- spec/support/test/resource_service.rb
-- spec/support/test_app_file.rb
+test_files: []
 has_rdoc: