protobuf 2.8.0.beta9 → 2.8.0

data/lib/protobuf.rb

@@ -92,20 +92,22 @@ module Protobuf
 
 end
 
-require 'protobuf/rpc/client'
-require 'protobuf/rpc/service'
-
-env_connector_type = ENV.fetch('PB_CLIENT_TYPE') {
-  ::Protobuf::DEFAULT_CONNECTOR
-}.to_s.downcase.strip.to_sym
-
-if ::Protobuf::CONNECTORS.include?(env_connector_type)
-  require "protobuf/#{env_connector_type}"
-else
-  $stderr.puts <<-WARN
+unless ENV.key?('PB_NO_NETWORKING')
+  require 'protobuf/rpc/client'
+  require 'protobuf/rpc/service'
+
+  env_connector_type = ENV.fetch('PB_CLIENT_TYPE') {
+    ::Protobuf::DEFAULT_CONNECTOR
+  }.to_s.downcase.strip.to_sym
+
+  if ::Protobuf::CONNECTORS.include?(env_connector_type)
+    require "protobuf/#{env_connector_type}"
+  else
+    $stderr.puts <<-WARN
     [WARNING] Require attempted on an invalid connector type '#{env_connector_type}'.
               Falling back to default '#{::Protobuf::DEFAULT_CONNECTOR}' connector.
-  WARN
+    WARN
 
-  require "protobuf/#{::Protobuf::DEFAULT_CONNECTOR}"
+    require "protobuf/#{::Protobuf::DEFAULT_CONNECTOR}"
+  end
 end

data/lib/protobuf/code_generator.rb

@@ -0,0 +1,41 @@
+require 'protobuf/generators/file_generator'
+
+module Protobuf
+  class CodeGenerator
+
+    CodeGeneratorFatalError = Class.new(RuntimeError)
+
+    def self.fatal(message)
+      raise CodeGeneratorFatalError, message
+    end
+
+    def self.print_tag_warning_suppress
+      STDERR.puts "Suppress tag warning output with PB_NO_TAG_WARNINGS=1."
+      def self.print_tag_warning_suppress; end
+    end
+
+    def self.warn(message)
+      STDERR.puts("[WARN] #{message}")
+    end
+
+    def initialize(request_bytes)
+      @request = ::Google::Protobuf::Compiler::CodeGeneratorRequest.decode(request_bytes)
+      @generated_files = []
+    end
+
+    def generate_file(file_descriptor)
+      file_generator = ::Protobuf::Generators::FileGenerator.new(file_descriptor)
+      @generated_files << file_generator.generate_output_file
+    end
+
+    def response_bytes
+      @request.proto_file.each do |file_descriptor|
+        generate_file(file_descriptor)
+      end
+
+      return ::Google::Protobuf::Compiler::CodeGeneratorResponse.encode(:file => @generated_files)
+    end
+
+  end
+end
+

data/lib/protobuf/descriptors/google/protobuf/compiler/plugin.pb.rb

@@ -0,0 +1,51 @@
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf/message'
+
+##
+# Imports
+#
+require 'google/protobuf/descriptor.pb'
+
+module Google
+
+  module Protobuf
+  
+    module Compiler
+    
+      ##
+      # Message Classes
+      #
+      class CodeGeneratorRequest < ::Protobuf::Message; end
+      class CodeGeneratorResponse < ::Protobuf::Message
+        class File < ::Protobuf::Message; end
+      end
+      
+      ##
+      # Message Fields
+      #
+      class CodeGeneratorRequest
+        repeated ::Protobuf::Field::StringField, :file_to_generate, 1
+        optional ::Protobuf::Field::StringField, :parameter, 2
+        repeated ::Google::Protobuf::FileDescriptorProto, :proto_file, 15
+      end
+      
+      class CodeGeneratorResponse
+        class File
+          optional ::Protobuf::Field::StringField, :name, 1
+          optional ::Protobuf::Field::StringField, :insertion_point, 2
+          optional ::Protobuf::Field::StringField, :content, 15
+        end
+        
+        optional ::Protobuf::Field::StringField, :error, 1
+        repeated ::Google::Protobuf::Compiler::CodeGeneratorResponse::File, :file, 15
+      end
+      
+      
+    end
+    
+  end
+  
+end
+

data/lib/protobuf/descriptors/google/protobuf/descriptor.pb.rb

