ruby_protobuf 0.1.0 → 0.2.0

data/lib/protobuf/{extend.rb → message/extend.rb}

@@ -1,4 +1,4 @@
-require 'protobuf/message'
+require 'protobuf/message/message'
 
 module Protobuf
   class Extend < Message

data/lib/protobuf/{field.rb → message/field.rb}

@@ -1,55 +1,43 @@
-require 'protobuf/wire_type'
+require 'protobuf/common/wire_type'
+require 'protobuf/descriptor/field_descriptor'
 
 module Protobuf
   module Field
     def self.build(message_class, rule, type, name, tag, opts={})
-      Base.build message_class, rule, type, name, tag, opts
+      field_class = 
+        if [:double, :float, :int32, :int64, :uint32, :uint64, 
+          :sint32, :sint64, :fixed32, :fixed64, :sfixed32, :sfixed64, 
+          :bool, :string, :bytes].include? type
+          eval "Protobuf::Field::#{type.to_s.capitalize}Field"
+        else
+          Protobuf::Field::FieldProxy
+        end
+      field_class.new message_class, rule, type, name, tag, opts
     end
 
     class InvalidRuleError < StandardError; end
 
-    class Base
+    class BaseField
       class <<self
-        def build(message_class, rule, type, name, tag, opts={})
-          field_class = nil
-          begin
-            field_class = eval "Protobuf::Field::#{type.to_s.capitalize}Field"
-          rescue NameError
-            type = typename_to_class message_class, type
-            field_class =
-              if type.superclass == Protobuf::Enum
-                Protobuf::Field::Enum
-              elsif type.superclass == Protobuf::Message
-                Protobuf::Field::Message
-              else
-                raise $!
-              end
-          end
-          field_class.new message_class, rule, type, name, tag, opts
-        end
-
-        def typename_to_class(message_class, type)
-          modules = message_class.to_s.split('::')
-          while
-            begin
-              type = eval((modules | [type.to_s]).join('::'))
-              break
-            rescue NameError
-              modules.empty? ? raise($!) : modules.pop
-            end
-          end
-          type
+        def descriptor
+          @descriptor ||= Protobuf::Descriptor::FieldDescriptor.new
         end
       end
 
       attr_accessor :message_class, :rule, :type, :name, :tag, :default
 
+      def descriptor
+        @descriptor ||= Protobuf::Descriptor::FieldDescriptor.new self
+      end
+
       def initialize(message_class, rule, type, name, tag, opts={})
         @message_class, @rule, @type, @name, @tag, @default = 
           message_class, rule, type, name, tag, opts[:default]
         @error_message = 'Type invalid'
       end
 
+      def ready?; true end
+
       def default_value
         case rule
         when :repeated
@@ -150,6 +138,41 @@ module Protobuf
       end
     end
 
+    class FieldProxy
+      def initialize(message_class, rule, type, name, tag, opts={})
+        @message_class, @rule, @type, @name, @tag, @opts =
+          message_class, rule, type, name, tag, opts
+      end
+
+      def ready?; false end
+
+      def setup
+        type = typename_to_class @message_class, @type
+        field_class =
+          if type.superclass == Protobuf::Enum
+            Protobuf::Field::EnumField
+          elsif type.superclass == Protobuf::Message
+            Protobuf::Field::MessageField
+          else
+            raise $!
+          end
+        field_class.new @message_class, @rule, type, @name, @tag, @opts
+      end
+
+      def typename_to_class(message_class, type)
+        modules = message_class.to_s.split('::')
+        while
+          begin
+            type = eval((modules | [type.to_s]).join('::'))
+            break
+          rescue NameError
+            modules.empty? ? raise($!) : modules.pop
+          end
+        end
+        type
+      end
+    end
+
     class FieldArray < Array
       def initialize(field)
         @field = field
@@ -184,7 +207,7 @@ module Protobuf
       end
     end
 
-    class StringField < Base
+    class StringField < BaseField
       def wire_type
         Protobuf::WireType::LENGTH_DELIMITED
       end
@@ -201,16 +224,22 @@ module Protobuf
       def set_bytes(method_instance, bytes)
         method_instance.send("#{name}=", bytes.pack('U*'))
       end
+ 
+      def set_array(method_instance, bytes)
+        message = bytes.pack('U*')
+        arr = method_instance.send name
+        arr << message
+      end
 
       def get_bytes(value)
         bytes = value.unpack('U*')
-        string_size = Int.get_bytes bytes.size
+        string_size = VarintField.get_bytes bytes.size
         #(string_size + bytes).pack('C*')
         string_size + bytes.pack('C*')
       end
     end
     
-    class BytesField < Base
+    class BytesField < BaseField
       def wire_type
         Protobuf::WireType::VARINT
       end
@@ -224,12 +253,12 @@ module Protobuf
       end
 
       def get_bytes(value)
-        string_size = Int.get_bytes value.size
+        string_size = VarintField.get_bytes value.size
         string_size + value.pack('C*')
       end
     end
 
-    class Int < Base
+    class VarintField < BaseField
       def wire_type
         Protobuf::WireType::VARINT
       end
@@ -278,27 +307,27 @@ module Protobuf
       end
     end
     
-    class Int32Field < Int
+    class Int32Field < VarintField
       def self.max; 1.0/0.0 end
       def self.min; -1.0/0.0 end
     end
     
-    class Int64Field < Int
+    class Int64Field < VarintField
       def self.max; 1.0/0.0 end
       def self.min; -1.0/0.0 end
     end
     
-    class Uint32Field < Int
+    class Uint32Field < VarintField
       def self.max; 1.0/0.0 end
       def self.min; 0 end
     end
     
-    class Uint64Field < Int
+    class Uint64Field < VarintField
       def self.max; 1.0/0.0 end
       def self.min; 0 end
     end
     
-    class Sint32Field < Int
+    class Sint32Field < VarintField
       def self.max; 1.0/0.0 end
       def self.min; -1.0/0.0 end
  
@@ -320,7 +349,7 @@ module Protobuf
       end
     end
     
-    class Sint64Field < Int
+    class Sint64Field < VarintField
       def self.max; 1.0/0.0 end
       def self.min; -1.0/0.0 end
  
@@ -342,7 +371,7 @@ module Protobuf
       end
     end
     
-    class DoubleField < Int
+    class DoubleField < VarintField
       def wire_type
         Protobuf::WireType::FIXED64
       end
@@ -372,7 +401,7 @@ module Protobuf
       end
     end
     
-    class FloatField < Int
+    class FloatField < VarintField
       def wire_type
         Protobuf::WireType::FIXED32
       end
@@ -402,7 +431,7 @@ module Protobuf
       end
    end
     
-    class Fixed32Field < Int
+    class Fixed32Field < VarintField
       def wire_type
         Protobuf::WireType::FIXED32
       end
@@ -424,7 +453,7 @@ module Protobuf
       end
     end
     
-    class Fixed64Field < Int
+    class Fixed64Field < VarintField
       def wire_type
         Protobuf::WireType::FIXED64
       end
@@ -446,7 +475,7 @@ module Protobuf
       end
     end
     
-    class Sfinxed32Field < Int
+    class Sfinxed32Field < VarintField
       def wire_type
         Protobuf::WireType::FIXED32
       end
@@ -460,7 +489,7 @@ module Protobuf
       end
     end
     
-    class Sfixed64Field < Int
+    class Sfixed64Field < VarintField
       def wire_type
         Protobuf::WireType::FIXED64
       end
@@ -474,7 +503,7 @@ module Protobuf
       end
     end
     
-    class BoolField < Int
+    class BoolField < VarintField
       def typed_default_value(default=nil)
         default or false
       end
@@ -493,7 +522,7 @@ module Protobuf
       end
     end
     
-    class Message < Base
+    class MessageField < BaseField
       def wire_type
         Protobuf::WireType::LENGTH_DELIMITED
       end
@@ -530,14 +559,14 @@ module Protobuf
         stringio = StringIO.new ''
         value.serialize_to stringio
         bytes = stringio.string.unpack 'C*'
-        string_size = Int.get_bytes bytes.size
+        string_size = VarintField.get_bytes bytes.size
         #(string_size + bytes).pack('C*')
         #bytes + string_size
         string_size + bytes.pack('C*')
       end
     end
 
-    class Enum < Int
+    class EnumField < VarintField
       def acceptable?(val)
         raise TypeError unless type.valid_tag? val
         true

data/lib/protobuf/{message.rb → message/message.rb}

@@ -1,7 +1,8 @@
 require 'stringio'
-require 'protobuf/decoder'
-require 'protobuf/encoder'
-require 'protobuf/field'
+require 'protobuf/message/decoder'
+require 'protobuf/message/encoder'
+require 'protobuf/message/field'
+require 'protobuf/descriptor/descriptor'
 
 module Protobuf
   OPTIONS = {}
@@ -48,10 +49,18 @@ module Protobuf
           raise TypeError
         end
       end
+
+      def descriptor
+        @descriptor ||= Protobuf::Descriptor::Descriptor.new(self)
+      end
     end
 
     def initialize
       fields.each do |tag, field|
+        unless field.ready?
+          field = field.setup
+          self.class.class_eval {@fields[tag] = field}
+        end
         field.define_accessor self
       end
     end

data/lib/protobuf/message/service.rb

@@ -0,0 +1,9 @@
+module Protobuf
+  class Service
+    class <<self
+      def rpc(hash)
+        raise NotImplementedError('TODO')
+      end
+    end
+  end
+end

data/lib/ruby_protobuf.rb

@@ -1,7 +1,7 @@
 require 'protobuf/compiler'
 
 class RubyProtobuf
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 
   def start(proto_file, options)
     unless File.exist?(proto_file)

data/test/addressbook.rb

@@ -1,7 +1,7 @@
-require 'protobuf/message'
-require 'protobuf/enum'
-require 'protobuf/service'
-require 'protobuf/extend'
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
 
 module Tutorial
   class Person < Protobuf::Message
@@ -39,3 +39,21 @@ module Tutorial
   #Protobuf::OPTIONS[:optimize_for] = :SPEED
   #Protobuf::OPTIONS[:java_package] = :'com.example.foo'
 end
+
+=begin
+tutorial = Object.const_set :Tutorial, Module.new
+person = tutorial.const_set :Person, Class.new(Protobuf::Message)
+person.required :string, :name, 1
+person.required :int32, :id, 2
+person.optional :string, :email, 3
+phone_type = person.const_set :PhoneType, Class.new(Protobuf::Enum)
+phone_type.const_set :MOBILE, 0
+phone_type.const_set :HOME, 1
+phone_type.const_set :WORK, 2
+phone_number = person.const_set :PhoneNumber, Class.new(Protobuf::Message)
+phone_number.required :string, :number, 1
+phone_number.optional :PhoneType, :type, 2, {:default => :HOME}
+person.repeated :PhoneNumber, :phone, 4
+address_book = tutorial.const_set :AddressBook, Class.new(Protobuf::Message)
+address_book.repeated :Person, :person, 1
+=end

data/test/check_unbuild.rb

@@ -0,0 +1,30 @@
+#!/usr/local/bin/ruby
+
+$:.push "#{File.dirname(__FILE__)}/../lib"
+
+require 'test/unit'
+require 'protobuf/descriptor/descriptor_builder' 
+require 'protobuf/descriptor/descriptor_proto'
+
+class DescriptorTest < Test::Unit::TestCase
+  def test_unbuild
+    tutorial_proto = Google::Protobuf::FileDescriptorProto.new
+    tutorial_proto.parse_from_file 'person.bin'
+    Protobuf::Descriptor::DescriptorBuilder.build tutorial_proto
+
+    assert_nothing_raised {Tutorial::Person}
+    assert_nothing_raised {Tutorial::Person.new}
+    assert_equal ['email', 'id', 'name', 'phone'], 
+      Tutorial::Person.fields.map{|tag, field| field.name}.sort
+
+    assert_nothing_raised {Tutorial::Person::PhoneNumber}
+    assert_nothing_raised {Tutorial::Person::PhoneNumber.new}
+    assert_equal ['number', 'type'], 
+      Tutorial::Person::PhoneNumber.fields.map{|tag, field| field.name}.sort
+
+    assert_nothing_raised {Tutorial::Person::PhoneType}
+    assert_equal 0, Tutorial::Person::PhoneType::MOBILE
+    assert_equal 1, Tutorial::Person::PhoneType::HOME
+    assert_equal 2, Tutorial::Person::PhoneType::WORK
+  end
+end

data/test/data/data2.bin

@@ -0,0 +1,3 @@
+
+John Doe�	jdoe@example.com"
+555-4321

data/test/test_addressbook.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
-require 'protobuf/message'
-require 'protobuf/enum'
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
 require 'test/addressbook'
 
 class AddressbookTest < Test::Unit::TestCase

data/test/test_compiler.rb

@@ -1,28 +1,28 @@
 require 'test/unit'
-require 'protobuf/compiler'
+require 'protobuf/compiler/compiler'
 
 class CompilerTest < Test::Unit::TestCase
   def test_compile
     assert_equal <<-eos.strip, Protobuf::Compiler.compile('test/addressbook.proto').strip
-require 'protobuf/message'
-require 'protobuf/enum'
-require 'protobuf/service'
-require 'protobuf/extend'
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
 
 module Tutorial
   
-  class Person < Protobuf::Message
+  class Person < ::Protobuf::Message
     required :string, :name, 1
     required :int32, :id, 2
     optional :string, :email, 3
     
-    class PhoneType < Protobuf::Enum
+    class PhoneType < ::Protobuf::Enum
       MOBILE = 0
       HOME = 1
       WORK = 2
     end
     
-    class PhoneNumber < Protobuf::Message
+    class PhoneNumber < ::Protobuf::Message
       required :string, :number, 1
       optional :PhoneType, :type, 2, {:default => :HOME}
     end
@@ -30,7 +30,7 @@ module Tutorial
     repeated :PhoneNumber, :phone, 4
   end
   
-  class AddressBook < Protobuf::Message
+  class AddressBook < ::Protobuf::Message
     repeated :Person, :person, 1
   end
 end