protobuf 3.0.0.rc1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f5adb66133630992323a9997d949111915d8829
-  data.tar.gz: 7e38efbe7179f878ba6851d7b959e2c4e9227399
+  metadata.gz: c8eb56b50b5911d64b5634ac4c82dd27ba291c70
+  data.tar.gz: 0f1707982fc81dcca0638f51a7efc0a91b50c11b
 SHA512:
-  metadata.gz: a5753795f4b427bad944603d34eacd68ba6f649104f841ffbd6f32ba09413206f0113087b588023ffaa5390ab96ddc4b669cb72a8dde924eb3b9818f9283ad79
-  data.tar.gz: 9144fc91254485e6af4bb9d25db6b2401a50a63920d2749ef262069802a2d0787020a65f81ac098b0f16f0fa6ac4b1a28a231d3997c8c6b3d5a5727e0e82a563
+  metadata.gz: 140f2c71c05670f79fe461ec55307c42d2c32a839a07e568e627193dfbec4efd252d1bbd807050aa9cff2f52e196f225d531498bd5b95a6204ea54a0038e5399
+  data.tar.gz: 054234f0c8236ce49675694c9efc217d1c2c8a689472ef42b47523266ca18b9f4aa6b7b7519e1ea385213395e76571074b336b212604b61f88867af04a8668fa

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 rvm:
-  - "1.9.2"
   - "1.9.3"
   - "2.0.0"
-script: NO_COMPILE_TEST_PROTOS=1 bundle exec rake spec
-before_install:
- - sudo apt-get install -qq libzmq3-dev
+script: NO_COMPILE_TEST_PROTOS=1 bundle exec rake spec/lib
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/51a956bcd2b1854d6756
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false

data/CHANGES.md

@@ -1,5 +1,16 @@
 # Unstable
 
+3.0.0.rc2
+---------
+
+Please read the [rc1 section below](#300rc1) for the greater changeset.
+
+- Add support for assigning a symbol to a string or bytes field. [#181, @abrandoned]
+- Add `first_alive_load_balance` option to rpc server. Pass `PB_FIRST_ALIVE_LOAD_BALANCE`
+   as an env variable to the client process to ensure the client asks the server
+   if it is alive (able to server requests to clients). [#183, @abrandoned]
+
+
 3.0.0.rc1
 ---------
 
@@ -48,6 +59,7 @@ __!! NOTE: These deprecated methods will be removed in v3.1. !!__
 
 #### Breaking Changes
 
+- Require Active Support 3.2+. [#177]
 - All files/classes relating to the EventMachine client and server are gone. Use `PB_CLIENT_TYPE` and `PB_SERVER_TYPE` of `socket` instead. [#116]
 - Cleaned up the `Enum` class, deprecating/renaming most methods. tl;dr, just use `MyEnum.fetch`.
    See #134 for more comprehensive documentation about which methods are going and away and which are being renamed. [#134]

data/lib/protobuf/field/base_field.rb

@@ -115,6 +115,11 @@ module Protobuf
         !! repeated
       end
 
+      # Is this a repeated message field?
+      def repeated_message?
+        repeated? && message?
+      end
+
       # Is this a required field?
       def required?
         !! required

data/lib/protobuf/field/bytes_field.rb

@@ -23,11 +23,7 @@ module Protobuf
       #
 
       def acceptable?(val)
-        if val.nil? || val.is_a?(::Protobuf::Message) || val.instance_of?(String)
-          return true
-        else
-          raise TypeError, "Cannot set field : #{name} to value : #{val}"
-        end
+        val.nil? || val.is_a?(String) || val.is_a?(Symbol) || val.is_a?(::Protobuf::Message)
       end
 
       def decode(bytes)
@@ -61,6 +57,7 @@ module Protobuf
           define_method(field.setter_method_name) do |val|
             begin
               field.warn_if_deprecated
+              val = "#{val}" if val.is_a?(Symbol)
 
               if val.nil?
                 @values.delete(field.name)

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

@@ -10,15 +10,16 @@ module Protobuf
   module Rpc
     module Connectors
       DEFAULT_OPTIONS = {
-        :service        => nil,           # Fully-qualified Service class
-        :method         => nil,           # Service method to invoke
-        :host           => '127.0.0.1',   # The hostname or address of the service (usually overridden or pre-configured)
-        :port           => '9399',        # The port of the service (usually overridden or pre-configured)
-        :request        => nil,           # The request object sent by the client
-        :request_type   => nil,           # The request type expected by the client
-        :response_type  => nil,           # The response type expected by the client
-        :timeout        => 300,           # The default timeout for the request, also handled by client.rb
-        :client_host    => nil            # The hostname or address of this client
+        :service                 => nil,         # Fully-qualified Service class
+        :method                  => nil,         # Service method to invoke
+        :host                    => '127.0.0.1', # The hostname or address of the service (usually overridden)
+        :port                    => '9399',      # The port of the service (usually overridden or pre-configured)
+        :request                 => nil,         # The request object sent by the client
+        :request_type            => nil,         # The request type expected by the client
+        :response_type           => nil,         # The response type expected by the client
+        :timeout                 => 300,         # The default timeout for the request, also handled by client.rb
+        :client_host             => nil,         # The hostname or address of this client
+        :first_alive_load_balance => false,       # Do we want to use check_avail frames before request
       }
 
       class Base
@@ -31,6 +32,11 @@ module Protobuf
           @options = DEFAULT_OPTIONS.merge(options)
         end
 
+        def first_alive_load_balance?
+          ENV.has_key?("PB_FIRST_ALIVE_LOAD_BALANCE") ||
+            options[:first_alive_load_balance]
+        end
+
         def send_request
           raise 'If you inherit a Connector from Base you must implement send_request'
         end

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

@@ -64,14 +64,28 @@ module Protobuf
         # service. The LINGER is set to 0 so we can close immediately in
         # the event of a timeout
         def create_socket
-          server_uri = lookup_server_uri
+          socket = nil
 
-          socket = zmq_context.socket(::ZMQ::REQ)
-          socket.setsockopt(::ZMQ::LINGER, 0)
+          begin
+            server_uri = lookup_server_uri
+
+            socket = zmq_context.socket(::ZMQ::REQ)
+            socket.setsockopt(::ZMQ::LINGER, 0)
+
+            log_debug { sign_message("Establishing connection: #{server_uri}") }
+            zmq_error_check(socket.connect(server_uri), :socket_connect)
+            log_debug { sign_message("Connection established to #{server_uri}") }
 
-          log_debug { sign_message("Establishing connection: #{server_uri}") }
-          zmq_error_check(socket.connect(server_uri), :socket_connect)
-          log_debug { sign_message("Connection established to #{server_uri}") }
+            if first_alive_load_balance?
+              check_available_response = ""
+              zmq_error_check(socket.send_string(::Protobuf::Rpc::Zmq::CHECK_AVAILABLE_MESSAGE), :socket_send_string)
+              zmq_error_check(socket.recv_string(check_available_response), :socket_recv_string)
+
+              if check_available_response == ::Protobuf::Rpc::Zmq::NO_WORKERS_AVAILABLE
+                zmq_error_check(socket.close, :socket_close)
+              end
+            end
+          end while socket.try(:socket).nil?
 
           socket
         end
@@ -87,7 +101,7 @@ module Protobuf
         # to the host and port in the options
         #
         def lookup_server_uri
-          5.times do
+          50.times do
             service_directory.all_listings_for(service).each do |listing|
               host = listing.try(:address)
               port = listing.try(:port)
@@ -98,7 +112,7 @@ module Protobuf
             port = options[:port]
             return "tcp://#{host}:#{port}" if host_alive?(host)
 
-            sleep 1
+            sleep(1.0/10.0) # not sure why sleeping at all, but should be way less than 1 second
           end
 
           raise "Host not found for service #{service}"

data/lib/protobuf/rpc/servers/zmq/broker.rb

@@ -86,9 +86,16 @@ module Protobuf
         end
 
         def process_frontend
-          if @idle_workers.any?
-            frames = read_from_frontend
-            write_to_backend([@idle_workers.shift, ""] + frames)
+          address, _, message, *frames = read_from_frontend
+
+          if message == ::Protobuf::Rpc::Zmq::CHECK_AVAILABLE_MESSAGE
+            if @idle_workers.any?
+              write_to_frontend([address, "", ::Protobuf::Rpc::Zmq::WORKERS_AVAILABLE])
+            else
+              write_to_frontend([address, "", ::Protobuf::Rpc::Zmq::NO_WORKERS_AVAILABLE])
+            end
+          else
+            write_to_backend([@idle_workers.shift, ""] + [address, "", message ] + frames)
           end
         end
 

data/lib/protobuf/rpc/servers/zmq/util.rb

@@ -6,6 +6,9 @@ module Protobuf
 
       ADDRESS_MATCH = /\A\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/.freeze
       WORKER_READY_MESSAGE = "\1"
+      CHECK_AVAILABLE_MESSAGE = "\3"
+      NO_WORKERS_AVAILABLE = "\4"
+      WORKERS_AVAILABLE = "\5"
 
       module Util
         include ::Protobuf::Logger::LogMethods

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.0.0.rc1'
+  VERSION = '3.0.0.rc2'
 end

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 ##
 # This file is auto-generated. DO NOT EDIT!
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport