protobuf 3.8.2 → 3.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef917148ada7494b0e7924434b0faa4e3a36155ac0893f687360f01b55b829d6
-  data.tar.gz: be5ae5cb6ff72a6c9151834da970137c0382f7177a2c8792458115c8a5d53df7
+  metadata.gz: c906a5d207f967c1bf49df971175e6e3f702be223e5a28eee2995bfe79f23d5e
+  data.tar.gz: c8a1b8ab9e6a8fc8bb2442d1c76cd7f926c8b1a4517e19d6933694779acc752f
 SHA512:
-  metadata.gz: 5594c91e41d5d0787874210f81865d39a5931b27ddf3a66178bce2e7125c6c293414492ad3e9ec9c02eda898e6c106874b2656549d61ffeb1f982fd596637a00
-  data.tar.gz: 2f6b14d78465a055be950fa1ba49a24f49e75548f28625ef8830eb8b77386a4a95266664693cac3ae02079071d27e44bc9e2e0f73ef32e56f7a4861003f5dfdd
+  metadata.gz: db8270d6a319265c66d79d735d477f8079eb1bf13147dc8a8e907b6be3e01bddb987249a2ecbd3e0985c47faf66344eb6b710e593c892ce9aa216f8b87496a5a
+  data.tar.gz: f40a2fdfff2fe27bb602873785699020f0567fb60fb9cdbfdf88002461e513789e624c644d67cc59d1c80ed4d9c76a76854fdd05e527640265bc3f8bef09f750

data/lib/protobuf.rb

@@ -1,6 +1,7 @@
+require 'base64'
 require 'logger'
-require 'socket'
 require 'pp'
+require 'socket'
 require 'stringio'
 
 require 'active_support/core_ext/object/blank'

data/lib/protobuf/enum.rb

@@ -283,6 +283,14 @@ module Protobuf
       tag.to_int
     end
 
+    ##
+    # This fixes a reflection bug in JrJackson RubyAnySerializer that does not
+    #     render Protobuf enums correctly because to_json is not defined.
+    #
+    def to_json
+      to_i
+    end
+
     def to_s(format = :tag)
       case format
       when :tag
@@ -316,5 +324,6 @@ module Protobuf
     # Instance Aliases
     #
     alias :to_hash_value to_i
+    alias :to_json_hash_value to_i
   end
 end

data/lib/protobuf/field/bytes_field.rb

@@ -69,6 +69,10 @@ module Protobuf
           fail TypeError, "Unacceptable value #{value} for field #{name} of type #{type_class}"
         end
       end
+
+      def json_encode(value)
+        Base64.strict_encode64(value)
+      end
     end
   end
 end

data/lib/protobuf/field/field_array.rb

@@ -46,6 +46,21 @@ module Protobuf
         end
       end
 
+      # Return a hash-representation of the given values for this field type
+      # that is safe to convert to JSON.
+      # The value in this case would be an array.
+      def to_json_hash_value
+        if field.respond_to?(:json_encode)
+          map do |value|
+            field.json_encode(value)
+          end
+        else
+          map do |value|
+            value.respond_to?(:to_json_hash_value) ? value.to_json_hash_value : value
+          end
+        end
+      end
+
       def to_s
         "[#{field.name}]"
       end

data/lib/protobuf/field/field_hash.rb

@@ -52,6 +52,24 @@ module Protobuf
         end
       end
 
+      # Return a hash-representation of the given values for this field type
+      # that is safe to convert to JSON.
+      #
+      # The value in this case would be the hash itself, right? Unfortunately
+      # not because the values of the map could be messages themselves that we
+      # need to transform.
+      def to_json_hash_value
+        if field.respond_to?(:json_encode)
+          each_with_object({}) do |(key, value), hash|
+            hash[key] = field.json_encode(value)
+          end
+        else
+          each_with_object({}) do |(key, value), hash|
+            hash[key] = value.respond_to?(:to_json_hash_value) ? value.to_json_hash_value : value
+          end
+        end
+      end
+
       def to_s
         "{#{field.name}}"
       end

data/lib/protobuf/field/string_field.rb

@@ -38,6 +38,9 @@ module Protobuf
         stream << tag_encoded << byte_size << value
       end
 
+      def json_encode(value)
+        value
+      end
     end
   end
 end

data/lib/protobuf/message.rb

@@ -145,7 +145,32 @@ module Protobuf
     end
 
     def to_json(options = {})
-      to_hash.to_json(options)
+      to_json_hash.to_json(options)
+    end
+
+    # Return a hash-representation of the given fields for this message type that
+    # is safe to convert to JSON.
+    def to_json_hash
+      result = {}
+
+      @values.each_key do |field_name|
+        value = self[field_name]
+        field = self.class.get_field(field_name, true)
+
+        # NB: to_json_hash_value should come before json_encode so as to handle
+        # repeated fields without extra logic.
+        hashed_value = if value.respond_to?(:to_json_hash_value)
+                         value.to_json_hash_value
+                       elsif field.respond_to?(:json_encode)
+                         field.json_encode(value)
+                       else
+                         value
+                       end
+
+        result[field.name] = hashed_value
+      end
+
+      result
     end
 
     def to_proto
@@ -179,6 +204,7 @@ module Protobuf
     # Instance Aliases
     #
     alias :to_hash_value to_hash
+    alias :to_json_hash_value to_json_hash
     alias :to_proto_hash to_hash
     alias :responds_to_has? respond_to_has?
     alias :respond_to_and_has? respond_to_has?

data/lib/protobuf/version.rb

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

data/spec/lib/protobuf/enum_spec.rb

@@ -160,6 +160,13 @@ RSpec.describe Protobuf::Enum do
       end
     end
 
+    describe '.to_json' do
+      it 'renders the enum value' do
+        expect(Test::EnumTestType::ONE.to_json).to eq(1)
+        expect({ :value => Test::EnumTestType::ONE }.to_json).to eq(%({"value":1}))
+      end
+    end
+
     describe '.valid_tag?' do
       context 'when tag is defined' do
         specify { expect(Test::EnumTestType.valid_tag?(tag)).to be true }

data/spec/lib/protobuf/message_spec.rb

@@ -427,6 +427,16 @@ RSpec.describe Protobuf::Message do
     end
 
     specify { expect(subject.to_json).to eq '{"name":"Test Name","active":false}' }
+
+    context 'for byte fields' do
+      let(:bytes) { "\x06\x8D1HP\x17:b" }
+
+      subject do
+        ::Test::ResourceFindRequest.new(:widget_bytes => [bytes])
+      end
+
+      specify { expect(subject.to_json).to eq '{"widget_bytes":["Bo0xSFAXOmI="]}' }
+    end
   end
 
   describe '.to_json' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.8.2
+  version: 3.8.3
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-06-08 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.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.