protobuf 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c15ccac39cd2875be40557654f55a9ee2c025c2
-  data.tar.gz: d5fb46c7db728b393c54fe8eb41136f229c9fe6c
+  metadata.gz: 7ab4fb52f93dfd58648db2463454e2b73215ec42
+  data.tar.gz: 32a62725dc2677e231d3ec63cd335fa3b3026316
 SHA512:
-  metadata.gz: 7c998e965bc3a0386e125ae719ba4fe96ab9d8c8e2fd63aea6bbedf774966d27fee4abcd01be29b5d957a70ed4dcf4ef75a109c7cb17b7da7c853d746042bb54
-  data.tar.gz: 6bdb5a27a6ce4a29817bbbad18d6593c27910de35ad3a4fbe18f8ce80b4bb31784212a7d127435644745936ebbd1e1797b989a12dedee89922c0d6e0db5e00f1
+  metadata.gz: 9f32ea8b0ef6e9339d43187648c438343e3643e5577a39b9c19f72fbf5749bbb6c614fdb1f4f53d3979ea3e75b67213d6afb81e1ce9bb6fabcf77e4db2dd6d1f
+  data.tar.gz: 2fc11caaa7c981e93f2515f8ebf4affc6e8fe9ba41a99314b7f4e005144b055a2c29018856b3652e17c91e187c2f1c44d267053374b8c1c1910079dfc5524878

data/.rubocop_todo.yml

@@ -1,11 +1,11 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-11-24 09:44:26 -0800 using RuboCop version 0.27.1.
+# on 2014-12-23 08:21:59 -0800 using RuboCop version 0.28.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 28
+# Offense count: 29
 Metrics/AbcSize:
   Max: 59
 
@@ -13,60 +13,70 @@ Metrics/AbcSize:
 Metrics/BlockNesting:
   Max: 5
 
-# Offense count: 9
+# Offense count: 8
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 233
+  Max: 232
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:
-  Max: 11
+  Max: 10
 
-# Offense count: 508
+# Offense count: 491
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 196
 
-# Offense count: 48
+# Offense count: 43
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 45
+  Max: 38
 
 # Offense count: 2
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 2
+# Offense count: 3
 Metrics/PerceivedComplexity:
-  Max: 12
+  Max: 11
 
-# Offense count: 216
+# Offense count: 189
 Style/Documentation:
   Enabled: false
 
-# Offense count: 15
+# Offense count: 12
 Style/DoubleNegation:
   Enabled: false
 
-# Offense count: 100
+# Offense count: 2
+Style/EmptyElse:
+  Enabled: false
+
+# Offense count: 73
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+# Offense count: 90
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/EmptyLinesAroundClassBody:
   Enabled: false
 
-# Offense count: 66
+# Offense count: 50
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/EmptyLinesAroundModuleBody:
   Enabled: false
 
-# Offense count: 53
+# Offense count: 46
 # Cop supports --auto-correct.
 Style/NumericLiterals:
   MinDigits: 21
 
-# Offense count: 464
+# Offense count: 463
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/StringLiterals:

data/lib/protobuf.rb

@@ -64,31 +64,6 @@ module Protobuf
     @gc_pause_server_request = !!value
   end
 
-  def self.deprecator
-    @deprecator ||= Deprecation.new('4.0', to_s).tap do |deprecation|
-      deprecation.silenced = ENV.key?('PB_IGNORE_DEPRECATIONS')
-      deprecation.behavior = :stderr
-    end
-  end
-
-  # Print Deprecation Warnings
-  #
-  # Default: true
-  #
-  # Simple boolean to define whether we want field deprecation warnings to
-  # be printed to stderr or not. The rpc_server has an option to set this value
-  # explicitly, or you can turn this option off by setting
-  # ENV['PB_IGNORE_DEPRECATIONS'] to a non-empty value.
-  #
-  # The rpc_server option will override the ENV setting.
-  def self.print_deprecation_warnings?
-    !deprecator.silenced
-  end
-
-  def self.print_deprecation_warnings=(value)
-    deprecator.silenced = !value
-  end
-
   # Permit unknown field on Message initialization
   #
   # Default: true

data/lib/protobuf/deprecation.rb

@@ -1,20 +1,112 @@
 require 'active_support/deprecation'
 
 module Protobuf
-  class Deprecation < ::ActiveSupport::Deprecation
-    def deprecate_methods(*args)
-      args.last.merge!(:deprecator => self) if args.last.is_a?(Hash)
-      super
+  if ::ActiveSupport::Deprecation.is_a?(Class)
+    class DeprecationBase < ::ActiveSupport::Deprecation
+      def deprecate_methods(*args)
+        deprecation_options = { :deprecator => self }
+
+        if args.last.is_a?(Hash)
+          args.last.merge!(deprecation_options)
+        else
+          args.push(deprecation_options)
+        end
+
+        super
+      end
+    end
+
+    class Deprecation < DeprecationBase
+      def define_deprecated_methods(target_module, method_hash)
+        target_module.module_eval do
+          method_hash.each do |old_method, new_method|
+            alias_method old_method, new_method
+          end
+        end
+
+        deprecate_methods(target_module, method_hash)
+      end
+    end
+
+    class FieldDeprecation < DeprecationBase
+      # this is a convenience deprecator for deprecated proto fields
+
+      def deprecate_method(target_module, method_name)
+        deprecate_methods(target_module, method_name => target_module)
+      end
+
+      private
+
+      def deprecated_method_warning(method_name, target_module)
+        "#{target_module.name}##{method_name} field usage is deprecated"
+      end
+    end
+  else
+    # TODO: remove this clause when Rails < 4 support is no longer needed
+    deprecator = ::ActiveSupport::Deprecation.clone
+    deprecator.instance_eval do
+      def new(deprecation_horizon = nil, *)
+        self.deprecation_horizon = deprecation_horizon if deprecation_horizon
+        self
+      end
     end
+    Deprecation = deprecator.clone
+    FieldDeprecation = deprecator.clone
 
-    def define_deprecated_methods(target_module, method_hash)
-      target_module.module_eval do
-        method_hash.each do |old_method, new_method|
-          alias_method old_method, new_method
+    Deprecation.instance_eval do
+      def define_deprecated_methods(target_module, method_hash)
+        target_module.module_eval do
+          method_hash.each do |old_method, new_method|
+            alias_method old_method, new_method
+          end
         end
+
+        deprecate_methods(target_module, method_hash)
+      end
+    end
+
+    FieldDeprecation.instance_eval do
+      def deprecate_method(target_module, method_name)
+        deprecate_methods(target_module, method_name => target_module)
       end
 
-      deprecate_methods(target_module, method_hash)
+      private
+
+      def deprecated_method_warning(method_name, target_module)
+        "#{target_module.name}##{method_name} field usage is deprecated"
+      end
     end
   end
+
+  def self.deprecator
+    @deprecator ||= Deprecation.new('4.0', to_s).tap do |deprecation|
+      deprecation.silenced = ENV.key?('PB_IGNORE_DEPRECATIONS')
+      deprecation.behavior = :stderr
+    end
+  end
+
+  def self.field_deprecator
+    @field_deprecator ||= FieldDeprecation.new.tap do |deprecation|
+      deprecation.silenced = ENV.key?('PB_IGNORE_DEPRECATIONS')
+      deprecation.behavior = :stderr
+    end
+  end
+
+  # Print Deprecation Warnings
+  #
+  # Default: true
+  #
+  # Simple boolean to define whether we want field deprecation warnings to
+  # be printed to stderr or not. The rpc_server has an option to set this value
+  # explicitly, or you can turn this option off by setting
+  # ENV['PB_IGNORE_DEPRECATIONS'] to a non-empty value.
+  #
+  # The rpc_server option will override the ENV setting.
+  def self.print_deprecation_warnings?
+    !field_deprecator.silenced
+  end
+
+  def self.print_deprecation_warnings=(value)
+    field_deprecator.silenced = !value
+  end
 end

data/lib/protobuf/field/base_field.rb

@@ -183,8 +183,9 @@ module Protobuf
           define_method(method_name) do
             @values[field.name] ||= ::Protobuf::Field::FieldArray.new(field)
           end
-          ::Protobuf.deprecator.deprecate_methods(method_name)
         end
+
+        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
       end
 
       def define_array_setter
@@ -210,8 +211,9 @@ module Protobuf
               @values[field.name].replace(val)
             end
           end
-          ::Protobuf.deprecator.deprecate_methods(method_name)
         end
+
+        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
       end
 
       def define_getter
@@ -222,8 +224,9 @@ module Protobuf
           define_method(method_name) do
             @values.fetch(field.name, field.default_value)
           end
-          ::Protobuf.deprecator.deprecate_methods(method_name)
         end
+
+        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
       end
 
       def define_setter
@@ -240,8 +243,9 @@ module Protobuf
               fail TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type_class}"
             end
           end
-          ::Protobuf.deprecator.deprecate_methods(method_name)
         end
+
+        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
       end
 
       def typed_default_value

data/lib/protobuf/field/bool_field.rb

@@ -38,13 +38,9 @@ module Protobuf
         super
 
         field = self
-        method_name = "#{field.getter}?"
 
         message_class.class_eval do
-          define_method(method_name) do
-            @values.fetch(field.name, field.default_value)
-          end
-          ::Protobuf.deprecator.deprecate_methods(method_name)
+          alias_method "#{field.getter}?", field.getter
         end
       end
 

data/lib/protobuf/field/bytes_field.rb

@@ -73,10 +73,10 @@ module Protobuf
               raise TypeError, "Got NoMethodError attempting to set #{val} for field #{field.name} of type #{field.type_class}: #{ex.message}"
             end
           end
-          ::Protobuf.deprecator.deprecate_methods(method_name)
         end
-      end
 
+        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
+      end
     end
   end
 end

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.4.1'
+  VERSION = '3.4.2'
 end

metadata

@@ -1,186 +1,214 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - BJ Neilsen
 - Brandon Dewitt
 - Devin Christensen
 - Adam Hutchison
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: thor
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: thread_safe
+  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
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ffi-rzmq
   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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
+  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'
-  prerelease: false
+        version: '3.0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-  prerelease: false
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rubocop
+  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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: timecop
+  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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: yard
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: pry
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
   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: ruby-prof
+  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.
 email:
 - bj.neilsen+protobuf@gmail.com
@@ -193,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
@@ -374,24 +402,24 @@ homepage: https://github.com/localshred/protobuf
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 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'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
 test_files:
@@ -465,4 +493,4 @@ test_files:
 - spec/support/test/resource.proto
 - spec/support/test/resource_service.rb
 - spec/support/test_app_file.rb
-has_rdoc:
+has_rdoc: