google-protobuf 3.2.0.2-java → 3.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 461bfa4fb4342cdd85bed3865116944153d68296
-  data.tar.gz: 61085ca6eba70751490028a3d85deba2706a61b5
+  metadata.gz: 037955ea5a91fe5fa697328de544f711a8e7b9d3
+  data.tar.gz: bac8b49f28ac405ac5351fe6b8a711d9c3956007
 SHA512:
-  metadata.gz: 1b636387c88818f4b7c75ae9c6d3caab23212a7c1a1c52431ade68d46ad53299d4fcd58edc64d52df287be44cb1c68df3dfde6f25c2640735a76f1779914b71f
-  data.tar.gz: 4cb6386fa5466ca352e02e7edbfe99eea04e2d00c673349176ef083ebde7f95530539c9e3beeabd4b4c8cec69ed0bf8f628568101733b8a915f411f88930884f
+  metadata.gz: e74099bc053254661cd890867f8ea863fc37de63352eb312507b192f34ef7c584e7a7d77d52764e1401fd67de24d42f0200fa691aae636eb43628cf3f3d77c67
+  data.tar.gz: 787a5410618113d974d1eb72c9f4b425f4dafdc46a642a610a665022bf8cb985eba271c14833e0b50a94bb69e4137c033ed94b0e7b7dcddc33fd76e1f72fd986

data/tests/basic.rb

@@ -927,6 +927,16 @@ module BasicTest
         :repeated_uint64=>[]
       }
       assert_equal expected_result, m.to_h
+
+      m = MapMessage.new(
+        :map_string_int32 => {"a" => 1, "b" => 2},
+        :map_string_msg => {"a" => TestMessage2.new(:foo => 1),
+                            "b" => TestMessage2.new(:foo => 2)})
+      expected_result = {
+        :map_string_int32 => {"a" => 1, "b" => 2},
+        :map_string_msg => {"a" => {:foo => 1}, "b" => {:foo => 2}}
+      }
+      assert_equal expected_result, m.to_h
     end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.2.0.2
+  version: 3.3.0
 platform: java
 authors:
 - Protobuf Authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -64,19 +64,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/google/protobuf.rb
 - lib/google/protobuf/any_pb.rb
 - lib/google/protobuf/api_pb.rb
 - lib/google/protobuf/duration_pb.rb
 - lib/google/protobuf/empty_pb.rb
 - lib/google/protobuf/field_mask_pb.rb
-- lib/google/protobuf/message_exts.rb
-- lib/google/protobuf/repeated_field.rb
 - lib/google/protobuf/source_context_pb.rb
 - lib/google/protobuf/struct_pb.rb
 - lib/google/protobuf/timestamp_pb.rb
 - lib/google/protobuf/type_pb.rb
-- lib/google/protobuf/well_known_types.rb
 - lib/google/protobuf/wrappers_pb.rb
 - lib/google/protobuf_java.jar
 - tests/basic.rb

data/lib/google/protobuf.rb

@@ -1,76 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# require mixins before we hook them into the java & c code
-require 'google/protobuf/message_exts'
-
-# We define these before requiring the platform-specific modules.
-# That way the module init can grab references to these.
-module Google
-  module Protobuf
-    class Error < StandardError; end
-    class ParseError < Error; end
-  end
-end
-
-if RUBY_PLATFORM == "java"
-  require 'json'
-  require 'google/protobuf_java'
-else
-  begin
-    require "google/#{RUBY_VERSION.sub(/\.\d+$/, '')}/protobuf_c"
-  rescue LoadError
-    require 'google/protobuf_c'
-  end
-end
-
-require 'google/protobuf/repeated_field'
-
-module Google
-  module Protobuf
-
-    def self.encode(msg)
-      msg.to_proto
-    end
-
-    def self.encode_json(msg)
-      msg.to_json
-    end
-
-    def self.decode(klass, proto)
-      klass.decode(proto)
-    end
-
-    def self.decode_json(klass, json)
-      klass.decode_json(json)
-    end
-
-  end
-end

data/lib/google/protobuf/message_exts.rb

@@ -1,53 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-module Google
-  module Protobuf
-    module MessageExts
-
-      #this is only called in jruby; mri loades the ClassMethods differently
-      def self.included(klass)
-        klass.extend(ClassMethods)
-      end
-
-      module ClassMethods
-      end
-
-      def to_json
-        self.class.encode_json(self)
-      end
-
-      def to_proto
-        self.class.encode(self)
-      end
-
-    end
-  end
-end

data/lib/google/protobuf/repeated_field.rb

@@ -1,188 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-require 'forwardable'
-
-#
-# This class makes RepeatedField act (almost-) like a Ruby Array.
-# It has convenience methods that extend the core C or Java based
-# methods.
-#
-# This is a best-effort to mirror Array behavior.  Two comments:
-#  1) patches always welcome :)
-#  2) if performance is an issue, feel free to rewrite the method
-#     in jruby and C.  The source code has plenty of examples
-#
-# KNOWN ISSUES
-#   - #[]= doesn't allow less used approaches such as `arr[1, 2] = 'fizz'`
-#   - #concat should return the orig array
-#   - #push should accept multiple arguments and push them all at the same time
-#
-module Google
-  module Protobuf
-    class RepeatedField
-      extend Forwardable
-
-      # methods defined in C or Java:
-      #   +
-      #   [], at
-      #   []=
-      #   concat
-      #   clear
-      #   dup, clone
-      #   each
-      #   push, <<
-      #   replace
-      #   length, size
-      #   ==
-      #   to_ary, to_a
-      #   also all enumerable
-      #
-      # NOTE:  using delegators rather than method_missing to make the
-      #        relationship explicit instead of implicit
-      def_delegators :to_ary,
-        :&, :*, :-, :'<=>',
-        :assoc, :bsearch, :bsearch_index, :combination, :compact, :count,
-        :cycle, :dig, :drop, :drop_while, :eql?, :fetch, :find_index, :flatten,
-        :include?, :index, :inspect, :join,
-        :pack, :permutation, :product, :pretty_print, :pretty_print_cycle,
-        :rassoc, :repeated_combination, :repeated_permutation, :reverse,
-        :rindex, :rotate, :sample, :shuffle, :shelljoin,
-        :to_s, :transpose, :uniq, :|
-
-
-      def first(n=nil)
-        n ? self[0..n] : self[0]
-      end
-
-
-      def last(n=nil)
-        n ? self[(self.size-n-1)..-1] : self[-1]
-      end
-
-
-      def pop(n=nil)
-        if n
-          results = []
-          n.times{ results << pop_one }
-          return results
-        else
-          return pop_one
-        end
-      end
-
-
-      def empty?
-        self.size == 0
-      end
-
-      # array aliases into enumerable
-      alias_method :each_index, :each_with_index
-      alias_method :slice, :[]
-      alias_method :values_at, :select
-      alias_method :map, :collect
-
-
-      class << self
-        def define_array_wrapper_method(method_name)
-          define_method(method_name) do |*args, &block|
-            arr = self.to_a
-            result = arr.send(method_name, *args)
-            self.replace(arr)
-            return result if result
-            return block ? block.call : result
-          end
-        end
-        private :define_array_wrapper_method
-
-
-        def define_array_wrapper_with_result_method(method_name)
-          define_method(method_name) do |*args, &block|
-            # result can be an Enumerator, Array, or nil
-            # Enumerator can sometimes be returned if a block is an optional argument and it is not passed in
-            # nil usually specifies that no change was made
-            result = self.to_a.send(method_name, *args, &block)
-            if result
-              new_arr = result.to_a
-              self.replace(new_arr)
-              if result.is_a?(Enumerator)
-                # generate a fresh enum; rewinding the exiting one, in Ruby 2.2, will
-                # reset the enum with the same length, but all the #next calls will
-                # return nil
-                result = new_arr.to_enum
-                # generate a wrapper enum so any changes which occur by a chained
-                # enum can be captured
-                ie = ProxyingEnumerator.new(self, result)
-                result = ie.to_enum
-              end
-            end
-            result
-          end
-        end
-        private :define_array_wrapper_with_result_method
-      end
-
-
-      %w(delete delete_at delete_if shift slice! unshift).each do |method_name|
-        define_array_wrapper_method(method_name)
-      end
-
-
-      %w(collect! compact! fill flatten! insert reverse!
-        rotate! select! shuffle! sort! sort_by! uniq!).each do |method_name|
-        define_array_wrapper_with_result_method(method_name)
-      end
-      alias_method :keep_if, :select!
-      alias_method :map!, :collect!
-      alias_method :reject!, :delete_if
-
-
-      # propagates changes made by user of enumerator back to the original repeated field.
-      # This only applies in cases where the calling function which created the enumerator,
-      # such as #sort!, modifies itself rather than a new array, such as #sort
-      class ProxyingEnumerator < Struct.new(:repeated_field, :external_enumerator)
-        def each(*args, &block)
-          results = []
-          external_enumerator.each_with_index do |val, i|
-            result = yield(val)
-            results << result
-            #nil means no change occurred from yield; usually occurs when #to_a is called
-            if result
-              repeated_field[i] = result if result != val
-            end
-          end
-          results
-        end
-      end
-
-
-    end
-  end
-end