@@ -0,0 +1,248 @@
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf/message'
+
+module Google
+
+  module Protobuf
+  
+    ##
+    # Message Classes
+    #
+    class FileDescriptorSet < ::Protobuf::Message; end
+    class FileDescriptorProto < ::Protobuf::Message; end
+    class DescriptorProto < ::Protobuf::Message
+      class ExtensionRange < ::Protobuf::Message; end
+    end
+    class FieldDescriptorProto < ::Protobuf::Message
+      class Type < ::Protobuf::Enum
+        define :TYPE_DOUBLE, 1
+        define :TYPE_FLOAT, 2
+        define :TYPE_INT64, 3
+        define :TYPE_UINT64, 4
+        define :TYPE_INT32, 5
+        define :TYPE_FIXED64, 6
+        define :TYPE_FIXED32, 7
+        define :TYPE_BOOL, 8
+        define :TYPE_STRING, 9
+        define :TYPE_GROUP, 10
+        define :TYPE_MESSAGE, 11
+        define :TYPE_BYTES, 12
+        define :TYPE_UINT32, 13
+        define :TYPE_ENUM, 14
+        define :TYPE_SFIXED32, 15
+        define :TYPE_SFIXED64, 16
+        define :TYPE_SINT32, 17
+        define :TYPE_SINT64, 18
+      end
+      
+      class Label < ::Protobuf::Enum
+        define :LABEL_OPTIONAL, 1
+        define :LABEL_REQUIRED, 2
+        define :LABEL_REPEATED, 3
+      end
+      
+    end
+    class EnumDescriptorProto < ::Protobuf::Message; end
+    class EnumValueDescriptorProto < ::Protobuf::Message; end
+    class ServiceDescriptorProto < ::Protobuf::Message; end
+    class MethodDescriptorProto < ::Protobuf::Message; end
+    class FileOptions < ::Protobuf::Message
+      class OptimizeMode < ::Protobuf::Enum
+        define :SPEED, 1
+        define :CODE_SIZE, 2
+        define :LITE_RUNTIME, 3
+      end
+      
+    end
+    class MessageOptions < ::Protobuf::Message; end
+    class FieldOptions < ::Protobuf::Message
+      class CType < ::Protobuf::Enum
+        define :STRING, 0
+        define :CORD, 1
+        define :STRING_PIECE, 2
+      end
+      
+    end
+    class EnumOptions < ::Protobuf::Message; end
+    class EnumValueOptions < ::Protobuf::Message; end
+    class ServiceOptions < ::Protobuf::Message; end
+    class MethodOptions < ::Protobuf::Message; end
+    class UninterpretedOption < ::Protobuf::Message
+      class NamePart < ::Protobuf::Message; end
+    end
+    class SourceCodeInfo < ::Protobuf::Message
+      class Location < ::Protobuf::Message; end
+    end
+    
+    ##
+    # Message Fields
+    #
+    class FileDescriptorSet
+      repeated ::Google::Protobuf::FileDescriptorProto, :file, 1
+    end
+    
+    class FileDescriptorProto
+      optional ::Protobuf::Field::StringField, :name, 1
+      optional ::Protobuf::Field::StringField, :package, 2
+      repeated ::Protobuf::Field::StringField, :dependency, 3
+      repeated ::Protobuf::Field::Int32Field, :public_dependency, 10
+      repeated ::Protobuf::Field::Int32Field, :weak_dependency, 11
+      repeated ::Google::Protobuf::DescriptorProto, :message_type, 4
+      repeated ::Google::Protobuf::EnumDescriptorProto, :enum_type, 5
+      repeated ::Google::Protobuf::ServiceDescriptorProto, :service, 6
+      repeated ::Google::Protobuf::FieldDescriptorProto, :extension, 7
+      optional ::Google::Protobuf::FileOptions, :options, 8
+      optional ::Google::Protobuf::SourceCodeInfo, :source_code_info, 9
+    end
+    
+    class DescriptorProto
+      class ExtensionRange
+        optional ::Protobuf::Field::Int32Field, :start, 1
+        optional ::Protobuf::Field::Int32Field, :end, 2
+      end
+      
+      optional ::Protobuf::Field::StringField, :name, 1
+      repeated ::Google::Protobuf::FieldDescriptorProto, :field, 2
+      repeated ::Google::Protobuf::FieldDescriptorProto, :extension, 6
+      repeated ::Google::Protobuf::DescriptorProto, :nested_type, 3
+      repeated ::Google::Protobuf::EnumDescriptorProto, :enum_type, 4
+      repeated ::Google::Protobuf::DescriptorProto::ExtensionRange, :extension_range, 5
+      optional ::Google::Protobuf::MessageOptions, :options, 7
+    end
+    
+    class FieldDescriptorProto
+      optional ::Protobuf::Field::StringField, :name, 1
+      optional ::Protobuf::Field::Int32Field, :number, 3
+      optional ::Google::Protobuf::FieldDescriptorProto::Label, :label, 4
+      optional ::Google::Protobuf::FieldDescriptorProto::Type, :type, 5
+      optional ::Protobuf::Field::StringField, :type_name, 6
+      optional ::Protobuf::Field::StringField, :extendee, 2
+      optional ::Protobuf::Field::StringField, :default_value, 7
+      optional ::Google::Protobuf::FieldOptions, :options, 8
+    end
+    
+    class EnumDescriptorProto
+      optional ::Protobuf::Field::StringField, :name, 1
+      repeated ::Google::Protobuf::EnumValueDescriptorProto, :value, 2
+      optional ::Google::Protobuf::EnumOptions, :options, 3
+    end
+    
+    class EnumValueDescriptorProto
+      optional ::Protobuf::Field::StringField, :name, 1
+      optional ::Protobuf::Field::Int32Field, :number, 2
+      optional ::Google::Protobuf::EnumValueOptions, :options, 3
+    end
+    
+    class ServiceDescriptorProto
+      optional ::Protobuf::Field::StringField, :name, 1
+      repeated ::Google::Protobuf::MethodDescriptorProto, :method, 2
+      optional ::Google::Protobuf::ServiceOptions, :options, 3
+    end
+    
+    class MethodDescriptorProto
+      optional ::Protobuf::Field::StringField, :name, 1
+      optional ::Protobuf::Field::StringField, :input_type, 2
+      optional ::Protobuf::Field::StringField, :output_type, 3
+      optional ::Google::Protobuf::MethodOptions, :options, 4
+    end
+    
+    class FileOptions
+      optional ::Protobuf::Field::StringField, :java_package, 1
+      optional ::Protobuf::Field::StringField, :java_outer_classname, 8
+      optional ::Protobuf::Field::BoolField, :java_multiple_files, 10, :default => false
+      optional ::Protobuf::Field::BoolField, :java_generate_equals_and_hash, 20, :default => false
+      optional ::Google::Protobuf::FileOptions::OptimizeMode, :optimize_for, 9, :default => ::Google::Protobuf::FileOptions::OptimizeMode::SPEED
+      optional ::Protobuf::Field::StringField, :go_package, 11
+      optional ::Protobuf::Field::BoolField, :cc_generic_services, 16, :default => false
+      optional ::Protobuf::Field::BoolField, :java_generic_services, 17, :default => false
+      optional ::Protobuf::Field::BoolField, :py_generic_services, 18, :default => false
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      
+      # Extension Fields
+      extensions 1000...536870912
+    end
+    
+    class MessageOptions
+      optional ::Protobuf::Field::BoolField, :message_set_wire_format, 1, :default => false
+      optional ::Protobuf::Field::BoolField, :no_standard_descriptor_accessor, 2, :default => false
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      
+      # Extension Fields
+      extensions 1000...536870912
+    end
+    
+    class FieldOptions
+      optional ::Google::Protobuf::FieldOptions::CType, :ctype, 1, :default => ::Google::Protobuf::FieldOptions::CType::STRING
+      optional ::Protobuf::Field::BoolField, :packed, 2
+      optional ::Protobuf::Field::BoolField, :lazy, 5, :default => false
+      optional ::Protobuf::Field::BoolField, :deprecated, 3, :default => false
+      optional ::Protobuf::Field::StringField, :experimental_map_key, 9
+      optional ::Protobuf::Field::BoolField, :weak, 10, :default => false
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      
+      # Extension Fields
+      extensions 1000...536870912
+    end
+    
+    class EnumOptions
+      optional ::Protobuf::Field::BoolField, :allow_alias, 2, :default => true
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      
+      # Extension Fields
+      extensions 1000...536870912
+    end
+    
+    class EnumValueOptions
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      
+      # Extension Fields
+      extensions 1000...536870912
+    end
+    
+    class ServiceOptions
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      
+      # Extension Fields
+      extensions 1000...536870912
+    end
+    
+    class MethodOptions
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      
+      # Extension Fields
+      extensions 1000...536870912
+    end
+    
+    class UninterpretedOption
+      class NamePart
+        required ::Protobuf::Field::StringField, :name_part, 1
+        required ::Protobuf::Field::BoolField, :is_extension, 2
+      end
+      
+      repeated ::Google::Protobuf::UninterpretedOption::NamePart, :name, 2
+      optional ::Protobuf::Field::StringField, :identifier_value, 3
+      optional ::Protobuf::Field::Uint64Field, :positive_int_value, 4
+      optional ::Protobuf::Field::Int64Field, :negative_int_value, 5
+      optional ::Protobuf::Field::DoubleField, :double_value, 6
+      optional ::Protobuf::Field::BytesField, :string_value, 7
+      optional ::Protobuf::Field::StringField, :aggregate_value, 8
+    end
+    
+    class SourceCodeInfo
+      class Location
+        repeated ::Protobuf::Field::Int32Field, :path, 1, :packed => true
+        repeated ::Protobuf::Field::Int32Field, :span, 2, :packed => true
+        optional ::Protobuf::Field::StringField, :leading_comments, 3
+        optional ::Protobuf::Field::StringField, :trailing_comments, 4
+      end
+      
+      repeated ::Google::Protobuf::SourceCodeInfo::Location, :location, 1
+    end
+    
+    
+  end
+  
+end
+

