ruby_protobuf 0.1.0 → 0.2.0

data/test/test_descriptor.rb

@@ -0,0 +1,122 @@
+require 'test/unit'
+require 'test/addressbook'
+require 'protobuf/descriptor/descriptor_builder'
+require 'protobuf/descriptor/descriptor_proto'
+
+class DescriptorTest < Test::Unit::TestCase
+  include Google::Protobuf
+  def test_build
+    tutorial_proto = FileDescriptorProto.new
+    tutorial_proto.package = 'Build::Tutorial'
+
+    person_proto = DescriptorProto.new
+    tutorial_proto.message_type << person_proto
+    person_proto.name = 'Person'
+
+    person_name_proto = FieldDescriptorProto.new
+    person_proto.field << person_name_proto
+    person_name_proto.label = FieldDescriptorProto::Label::LABEL_REQUIRED
+    person_name_proto.type = FieldDescriptorProto::Type::TYPE_STRING
+    person_name_proto.name = 'name'
+    person_name_proto.number = 1
+
+    person_id_proto = FieldDescriptorProto.new
+    person_proto.field << person_id_proto
+    person_id_proto.label = FieldDescriptorProto::Label::LABEL_REQUIRED
+    person_id_proto.type = FieldDescriptorProto::Type::TYPE_INT32
+    person_id_proto.name = 'id'
+    person_id_proto.number = 2
+
+    person_email_proto = FieldDescriptorProto.new
+    person_proto.field << person_email_proto
+    person_email_proto.label = FieldDescriptorProto::Label::LABEL_OPTIONAL
+    person_email_proto.type = FieldDescriptorProto::Type::TYPE_STRING
+    person_email_proto.name = 'email'
+    person_email_proto.number = 3
+
+    person_phone_type_proto = EnumDescriptorProto.new
+    person_proto.enum_type << person_phone_type_proto
+    person_phone_type_proto.name = 'PhoneType'
+
+    person_phone_type_mobile_proto = EnumValueDescriptorProto.new
+    person_phone_type_proto.value << person_phone_type_mobile_proto
+    person_phone_type_mobile_proto.name = 'MOBILE'
+    person_phone_type_mobile_proto.number = 0
+
+    person_phone_type_home_proto = EnumValueDescriptorProto.new
+    person_phone_type_proto.value << person_phone_type_home_proto
+    person_phone_type_home_proto.name = 'HOME'
+    person_phone_type_home_proto.number = 1
+
+    person_phone_type_work_proto = EnumValueDescriptorProto.new
+    person_phone_type_proto.value << person_phone_type_work_proto
+    person_phone_type_work_proto.name = 'WORK'
+    person_phone_type_work_proto.number = 2
+
+    person_phone_number_proto = DescriptorProto.new
+    person_proto.nested_type << person_phone_number_proto
+    person_phone_number_proto.name = 'PhoneNumber'
+
+    person_phone_number_number_proto = FieldDescriptorProto.new
+    person_phone_number_proto.field << person_phone_number_number_proto
+    person_phone_number_number_proto.label = FieldDescriptorProto::Label::LABEL_REQUIRED
+    person_phone_number_number_proto.type = FieldDescriptorProto::Type::TYPE_STRING
+    person_phone_number_number_proto.name = 'number'
+    person_phone_number_number_proto.number = 1
+    
+    person_phone_number_type_proto = FieldDescriptorProto.new
+    person_phone_number_proto.field << person_phone_number_type_proto
+    person_phone_number_type_proto.label = FieldDescriptorProto::Label::LABEL_OPTIONAL
+    person_phone_number_type_proto.type = FieldDescriptorProto::Type::TYPE_ENUM
+    person_phone_number_type_proto.type_name = 'PhoneType'
+    person_phone_number_type_proto.name = 'type'
+    person_phone_number_type_proto.number = 2
+    person_phone_number_type_proto.default_value = 'HOME'
+
+    person_phone_phone_number_proto = FieldDescriptorProto.new
+    person_proto.field << person_phone_phone_number_proto
+    person_phone_phone_number_proto.label = FieldDescriptorProto::Label::LABEL_REPEATED
+    person_phone_phone_number_proto.type = FieldDescriptorProto::Type::TYPE_MESSAGE
+    person_phone_phone_number_proto.type_name = 'PhoneNumber'
+    person_phone_phone_number_proto.name = 'phone'
+    person_phone_phone_number_proto.number = 4
+
+    address_book_proto = DescriptorProto.new
+    tutorial_proto.message_type << address_book_proto
+    address_book_proto.name = 'AddressBook'
+
+    address_book_person_proto = FieldDescriptorProto.new
+    address_book_proto.field << address_book_person_proto
+    address_book_person_proto.label = FieldDescriptorProto::Label::LABEL_REPEATED
+    address_book_person_proto.type = FieldDescriptorProto::Type::TYPE_MESSAGE
+    address_book_person_proto.type_name = 'Person'
+    address_book_person_proto.name = 'person'
+    address_book_person_proto.number = 1
+
+    Protobuf::Descriptor::DescriptorBuilder.build tutorial_proto
+
+    assert_nothing_raised {Build::Tutorial::Person}
+    assert_nothing_raised {Build::Tutorial::Person.new}
+    assert_equal ['email', 'id', 'name', 'phone'], 
+      Build::Tutorial::Person.fields.map{|tag, field| field.name}.sort
+
+    assert_nothing_raised {Build::Tutorial::Person::PhoneNumber}
+    assert_nothing_raised {Build::Tutorial::Person::PhoneNumber.new}
+    assert_equal ['number', 'type'], 
+      Build::Tutorial::Person::PhoneNumber.fields.map{|tag, field| field.name}.sort
+
+    assert_nothing_raised {Build::Tutorial::Person::PhoneType}
+    assert_equal 0, Build::Tutorial::Person::PhoneType::MOBILE
+    assert_equal 1, Build::Tutorial::Person::PhoneType::HOME
+    assert_equal 2, Build::Tutorial::Person::PhoneType::WORK
+
+    assert_nothing_raised {Build::Tutorial::AddressBook}
+  end
+
+  def test_unbuild
+    proto = Protobuf::Descriptor::FileDescriptor.unbuild Tutorial::Person
+    proto.serialize_to_file 'person.bin'
+    puts
+    puts "run `test/check_unbuild.rb'"
+  end
+end