data/lib/google/protobuf/well_known_types.rb

@@ -1,212 +0,0 @@
-#!/usr/bin/ruby
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-require 'google/protobuf/any_pb'
-require 'google/protobuf/duration_pb'
-require 'google/protobuf/field_mask_pb'
-require 'google/protobuf/struct_pb'
-require 'google/protobuf/timestamp_pb'
-
-module Google
-  module Protobuf
-
-    Any.class_eval do
-      def pack(msg, type_url_prefix='type.googleapis.com/')
-        if type_url_prefix.empty? or type_url_prefix[-1] != '/' then
-          self.type_url = "#{type_url_prefix}/#{msg.class.descriptor.name}"
-        else
-          self.type_url = "#{type_url_prefix}#{msg.class.descriptor.name}"
-        end
-        self.value = msg.to_proto
-      end
-
-      def unpack(klass)
-        if self.is(klass) then
-          klass.decode(self.value)
-        else
-          nil
-        end
-      end
-
-      def type_name
-        return self.type_url.split("/")[-1]
-      end
-
-      def is(klass)
-        return self.type_name == klass.descriptor.name
-      end
-    end
-
-    Timestamp.class_eval do
-      def to_time
-        Time.at(self.to_f)
-      end
-
-      def from_time(time)
-        self.seconds = time.to_i
-        self.nanos = time.nsec
-      end
-
-      def to_i
-        self.seconds
-      end
-
-      def to_f
-        self.seconds + (self.nanos.to_f / 1_000_000_000)
-      end
-    end
-
-    Duration.class_eval do
-      def to_f
-        self.seconds + (self.nanos.to_f / 1_000_000_000)
-      end
-    end
-
-    class UnexpectedStructType < Google::Protobuf::Error; end
-
-    Value.class_eval do
-      def to_ruby(recursive = false)
-        case self.kind
-        when :struct_value
-          if recursive
-            self.struct_value.to_h
-          else
-            self.struct_value
-          end
-        when :list_value
-          if recursive
-            self.list_value.to_a
-          else
-            self.list_value
-          end
-        when :null_value
-          nil
-        when :number_value
-          self.number_value
-        when :string_value
-          self.string_value
-        when :bool_value
-          self.bool_value
-        else
-          raise UnexpectedStructType
-        end
-      end
-
-      def from_ruby(value)
-        case value
-        when NilClass
-          self.null_value = 0
-        when Numeric
-          self.number_value = value
-        when String
-          self.string_value = value
-        when TrueClass
-          self.bool_value = true
-        when FalseClass
-          self.bool_value = false
-        when Struct
-          self.struct_value = value
-        when Hash
-          self.struct_value = Struct.from_hash(value)
-        when ListValue
-          self.list_value = value
-        when Array
-          self.list_value = ListValue.from_a(value)
-        else
-          raise UnexpectedStructType
-        end
-      end
-    end
-
-    Struct.class_eval do
-      def [](key)
-        self.fields[key].to_ruby
-      end
-
-      def []=(key, value)
-        unless key.is_a?(String)
-          raise UnexpectedStructType, "Struct keys must be strings."
-        end
-        self.fields[key] ||= Google::Protobuf::Value.new
-        self.fields[key].from_ruby(value)
-      end
-
-      def to_h
-        ret = {}
-        self.fields.each { |key, val| ret[key] = val.to_ruby(true) }
-        ret
-      end
-
-      def self.from_hash(hash)
-        ret = Struct.new
-        hash.each { |key, val| ret[key] = val }
-        ret
-      end
-    end
-
-    ListValue.class_eval do
-      include Enumerable
-
-      def length
-        self.values.length
-      end
-
-      def [](index)
-        self.values[index].to_ruby
-      end
-
-      def []=(index, value)
-        self.values[index].from_ruby(value)
-      end
-
-      def <<(value)
-        wrapper = Google::Protobuf::Value.new
-        wrapper.from_ruby(value)
-        self.values << wrapper
-      end
-
-      def each
-        self.values.each { |x| yield(x.to_ruby) }
-      end
-
-      def to_a
-        self.values.map { |x| x.to_ruby(true) }
-      end
-
-      def self.from_a(arr)
-        ret = ListValue.new
-        arr.each { |val| ret << val }
-        ret
-      end
-    end
-
-  end
-end