google-protobuf 3.6.1-x64-mingw32 → 3.7.0.rc.2-x64-mingw32

data/ext/google/protobuf_c/wrap_memcpy.c

@@ -33,7 +33,7 @@
 // On x86-64 Linux with glibc, we link against the 2.2.5 version of memcpy so
 // that we avoid depending on the 2.14 version of the symbol. This way,
 // distributions that are using pre-2.14 versions of glibc can successfully use
-// the gem we distribute (https://github.com/google/protobuf/issues/2783).
+// the gem we distribute (https://github.com/protocolbuffers/protobuf/issues/2783).
 //
 // This wrapper is enabled by passing the linker flags -Wl,-wrap,memcpy in
 // extconf.rb.

data/lib/google/protobuf.rb

@@ -37,6 +37,7 @@ module Google
   module Protobuf
     class Error < StandardError; end
     class ParseError < Error; end
+    class TypeError < ::TypeError; end
   end
 end
 
@@ -68,8 +69,8 @@ module Google
       klass.decode(proto)
     end
 
-    def self.decode_json(klass, json)
-      klass.decode_json(json)
+    def self.decode_json(klass, json, options = {})
+      klass.decode_json(json, options)
     end
 
   end

data/lib/google/protobuf/any_pb.rb

@@ -4,9 +4,11 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Any" do
-    optional :type_url, :string, 1
-    optional :value, :bytes, 2
+  add_file("google/protobuf/any.proto", :syntax => :proto3) do
+    add_message "google.protobuf.Any" do
+      optional :type_url, :string, 1
+      optional :value, :bytes, 2
+    end
   end
 end
 

data/lib/google/protobuf/api_pb.rb

@@ -6,27 +6,29 @@ require 'google/protobuf'
 require 'google/protobuf/source_context_pb'
 require 'google/protobuf/type_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Api" do
-    optional :name, :string, 1
-    repeated :methods, :message, 2, "google.protobuf.Method"
-    repeated :options, :message, 3, "google.protobuf.Option"
-    optional :version, :string, 4
-    optional :source_context, :message, 5, "google.protobuf.SourceContext"
-    repeated :mixins, :message, 6, "google.protobuf.Mixin"
-    optional :syntax, :enum, 7, "google.protobuf.Syntax"
-  end
-  add_message "google.protobuf.Method" do
-    optional :name, :string, 1
-    optional :request_type_url, :string, 2
-    optional :request_streaming, :bool, 3
-    optional :response_type_url, :string, 4
-    optional :response_streaming, :bool, 5
-    repeated :options, :message, 6, "google.protobuf.Option"
-    optional :syntax, :enum, 7, "google.protobuf.Syntax"
-  end
-  add_message "google.protobuf.Mixin" do
-    optional :name, :string, 1
-    optional :root, :string, 2
+  add_file("google/protobuf/api.proto", :syntax => :proto3) do
+    add_message "google.protobuf.Api" do
+      optional :name, :string, 1
+      repeated :methods, :message, 2, "google.protobuf.Method"
+      repeated :options, :message, 3, "google.protobuf.Option"
+      optional :version, :string, 4
+      optional :source_context, :message, 5, "google.protobuf.SourceContext"
+      repeated :mixins, :message, 6, "google.protobuf.Mixin"
+      optional :syntax, :enum, 7, "google.protobuf.Syntax"
+    end
+    add_message "google.protobuf.Method" do
+      optional :name, :string, 1
+      optional :request_type_url, :string, 2
+      optional :request_streaming, :bool, 3
+      optional :response_type_url, :string, 4
+      optional :response_streaming, :bool, 5
+      repeated :options, :message, 6, "google.protobuf.Option"
+      optional :syntax, :enum, 7, "google.protobuf.Syntax"
+    end
+    add_message "google.protobuf.Mixin" do
+      optional :name, :string, 1
+      optional :root, :string, 2
+    end
   end
 end
 

data/lib/google/protobuf/duration_pb.rb

@@ -4,9 +4,11 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Duration" do
-    optional :seconds, :int64, 1
-    optional :nanos, :int32, 2
+  add_file("google/protobuf/duration.proto", :syntax => :proto3) do
+    add_message "google.protobuf.Duration" do
+      optional :seconds, :int64, 1
+      optional :nanos, :int32, 2
+    end
   end
 end
 

data/lib/google/protobuf/empty_pb.rb

@@ -4,7 +4,9 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Empty" do
+  add_file("google/protobuf/empty.proto", :syntax => :proto3) do
+    add_message "google.protobuf.Empty" do
+    end
   end
 end
 

data/lib/google/protobuf/field_mask_pb.rb

@@ -4,8 +4,10 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.FieldMask" do
-    repeated :paths, :string, 1
+  add_file("google/protobuf/field_mask.proto", :syntax => :proto3) do
+    add_message "google.protobuf.FieldMask" do
+      repeated :paths, :string, 1
+    end
   end
 end
 

data/lib/google/protobuf/repeated_field.rb

@@ -79,7 +79,7 @@ module Google
 
 
       def first(n=nil)
-        n ? self[0..n] : self[0]
+        n ? self[0...n] : self[0]
       end
 
 

data/lib/google/protobuf/source_context_pb.rb

@@ -4,8 +4,10 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.SourceContext" do
-    optional :file_name, :string, 1
+  add_file("google/protobuf/source_context.proto", :syntax => :proto3) do
+    add_message "google.protobuf.SourceContext" do
+      optional :file_name, :string, 1
+    end
   end
 end
 

data/lib/google/protobuf/struct_pb.rb

@@ -4,24 +4,26 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Struct" do
-    map :fields, :string, :message, 1, "google.protobuf.Value"
-  end
-  add_message "google.protobuf.Value" do
-    oneof :kind do
-      optional :null_value, :enum, 1, "google.protobuf.NullValue"
-      optional :number_value, :double, 2
-      optional :string_value, :string, 3
-      optional :bool_value, :bool, 4
-      optional :struct_value, :message, 5, "google.protobuf.Struct"
-      optional :list_value, :message, 6, "google.protobuf.ListValue"
+  add_file("google/protobuf/struct.proto", :syntax => :proto3) do
+    add_message "google.protobuf.Struct" do
+      map :fields, :string, :message, 1, "google.protobuf.Value"
+    end
+    add_message "google.protobuf.Value" do
+      oneof :kind do
+        optional :null_value, :enum, 1, "google.protobuf.NullValue"
+        optional :number_value, :double, 2
+        optional :string_value, :string, 3
+        optional :bool_value, :bool, 4
+        optional :struct_value, :message, 5, "google.protobuf.Struct"
+        optional :list_value, :message, 6, "google.protobuf.ListValue"
+      end
+    end
+    add_message "google.protobuf.ListValue" do
+      repeated :values, :message, 1, "google.protobuf.Value"
+    end
+    add_enum "google.protobuf.NullValue" do
+      value :NULL_VALUE, 0
     end
-  end
-  add_message "google.protobuf.ListValue" do
-    repeated :values, :message, 1, "google.protobuf.Value"
-  end
-  add_enum "google.protobuf.NullValue" do
-    value :NULL_VALUE, 0
   end
 end
 

data/lib/google/protobuf/timestamp_pb.rb

@@ -4,9 +4,11 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Timestamp" do
-    optional :seconds, :int64, 1
-    optional :nanos, :int32, 2
+  add_file("google/protobuf/timestamp.proto", :syntax => :proto3) do
+    add_message "google.protobuf.Timestamp" do
+      optional :seconds, :int64, 1
+      optional :nanos, :int32, 2
+    end
   end
 end
 

data/lib/google/protobuf/type_pb.rb

@@ -6,72 +6,74 @@ require 'google/protobuf'
 require 'google/protobuf/any_pb'
 require 'google/protobuf/source_context_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Type" do
-    optional :name, :string, 1
-    repeated :fields, :message, 2, "google.protobuf.Field"
-    repeated :oneofs, :string, 3
-    repeated :options, :message, 4, "google.protobuf.Option"
-    optional :source_context, :message, 5, "google.protobuf.SourceContext"
-    optional :syntax, :enum, 6, "google.protobuf.Syntax"
-  end
-  add_message "google.protobuf.Field" do
-    optional :kind, :enum, 1, "google.protobuf.Field.Kind"
-    optional :cardinality, :enum, 2, "google.protobuf.Field.Cardinality"
-    optional :number, :int32, 3
-    optional :name, :string, 4
-    optional :type_url, :string, 6
-    optional :oneof_index, :int32, 7
-    optional :packed, :bool, 8
-    repeated :options, :message, 9, "google.protobuf.Option"
-    optional :json_name, :string, 10
-    optional :default_value, :string, 11
-  end
-  add_enum "google.protobuf.Field.Kind" do
-    value :TYPE_UNKNOWN, 0
-    value :TYPE_DOUBLE, 1
-    value :TYPE_FLOAT, 2
-    value :TYPE_INT64, 3
-    value :TYPE_UINT64, 4
-    value :TYPE_INT32, 5
-    value :TYPE_FIXED64, 6
-    value :TYPE_FIXED32, 7
-    value :TYPE_BOOL, 8
-    value :TYPE_STRING, 9
-    value :TYPE_GROUP, 10
-    value :TYPE_MESSAGE, 11
-    value :TYPE_BYTES, 12
-    value :TYPE_UINT32, 13
-    value :TYPE_ENUM, 14
-    value :TYPE_SFIXED32, 15
-    value :TYPE_SFIXED64, 16
-    value :TYPE_SINT32, 17
-    value :TYPE_SINT64, 18
-  end
-  add_enum "google.protobuf.Field.Cardinality" do
-    value :CARDINALITY_UNKNOWN, 0
-    value :CARDINALITY_OPTIONAL, 1
-    value :CARDINALITY_REQUIRED, 2
-    value :CARDINALITY_REPEATED, 3
-  end
-  add_message "google.protobuf.Enum" do
-    optional :name, :string, 1
-    repeated :enumvalue, :message, 2, "google.protobuf.EnumValue"
-    repeated :options, :message, 3, "google.protobuf.Option"
-    optional :source_context, :message, 4, "google.protobuf.SourceContext"
-    optional :syntax, :enum, 5, "google.protobuf.Syntax"
-  end
-  add_message "google.protobuf.EnumValue" do
-    optional :name, :string, 1
-    optional :number, :int32, 2
-    repeated :options, :message, 3, "google.protobuf.Option"
-  end
-  add_message "google.protobuf.Option" do
-    optional :name, :string, 1
-    optional :value, :message, 2, "google.protobuf.Any"
-  end
-  add_enum "google.protobuf.Syntax" do
-    value :SYNTAX_PROTO2, 0
-    value :SYNTAX_PROTO3, 1
+  add_file("google/protobuf/type.proto", :syntax => :proto3) do
+    add_message "google.protobuf.Type" do
+      optional :name, :string, 1
+      repeated :fields, :message, 2, "google.protobuf.Field"
+      repeated :oneofs, :string, 3
+      repeated :options, :message, 4, "google.protobuf.Option"
+      optional :source_context, :message, 5, "google.protobuf.SourceContext"
+      optional :syntax, :enum, 6, "google.protobuf.Syntax"
+    end
+    add_message "google.protobuf.Field" do
+      optional :kind, :enum, 1, "google.protobuf.Field.Kind"
+      optional :cardinality, :enum, 2, "google.protobuf.Field.Cardinality"
+      optional :number, :int32, 3
+      optional :name, :string, 4
+      optional :type_url, :string, 6
+      optional :oneof_index, :int32, 7
+      optional :packed, :bool, 8
+      repeated :options, :message, 9, "google.protobuf.Option"
+      optional :json_name, :string, 10
+      optional :default_value, :string, 11
+    end
+    add_enum "google.protobuf.Field.Kind" do
+      value :TYPE_UNKNOWN, 0
+      value :TYPE_DOUBLE, 1
+      value :TYPE_FLOAT, 2
+      value :TYPE_INT64, 3
+      value :TYPE_UINT64, 4
+      value :TYPE_INT32, 5
+      value :TYPE_FIXED64, 6
+      value :TYPE_FIXED32, 7
+      value :TYPE_BOOL, 8
+      value :TYPE_STRING, 9
+      value :TYPE_GROUP, 10
+      value :TYPE_MESSAGE, 11
+      value :TYPE_BYTES, 12
+      value :TYPE_UINT32, 13
+      value :TYPE_ENUM, 14
+      value :TYPE_SFIXED32, 15
+      value :TYPE_SFIXED64, 16
+      value :TYPE_SINT32, 17
+      value :TYPE_SINT64, 18
+    end
+    add_enum "google.protobuf.Field.Cardinality" do
+      value :CARDINALITY_UNKNOWN, 0
+      value :CARDINALITY_OPTIONAL, 1
+      value :CARDINALITY_REQUIRED, 2
+      value :CARDINALITY_REPEATED, 3
+    end
+    add_message "google.protobuf.Enum" do
+      optional :name, :string, 1
+      repeated :enumvalue, :message, 2, "google.protobuf.EnumValue"
+      repeated :options, :message, 3, "google.protobuf.Option"
+      optional :source_context, :message, 4, "google.protobuf.SourceContext"
+      optional :syntax, :enum, 5, "google.protobuf.Syntax"
+    end
+    add_message "google.protobuf.EnumValue" do
+      optional :name, :string, 1
+      optional :number, :int32, 2
+      repeated :options, :message, 3, "google.protobuf.Option"
+    end
+    add_message "google.protobuf.Option" do
+      optional :name, :string, 1
+      optional :value, :message, 2, "google.protobuf.Any"
+    end
+    add_enum "google.protobuf.Syntax" do
+      value :SYNTAX_PROTO2, 0
+      value :SYNTAX_PROTO3, 1
+    end
   end
 end
 

data/lib/google/protobuf/well_known_types.rb

@@ -39,6 +39,12 @@ module Google
   module Protobuf
 
     Any.class_eval do
+      def self.pack(msg, type_url_prefix='type.googleapis.com/')
+        any = self.new
+        any.pack(msg, type_url_prefix)
+        any
+      end
+
       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}"
@@ -149,6 +155,8 @@ module Google
     Struct.class_eval do
       def [](key)
         self.fields[key].to_ruby
+      rescue NoMethodError
+        nil
       end
 
       def []=(key, value)
@@ -170,6 +178,10 @@ module Google
         hash.each { |key, val| ret[key] = val }
         ret
       end
+
+      def has_key?(key)
+        self.fields.has_key?(key)
+      end
     end
 
     ListValue.class_eval do

data/lib/google/protobuf/wrappers_pb.rb

@@ -4,32 +4,34 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.DoubleValue" do
-    optional :value, :double, 1
-  end
-  add_message "google.protobuf.FloatValue" do
-    optional :value, :float, 1
-  end
-  add_message "google.protobuf.Int64Value" do
-    optional :value, :int64, 1
-  end
-  add_message "google.protobuf.UInt64Value" do
-    optional :value, :uint64, 1
-  end
-  add_message "google.protobuf.Int32Value" do
-    optional :value, :int32, 1
-  end
-  add_message "google.protobuf.UInt32Value" do
-    optional :value, :uint32, 1
-  end
-  add_message "google.protobuf.BoolValue" do
-    optional :value, :bool, 1
-  end
-  add_message "google.protobuf.StringValue" do
-    optional :value, :string, 1
-  end
-  add_message "google.protobuf.BytesValue" do
-    optional :value, :bytes, 1
+  add_file("google/protobuf/wrappers.proto", :syntax => :proto3) do
+    add_message "google.protobuf.DoubleValue" do
+      optional :value, :double, 1
+    end
+    add_message "google.protobuf.FloatValue" do
+      optional :value, :float, 1
+    end
+    add_message "google.protobuf.Int64Value" do
+      optional :value, :int64, 1
+    end
+    add_message "google.protobuf.UInt64Value" do
+      optional :value, :uint64, 1
+    end
+    add_message "google.protobuf.Int32Value" do
+      optional :value, :int32, 1
+    end
+    add_message "google.protobuf.UInt32Value" do
+      optional :value, :uint32, 1
+    end
+    add_message "google.protobuf.BoolValue" do
+      optional :value, :bool, 1
+    end
+    add_message "google.protobuf.StringValue" do
+      optional :value, :string, 1
+    end
+    add_message "google.protobuf.BytesValue" do
+      optional :value, :bytes, 1
+    end
   end
 end