ruby_protobuf 0.3.0 → 0.3.2

data/lib/protobuf/compiler/template/rpc_bin.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require '<%= underscored_name %>'
 
 <%= module_name %>::<%= service_name %>.new(:port => <%= default_port %>).start

data/lib/protobuf/compiler/template/rpc_client.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require 'protobuf/rpc/client'
 require '<%= required_file %>'
 

data/lib/protobuf/compiler/visitors.rb

@@ -1,14 +1,54 @@
 require 'erb'
+require 'fileutils'
+require 'protobuf/descriptor/descriptor_proto'
 
 module Protobuf
   module Visitor
-    class CreateMessageVisitor
-      attr_accessor :indent, :context
+    class Base
+      attr_reader :silent
 
-      def initialize(proto_dir='.', out_dir='.')
+      def create_file_with_backup(filename, contents, executable=false)
+        if File.exist? filename
+          if File.read(filename) == contents
+            # do nothing
+            return
+          else
+            backup_filename = "#{filename}.#{Time.now.to_i}" 
+            log_writing "#{backup_filename}", "backingup..."
+            FileUtils.copy filename, backup_filename
+          end
+        end
+
+        File.open(filename, 'w') do |file| 
+          log_writing filename
+          FileUtils.mkpath File.dirname(filename)
+          file.write contents
+        end
+       	FileUtils.chmod 0755, filename if executable
+      end
+
+      def log_writing(filename, message="writing...")
+        puts "#{filename} #{message}" unless silent
+      end
+    end
+
+    class CreateMessageVisitor < Base
+      attr_accessor :indent, :context, :attach_proto, :proto_file
+
+      def initialize(proto_file=nil, proto_dir='.', out_dir='.')
         @proto_dir, @out_dir = proto_dir, out_dir
         @indent = 0
         @context = []
+        @attach_proto = true
+        @proto_file = proto_file
+      end
+
+      def attach_proto?
+        @attach_proto
+      end
+
+      def commented_proto_contents
+        File.read(proto_file).gsub(/^/, '# ') if proto_file
       end
 
       def write(str)
@@ -47,20 +87,31 @@ module Protobuf
       end
 
       def visit(node)
-        node.accept_message_creator self 
+        node.accept_message_visitor self 
         self
       end
 
       def required_message_from_proto(proto_file)
-        rb_path = proto_file.sub(/\.proto$/, '.rb')
+        rb_path = proto_file.sub(/\.proto$/, '.pb.rb')
         unless File.exist?("#{@out_dir}/#{rb_path}")
           Compiler.compile proto_file, @proto_dir, @out_dir
         end
-        rb_path.sub /\.rb$/, ''
+        rb_path.sub(/\.rb$/, '')
+      end
+
+      def create_files(filename, out_dir, file_create)
+        eval to_s # check the message
+        if file_create
+          log_writing filename
+          FileUtils.mkpath File.dirname(filename)
+          File.open(filename, 'w') {|file| file.write to_s}
+        else
+          to_s
+        end
       end
     end
 
-    class CreateRpcVisitor
+    class CreateRpcVisitor < Base
       attr_accessor :package, :services, :current_service, :file_contents
 
       def initialize
@@ -70,7 +121,7 @@ module Protobuf
       end
 
       def visit(node)
-        node.accept_rpc_creator self
+        node.accept_rpc_visitor self
         self
       end
 
@@ -78,8 +129,7 @@ module Protobuf
         (@services[@current_service] ||= []) << [name, request.first, response.first]
       end
 
-      #def create_files(message_file, out_dir, create_file=true)
-      def create_files(message_file, out_dir, create_file=false)
+      def create_files(message_file, out_dir, create_file=true)
         @create_file = create_file
         default_port = 9999
         @services.each do |service_name, rpcs|
@@ -91,7 +141,8 @@ module Protobuf
           create_service message_file, out_dir, underscored_name, message_module, 
             service_name, default_port, rpcs, required_file
           rpcs.each do |name, request, response|
