ruby_protobuf 0.3.3 → 0.4.1

data/test/proto/addressbook_base.pb.rb

@@ -0,0 +1,59 @@
+### Generated by rprotoc. DO NOT EDIT!
+### <proto file: test/proto/addressbook_base.proto>
+# package tutorial_ext;
+# 
+# message Person {
+#   required string name = 1;
+#   required int32 id = 2;
+#   optional string email = 3;
+# 
+#   enum PhoneType {
+#     MOBILE = 0;
+#     HOME = 1;
+#     WORK = 2;
+#   }
+# 
+#   message PhoneNumber {
+#     required string number = 1;
+#     optional PhoneType type = 2 [default = HOME];
+#   }
+# 
+#   repeated PhoneNumber phone = 4;
+# 
+#   extensions 100 to 200;
+# }
+# 
+# message AddressBook {
+#   repeated Person person = 1;
+# }
+
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
+
+module TutorialExt
+  class Person < ::Protobuf::Message
+    defined_in __FILE__
+    required :string, :name, 1
+    required :int32, :id, 2
+    optional :string, :email, 3
+    class PhoneType < ::Protobuf::Enum
+      defined_in __FILE__
+      define :MOBILE, 0
+      define :HOME, 1
+      define :WORK, 2
+    end
+    class PhoneNumber < ::Protobuf::Message
+      defined_in __FILE__
+      required :string, :number, 1
+      optional :PhoneType, :type, 2, :default => :HOME
+    end
+    repeated :PhoneNumber, :phone, 4
+    extensions 100..200
+  end
+  class AddressBook < ::Protobuf::Message
+    defined_in __FILE__
+    repeated :Person, :person, 1
+  end
+end

data/test/proto/addressbook_base.proto

@@ -1,4 +1,4 @@
-package tutorial;
+package tutorial_ext;
 
 message Person {
   required string name = 1;

data/test/proto/addressbook_ext.pb.rb

@@ -0,0 +1,21 @@
+### Generated by rprotoc. DO NOT EDIT!
+### <proto file: test/proto/addressbook_ext.proto>
+# import "test/proto/addressbook_base.proto";
+# package tutorial_ext;
+# 
+# extend Person {
+#   optional int32 age = 100;
+# }
+
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
+
+require 'test/proto/addressbook_base.pb'
+module TutorialExt
+  class Person < ::Protobuf::Message
+    defined_in __FILE__
+    optional :int32, :age, 100, :extension => true
+  end
+end

data/test/proto/addressbook_ext.proto

@@ -1,5 +1,5 @@
-import "test/addressbook_base.proto";
-package tutorial;
+import "test/proto/addressbook_base.proto";
+package tutorial_ext;
 
 extend Person {
   optional int32 age = 100;

data/test/{ext_collision.rb → proto/ext_collision.pb.rb}

@@ -22,4 +22,4 @@ class ExtCollisionTest < ::Protobuf::Message
   defined_in __FILE__
   optional :string, :a, 1
   optional :string, :b, 1
-end
+end

data/test/{ext_range.rb → proto/ext_range.pb.rb}

@@ -1,10 +1,10 @@
 ### Generated by rprotoc. DO NOT EDIT!
 ### <proto file: test/proto/ext_range.proto>
-# message ExtCollisionTest {
+# message ExtRangeTest {
 #   extensions 1 to 10;
 # }
 # 
-# message ExtCollisionTest {
+# extend ExtRangeTest {
 #   optional string a = 11;
 # }
 
@@ -13,11 +13,11 @@ require 'protobuf/message/enum'
 require 'protobuf/message/service'
 require 'protobuf/message/extend'
 
-class ExtCollisionTest < ::Protobuf::Message
+class ExtRangeTest < ::Protobuf::Message
   defined_in __FILE__
   extensions 1..10
 end
-class ExtCollisionTest < ::Protobuf::Message
+class ExtRangeTest < ::Protobuf::Message
   defined_in __FILE__
   optional :string, :a, 11, :extension => true
 end

data/test/proto/ext_range.proto

@@ -1,7 +1,7 @@
-message ExtCollisionTest {
+message ExtRangeTest {
   extensions 1 to 10;
 }
 
-extend ExtCollisionTest {
+extend ExtRangeTest {
   optional string a = 11;
 }

data/test/proto/float_default.proto

@@ -0,0 +1,10 @@
+message M {  
+  optional float f = 1 [default = 4.2];  
+  optional float g = 2 [default = -4.2];  
+  optional float h = 3 [default = 4352];
+  optional float i = 4 [default = 23145.2 ];
+  optional float j = 5 [default = -5 ];
+  optional float k = 6 [default = +23 ];
+  optional float l = 7 [default = +23.42 ];
+}
+

data/test/proto/lowercase.pb.rb

@@ -0,0 +1,31 @@
+### Generated by rprotoc. DO NOT EDIT!
+### <proto file: test/proto/lowercase.proto>
+# package test.lowercase;
+# 
+# message foo {  
+#   message bar {
+#   } 
+# }
+# message baaz {  
+#   required foo.bar x = 1;
+# }
+
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
+
+module Test
+  module Lowercase
+    class Foo < ::Protobuf::Message
+      defined_in __FILE__
+      class Bar < ::Protobuf::Message
+        defined_in __FILE__
+      end
+    end
+    class Baaz < ::Protobuf::Message
+      defined_in __FILE__
+      required :'foo::bar', :x, 1
+    end
+  end
+end

data/test/proto/lowercase.proto

@@ -0,0 +1,9 @@
+package test.lowercase;
+
+message foo {  
+  message bar {
+  } 
+}
+message baaz {  
+  required foo.bar x = 1;
+}

data/test/{merge.rb → proto/merge.pb.rb}

@@ -1,5 +1,5 @@
 ### Generated by rprotoc. DO NOT EDIT!
-### <proto file: test/merge.proto>
+### <proto file: test/proto/merge.proto>
 # package test;
 # 
 # message MergeMessage {
@@ -37,4 +37,4 @@ module Test
     repeated :InnerMessage1, :repeate_message, 2
     required :InnerMessage2, :require_message, 3
   end
-end
+end

data/test/proto/nested.pb.rb

@@ -0,0 +1,31 @@
+### Generated by rprotoc. DO NOT EDIT!
+### <proto file: test/proto/nested.proto>
+# package test.nested;
+# 
+# message Foo {  
+#   message Bar {
+#   } 
+# }
+# message Baaz {  
+#   optional Foo.Bar x = 1;
+# }
+
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
+
+module Test
+  module Nested
+    class Foo < ::Protobuf::Message
+      defined_in __FILE__
+      class Bar < ::Protobuf::Message
+        defined_in __FILE__
+      end
+    end
+    class Baaz < ::Protobuf::Message
+      defined_in __FILE__
+      optional :'Foo::Bar', :x, 1
+    end
+  end
+end

data/test/proto/nested.proto

@@ -1,3 +1,5 @@
+package test.nested;
+
 message Foo {  
   message Bar {
   } 

data/test/proto/optional_field.pb.rb

@@ -0,0 +1,36 @@
+### Generated by rprotoc. DO NOT EDIT!
+### <proto file: test/proto/optional_field.proto>
+# package test.optional_field;
+# 
+# message Message {
+#   enum Enum {
+#     A = 1;
+#     B = 2;
+#   }
+#   optional uint32 number = 1 [default = 20];
+#   optional string text   = 2 [default = "default string"];
+#   optional Enum   enum   = 3 [default = B];
+#   optional int32  signed = 4 [default = -100];
+# }
+
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
+
+module Test
+  module OptionalField
+    class Message < ::Protobuf::Message
+      defined_in __FILE__
+      class Enum < ::Protobuf::Enum
+        defined_in __FILE__
+        define :A, 1
+        define :B, 2
+      end
+      optional :uint32, :number, 1, :default => 20
+      optional :string, :text, 2, :default => "default string"
+      optional :Enum, :enum, 3, :default => :B
+      optional :int32, :signed, 4, :default => -100
+    end
+  end
+end

data/test/proto/optional_field.proto

@@ -0,0 +1,12 @@
+package test.optional_field;
+
+message Message {
+  enum Enum {
+    A = 1;
+    B = 2;
+  }
+  optional uint32 number = 1 [default = 20];
+  optional string text   = 2 [default = "default string"];
+  optional Enum   enum   = 3 [default = B];
+  optional int32  signed = 4 [default = -100];
+}

data/test/proto/packed.pb.rb

@@ -0,0 +1,23 @@
+### Generated by rprotoc. DO NOT EDIT!
+### <proto file: test/proto/packed.proto>
+# package test.packed_field;
+# 
+# message Message {
+#   repeated int32   a = 1 [packed = true];
+#   repeated fixed32 b = 2 [packed = true];
+# }
+
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
+
+module Test
+  module PackedField
+    class Message < ::Protobuf::Message
+      defined_in __FILE__
+      repeated :int32, :a, 1, :packed => true
+      repeated :fixed32, :b, 2, :packed => true
+    end
+  end
+end

data/test/proto/packed.proto

@@ -0,0 +1,6 @@
+package test.packed_field;
+
+message Message {
+  repeated int32   a = 1 [packed = true];
+  repeated fixed32 b = 2 [packed = true];
+}

data/test/{types.rb → proto/types.pb.rb}

@@ -1,5 +1,47 @@
+### Generated by rprotoc. DO NOT EDIT!
+### <proto file: test/proto/types.proto>
+# package test.types;
+# 
+# message TestTypes {
+#   required double type1 = 1;
+#   required float type2 = 2;
+#   required int32 type3 = 3;
+#   required int64 type4 = 4;
+#   required uint32 type5 = 5;
+#   required uint64 type6 = 6;
+#   required sint32 type7 = 7;
+#   required sint64 type8 = 8;
+#   required fixed32 type9 = 9;
+#   required fixed64 type10 = 10;
+#   required bool type11 = 11;
+#   required string type12 = 12;
+#   required bytes type13 = 13;
+#   required sfixed32 type14 = 14;
+#   required sfixed64 type15 = 15;
+# }
+# 
+# message RepeatedTypes {
+#   repeated double type1 = 1;
+#   repeated float type2 = 2;
+#   repeated int32 type3 = 3;
+#   repeated int64 type4 = 4;
+#   repeated uint32 type5 = 5;
+#   repeated uint64 type6 = 6;
+#   repeated sint32 type7 = 7;
+#   repeated sint64 type8 = 8;
+#   repeated fixed32 type9 = 9;
+#   repeated fixed64 type10 = 10;
+#   repeated bool type11 = 11;
+#   repeated string type12 = 12;
+#   repeated bytes type13 = 13;
+#   repeated sfixed32 type14 = 14;
+#   repeated sfixed64 type15 = 15;
+# }
+
 require 'protobuf/message/message'
 require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
 
 module Test
   module Types
@@ -40,4 +82,4 @@ module Test
       repeated :sfixed64, :type15, 15
     end
   end
-end
+end

data/test/test_addressbook.rb

@@ -1,43 +1,56 @@
 require 'test/unit'
 require 'protobuf/message/message'
 require 'protobuf/message/enum'
-require 'test/addressbook'
+require 'test/proto/addressbook.pb'
 
 class AddressbookTest < Test::Unit::TestCase
   def test_enum
     phone_number = Tutorial::Person::PhoneNumber.new
-    assert_equal Tutorial::Person::PhoneType::HOME, phone_number.type
+    assert_equal(Tutorial::Person::PhoneType::HOME, phone_number.type)
     phone_number.type = Tutorial::Person::PhoneType::MOBILE
-    assert_equal 0, phone_number.type
+    assert_equal(0, phone_number.type)
     phone_number.type = Tutorial::Person::PhoneType::HOME
-    assert_equal 1, phone_number.type
+    assert_equal(1, phone_number.type)
     phone_number.type = Tutorial::Person::PhoneType::WORK
-    assert_equal 2, phone_number.type
-    assert_raise TypeError do
+    assert_equal(2, phone_number.type)
+    assert_raise(TypeError) do
       phone_number.type = 3
     end
   end
 
+  def test_symbol_enum
+    phone_number = Tutorial::Person::PhoneNumber.new
+    assert_equal(Tutorial::Person::PhoneType::HOME, phone_number.type)
+    phone_number.type = :MOBILE
+    assert_equal(0, phone_number.type)
+    phone_number.type = :HOME
+    assert_equal(1, phone_number.type)
+    phone_number.type = :WORK
+    assert_equal(2, phone_number.type)
+    assert_raise(TypeError) do
+      phone_number.type = :UNKNOWN
+    end
+  end
+
   def test_initial_value
     person = Tutorial::Person.new
-    assert_nil person.name
-    assert_nil person.id
-    assert_equal [], person.phone
-    assert_equal '', person.email
+    assert_nil(person.name)
+    assert_nil(person.id)
+    assert_equal([], person.phone)
+    assert_equal('', person.email)
   end
 
   def test_repeatable
     address_book = Tutorial::AddressBook.new
-    assert_equal [], address_book.person
-    assert_instance_of Protobuf::Field::FieldArray, address_book.person
+    assert_equal([], address_book.person)
+    assert_instance_of(Protobuf::Field::FieldArray, address_book.person)
     address_book.person << Tutorial::Person.new
-    assert_equal 1, address_book.person.size
-    assert_raise TypeError do
+    assert_equal(1, address_book.person.size)
+    assert_raise(TypeError) do
       address_book.person << 1
     end
-    assert_equal 1, address_book.person.size
+    assert_equal(1, address_book.person.size)
     address_book.person << Tutorial::Person.new
-    assert_equal 2, address_book.person.size
+    assert_equal(2, address_book.person.size)
   end
 end
-