protobuf 3.8.1 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a83d5de57b9c6a5360694475d248d6e0fc10ae50
-  data.tar.gz: 8d662211209d4d768f48247e4088c0c2d3248df2
+SHA256:
+  metadata.gz: ef917148ada7494b0e7924434b0faa4e3a36155ac0893f687360f01b55b829d6
+  data.tar.gz: be5ae5cb6ff72a6c9151834da970137c0382f7177a2c8792458115c8a5d53df7
 SHA512:
-  metadata.gz: f160e7baed1d88bf0afc04850217140e0f50121c8e3ca0ca08daa564ee9f09f82f8f3b39da79cd3f6d1b1e05001ef20be69c2362f7dd4df44a6953e43562da96
-  data.tar.gz: c307c334b2a68a97d0dd86c4560177df02c75990e80f3cace69406a8d50f3948a83651ca2bbc873c6efbd17eb8102786cbbd50b5a649181271e5405df6b6e895
+  metadata.gz: 5594c91e41d5d0787874210f81865d39a5931b27ddf3a66178bce2e7125c6c293414492ad3e9ec9c02eda898e6c106874b2656549d61ffeb1f982fd596637a00
+  data.tar.gz: 2f6b14d78465a055be950fa1ba49a24f49e75548f28625ef8830eb8b77386a4a95266664693cac3ae02079071d27e44bc9e2e0f73ef32e56f7a4861003f5dfdd

data/.travis.yml

@@ -22,6 +22,7 @@ rvm:
   - 2.2
   - 2.2.2
   - 2.3
+  - 2.4
   - jruby-9.1.7.0
   - rbx-2
 env:

data/lib/protobuf/enum.rb

@@ -259,10 +259,16 @@ module Protobuf
       super(tag)
     end
 
-    # Overriding the class so ActiveRecord/Arel visitor will visit the enum as a Fixnum
+    # Overriding the class so ActiveRecord/Arel visitor will visit the enum as an
+    # Integer.
     #
     def class
-      Fixnum
+      # This is done for backward compatibility for < 2.4.0. This ensures that
+      # if Ruby version >= 2.4.0, this will return Integer. If below, then will
+      # return Fixnum.
+      #
+      # This prevents the constant deprecation warnings on Fixnum.
+      tag.class
     end
 
     def inspect

data/lib/protobuf/tasks/compile.rake

@@ -1,13 +1,32 @@
-require 'fileutils'
+require "fileutils"
 
 namespace :protobuf do
 
-  desc 'Clean & Compile the protobuf source to ruby classes. Pass PB_NO_CLEAN=1 if you do not want to force-clean first.'
+  desc "Clean & Compile the protobuf source to ruby classes. Pass PB_NO_CLEAN=1 if you do not want to force-clean first."
   task :compile, [:package, :source, :destination, :plugin, :file_extension] do |_tasks, args|
-    args.with_defaults(:destination => 'lib')
-    args.with_defaults(:source => 'definitions')
-    args.with_defaults(:plugin => 'ruby')
-    args.with_defaults(:file_extension => '.pb.rb')
+    binpath = ::File.expand_path("../../../../bin", __FILE__)
+
+    args.with_defaults(:destination => "lib")
+    args.with_defaults(:source => "definitions")
+    args.with_defaults(:plugin => "protoc-gen-ruby-protobuf=#{binpath}/protoc-gen-ruby")
+    args.with_defaults(:file_extension => ".pb.rb")
+
+    # The local Ruby generator collides with the builtin Ruby generator
+    #
+    # From the protoc docs:
+    #
+    #   --plugin=EXECUTABLE
+    #
+    #   ...EXECUTABLE may be of the form NAME=PATH, in which case the given plugin name
+    #   is mapped to the given executable even if the executable"s own name differs.
+    #
+    # Use the NAME=PATH form to specify an alternative plugin name that avoids the name collision
+    #
+    plugin_name, _plugin_path = args[:plugin].split("=")
+
+    # The plugin name MUST have the protoc-gen- prefix in order to work, but that prefix is dropped
+    # when using the plugin to generate definitions
+    plugin_name.gsub!("protoc-gen-", "")
 
     unless do_not_clean?
       force_clean!
@@ -16,22 +35,23 @@ namespace :protobuf do
 
     command = []
     command << "protoc"
-    command << "--#{args[:plugin]}_out=#{args[:destination]}"
+    command << "--plugin=#{args[:plugin]}"
+    command << "--#{plugin_name}_out=#{args[:destination]}"
     command << "-I #{args[:source]}"
     command << Dir["#{args[:source]}/#{args[:package]}/**/*.proto"].join(" ")
-    full_command = command.join(' ')
+    full_command = command.join(" ")
 
     puts full_command
     system(full_command)
   end
 
-  desc 'Clean the generated *.pb.rb files from the destination package. Pass PB_FORCE_CLEAN=1 to skip confirmation step.'
+  desc "Clean the generated *.pb.rb files from the destination package. Pass PB_FORCE_CLEAN=1 to skip confirmation step."
   task :clean, [:package, :destination, :file_extension] do |_task, args|
-    args.with_defaults(:destination => 'lib')
-    args.with_defaults(:file_extension => '.pb.rb')
+    args.with_defaults(:destination => "lib")
+    args.with_defaults(:file_extension => ".pb.rb")
 
-    file_extension = args[:file_extension].sub(/\*?\.+/, '')
-    files_to_clean = ::File.join(args[:destination], args[:package], '**', "*.#{file_extension}")
+    file_extension = args[:file_extension].sub(/\*?\.+/, "")
+    files_to_clean = ::File.join(args[:destination], args[:package], "**", "*.#{file_extension}")
 
     if force_clean? || permission_to_clean?(files_to_clean)
       ::Dir.glob(files_to_clean).each do |file|
@@ -41,15 +61,15 @@ namespace :protobuf do
   end
 
   def do_not_clean?
-    ! ::ENV.key?('PB_NO_CLEAN')
+    ! ::ENV.key?("PB_NO_CLEAN")
   end
 
   def force_clean?
-    ::ENV.key?('PB_FORCE_CLEAN')
+    ::ENV.key?("PB_FORCE_CLEAN")
   end
 
   def force_clean!
-    ::ENV['PB_FORCE_CLEAN'] = '1'
+    ::ENV["PB_FORCE_CLEAN"] = "1"
   end
 
   def permission_to_clean?(files_to_clean)

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.8.1' # rubocop:disable Style/MutableConstant
+  VERSION = '3.8.2' # rubocop:disable Style/MutableConstant
 end

data/spec/lib/protobuf/enum_spec.rb

@@ -214,7 +214,7 @@ RSpec.describe Protobuf::Enum do
   end
 
   subject { Test::EnumTestType::ONE }
-  specify { expect(subject.class).to eq(Fixnum) }
+  specify { expect(subject.class).to eq(1.class) }
   specify { expect(subject.parent_class).to eq(Test::EnumTestType) }
   specify { expect(subject.name).to eq(:ONE) }
   specify { expect(subject.tag).to eq(1) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.2
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -468,7 +468,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.