-            create_client out_dir, underscored_name, default_port, name, request, response, message_module, required_file
+            create_client out_dir, underscored_name, default_port, name, request, response, 
+              message_module, required_file
           end
         end
         @file_contents
@@ -100,21 +151,23 @@ module Protobuf
       def create_bin(out_dir, underscored_name, module_name, service_name, default_port)
         bin_filename = "#{out_dir}/start_#{underscored_name}"
         bin_contents = template_erb('rpc_bin').result binding
-        File.open(bin_filename, 'w') {|f| f.write bin_contents} if @create_file
+        create_file_with_backup bin_filename, bin_contents, true if @create_file
         @file_contents[bin_filename] = bin_contents
       end
 
-      def create_service(message_file, out_dir, underscored_name, module_name, service_name, default_port, rpcs, required_file)
+      def create_service(message_file, out_dir, underscored_name, module_name, service_name, 
+        default_port, rpcs, required_file)
         service_filename = "#{out_dir}/#{underscored_name}.rb"
         service_contents = template_erb('rpc_service').result binding
-        File.open(service_filename, 'w') {|f| f.write service_contents} if @create_file
+        create_file_with_backup service_filename, service_contents if @create_file
         @file_contents[service_filename] = service_contents
       end
 
-      def create_client(out_dir, underscored_name, default_port, name, request, response, message_module, required_file)
+      def create_client(out_dir, underscored_name, default_port, name, request, response, 
+        message_module, required_file)
         client_filename = "#{out_dir}/client_#{underscore name}.rb"
         client_contents = template_erb('rpc_client').result binding
-        File.open(client_filename, 'w') {|f| f.write client_contents} if @create_file
+        create_file_with_backup client_filename, client_contents, true if @create_file
         @file_contents[client_filename] = client_contents
       end
 
@@ -128,5 +181,104 @@ module Protobuf
         ERB.new File.read("#{File.dirname(__FILE__)}/template/#{template}.erb"), nil, '-'
       end
     end
+
+    class CreateDescriptorVisitor < Base
+      attr_reader :file_descriptor
+      attr_accessor :filename
+
+      def initialize(filename=nil)
+        @context = []
+        @filename = filename
+      end
+
+      def visit(node)
+        node.accept_descriptor_visitor self 
+        self
+      end
+
+      def in_context(descriptor, &block)
+        @context.push descriptor
+        block.call
+        @context.pop
+      end
+
+      def current_descriptor
+        @context.last
+      end
+
+      def file_descriptor=(descriptor)
+       @file_descriptor = descriptor
+       @file_descriptor.name = @filename
+      end
+
+      def add_option(name, value)
+        options = 
+          case current_descriptor
+          when Google::Protobuf::FileDescriptorProto
+            Google::Protobuf::FileOptions.new
+          when Google::Protobuf::DescriptorProto
+            Google::Protobuf::MessageOptions.new
+          when Google::Protobuf::FieldDescriptorProto
+            Google::Protobuf::FieldOptions.new
+          when Google::Protobuf::EnumDescriptorProto
+            Google::Protobuf::EnumOptions.new
+          when Google::Protobuf::EnumValueDescriptorProto
+            Google::Protobuf::EnumValueOptions.new
+          when Google::Protobuf::ServiceDescriptorProto
+            Google::Protobuf::ServiceOptions.new
+          when Google::Protobuf::MethodDescriptorProto
+            Google::Protobuf::MethodOptions.new
+          else
+            raise ArgumentError.new('Invalid context')
+          end
+        #TODO how should options be handled?
+        #current_descriptor.options << option
+      end
+
+      def descriptor=(descriptor)
+        case current_descriptor
+        when Google::Protobuf::FileDescriptorProto
+          current_descriptor.message_type << descriptor
+        when Google::Protobuf::DescriptorProto
+          current_descriptor.nested_type << descriptor
+        else
+          raise ArgumentError.new('Invalid context')
+        end
+      end
+      alias message_descriptor= descriptor=
+
+      def enum_descriptor=(descriptor)
+        current_descriptor.enum_type << descriptor
+      end
+
+      def enum_value_descriptor=(descriptor)
+        current_descriptor.value << descriptor
+      end
+
+      def service_descriptor=(descriptor)
+        current_descriptor.service << descriptor
+      end
+
+      def method_descriptor=(descriptor)
+        current_descriptor.method << descriptor
+      end
+
+      def field_descriptor=(descriptor)
+        case current_descriptor
+        when Google::Protobuf::FileDescriptorProto
+          current_descriptor.extension << descriptor
+        when Google::Protobuf::DescriptorProto
+          current_descriptor.field << descriptor
+          #TODO: how should i distiguish between field and extension
+          #current_descriptor.extension << descriptor
+        else
+          raise ArgumentError.new('Invalid context')
+        end
+      end
+
+      def extension_range_descriptor=(descriptor)
+        current_descriptor.extension_range << descriptor
+      end
+    end
   end
 end

