protobuf 1.4.2 → 2.0.0.rc1

data/lib/protobuf/common/util.rb

@@ -1,59 +0,0 @@
-module Protobuf
-  module Util
-    module_function
-
-    # Takes a string or symbol and camelizes it:
-    # Expects: some_long_name
-    # Returns: SomeLongName
-    def camelize(str)
-      if (str.is_a? Array)
-        str.map{|p| camelize(p.to_s) }.join('::')
-      else
-        str.to_s.gsub(/(?:\A|_)(\w)/) { $1.upcase }
-      end
-    end
-
-    # Expects: SomeLongName, SOMELongName
-    # Returns: some_long_name
-    def underscore(str)
-      str.to_s.gsub(/\B[A-Z](?:[a-z])/, '_\&').downcase
-    end
-  
-    # Expects: SomeModule::Path
-    # Returns: some_module/path
-    def module_to_path(str)
-      pkg = str.to_s.split('::')
-      pkg.map{|e| underscore(e) }.join('/')
-    end
-  
-    # Expects: PackageA.PackageB
-    # Returns: package_a/package_b
-    def package_to_path(str)
-      str.to_s.split('.').map{|e| underscore(e) }.join('/')
-    end
-  
-    # Takes a class constant and converts it to a string resembling a java package path
-    # Expects: ModA::ModB::MyService
-    # Returns: mod_a.mod_b.MyService
-    def packagize(klass)
-      klass = klass.to_s.split('::') unless klass.is_a? Array
-      klass_name = klass.pop
-      klass.map{|e| underscore(e) }.join('.') + ".#{klass_name}"
-    end
-  
-    # The reverse of packagize. Takes a string resembling a java package path
-    # and converts it into a module constant
-    # Expects: mod_a.mod_b.MyService
-    # Returns: ModA::ModB::MyService
-    def moduleize(str)
-      str = str.join('.') if str.is_a? Array
-      str.split('.').map{|e| camelize(e) }.join('::')
-    end
-  
-    def constantize(klass)
-      constants = moduleize(klass).split('::')
-      constants.inject(Module.const_get(constants.shift)) {|const, obj| const.const_get(obj) }
-    end
-  
-  end
-end

data/lib/protobuf/compiler/compiler.rb

@@ -1,52 +0,0 @@
-require 'fileutils'
-require 'protobuf/compiler/proto_parser'
-require 'protobuf/compiler/nodes'
-require 'protobuf/compiler/visitors'
-
-module Protobuf
-  class Compiler
-    def self.compile(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      self.new.compile(proto_file, proto_dir, out_dir, file_create)
-    end
-
-    def compile(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      create_message(proto_file, proto_dir, out_dir, file_create)
-      create_rpc(proto_file, proto_dir, out_dir, file_create)
-    end
-
-    def create_message(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      rb_file = File.join(out_dir, File.basename(proto_file).sub(/\.[^\0]*\z/, '') + '.pb.rb')
-      proto_path = validate_existence(proto_file, proto_dir)
-
-      message_visitor = Visitor::CreateMessageVisitor.new(proto_file, proto_dir, out_dir)
-      File.open(proto_path) do |file|
-        message_visitor.visit(ProtoParser.new.parse(file))
-      end
-      message_visitor.create_files(rb_file, out_dir, file_create)
-    end
-
-    def create_rpc(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      message_file = File.join(out_dir, File.basename(proto_file).sub(/\.[^\0]*\z/, '') + '.pb.rb')
-      proto_path = validate_existence(proto_file, proto_dir)
-
-      rpc_visitor = Visitor::CreateRpcVisitor.new
-      File.open(proto_path) do |file|
-        rpc_visitor.visit(ProtoParser.new.parse(file))
-      end
-      rpc_visitor.create_files(message_file, out_dir, file_create)
-    end
-
-    def validate_existence(path, base_dir)
-      if File.exist?(path)
-        path
-      else
-        newpath = File.join(base_dir, path)
-        if File.exist?(newpath)
-          newpath
-        else
-          raise ArgumentError, "File does not exist: #{path}"
-        end
-      end
-    end
-  end
-end

data/lib/protobuf/compiler/nodes.rb

@@ -1,323 +0,0 @@
-require 'protobuf/common/util'
-require 'protobuf/descriptor/descriptor_proto'
-
-module Protobuf
-  module Node
-    class Base
-      def define_in_the_file(visitor)
-        visitor.write("defined_in __FILE__") if visitor.attach_proto?
-      end
-
-      def accept_message_visitor(visitor)
-      end
-
-      def accept_rpc_visitor(vistor)
-      end
-
-      def accept_descriptor_visitor(visitor)
-      end
-    end
-
-    class ProtoNode < Base
-      attr_reader :children
-
-      def initialize(children)
-        @children = children || []
-      end
-
-      def accept_message_visitor(visitor)
-        visitor.write('### Generated by rprotoc. DO NOT EDIT!')
-        visitor.write("### <proto file: #{visitor.proto_file}>") if visitor.attach_proto?
-        visitor.write(visitor.commented_proto_contents) if visitor.attach_proto?
-        visitor.write(<<-EOS)
-require 'protobuf/message/message'
-require 'protobuf/message/enum'
-require 'protobuf/message/extend'
-        EOS
-        @children.each {|child| child.accept_message_visitor(visitor) }
-        visitor.close_ruby
-      end
-
-      def accept_rpc_visitor(visitor)
-        @children.each {|child| child.accept_rpc_visitor(visitor) }
-      end
-
-      def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::FileDescriptorProto.new(:name => visitor.filename)
-        visitor.file_descriptor = descriptor
-        visitor.in_context(descriptor) do
-          @children.each {|child| child.accept_descriptor_visitor(visitor) }
-        end
-      end
-    end
-
-    class ImportNode < Base
-      def initialize(path)
-        @path = path
-      end
-
-      def accept_message_visitor(visitor)
-        visitor.write("require '#{visitor.required_message_from_proto(@path)}'")
-      end
-
-      def accept_descriptor_visitor(visitor)
-        visitor.current_descriptor.dependency << @path
-      end
-    end
-
-    class PackageNode < Base
-      def initialize(path_list)
-        @path_list = path_list
-      end
-
-      def accept_message_visitor(visitor)
-        visitor.package = @path_list.dup
-        @path_list.each do |path|
-          visitor.write("module #{Util.camelize(path)}")
-          visitor.increment
-        end
-      end
-
-      def accept_rpc_visitor(visitor)
-        visitor.package = @path_list.dup
-      end
-
-      def accept_descriptor_visitor(visitor)
-        visitor.current_descriptor.package = @path_list.join('.')
-      end
-    end
-
-    class OptionNode < Base
-      def initialize(name_list, value)
-        @name_list, @value = name_list, value
-      end
-
-      def accept_message_visitor(visitor)
-        visitor.write("::Protobuf::OPTIONS[:#{@name_list.join('.').inspect}] = #{@value.inspect}")
-      end
-
-      def accept_descriptor_visitor(visitor)
-        visitor.add_option(@name_list.join('.'), @value)
-      end
-    end
-
-    class MessageNode < Base
-      def initialize(name, children)
-        @name, @children = name, children
-      end
-
-      def accept_message_visitor(visitor)
-        class_name = @name.to_s
-        class_name.gsub!(/\A[a-z]/) {|c| c.upcase}
-        visitor.write("class #{class_name} < ::Protobuf::Message")
-        visitor.in_context(self.class) do
-          define_in_the_file(visitor)
-          @children.each {|child| child.accept_message_visitor(visitor) }
-        end
-        visitor.write('end')
-      end
-
-      def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::DescriptorProto.new(:name => @name.to_s)
-        visitor.descriptor = descriptor
-        visitor.in_context(descriptor) do
-          @children.each {|child| child.accept_descriptor_visitor(visitor) }
-        end
-      end
-    end
-
-    class ExtendNode < Base
-      def initialize(name, children)
-        @name, @children = name, children
-      end
-
-      def accept_message_visitor(visitor)
-        name = @name.is_a?(Array) ? @name.join : name.to_s
-        visitor.write("class #{name} < ::Protobuf::Message")
-        visitor.in_context(self.class) do
-          define_in_the_file(visitor)
-          @children.each {|child| child.accept_message_visitor(visitor) }
-        end
-        visitor.write('end')
-      end
-
-      def accept_descriptor_visitor(visitor)
-        # TODO: how should i handle this?
-      end
-    end
-
-    class EnumNode < Base
-      def initialize(name, children)
-        @name, @children = name, children
-      end
-
-      def accept_message_visitor(visitor)
-        visitor.write("class #{@name} < ::Protobuf::Enum")
-        visitor.in_context(self.class) do
-          define_in_the_file(visitor)
-          @children.each {|child| child.accept_message_visitor(visitor) }
-        end
-        visitor.write('end')
-      end
-
-      def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::EnumDescriptorProto.new(:name => @name.to_s)
-        visitor.enum_descriptor = descriptor
-        visitor.in_context(descriptor) do
-          @children.each {|child| child.accept_descriptor_visitor(visitor) }
-        end
-      end
-    end
-
-    class EnumFieldNode < Base
-      def initialize(name, value)
-        @name, @value = name, value
-      end
-
-      def accept_message_visitor(visitor)
-        visitor.write("define :#{@name}, #{@value}")
-      end
-
-      def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::EnumValueDescriptorProto.new(:name => @name.to_s, :number => @value)
-        visitor.enum_value_descriptor = descriptor
-      end
-    end
-
-    class ServiceNode < Base
-      def initialize(name, children)
-        @name, @children = name, children
-      end
-
-      def accept_message_visitor(visitor)
-        # do nothing
-      end
-
-      def accept_rpc_visitor(visitor)
-        visitor.current_service = @name
-        @children.each {|child| child.accept_rpc_visitor(visitor) }
-      end
-
-      def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::ServiceDescriptorProto.new(:name => @name.to_s)
-        visitor.service_descriptor = descriptor
-        visitor.in_context(descriptor) do
-          @children.each {|child| child.accept_descriptor_visitor(visitor) }
-        end
-      end
-    end
-
-    class RpcNode < Base
-      def initialize(name, request, response)
-        @name, @request, @response = name, request, response
-      end
-
-      def accept_message_visitor(visitor)
-        # do nothing
-      end
-
-      def accept_rpc_visitor(visitor)
-        visitor.add_rpc(@name, @request, @response)
-      end
-
-      def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::MethodDescriptorProto.new(:name => @name.to_s, :input_type => @request.to_s, :output_type => @response.to_s)
-        visitor.method_descriptor = descriptor
-      end
-    end
-
-    class GroupNode < Base
-      def initialize(label, name, value, children)
-        @label, @name, @value, @children = label, name, value, children
-      end
-
-      def accept_message_visitor(visitor)
-        raise NotImplementedError
-      end
-
-      def accept_descriptor_visitor(visitor)
-        raise NotImplementedError
-      end
-    end
-
-    class FieldNode < Base
-      def initialize(label, type, name, value, opts={})
-        @label, @type, @name, @value, @opts = label, type, name, value, opts
-      end
-
-      def accept_message_visitor(visitor)
-        opts = @opts.empty? ? '' : ", #{@opts.map{|k, v| ":#{k} => #{v.inspect}" }.join(', ')}"
-        if visitor.context.first == ExtendNode
-          opts << ', :extension => true'
-        end
-        type = if @type.is_a?(Array)
-               then (@type.size > 1) ? "'#{@type.map{|e| Util.camelize(e) }.join('::')}'" : @type[0]
-               else @type
-               end
-        visitor.write("#{@label} :#{type}, :#{@name}, #{@value}#{opts}")
-      end
-
-      def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::FieldDescriptorProto.new(:name => @name.to_s, :number => @value)
-        descriptor.label = Google::Protobuf::FieldDescriptorProto::Label.const_get("LABEL_#{@label.to_s.upcase}")
-        descriptor.type = Google::Protobuf::FieldDescriptorProto::Type.const_get("TYPE_#{@type.to_s.upcase}") if predefined_type?
-        descriptor.type_name = @type.is_a?(Array) ? @type.join : @type.to_s
-        @opts.each do |key, val|
-          case key.to_sym
-          when :default then
-            descriptor.default_value = val.to_s
-          end
-        end
-        visitor.field_descriptor = descriptor
-      end
-
-      private
-
-      def predefined_type?
-        # TODO: constantize
-        %w{double float int64 uint64 int32 fixed64 fixed32 bool string group message bytes uint32 enum sfixed32 sfixed64 sint32 sint64}.include?(@type.to_s)
-      end
-    end
-
-    class ExtensionsNode < Base
-      def initialize(range)
-        @range = range
-      end
-
-      def accept_message_visitor(visitor)
-        visitor.write("extensions #{@range.first.to_s}")
-      end
-
-      def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::DescriptorProto::ExtensionRange.new(:start => @range.first.low)
-        case @range.first.high
-        when NilClass then # ignore
-        when :max     then descriptor.end = 1
-        else               descriptor.end = @range.first.high
-        end
-        visitor.extension_range_descriptor = descriptor
-      end
-    end
-
-    class ExtensionRangeNode < Base
-      attr_reader :low, :high
-
-      def initialize(low, high=nil)
-        @low, @high = low, high
-      end
-
-      #def accept_message_visitor(visitor)
-      #end
-
-      def to_s
-        if @high.nil?
-          @low.to_s
-        elsif @high == :max
-          "#{@low}..::Protobuf::Extend::MAX"
-        else
-          "#{@low}..#{@high}"
-        end
-      end
-    end
-  end
-end

data/lib/protobuf/compiler/proto.y

@@ -1,216 +0,0 @@
-class Protobuf::ProtoParser
-rule
-  proto : proto_item
-          { result = Protobuf::Node::ProtoNode.new(val) }
-        | proto proto_item
-          { result.children << val[1] if val[1]}
-
-  proto_item : message
-             | extend
-             | enum
-             | import
-             | package
-             | option
-             | service
-             | ';'      { result = nil }
-
-  import : 'import' STRING_LITERAL ';'
-           { result = Protobuf::Node::ImportNode.new(val[1]) }
-
-  package : 'package' IDENT dot_ident_list ';'
-            { result = Protobuf::Node::PackageNode.new(val[2].unshift(val[1])) }
-
-  dot_ident_list :
-                   { result = [] }
-                 | dot_ident_list '.' IDENT
-                   { result << val[2] }
-
-  option : 'option' option_body ';'
-           { result = Protobuf::Node::OptionNode.new(*val[1]) }
-
-  option_body : IDENT dot_ident_list '=' constant
-                { result = [val[1].unshift(val[0]), val[3]] }
-
-  message : 'message' IDENT message_body
-            { result = Protobuf::Node::MessageNode.new(val[1], val[2]) }
-
-  extend : 'extend' user_type '{' extend_body_list '}'
-           { result = Protobuf::Node::ExtendNode.new(val[1], val[3]) }
-
-  extend_body_list :
-                     { result = [] }
-                   | extend_body_list extend_body
-                     { result << val[1] if val[1] }
-
-  extend_body : field
-              | group
-              | ';'    { result = nil }
-
-  enum : 'enum' IDENT '{' enum_body_list '}'
-         { result = Protobuf::Node::EnumNode.new(val[1], val[3]) }
-
-  enum_body_list :
-                   { result = [] }
-                 | enum_body_list enum_body
-                   { result << val[1] if val[1] }
-
-  enum_body : option
-            | enum_field
-            | ';'         { result = nil }
-
-  enum_field : IDENT '=' integer_literal ';'
-               { result = Protobuf::Node::EnumFieldNode.new(val[0], val[2]) }
-
-  service : 'service' IDENT '{' service_body_list '}'
-            { result = Protobuf::Node::ServiceNode.new(val[1], val[3]) }
-
-  service_body_list :
-                      { result = [] }
-                    | service_body_list service_body
-                      { result << val[1] if val[1] }
-
-  service_body : option
-               | rpc
-               | ';'     { result = nil}
-
-  rpc : 'rpc' IDENT '(' rpc_arg ')' 'returns' '(' rpc_arg ')' ';'
-        { result = Protobuf::Node::RpcNode.new(val[1], val[3], val[7]) }
-
-  rpc_arg :
-          | user_type
-
-  message_body : '{' message_body_body_list '}'
-                 { result = val[1] }
-
-  message_body_body_list :
-                           { result = [] }
-                         | message_body_body_list message_body_body
-                           { result << val[1] if val[1] }
-
-  message_body_body : field
-                    | enum
-                    | message
-                    | extend
-                    | extensions
-                    | group
-                    | option
-                    | ';'        { result = nil }
-
-  group : label 'group' CAMEL_IDENT '=' integer_literal message_body
-          { result = Protobuf::Node::GroupNode.new(val[0], val[2], val[4], val[5]) }
-
-  field : label type field_name '=' integer_literal ';'
-          { result = Protobuf::Node::FieldNode.new(val[0], val[1], val[2], val[4]) }
-        | label type field_name '=' integer_literal '[' field_option_list ']' ';'
-          { result = Protobuf::Node::FieldNode.new(val[0], val[1], val[2], val[4], val[6]) }
-
-  field_name : IDENT | "required" | "optional" | "repeated" | "import" | "package" | "option" | "message" | "extend" | "enum" | "service" | "rpc" | "returns" | "group" | "default" | "extensions" | "to" | "max" | "double" | "float" | "int32" | "int64" | "uint32" | "uint64" | "sint32" | "sint64" | "fixed32" | "fixed64" | "sfixed32" | "sfixed64" | "bool" | "string" | "bytes"
-
-  field_option_list : field_option
-                      { result = val }
-                    | field_option_list ',' field_option
-                      { result << val[2] }
-
-  field_option : option_body
-               | 'default' '=' constant
-                 { result = [:default, val[2]] }
-
-  extensions : 'extensions' extension comma_extension_list ';'
-               { result = Protobuf::Node::ExtensionsNode.new(val[2].unshift(val[1])) }
-
-  comma_extension_list :
-                         { result = [] }
-                       | ',' extension
-                         { result << val[1] }
-
-  extension : integer_literal
-              { result = Protobuf::Node::ExtensionRangeNode.new(val[0]) }
-            | integer_literal 'to' integer_literal
-              { result = Protobuf::Node::ExtensionRangeNode.new(val[0], val[2]) }
-            | integer_literal 'to' 'max'
-              { result = Protobuf::Node::ExtensionRangeNode.new(val[0], :max) }
-
-  label : 'required'
-        | 'optional'
-        | 'repeated'
-
-  type : 'double' | 'float' | 'int32' | 'int64' | 'uint32' | 'uint64'
-       | 'sint32' | 'sint64' | 'fixed32' | 'fixed64' | 'sfixed32' | 'sfixed64'
-       | 'bool' | 'string' | 'bytes' | user_type
-
-  user_type : IDENT dot_ident_list
-              { result = val[1].unshift(val[0]) }
-            | '.' IDENT dot_ident_list
-              { result = val[1].unshift(val[0]) }
-
-  constant : IDENT
-           | integer_literal
-           | FLOAT_LITERAL
-           | STRING_LITERAL
-           | BOOLEAN_LITERAL
-
-  integer_literal : DEC_INTEGER
-                  | HEX_INTEGER
-                  | OCT_INTEGER
-end
-
----- inner
-
-  require 'strscan'
-
-  def parse(f)
-    @scanner = StringScanner.new(f.read)
-    yyparse(self, :scan)
-  end
-
-  def scan_debug
-    scan do |token, value|
-      p [token, value]
-      yield [token, value]
-    end
-  end
-
-  def scan
-    until @scanner.eos?
-      case
-      when match(/\s+/, /\/\/.*/)
-        # skip
-      when match(/\/\*/)
-        # C-like comment
-        raise 'EOF inside block comment' until @scanner.scan_until(/\*\//)
-      when match(/(?:required|optional|repeated|import|package|option|message|extend|enum|service|rpc|returns|group|default|extensions|to|max|double|float|int32|int64|uint32|uint64|sint32|sint64|fixed32|fixed64|sfixed32|sfixed64|bool|string|bytes)\b/)
-        yield [@token, @token.to_sym]
-      when match(/[+-]?\d*\.\d+([Ee][\+-]?\d+)?/)
-        yield [:FLOAT_LITERAL, @token.to_f]
-      when match(/[+-]?[1-9]\d*(?!\.)/, /0(?![.xX0-9])/)
-        yield [:DEC_INTEGER, @token.to_i]
-      when match(/0[xX]([A-Fa-f0-9])+/)
-        yield [:HEX_INTEGER, @token.to_i(0)]
-      when match(/0[0-7]+/)
-        yield [:OCT_INTEGER, @token.to_i(0)]
-      when match(/(true|false)\b/)
-        yield [:BOOLEAN_LITERAL, @token == 'true']
-      when match(/"(?:[^"\\]+|\\.)*"/, /'(?:[^'\\]+|\\.)*'/)
-        yield [:STRING_LITERAL, eval(@token)]
-      when match(/[a-zA-Z_]\w*/)
-        yield [:IDENT, @token.to_sym]
-      when match(/[A-Z]\w*/)
-        yield [:CAMEL_IDENT, @token.to_sym]
-      when match(/./)
-        yield [@token, @token]
-      else
-        raise "parse error around #{@scanner.string[@scanner.pos, 32].inspect}"
-      end
-    end
-    yield [false, nil]
-  end
-
-  def match(*regular_expressions)
-    regular_expressions.each do |re|
-      if @scanner.scan(re)
-        @token = @scanner[0]
-        return true
-      end
-    end
-    false
-  end