data/lib/protobuf/field/base_field.rb

@@ -1,4 +1,3 @@
-require 'protobuf'
 require 'protobuf/wire_type'
 require 'protobuf/field/field_array'
 

data/lib/protobuf/field/bytes_field.rb

@@ -46,7 +46,7 @@ module Protobuf
       end
 
       def encode(value)
-        value = value.serialize_to_string if value.is_a?(::Protobuf::Message)
+        value = value.encode if value.is_a?(::Protobuf::Message)
         value.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
 
         string_size = ::Protobuf::Field::VarintField.encode(value.size)

data/lib/protobuf/field/message_field.rb

@@ -14,13 +14,11 @@ module Protobuf
       end
 
       def decode(bytes)
-        message = type.new
-        message.parse_from_string(bytes)
-        message
+        type.decode(bytes)
       end
 
       def encode(value)
-        bytes = value.serialize_to_string
+        bytes = value.encode
         result = ::Protobuf::Field::VarintField.encode(bytes.size)
         result << bytes
       end

data/lib/protobuf/field/varint_field.rb

@@ -4,8 +4,8 @@ module Protobuf
   module Field
     class VarintField < BaseField
       INT32_MAX  =  2**31 - 1
-      INT32_MIN  = -2**31 
-      INT64_MAX  =  2**63 - 1 
+      INT32_MIN  = -2**31
+      INT64_MAX  =  2**63 - 1
       INT64_MIN  = -2**63
       UINT32_MAX =  2**32 - 1
       UINT64_MAX =  2**64 - 1
@@ -26,15 +26,12 @@ module Protobuf
       end
 
       def self.encode(value)
-        return [value].pack('C') if value < 128
-
         bytes = []
-        until value == 0
+        until value < 128
           bytes << (0x80 | (value & 0x7f))
           value >>= 7
         end
-        bytes[-1] &= 0x7f
-        bytes.pack('C*')
+        (bytes << value).pack('C*')
       end
 
       ##

data/lib/protobuf/generators/base.rb

@@ -0,0 +1,71 @@
+require 'protobuf/generators/printable'
+
+module Protobuf
+  module Generators
+    class Base
+      include ::Protobuf::Generators::Printable
+
+      def self.validate_tags(type_name, tags)
+        return if tags.empty?
+
+        unique_tags = tags.uniq
+
+        if unique_tags.size < tags.size
+          ::Protobuf::CodeGenerator.fatal("#{type_name} object has duplicate tags. Expected #{unique_tags.size} tags, but got #{tags.size}. Suppress with PB_NO_TAG_WARNINGS=1.")
+        end
+
+        unless ENV.key?('PB_NO_TAG_WARNINGS')
+          range = (tags.min)..(tags.max)
+          if range.respond_to?(:size)
+            expected_size = range.size
+          else
+            expected_size = range.to_a.size
+          end
+
+          if tags.size < expected_size
+            ::Protobuf::CodeGenerator.print_tag_warning_suppress
+            ::Protobuf::CodeGenerator.warn("#{type_name} object should have #{expected_size} tags (#{range.begin}..#{range.end}), but found #{tags.size} tags.")
+          end
+        end
+      end
+
+      attr_reader :descriptor, :namespace, :options
+
+      def initialize(descriptor, indent_level = 0, options = {})
+        @descriptor = descriptor
+        @options = options
+        @namespace = @options.fetch(:namespace) { [] }
+        init_printer(indent_level)
+      end
+
+      def fully_qualified_type_namespace
+        ".#{type_namespace.join('.')}"
+      end
+
+      def run_once(label, &block)
+        tracker_ivar = "@_#{label}_compiled"
+        value_ivar = "@_#{label}_compiled_value"
+
+        if instance_variable_get(tracker_ivar)
+          return instance_variable_get(value_ivar)
+        else
+          return_value = block.call
+          instance_variable_set(tracker_ivar, true)
+          instance_variable_set(value_ivar, return_value)
+          return return_value
+        end
+      end
+
+      def to_s
+        compile
+        print_contents # see Printable
+      end
+
+      def type_namespace
+        @type_namespace ||= @namespace + [ descriptor.name ]
+      end
+
+    end
+  end
+end
+