ruby_protobuf 0.3.0 → 0.3.2

data/test/test_standard_message.rb

@@ -40,20 +40,23 @@ class StandardMessageTest < Test::Unit::TestCase
     person.phone.last.type = Tutorial::Person::PhoneType::WORK
 
     person2 = person.dup
-    assert_not_equal person, person2
+    assert person == person2
+    assert !person.eql?(person2)
     assert_equal person.name, person2.name
     assert_equal person.id, person2.id
     assert_equal person.email, person2.email
     assert_equal person.phone.size, person2.phone.size
-    assert_not_equal person.phone.first, person2.phone.first
+    assert person.phone.first == person2.phone.first
+    assert !person.phone.first.eql?(person2.phone.first)
     assert_equal person.phone.first.number, person2.phone.first.number
     assert_equal person.phone.first.type, person2.phone.first.type
-    assert_not_equal person.phone.last, person2.phone.last
+    assert person.phone.last == person2.phone.last
+    assert !person.phone.last.eql?(person2.phone.last)
     assert_equal person.phone.last.number, person2.phone.last.number
     assert_equal person.phone.last.type, person2.phone.last.type
   end
 
-  def test_to_s
+  def test_inspect
     person = Tutorial::Person.new
     person.name = 'name'
     person.id = 1234
@@ -65,7 +68,7 @@ class StandardMessageTest < Test::Unit::TestCase
     person.phone.last.number = '456-123'
     person.phone.last.type = Tutorial::Person::PhoneType::WORK
 
-    assert_equal <<-eos, person.to_s
+    assert_equal <<-eos, person.inspect
 name: "name"
 id: 1234
 email: "abc@cde.fgh"

data/test/test_types.rb

@@ -16,7 +16,9 @@ class TypesTest < Test::Unit::TestCase
     types.type10 = 100000
     types.type11 = false
     types.type12 = 'hello all types'
-    #types.type13 = 
+    image_bin = File.open('test/data/unk.png', 'r+b'){|f| f.read}
+    types.type13 = image_bin
+
     serialized_string = types.serialize_to_string
 
     types2 = Test::Types::TestTypes.new
@@ -33,7 +35,8 @@ class TypesTest < Test::Unit::TestCase
     assert_equal 100000, types2.type10
     assert !types2.type11
     assert_equal 'hello all types', types2.type12
-    #types2.type13
+    assert_equal 10938, types2.type13.size
+    assert_equal image_bin, types2.type13
   end
 
   def test_parse
@@ -49,9 +52,9 @@ class TypesTest < Test::Unit::TestCase
     assert_equal(-10, types.type8)
     assert_equal 10000, types.type9
     assert_equal 100000, types.type10
-    assert_equal false, types.type11
+    assert_equal false, !!types.type11
     assert_equal 'hello all types', types.type12
-    # types.type13
+    assert_equal File.open('test/data/unk.png', 'r+b'){|f| f.read}, types.type13
   end
 
   def test_double
@@ -168,13 +171,11 @@ class TypesTest < Test::Unit::TestCase
 
   def test_bytes
     types = Test::Types::TestTypes.new
-    # TODO
-=begin
     assert_nothing_raised do types.type13 = '' end
     assert_nothing_raised do types.type13 = 'hello' end
-    assert_raise TypeError do types.type13 = nil end
+    assert_nothing_raised do types.type13 = nil end
     assert_raise TypeError do types.type13 = 0 end
     assert_raise TypeError do types.type13 = true end
-=end
+    assert_raise TypeError do types.type13 = [] end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_protobuf
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors: 
 - ANDO Yasushi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-18 00:00:00 -04:00
+date: 2008-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,23 +25,19 @@ dependencies:
 description: "== DESCRIPTION:  Protocol Buffers for Ruby.  == FEATURES/PROBLEMS:  * Compile .proto file to ruby script * Parse the binary wire format for protocol buffer * Serialize data to the binary wire format for protocol buffer"
 email: andyjpn@gmail.com
 executables: 
