protobuf 3.4.3 → 3.4.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8039705f02dc03d0ecc6415c8a6ef2d7114b96c5
+  data.tar.gz: 1978cec9ab539484b2d299c5a109e78af267c7fe
+SHA512:
+  metadata.gz: 6d0c733b3656fe080337232cdfbf68b996541add9206b1f621bbb6cd6df8d116296ceded1d797c1e3743314dd8b7f27761c8882d7e66c64427600990e26ba5ef
+  data.tar.gz: a44e9cff6f284880bcfaf6aaa29cc5dc12d16a35e5808e45a3a6510fb34db23ca8e76d0187fa3d1acbc2ea8593115b3b3d1dbdc7d755c04384607ac26ef28b40

data/lib/protobuf/message/fields.rb

@@ -3,6 +3,7 @@ module Protobuf
     module Fields
 
       def self.extended(other)
+        other.extend(ClassMethods)
         ::Protobuf.deprecator.define_deprecated_methods(
           other.singleton_class,
           :get_ext_field_by_name => :get_extension_field,
@@ -10,110 +11,123 @@ module Protobuf
           :get_field_by_name => :get_field,
           :get_field_by_tag => :get_field,
         )
+
+        def inherited(subclass)
+          inherit_fields!(subclass)
+        end
       end
 
-      ##
-      # Field Definition Methods
-      #
+      module ClassMethods
 
-      # Define an optional field.
-      #
-      def optional(type_class, name, tag, options = {})
-        define_field(:optional, type_class, name, tag, options)
-      end
+        ##
+        # Field Definition Methods
+        #
 
-      # Define a repeated field.
-      #
-      def repeated(type_class, name, tag, options = {})
-        define_field(:repeated, type_class, name, tag, options)
-      end
+        # Define an optional field.
+        #
+        def optional(type_class, name, tag, options = {})
+          define_field(:optional, type_class, name, tag, options)
+        end
 
-      # Define a required field.
-      #
-      def required(type_class, name, tag, options = {})
-        define_field(:required, type_class, name, tag, options)
-      end
+        # Define a repeated field.
+        #
+        def repeated(type_class, name, tag, options = {})
+          define_field(:repeated, type_class, name, tag, options)
+        end
 
-      # Define an extension range.
-      #
-      def extensions(range)
-        extension_ranges << range
-      end
+        # Define a required field.
+        #
+        def required(type_class, name, tag, options = {})
+          define_field(:required, type_class, name, tag, options)
+        end
 
-      ##
-      # Field Access Methods
-      #
+        # Define an extension range.
+        #
+        def extensions(range)
+          extension_ranges << range
+        end
 
-      def all_fields
-        @all_fields ||= field_store.values.uniq.sort_by(&:tag)
-      end
+        ##
+        # Field Access Methods
+        #
+        def all_fields
+          @all_fields ||= field_store.values.uniq.sort_by(&:tag)
+        end
 
-      def extension_fields
-        @extension_fields ||= all_fields.select(&:extension?)
-      end
+        def extension_fields
+          @extension_fields ||= all_fields.select(&:extension?)
+        end
 
-      def extension_ranges
-        @extension_ranges ||= []
-      end
+        def extension_ranges
+          @extension_ranges ||= []
+        end
 
-      def extension_tag?(tag)
-        tag.respond_to?(:to_i) && get_extension_field(tag).present?
-      end
+        def extension_tag?(tag)
+          tag.respond_to?(:to_i) && get_extension_field(tag).present?
+        end
 
-      def field_store
-        @field_store ||= {}
-      end
+        def field_store
+          @field_store ||= {}
+        end
 
-      def fields
-        @fields ||= all_fields.reject(&:extension?)
-      end
+        def fields
+          @fields ||= all_fields.reject(&:extension?)
+        end
 
-      def field_tag?(tag, allow_extension = false)
-        tag.respond_to?(:to_i) && get_field(tag, allow_extension).present?
-      end
+        def field_tag?(tag, allow_extension = false)
+          tag.respond_to?(:to_i) && get_field(tag, allow_extension).present?
+        end
 
-      def get_extension_field(name_or_tag)
-        name_or_tag = name_or_tag.to_sym if name_or_tag.respond_to?(:to_sym)
-        field = field_store[name_or_tag]
-        field if field.try(:extension?) { false }
-      end
+        def get_extension_field(name_or_tag)
+          name_or_tag = name_or_tag.to_sym if name_or_tag.respond_to?(:to_sym)
+          field = field_store[name_or_tag]
+          field if field.try(:extension?) { false }
+        end
 
