protobuf 2.8.13 → 3.0.0.rc1

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

@@ -26,11 +26,11 @@ module GoogleUnittestImport
   # Message Fields
   #
   class PublicImportMessage
-    optional ::Protobuf::Field::Int32Field, :e, 1
+    optional :int32, :e, 1
   end
 
   class ImportMessage
-    optional ::Protobuf::Field::Int32Field, :d, 1
+    optional :int32, :d, 1
   end
 
 end

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

@@ -40,14 +40,14 @@ module Test
 
   class PayloadA
     class Foo
-      optional ::Protobuf::Field::StringField, :foo_a, 1
+      optional :string, :foo_a, 1
     end
 
   end
 
   class PayloadB
     class Foo
-      optional ::Protobuf::Field::StringField, :foo_b, 1
+      optional :string, :foo_b, 1
     end
 
   end

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

@@ -47,54 +47,54 @@ module Test
   # Message Fields
   #
   class ResourceFindRequest
-    required ::Protobuf::Field::StringField, :name, 1
-    optional ::Protobuf::Field::BoolField, :active, 2
-    repeated ::Protobuf::Field::StringField, :widgets, 3
-    repeated ::Protobuf::Field::BytesField, :widget_bytes, 4
+    required :string, :name, 1
+    optional :bool, :active, 2
+    repeated :string, :widgets, 3
+    repeated :bytes, :widget_bytes, 4
   end
 
   class ResourceSleepRequest
-    optional ::Protobuf::Field::Int32Field, :sleep, 1
+    optional :int32, :sleep, 1
   end
 
   class Resource
-    required ::Protobuf::Field::StringField, :name, 1
-    optional ::Protobuf::Field::Int64Field, :date_created, 2
+    required :string, :name, 1
+    optional :int64, :date_created, 2
     optional ::Test::StatusType, :status, 3
     repeated ::Test::StatusType, :repeated_enum, 4
     # Extension Fields
     extensions 100...536870912
-    optional ::Protobuf::Field::BoolField, :ext_is_searchable, 100, :extension => true
-    optional ::Protobuf::Field::BoolField, :ext_is_hidden, 101, :extension => true
+    optional :bool, :ext_is_searchable, 100, :extension => true
+    optional :bool, :ext_is_hidden, 101, :extension => true
     optional ::Test::Searchable::SearchType, :ext_search_type, 102, :default => ::Test::Searchable::SearchType::FLAT, :extension => true
-    optional ::Protobuf::Field::BoolField, :ext_nested_in_level_one, 105, :extension => true
-    optional ::Protobuf::Field::BoolField, :ext_dup_field, 106, :extension => true
+    optional :bool, :ext_nested_in_level_one, 105, :extension => true
+    optional :bool, :ext_dup_field, 106, :extension => true
   end
 
   class MessageParent
     class MessageChild
-      optional ::Protobuf::Field::StringField, :child1, 1
+      optional :string, :child1, 1
     end
 
   end
 
   class Nested
     class NestedLevelOne
-      optional ::Protobuf::Field::BoolField, :level_one, 1, :default => true
+      optional :bool, :level_one, 1, :default => true
       # Extension Fields
       extensions 100...102
-      optional ::Protobuf::Field::BoolField, :ext_nested_level_one_outer, 101, :extension => true
-      optional ::Protobuf::Field::BoolField, :ext_nested_level_one, 100, :extension => true
+      optional :bool, :ext_nested_level_one_outer, 101, :extension => true
+      optional :bool, :ext_nested_level_one, 100, :extension => true
     end
 
-    optional ::Protobuf::Field::StringField, :name, 1
+    optional :string, :name, 1
     optional ::Test::Resource, :resource, 2
     repeated ::Test::Resource, :multiple_resources, 3
     optional ::Test::StatusType, :status, 4
     # Extension Fields
     extensions 100...111
-    optional ::Protobuf::Field::StringField, :foo, 100, :extension => true
-    optional ::Protobuf::Field::Int64Field, :bar, 101, :extension => true
+    optional :string, :foo, 100, :extension => true
+    optional :int64, :bar, 101, :extension => true
   end
 
 
@@ -103,6 +103,7 @@ module Test
   #
   class ResourceService < ::Protobuf::Rpc::Service
     rpc :find, ::Test::ResourceFindRequest, ::Test::Resource
+    rpc :find_with_rpc_failed, ::Test::ResourceFindRequest, ::Test::Resource
     rpc :find_with_sleep, ::Test::ResourceSleepRequest, ::Test::Resource
   end
 

data/spec/support/test/resource.proto

@@ -84,5 +84,6 @@ extend Nested.NestedLevelOne {
 
 service ResourceService {
   rpc Find (ResourceFindRequest) returns (Resource);
+  rpc FindWithRpcFailed (ResourceFindRequest) returns (Resource);
   rpc FindWithSleep (ResourceSleepRequest) returns (Resource);
 }

data/spec/support/test/resource_service.rb

@@ -17,5 +17,10 @@ module Test
       response.name = 'Request should have timed out'
     end
 
+    # request -> Test::ResourceFindRequest
+    # response -> Test::Resource
+    def find_with_rpc_failed
+      rpc_failed('Find failed')
+    end
   end
 end

metadata

@@ -1,169 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.8.13
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - BJ Neilsen
 - Brandon Dewitt
 - Devin Christensen
+- Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: middleware
   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
+  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: eventmachine
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: perftools.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Google Protocol Buffers serialization and RPC implementation for Ruby.
@@ -171,16 +186,16 @@ email:
 - bj.neilsen+protobuf@gmail.com
 - brandonsdewitt+protobuf@gmail.com
 - quixoten@gmail.com
+- liveh2o@gmail.com
 executables:
 - protoc-gen-ruby
 - rpc_server
-- rprotoc
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .travis.yml
+- .yardopts
 - CHANGES.md
 - CONTRIBUTING.md
 - Gemfile
@@ -189,25 +204,23 @@ files:
 - Rakefile
 - bin/protoc-gen-ruby
 - bin/rpc_server
-- bin/rprotoc
 - lib/protobuf.rb
 - lib/protobuf/cli.rb
 - lib/protobuf/code_generator.rb
+- lib/protobuf/decoder.rb
+- lib/protobuf/deprecator.rb
 - lib/protobuf/descriptors.rb
 - lib/protobuf/descriptors/google/protobuf/compiler/plugin.pb.rb
 - lib/protobuf/descriptors/google/protobuf/descriptor.pb.rb
+- lib/protobuf/encoder.rb
 - lib/protobuf/enum.rb
-- lib/protobuf/enum_value.rb
-- lib/protobuf/evented.rb
 - lib/protobuf/exceptions.rb
-- lib/protobuf/ext/eventmachine.rb
 - lib/protobuf/field.rb
 - lib/protobuf/field/base_field.rb
 - lib/protobuf/field/bool_field.rb
 - lib/protobuf/field/bytes_field.rb
 - lib/protobuf/field/double_field.rb
 - lib/protobuf/field/enum_field.rb
-- lib/protobuf/field/extension_fields.rb
 - lib/protobuf/field/field_array.rb
 - lib/protobuf/field/fixed32_field.rb
 - lib/protobuf/field/fixed64_field.rb
@@ -237,25 +250,29 @@ files:
 - lib/protobuf/lifecycle.rb
 - lib/protobuf/logger.rb
 - lib/protobuf/message.rb
-- lib/protobuf/message/decoder.rb
-- lib/protobuf/message/message.rb
+- lib/protobuf/message/fields.rb
+- lib/protobuf/message/serialization.rb
+- 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/em_client.rb
-- lib/protobuf/rpc/connectors/eventmachine.rb
 - lib/protobuf/rpc/connectors/socket.rb
 - lib/protobuf/rpc/connectors/zmq.rb
 - lib/protobuf/rpc/dynamic_discovery.pb.rb
+- lib/protobuf/rpc/env.rb
 - lib/protobuf/rpc/error.rb
 - lib/protobuf/rpc/error/client_error.rb
 - lib/protobuf/rpc/error/server_error.rb
+- lib/protobuf/rpc/middleware.rb
+- lib/protobuf/rpc/middleware/exception_handler.rb
+- lib/protobuf/rpc/middleware/logger.rb
+- lib/protobuf/rpc/middleware/request_decoder.rb
+- lib/protobuf/rpc/middleware/response_encoder.rb
+- lib/protobuf/rpc/middleware/runner.rb
 - lib/protobuf/rpc/rpc.pb.rb
 - lib/protobuf/rpc/server.rb
-- lib/protobuf/rpc/servers/evented/server.rb
-- lib/protobuf/rpc/servers/evented_runner.rb
 - lib/protobuf/rpc/servers/socket/server.rb
 - lib/protobuf/rpc/servers/socket/worker.rb
 - lib/protobuf/rpc/servers/socket_runner.rb
@@ -286,16 +303,14 @@ files:
 - spec/data/types.bin
 - spec/encoding/all_types_spec.rb
 - spec/encoding/extreme_values_spec.rb
-- spec/functional/embedded_service_spec.rb
-- spec/functional/evented_server_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/enum_value_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
@@ -306,13 +321,17 @@ files:
 - spec/lib/protobuf/lifecycle_spec.rb
 - spec/lib/protobuf/logger_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/servers/evented_server_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
@@ -359,17 +378,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.2
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
@@ -380,16 +399,14 @@ test_files:
 - spec/data/types.bin
 - spec/encoding/all_types_spec.rb
 - spec/encoding/extreme_values_spec.rb
-- spec/functional/embedded_service_spec.rb
-- spec/functional/evented_server_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/enum_value_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
@@ -400,13 +417,17 @@ test_files:
 - spec/lib/protobuf/lifecycle_spec.rb
 - spec/lib/protobuf/logger_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/servers/evented_server_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

data/bin/rprotoc

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-command = [ 'protoc', ARGV ].flatten.join(' ')
-
-$stderr.puts "[DEPRECATED] `rprotoc` is deprecated. Use `protoc --ruby_out ...` instead."
-$stdout.puts command
-
-exec command

data/lib/protobuf/enum_value.rb

@@ -1,85 +0,0 @@
-require 'delegate'
-require 'protobuf/enum'
-
-##
-# Adding extension to Numeric until
-# we can get people to stop calling #value
-# on EnumValue
-class Numeric
-  unless method_defined?(:value)
-    def value
-      self
-    end
-  end
-end
-
-module Protobuf
-  class EnumValue < SimpleDelegator
-
-    attr_reader :parent_class, :name
-
-    ##
-    # Constructor
-    #
-    def initialize(parent_class, name, value)
-      @parent_class = parent_class
-      @name = name
-      @value = value
-      super(@value)
-    end
-
-    # Overriding the class so ActiveRecord/Arel visitor will visit the enum as a Fixnum
-    def class
-      Fixnum
-    end
-
-    def inspect
-      "\#<Protobuf::EnumValue #{@parent_class}::#{@name}=#{@value}>"
-    end
-
-    def to_i
-      @value
-    end
-
-    def to_int
-      @value.to_int
-    end
-
-    def to_s(format = :value_string)
-      case format
-      when :value_string then
-        self.to_i.to_s
-      when :name then
-        name.to_s
-      else
-        self.to_i.to_s
-      end
-    end
-
-    # Re-implement `try` in order to fix the problem where
-    # the underlying fixnum doesn't respond to all methods (e.g. name or value).
-    # If we respond to the first argument, `__send__` the args. Otherwise,
-    # delegate the `try` call to the underlying vlaue fixnum.
-    #
-    def try(*args, &block)
-      case
-      when args.empty? && block_given?
-        yield self
-      when respond_to?(args.first)
-        __send__(*args, &block)
-      else
-        @value.try(*args, &block)
-      end
-    end
-
-    def value
-      @value
-    end
-
-    ##
-    # Instance Aliases
-    #
-    alias_method :to_hash_value, :to_i
-  end
-end
-

data/lib/protobuf/evented.rb

@@ -1,37 +0,0 @@
-##
-## Evented Mode
-##
-#
-# Require this file if you wish to run your server and/or client RPC
-# with the evented handlers via EventMachine.
-#
-# To run with rpc_server specify the switch `evented`:
-#
-#   rpc_server --evented myapp.rb
-#
-# To run for client-side only override the require in your Gemfile:
-#
-#   gem 'protobuf', :require => 'protobuf/evented'
-#
-$stderr.puts <<-WARN
-  [DEPRECATED] You are using the evented connector and/or server which has been deprecated.
-               Versions >= 3.0 will no longer provide the evented module for clients
-               and servers. You should upgrade to the socket or zmq transport configurations.
-
-               To upgrade your rpc_server, simply replace `--evented` option
-               with `--socket` or `--zmq`. If you are using the `PB_CLIENT_TYPE`
-               env variable, simply assign it to socket or zmq.
-
-               If you are requiring the gem in your gemfile expclitly, change
-               the require to match your chosen transport type:
-
-                  `gem 'protobuf', :require => 'protobuf/socket'`
-WARN
-
-require 'protobuf'
-Protobuf.connector_type = :evented
-
-require 'eventmachine'
-require 'protobuf/ext/eventmachine'
-require 'protobuf/rpc/servers/evented/server'
-require 'protobuf/rpc/connectors/eventmachine'

data/lib/protobuf/ext/eventmachine.rb

@@ -1,14 +0,0 @@
-require 'fiber'
-
-# Method from em-synchrony
-# https://github.com/igrigorik/em-synchrony
-#
-# A convenience method for wrapping EM.run body within
-# a Ruby Fiber such that async operations can be transparently
-# paused and resumed based on IO scheduling
-module EventMachine
-  def self.fiber_run(blk=nil, tail=nil, &block)
-    context = Proc.new{ Fiber.new{ (b = blk || block) and b.call }.resume }
-    self.run(context, tail)
-  end
-end