data/lib/protobuf/message/enum.rb

@@ -1,8 +1,11 @@
 require 'protobuf/descriptor/enum_descriptor'
+require 'protobuf/message/protoable'
 
 module Protobuf
   class Enum
     class <<self
+      include Protobuf::Protoable
+
       def get_name_by_tag(tag)
         constants.find do |name|
           class_eval(name) == tag

data/lib/protobuf/message/field.rb

@@ -128,20 +128,20 @@ module Protobuf
         raise NotImplementedError
       end
 
-      def merge(message_instance, bytes)
+      def merge(message_instance, value)
         if repeated?
-          merge_array method_instance, bytes
+          merge_array message_instance, value
         else
-          merge_value method_instance, bytes
+          merge_value message_instance, value
         end
       end
 
-      def merge_array(message_instance, bytes)
-        raise NotImplementedError
+      def merge_array(message_instance, value)
+        message_instance[tag].concat value 
       end
 
-      def merge_value(message_instance, bytes)
-        raise NotImplementedError
+      def merge_value(message_instance, value)
+        message_instance[tag] = value
       end
 
       def repeated?; rule == :repeated end
@@ -247,13 +247,13 @@ module Protobuf
         true
       end
 
-      def set_bytes(method_instance, bytes)
-        method_instance.send("#{name}=", bytes.pack('U*'))
+      def set_bytes(message_instance, bytes)
+        message_instance.send("#{name}=", bytes.pack('U*'))
       end
  
-      def set_array(method_instance, bytes)
+      def set_array(message_instance, bytes)
         message = bytes.pack('U*')
-        arr = method_instance.send name
+        arr = message_instance.send name
         arr << message
       end
 
@@ -267,20 +267,31 @@ module Protobuf
     
     class BytesField < BaseField
       def wire_type
-        Protobuf::WireType::VARINT
+        Protobuf::WireType::LENGTH_DELIMITED
       end
 
       def typed_default_value(default=nil)
-        default or []
+        default or ''
       end
 
-      def set_bytes(method_instance, bytes)
-        method_instance.send("#{name}=", bytes)
+      def acceptable?(val)
+        raise TypeError unless val.instance_of? String
+        true
+      end
+
+      def set_bytes(message_instance, bytes)
+        message_instance.send("#{name}=", bytes.pack('C*'))
+      end
+ 
+      def set_array(message_instance, bytes)
+        message = bytes.pack('C*')
+        arr = message_instance.send name
+        arr << message
       end
 
       def get_bytes(value)
-        string_size = VarintField.get_bytes value.size
-        string_size + value.pack('C*')
+        string_size = VarintField.get_bytes value.unpack('C*').size
+        string_size + value
       end
     end
 
@@ -293,13 +304,13 @@ module Protobuf
         default or 0
       end
  
-      def set_bytes(method_instance, bytes)
+      def set_bytes(message_instance, bytes)
         # TODO should refactor using pack('w*')
         value = 0
         bytes.each_with_index do |byte, index|
           value |= byte << (7 * index)
         end
-        method_instance.send("#{name}=", value)
+        message_instance.send("#{name}=", value)
       end
 
       def self.get_bytes(value)
@@ -357,7 +368,7 @@ module Protobuf
       def self.max; 1.0/0.0 end
       def self.min; -1.0/0.0 end
  
-      def set_bytes(method_instance, bytes)
+      def set_bytes(message_instance, bytes)
         # TODO use only bit-operations
         byte = bytes.first
         value = 
@@ -366,7 +377,7 @@ module Protobuf
           else
             -(byte + 1) / 2
           end
-        method_instance.send("#{name}=", value)
+        message_instance.send("#{name}=", value)
       end
 
       def get_bytes(value)
@@ -379,7 +390,7 @@ module Protobuf
       def self.max; 1.0/0.0 end
       def self.min; -1.0/0.0 end
  
-      def set_bytes(method_instance, bytes)
+      def set_bytes(message_instance, bytes)
         # TODO use only bit-operations
         byte = bytes.first
         value = 
@@ -388,7 +399,7 @@ module Protobuf
           else
             -(byte + 1) / 2
           end
-        method_instance.send("#{name}=", value)
+        message_instance.send("#{name}=", value)
       end
 
       def get_bytes(value)
@@ -412,8 +423,8 @@ module Protobuf
         -(2**(64/2) - 1)
       end
  
-      def set_bytes(method_instance, bytes)
-        method_instance.send("#{name}=", bytes.unpack('E').first)
+      def set_bytes(message_instance, bytes)
+        message_instance.send("#{name}=", bytes.unpack('E').first)
       end
 
       def get_bytes(value)
@@ -442,8 +453,8 @@ module Protobuf
         -(2**(32/2) - 1)
       end
  
-      def set_bytes(method_instance, bytes)
-        method_instance.send("#{name}=", bytes.unpack('e').first)
+      def set_bytes(message_instance, bytes)
+        message_instance.send("#{name}=", bytes.unpack('e').first)
       end
 
       def get_bytes(value)
@@ -470,8 +481,8 @@ module Protobuf
         0
       end
  
-      def set_bytes(method_instance, bytes)
-        method_instance.send("#{name}=", bytes.unpack('L').first)
+      def set_bytes(message_instance, bytes)
+        message_instance.send("#{name}=", bytes.unpack('L').first)
       end
 
       def get_bytes(value)
@@ -492,8 +503,8 @@ module Protobuf
         0
       end
  
-      def set_bytes(method_instance, bytes)
-        method_instance.send("#{name}=", bytes.unpack('l').first)
+      def set_bytes(message_instance, bytes)
+        message_instance.send("#{name}=", bytes.unpack('l').first)
       end
 
       def get_bytes(value)
@@ -539,8 +550,8 @@ module Protobuf
         true
       end
  
-      def set_bytes(method_instance, bytes)
-        method_instance.send("#{name}=", bytes.first == 1)
+      def set_bytes(message_instance, bytes)
+        message_instance.send("#{name}=", bytes.first == 1)
       end
 
       def get_bytes(value)
@@ -566,18 +577,18 @@ module Protobuf
         true
       end
  
-      def set_bytes(method_instance, bytes)
+      def set_bytes(message_instance, bytes)
         message = type.new
         #message.parse_from bytes
         message.parse_from_string bytes.pack('U*') # TODO
-        method_instance.send("#{name}=", message)
+        message_instance.send("#{name}=", message)
       end
  
-      def set_array(method_instance, bytes)
+      def set_array(message_instance, bytes)
         message = type.new
         #message.parse_from bytes
         message.parse_from_string bytes.pack('U*')
-        arr = method_instance.send name
+        arr = message_instance.send name
         arr << message
       end
 
@@ -590,6 +601,10 @@ module Protobuf
         #bytes + string_size
         string_size + bytes.pack('C*')
       end
+
+      def merge_value(message_instance, value)
+        message_instance[tag].merge_from value
+      end
     end
 
     class EnumField < VarintField