-      def get_field(name_or_tag, allow_extension = false)
-        name_or_tag = name_or_tag.to_sym if name_or_tag.respond_to?(:to_sym)
-        field = field_store[name_or_tag]
+        def get_field(name_or_tag, allow_extension = false)
+          name_or_tag = name_or_tag.to_sym if name_or_tag.respond_to?(:to_sym)
+          field = field_store[name_or_tag]
 
-        if field && (allow_extension || !field.extension?)
-          field
-        else
-          nil
+          if field && (allow_extension || !field.extension?)
+            field
+          else
+            nil
+          end
         end
-      end
 
-      def define_field(rule, type_class, field_name, tag, options)
-        raise_if_tag_collision(tag, field_name)
-        raise_if_name_collision(field_name)
+        def define_field(rule, type_class, field_name, tag, options)
+          raise_if_tag_collision(tag, field_name)
+          raise_if_name_collision(field_name)
 
-        field = ::Protobuf::Field.build(self, rule, type_class, field_name, tag, options)
-        field_store[field_name] = field
-        field_store[tag] = field
+          field = ::Protobuf::Field.build(self, rule, type_class, field_name, tag, options)
+          field_store[field_name] = field
+          field_store[tag] = field
 
-        define_method("#{field_name}!") do
-          @values[field_name]
+          define_method("#{field_name}!") do
+            @values[field_name]
+          end
         end
-      end
 
-      def raise_if_tag_collision(tag, field_name)
-        if get_field(tag, true)
-          fail TagCollisionError, %(Field number #{tag} has already been used in "#{name}" by field "#{field_name}".)
+        def raise_if_tag_collision(tag, field_name)
+          if get_field(tag, true)
+            fail TagCollisionError, %(Field number #{tag} has already been used in "#{name}" by field "#{field_name}".)
+          end
         end
-      end
 
-      def raise_if_name_collision(field_name)
-        if get_field(field_name, true)
-          fail DuplicateFieldNameError, %(Field name #{field_name} has already been used in "#{name}".)
+        def raise_if_name_collision(field_name)
+          if get_field(field_name, true)
+            fail DuplicateFieldNameError, %(Field name #{field_name} has already been used in "#{name}".)
+          end
         end
-      end
 
+        def inherit_fields!(subclass)
+          instance_variables.each do |iv|
+            subclass.instance_variable_set(iv, instance_variable_get(iv))
+          end
+        end
+        private :inherit_fields!
+
+      end
     end
   end
 end

data/lib/protobuf/version.rb

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

data/spec/functional/class_inheritance_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+require 'spec/support/test/resource_service'
+
+RSpec.describe 'works through class inheritance' do
+  module Corp
+    module Protobuf
+      class Error < ::Protobuf::Message
+        required :string, :foo, 1
+      end
+    end
+  end
+  module Corp
+    class ErrorHandler < Corp::Protobuf::Error
+    end
+  end
+
+  let(:args) { { :foo => 'bar' } }
+  let(:parent_class) { Corp::Protobuf::Error }
+  let(:inherited_class) { Corp::ErrorHandler }
+
+  specify '#encode' do
+    expected_result = "\n\x03bar"
+    expected_result.force_encoding(Encoding::BINARY)
+    expect(parent_class.new(args).encode).to eq(expected_result)
+    expect(inherited_class.new(args).encode).to eq(expected_result)
+  end
+
+  specify '#to_hash' do
+    expect(parent_class.new(args).to_hash).to eq(args)
+    expect(inherited_class.new(args).to_hash).to eq(args)
+  end
+
+  specify '#to_json' do
+    expect(parent_class.new(args).to_json).to eq(args.to_json)
+    expect(inherited_class.new(args).to_json).to eq(args.to_json)
+  end
+
+  specify '.encode' do
+    expected_result = "\n\x03bar"
+    expected_result.force_encoding(Encoding::BINARY)
+    expect(parent_class.encode(args)).to eq(expected_result)
+    expect(inherited_class.encode(args)).to eq(expected_result)
+  end
+
+  specify '.decode' do
+    raw_value = "\n\x03bar"
+    raw_value.force_encoding(Encoding::BINARY)
+    expect(parent_class.decode(raw_value).to_hash).to eq(args)
+    expect(inherited_class.decode(raw_value).to_hash).to eq(args)
+  end
+
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.4.3
-  prerelease: 
+  version: 3.4.4
 platform: ruby
 authors:
 - BJ Neilsen
@@ -12,230 +11,202 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Google Protocol Buffers serialization and RPC implementation for Ruby.
@@ -250,11 +221,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
+- ".yardopts"
 - CHANGES.md
 - CONTRIBUTING.md
 - Gemfile
@@ -363,6 +334,7 @@ files:
 - 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
@@ -430,33 +402,97 @@ files:
 homepage: https://github.com/localshred/protobuf
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2458400158971729281
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2458400158971729281
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
-test_files: []
+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
 has_rdoc: