google-protobuf 3.2.0.2-java → 3.19.0.rc.2-java

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}"
@@ -66,13 +72,24 @@ module Google
     end
 
     Timestamp.class_eval do
-      def to_time
-        Time.at(self.to_f)
+      if RUBY_VERSION < "2.5"
+        def to_time
+          Time.at(self.to_f)
+        end
+      else
+        def to_time
+          Time.at(seconds, nanos, :nanosecond)
+        end
       end
 
       def from_time(time)
         self.seconds = time.to_i
         self.nanos = time.nsec
+        self
+      end
+
+      def self.from_time(time)
+        new.from_time(time)
       end
 
       def to_i
@@ -80,7 +97,7 @@ module Google
       end
 
       def to_f
-        self.seconds + (self.nanos.to_f / 1_000_000_000)
+        self.seconds + (self.nanos.quo(1_000_000_000))
       end
     end
 
@@ -149,6 +166,8 @@ module Google
     Struct.class_eval do
       def [](key)
         self.fields[key].to_ruby
+      rescue NoMethodError
+        nil
       end
 
       def []=(key, value)
@@ -170,6 +189,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,45 +4,47 @@
 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
 
 module Google
   module Protobuf
-    DoubleValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.DoubleValue").msgclass
-    FloatValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FloatValue").msgclass
-    Int64Value = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Int64Value").msgclass
-    UInt64Value = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.UInt64Value").msgclass
-    Int32Value = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Int32Value").msgclass
-    UInt32Value = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.UInt32Value").msgclass
-    BoolValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.BoolValue").msgclass
-    StringValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.StringValue").msgclass
-    BytesValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.BytesValue").msgclass
+    DoubleValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.DoubleValue").msgclass
+    FloatValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FloatValue").msgclass
+    Int64Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Int64Value").msgclass
+    UInt64Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.UInt64Value").msgclass
+    Int32Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Int32Value").msgclass
+    UInt32Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.UInt32Value").msgclass
+    BoolValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.BoolValue").msgclass
+    StringValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.StringValue").msgclass
+    BytesValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.BytesValue").msgclass
   end
 end

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
 
@@ -49,8 +50,10 @@ else
   rescue LoadError
     require 'google/protobuf_c'
   end
+
 end
 
+require 'google/protobuf/descriptor_dsl'
 require 'google/protobuf/repeated_field'
 
 module Google
@@ -60,16 +63,16 @@ module Google
       msg.to_proto
     end
 
-    def self.encode_json(msg)
-      msg.to_json
+    def self.encode_json(msg, options = {})
+      msg.to_json(options)
     end
 
     def self.decode(klass, proto)
       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