+- mk_parser
 - rprotoc
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- Manifest.txt
 - README.txt
 files: 
 - History.txt
-- Manifest.txt
 - README.txt
 - Rakefile
+- bin/mk_parser
 - bin/rprotoc
-- examples/addressbook.proto
-- examples/addressbook.rb
-- examples/reading_a_message.rb
-- examples/writing_a_message.rb
 - lib/protobuf/common/wire_type.rb
 - lib/protobuf/compiler/compiler.rb
 - lib/protobuf/compiler/compiler_old.rb
@@ -66,23 +62,41 @@ files:
 - lib/protobuf/message/extend.rb
 - lib/protobuf/message/field.rb
 - lib/protobuf/message/message.rb
+- lib/protobuf/message/protoable.rb
 - lib/protobuf/message/service.rb
 - lib/protobuf/rpc/client.rb
 - lib/protobuf/rpc/handler.rb
 - lib/protobuf/rpc/server.rb
 - lib/ruby_protobuf.rb
-- test/addressbook.proto
 - test/addressbook.rb
-- test/addressbook_base.proto
 - test/addressbook_base.rb
-- test/addressbook_ext.proto
 - test/addressbook_ext.rb
 - test/check_unbuild.rb
+- test/collision.rb
 - test/data/data.bin
 - test/data/data_source.py
 - test/data/types.bin
 - test/data/types_source.py
-- test/rpc.proto
+- test/data/unk.png
+- test/ext_collision.rb
+- test/ext_range.rb
+- test/merge.rb
+- test/nested.rb
+- test/proto/addressbook.pb.rb
+- test/proto/addressbook.proto
+- test/proto/addressbook.rb
+- test/proto/addressbook_base.proto
+- test/proto/addressbook_ext.proto
+- test/proto/bool_default.pb.rb
+- test/proto/bool_default.proto
+- test/proto/collision.proto
+- test/proto/ext_collision.proto
+- test/proto/ext_range.proto
+- test/proto/float_default.proto
+- test/proto/merge.proto
+- test/proto/nested.proto
+- test/proto/rpc.proto
+- test/proto/types.proto
 - test/test_addressbook.rb
 - test/test_compiler.rb
 - test/test_descriptor.rb
@@ -93,7 +107,6 @@ files:
 - test/test_serialize.rb
 - test/test_standard_message.rb
 - test/test_types.rb
-- test/types.proto
 - test/types.rb
 has_rdoc: true
 homepage: 

data/Manifest.txt

@@ -1,62 +0,0 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-bin/rprotoc
-examples/addressbook.proto
-examples/addressbook.rb
-examples/reading_a_message.rb
-examples/writing_a_message.rb
-lib/protobuf/common/wire_type.rb
-lib/protobuf/compiler/compiler.rb
-lib/protobuf/compiler/compiler_old.rb
-lib/protobuf/compiler/nodes.rb
-lib/protobuf/compiler/proto.y
-lib/protobuf/compiler/proto2.ebnf
-lib/protobuf/compiler/proto_parser.rb
-lib/protobuf/compiler/template/rpc_bin.erb
-lib/protobuf/compiler/template/rpc_client.erb
-lib/protobuf/compiler/template/rpc_service.erb
-lib/protobuf/compiler/visitors.rb
-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/protobuf/rpc/client.rb
-lib/protobuf/rpc/handler.rb
-lib/protobuf/rpc/server.rb
-lib/ruby_protobuf.rb
-test/addressbook.proto
-test/addressbook.rb
-test/addressbook_base.proto
-test/addressbook_base.rb
-test/addressbook_ext.proto
-test/addressbook_ext.rb
-test/check_unbuild.rb
-test/data/data.bin
-test/data/data_source.py
-test/data/types.bin
-test/data/types_source.py
-test/rpc.proto
-test/test_addressbook.rb
-test/test_compiler.rb
-test/test_descriptor.rb
-test/test_extension.rb
-test/test_message.rb
-test/test_parse.rb
-test/test_ruby_protobuf.rb
-test/test_serialize.rb
-test/test_standard_message.rb
-test/test_types.rb
-test/types.proto
-test/types.rb

data/examples/addressbook.proto

@@ -1,24 +0,0 @@
-package tutorial;
-
-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;
-}
-
-message AddressBook {
-  repeated Person person = 1;
-}

data/examples/addressbook.rb

@@ -1,30 +0,0 @@
-require 'protobuf/message/message'
-require 'protobuf/message/enum'
-require 'protobuf/message/service'
-require 'protobuf/message/extend'
-
-module Tutorial
-  
-  class Person < ::Protobuf::Message
-    required :string, :name, 1
-    required :int32, :id, 2
-    optional :string, :email, 3
-    
-    class PhoneType < ::Protobuf::Enum
-      MOBILE = 0
-      HOME = 1
-      WORK = 2
-    end
-    
-    class PhoneNumber < ::Protobuf::Message
-      required :string, :number, 1
-      optional :PhoneType, :type, 2, {:default => :HOME}
-    end
-    
-    repeated :PhoneNumber, :phone, 4
-  end
-  
-  class AddressBook < ::Protobuf::Message
-    repeated :Person, :person, 1
-  end
-end

data/examples/reading_a_message.rb

@@ -1,32 +0,0 @@
-#!/usr/local/bin/ruby
-
-require 'addressbook'
-
-def list_people(address_book)
-  address_book.person.each do |person|
-    puts "Person ID: #{person.id}"
-    puts "  Name: #{person.name}"
-    puts "  E-mail: #{person.email}" unless person.email.empty?
-    person.phone.each do |phone_number|
-      print(case phone_number.type
-            when Tutorial::Person::PhoneType::MOBILE
-              '  Mobile phone #: '
-            when Tutorial::Person::PhoneType::HOME
-              '  Home phone #: '
-            when Tutorial::Person::PhoneType::WORK
-              '  Work phone #: '
-            end)
-      puts phone_number.number
-    end
-  end
-end
-
-unless ARGV.size == 1
-  puts "Usage: #{$0} ADDRESS_BOOK_FILE"
-  exit
-end
-
-address_book = Tutorial::AddressBook.new
-address_book.parse_from_file ARGV[0]
-
-list_people address_book

data/examples/writing_a_message.rb

@@ -1,46 +0,0 @@
-#!/usr/local/bin/ruby
-
-require 'addressbook'
-
-def prompt_for_address(person)
-  print 'Enter person ID number: '
-  person.id = STDIN.gets.strip.to_i
-  print 'Enter name: '
-  person.name = STDIN.gets.strip
-  print 'Enter email address (blank for none): '
-  email = STDIN.gets.strip
-  person.email = email unless email.empty?
-
-  loop do
-    print 'Enter a phone number (or leave blank to finish): '
-    break if (number = STDIN.gets.strip).empty?
-
-    person.phone << Tutorial::Person::PhoneNumber.new
-    person.phone.last.number = number
-
-    print 'Is this a mobile, home, or work phone? '
-    person.phone.last.type = 
-      case type = STDIN.gets.strip
-      when 'mobile'
-        Tutorial::Person::PhoneType::MOBILE
-      when 'home'
-        Tutorial::Person::PhoneType::HOME
-      when 'work'
-        Tutorial::Person::PhoneType::WORK
-      else
-        puts 'Unknown phone type; leaving as default value.'
-        nil
-      end
-  end
-end
-
-unless ARGV.size == 1
-  puts "Usage: #{$0} ADDRESS_BOOK_FILE" 
-  exit
-end
-
-address_book = Tutorial::AddressBook.new
-address_book.parse_from_file ARGV[0] if File.exist? ARGV[0]
-address_book.person << Tutorial::Person.new
-prompt_for_address address_book.person.last
-address_book.serialize_to_file ARGV[0]