data/test/test_message.rb

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

data/test/types.rb

@@ -1,4 +1,4 @@
-require 'protobuf/message'
+require 'protobuf/message/message'
 
 module Test
   module Types

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_protobuf
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - ANDO Yasushi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-01 00:00:00 +09:00
+date: 2008-08-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +26,6 @@ description: "== DESCRIPTION:  Protocol Buffers for Ruby.  == FEATURES/PROBLEMS:
 email: andyjpn@gmail.com
 executables: 
 - rprotoc
-- ruby_protobuf
 extensions: []
 
 extra_rdoc_files: 
@@ -39,26 +38,35 @@ files:
 - README.txt
 - Rakefile
 - bin/rprotoc
-- bin/ruby_protobuf
-- lib/protobuf/compiler.rb
-- lib/protobuf/decoder.rb
-- lib/protobuf/encoder.rb
-- lib/protobuf/enum.rb
-- lib/protobuf/extend.rb
-- lib/protobuf/field.rb
-- lib/protobuf/message.rb
-- lib/protobuf/parser.y
-- lib/protobuf/service.rb
-- lib/protobuf/wire_type.rb
+- lib/protobuf/common/wire_type.rb
+- lib/protobuf/compiler/compiler.rb
+- lib/protobuf/compiler/parser.y
+- lib/protobuf/descriptor/descriptor.proto
+- lib/protobuf/descriptor/descriptor.rb
+- lib/protobuf/descriptor/descriptor_builder.rb
+- lib/protobuf/descriptor/descriptor_proto.rb
+- lib/protobuf/descriptor/enum_descriptor.rb
+- lib/protobuf/descriptor/field_descriptor.rb
+- lib/protobuf/descriptor/file_descriptor.rb
+- lib/protobuf/message/decoder.rb
+- lib/protobuf/message/encoder.rb
+- lib/protobuf/message/enum.rb
+- lib/protobuf/message/extend.rb
+- lib/protobuf/message/field.rb
+- lib/protobuf/message/message.rb
+- lib/protobuf/message/service.rb
 - lib/ruby_protobuf.rb
 - test/addressbook.proto
 - test/addressbook.rb
+- test/check_unbuild.rb
 - test/data/data.bin
+- test/data/data2.bin
 - test/data/data_source.py
 - test/data/types.bin
 - test/data/types_source.py
 - test/test_addressbook.rb
 - test/test_compiler.rb
+- test/test_descriptor.rb
 - test/test_message.rb
 - test/test_parse.rb
 - test/test_ruby_protobuf.rb
@@ -101,3 +109,4 @@ test_files:
 - test/test_types.rb
 - test/test_serialize.rb
 - test/test_compiler.rb
+- test/test_descriptor.rb

data/lib/protobuf/enum.rb

@@ -1,13 +0,0 @@
-module Protobuf
-  class Enum
-    def self.get_name_by_tag(tag)
-      constants.find do |name|
-        class_eval(name) == tag
-      end
-    end
-
-    def self.valid_tag?(tag)
-      not get_name_by_tag(tag).nil?
-    end
-  end
-end

data/lib/protobuf/service.rb

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