macks-ruby_protobuf 0.3.2.3 → 0.3.3

data/History.txt

@@ -1,5 +1,11 @@
-=== 0.3.1 / 2008-08-22
+=== 0.3.3 / 2009-07-10
 
+* 0.3.3 (rev.218)
+  * Support C-like comment.
+  * Optimize for speed.
+  * Bug fixes.
+* 0.3.2 (rev.185)
+  * Bug fixes.
 * 0.3.1 fixed bugs concerning RPC (rev.146)
 * 0.3.0 RPC is available (rev.124)
   * RPC is available

data/Manifest.txt

@@ -2,6 +2,7 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+script/mk_parser
 bin/rprotoc
 examples/addressbook.proto
 examples/addressbook.pb.rb
@@ -36,7 +37,6 @@ lib/protobuf/rpc/client.rb
 lib/protobuf/rpc/handler.rb
 lib/protobuf/rpc/server.rb
 lib/ruby_protobuf.rb
-script/mk_parser
 test/addressbook.rb
 test/addressbook_base.rb
 test/addressbook_ext.rb

data/Rakefile

@@ -5,13 +5,13 @@ require 'rubygems'
 require 'hoe'
 require 'ruby_protobuf'
 
-Hoe.new('ruby_protobuf', RubyProtobuf::VERSION) do |p|
-  p.rubyforge_name = nil
-  p.author = 'MATSUYAMA Kengo'
-  p.email = 'macksx@gmail.com'
+Hoe.spec('ruby_protobuf') do |p|
+  p.version = RubyProtobuf::VERSION
+  p.rubyforge_name = 'ruby-protobuf'
+  p.developer('MATSUYAMA Kengo', 'macksx@gmail.com')
   p.summary = 'Protocol Buffers for Ruby'
   p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
-  p.url = 'http://github.com/macks/ruby-protobuf'
+  p.url = 'http://code.google.com/p/ruby-protobuf'
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
 end
 

data/bin/rprotoc

@@ -10,10 +10,10 @@ require 'ruby_protobuf'
 require 'protobuf/compiler/compiler'
 
 
-OPT = {}
+options = {}
 opts = OptionParser.new("#{$0} [OPTIONS] PROTO_FILE")
-opts.on('-p', '--proto_path <PATH>', 'Specify the directory in which to search for imports. The current directory is default.'){|v| OPT[:proto_path] = v}
-opts.on('-o', '--out <OUT_DIR>', 'Specify the directory in which Ruby source file is generated. The current directory is default.'){|v| OPT[:out] = v}
+opts.on('-p', '--proto_path <PATH>', 'Specify the directory in which to search for imports. The current directory is default.'){|v| options[:proto_path] = v}
+opts.on('-o', '--out <OUT_DIR>', 'Specify the directory in which Ruby source file is generated. The current directory is default.'){|v| options[:out] = v}
 opts.on_tail('-v', '--version', 'Show version.'){puts(opts.ver); exit}
 opts.on_tail('-h', '--help', 'Show this message.'){puts(opts.help); exit}
 
@@ -26,11 +26,11 @@ rescue OptionParser::ParseError
   exit 1
 end
 
-PROTO_FILE = ARGV.shift
+proto_file = ARGV.shift
 
-unless PROTO_FILE
+unless proto_file
   puts opts
   exit
 end
 
-Protobuf::Compiler.compile(PROTO_FILE, (OPT[:proto_path] or '.'), (OPT[:out] or '.'))
+Protobuf::Compiler.compile(proto_file, (options[:proto_path] or '.'), (options[:out] or '.'))

data/lib/protobuf/compiler/compiler.rb

@@ -15,12 +15,7 @@ module Protobuf
     end
 
     def create_message(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      out_dir.sub! %r{/$}, ''
-      proto_dir.sub! %r{/$}, ''
-      rb_file = 
-        if proto_file =~ %r{^/} 
-        then "#{out_dir}/#{proto_file.split('/').last.sub(/\.proto$/, '')}.pb.rb"  
-        else "#{out_dir}/#{proto_file.sub(/\.proto$/, '')}.pb.rb" end
+      rb_file = File.join(out_dir, File.basename(proto_file).sub(/\.[^\0]*\z/, '') + '.pb.rb')
       proto_path = validate_existence proto_file, proto_dir
 
       message_visitor = Protobuf::Visitor::CreateMessageVisitor.new proto_file, proto_dir, out_dir
@@ -31,8 +26,7 @@ module Protobuf
     end
 
     def create_rpc(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      message_file = "#{out_dir}/#{proto_file.sub(/\.proto$/, '')}.pb.rb"
-      out_dir = "#{out_dir}/#{File.dirname proto_file}"
+      message_file = File.join(out_dir, File.basename(proto_file).sub(/\.[^\0]*\z/, '') + '.pb.rb')
       proto_path = validate_existence proto_file, proto_dir
 
       rpc_visitor = Protobuf::Visitor::CreateRpcVisitor.new
@@ -44,11 +38,15 @@ module Protobuf
 
     def validate_existence(path, base_dir)
       if File.exist? path
-      elsif File.exist?(path = "#{base_dir or '.'}/#{path}")
+        path
       else
-        raise ArgumentError.new("File does not exist: #{path}")
+        newpath = File.join(base_dir, path)
+        if File.exist? newpath
+          newpath
+        else
+          raise ArgumentError.new("File does not exist: #{path}")
+        end
       end
-      path
     end
   end
 end

data/lib/protobuf/compiler/nodes.rb

@@ -106,7 +106,9 @@ require 'protobuf/message/extend'
       end
 
       def accept_message_visitor(visitor)
-        visitor.write "class #{@name} < ::Protobuf::Message"
+        class_name = @name.to_s
+        class_name.gsub!(/\A[a-z]/) {|c| c.upcase}
+        visitor.write "class #{class_name} < ::Protobuf::Message"
         visitor.in_context self.class do 
           define_in_the_file visitor
           #@children.each {|child| child.accept_message_visitor visitor}

data/lib/protobuf/compiler/proto.y

@@ -185,14 +185,14 @@ end
         raise 'EOF inside block comment' until @scanner.scan_until(/\*\//)
       when match(/(?:required|optional|repeated|import|package|option|message|extend|enum|service|rpc|returns|group|default|extensions|to|max|double|float|int32|int64|uint32|uint64|sint32|sint64|fixed32|fixed64|sfixed32|sfixed64|bool|string|bytes)\b/)
         yield [@token, @token.to_sym]
-      when match(/[1-9]\d*(?!\.)/, /0(?![.xX0-9])/)
+      when match(/[+-]?\d*\.\d+([Ee][\+-]?\d+)?/)
+        yield [:FLOAT_LITERAL, @token.to_f]
+      when match(/[+-]?[1-9]\d*(?!\.)/, /0(?![.xX0-9])/)
         yield [:DEC_INTEGER, @token.to_i]
       when match(/0[xX]([A-Fa-f0-9])+/)
         yield [:HEX_INTEGER, @token.to_i(0)]
       when match(/0[0-7]+/)
         yield [:OCT_INTEGER, @token.to_i(0)]
-      when match(/\d+(\.\d+)?([Ee][\+-]?\d+)?/)
-        yield [:FLOAT_LITERAL, @token.to_f]
       when match(/(true|false)\b/)
         yield [:BOOLEAN_LITERAL, @token == 'true']
       when match(/"(?:[^"\\]+|\\.)*"/, /'(?:[^'\\]+|\\.)*'/)

data/lib/protobuf/compiler/proto_parser.rb

@@ -10,7 +10,7 @@
 unless $".index 'racc/parser.rb'
 $".push 'racc/parser.rb'
 
-self.class.module_eval <<'..end racc/parser.rb modeval..id9f4fc093ed', 'racc/parser.rb', 1
+self.class.module_eval <<'..end racc/parser.rb modeval..id521073ac1f', 'racc/parser.rb', 1
 #
 # $Id: parser.rb,v 1.7 2005/11/20 17:31:32 aamine Exp $
 #
@@ -453,7 +453,7 @@ module Racc
   end
 
 end
-..end racc/parser.rb modeval..id9f4fc093ed
+..end racc/parser.rb modeval..id521073ac1f
 end
 ###### racc/parser.rb end
 
@@ -462,7 +462,7 @@ module Protobuf
 
   class ProtoParser < Racc::Parser
 
-module_eval <<'..end lib/protobuf/compiler/proto.y modeval..idbff1afc93c', 'lib/protobuf/compiler/proto.y', 163
+module_eval <<'..end lib/protobuf/compiler/proto.y modeval..id7865f341f1', 'lib/protobuf/compiler/proto.y', 163
 
   require 'strscan'
 
@@ -488,14 +488,14 @@ module_eval <<'..end lib/protobuf/compiler/proto.y modeval..idbff1afc93c', 'lib/
         raise 'EOF inside block comment' until @scanner.scan_until(/\*\//)
       when match(/(?:required|optional|repeated|import|package|option|message|extend|enum|service|rpc|returns|group|default|extensions|to|max|double|float|int32|int64|uint32|uint64|sint32|sint64|fixed32|fixed64|sfixed32|sfixed64|bool|string|bytes)\b/)
         yield [@token, @token.to_sym]
-      when match(/[1-9]\d*(?!\.)/, /0(?![.xX0-9])/)
+      when match(/[+-]?\d*\.\d+([Ee][\+-]?\d+)?/)
+        yield [:FLOAT_LITERAL, @token.to_f]
+      when match(/[+-]?[1-9]\d*(?!\.)/, /0(?![.xX0-9])/)
         yield [:DEC_INTEGER, @token.to_i]
       when match(/0[xX]([A-Fa-f0-9])+/)
         yield [:HEX_INTEGER, @token.to_i(0)]
       when match(/0[0-7]+/)
         yield [:OCT_INTEGER, @token.to_i(0)]
-      when match(/\d+(\.\d+)?([Ee][\+-]?\d+)?/)
-        yield [:FLOAT_LITERAL, @token.to_f]
       when match(/(true|false)\b/)
         yield [:BOOLEAN_LITERAL, @token == 'true']
       when match(/"(?:[^"\\]+|\\.)*"/, /'(?:[^'\\]+|\\.)*'/)
@@ -522,7 +522,7 @@ module_eval <<'..end lib/protobuf/compiler/proto.y modeval..idbff1afc93c', 'lib/
     end
     false
   end
-..end lib/protobuf/compiler/proto.y modeval..idbff1afc93c
+..end lib/protobuf/compiler/proto.y modeval..id7865f341f1
 
 ##### racc 1.4.5 generates ###
 

data/lib/protobuf/message/field.rb

@@ -85,7 +85,11 @@ module Protobuf
 
       def define_accessor
         define_getter
-        define_setter unless rule == :repeated
+        if rule == :repeated
+          define_array_setter
+        else
+          define_setter
+        end
       end
 
       def define_getter
@@ -114,6 +118,15 @@ module Protobuf
         end
       end
 
+      def define_array_setter
+        field = self
+        @message_class.class_eval do
+          define_method("#{field.name}=") do |val|
+            @values[field.name].replace(val)
+          end
+        end
+      end
+
       public
 
       # encoder/decoder related methods
@@ -224,32 +237,41 @@ module Protobuf
       end
 
       def []=(nth, val)
-        if @field.acceptable? val
-          super
-        end
+        super(normalize(val))
       end
 
       def <<(val)
-        if @field.acceptable? val
-          super
-        end
+        super(normalize(val))
       end
 
       def push(val)
-        if @field.acceptable? val
-          super
-        end
+        super(normalize(val))
       end
 
       def unshift(val)
-        if @field.acceptable? val
-          super
-        end
+        super(normalize(val))
+      end
+
+      def replace(val)
+        raise TypeError unless val.is_a?(Array)
+        val = val.map {|v| normalize(v)}
+        super(val)
       end
 
       def to_s
         "[#{@field.name}]"
       end
+
+      private
+
+      def normalize(val)
+        raise TypeError unless @field.acceptable?(val)
+        if @field.is_a?(MessageField) && val.is_a?(Hash)
+          @field.type.new(val)
+        else
+          val
+        end
+      end
     end
 
     class BytesField < BaseField
@@ -529,6 +551,24 @@ module Protobuf
         def default; nil end
       end
 
+      def define_setter
+        field = self
+        @message_class.class_eval do
+          define_method("#{field.name}=") do |val|
+            case val
+            when nil
+              @values.delete(field.name)
+            when Hash
+              @values[field.name] = field.type.new(val)
+            when field.type
+              @values[field.name] = val
+            else
+              raise TypeError
+            end
+          end
+        end
+      end
+
       def wire_type
         Protobuf::WireType::LENGTH_DELIMITED
       end
@@ -542,7 +582,7 @@ module Protobuf
       end
 
       def acceptable?(val)
-        raise TypeError unless val.instance_of? type
+        raise TypeError unless val.instance_of?(type) or val.instance_of?(Hash)
         true
       end
 

data/lib/protobuf/message/message.rb

@@ -188,9 +188,9 @@ module Protobuf
               "#{i}#{field.name} {\n#{value.inspect(indent + 1)}#{i}}\n"
             end
           elsif field.is_a? Protobuf::Field::EnumField
-            if field.optional? and not has_field?(field.name)
-              ''
-            else
+	    if field.optional? and not has_field?(field.name)
+	      ''
+	    else
               "#{i}#{field.name}: #{field.type.name_by_value(value)}\n"
             end
           else
@@ -225,7 +225,7 @@ module Protobuf
       if filename.is_a? File
         parse_from filename
       else
-        File.open(filename, 'r') do |f|
+        File.open(filename, 'rb') do |f|
           parse_from f
         end
       end
@@ -238,7 +238,9 @@ module Protobuf
     def serialize_to_string(string='')
       io = StringIO.new string
       serialize_to io
-      io.string
+      result = io.string
+      result.force_encoding('ASCII-8BIT') if result.respond_to?(:force_encoding)
+      result
     end
     alias to_s serialize_to_string
 
@@ -246,7 +248,7 @@ module Protobuf
       if filename.is_a? File
         serialize_to filename
       else
-        File.open(filename, 'w') do |f|
+        File.open(filename, 'wb') do |f|
           serialize_to f
         end
       end
@@ -263,8 +265,8 @@ module Protobuf
     end
 
     def set_field(tag, bytes)
-      #get_field_by_tag(tag).set self, bytes # TODO
-      (get_field_by_tag(tag) or get_ext_field_by_tag(tag)).set self, bytes
+      field = (get_field_by_tag(tag) or get_ext_field_by_tag(tag))
+      field.set self, bytes if field
     end
 
     def merge_field(tag, value)
@@ -273,22 +275,18 @@ module Protobuf
     end
 
     def [](tag_or_name)
-      if field = get_field(tag_or_name)
-        send field.name
-      elsif field = get_ext_field(tag_or_name)
+      if field = get_field(tag_or_name) || get_ext_field(tag_or_name)
         send field.name
       else
-        raise NoMethodError.new("No such method: #{tag_or_name.inspect}")
+        raise NoMethodError.new("No such field: #{tag_or_name.inspect}")
       end
     end
 
     def []=(tag_or_name, value)
-      if field = get_field(tag_or_name) and not field.repeated?
-        send "#{field.name}=", value
-      elsif field = get_ext_field(tag_or_name) and not field.repeated?
+      if field = get_field(tag_or_name) || get_ext_field(tag_or_name)
         send "#{field.name}=", value
       else
-        raise NoMethodError.new("No such method: #{tag_or_name.inspect}")
+        raise NoMethodError.new("No such field: #{tag_or_name.inspect}")
       end
     end
 

data/lib/ruby_protobuf.rb

@@ -1,3 +1,3 @@
 class RubyProtobuf
-  VERSION = '0.3.2.3'
+  VERSION = '0.3.3'
 end

data/test/test_compiler.rb

@@ -8,7 +8,15 @@ class CompilerTest < Test::Unit::TestCase
     assert_compile_proto <<-eos, 'test/proto/float_default.proto'
 ### Generated by rprotoc. DO NOT EDIT!
 ### <proto file: test/proto/float_default.proto>
-# message M {  optional float f = 1 [default = 4.2];  }
+# 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 ];
+# }
 # 
 
 require 'protobuf/message/message'
@@ -19,6 +27,12 @@ require 'protobuf/message/extend'
 class M < ::Protobuf::Message
   defined_in __FILE__
   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
 end
     eos
   end
@@ -142,9 +156,9 @@ end
   end
 
   def test_create_rpc
-    file_contents = Protobuf::Compiler.new.create_rpc('test/proto/rpc.proto', '.', '.', false)
+    file_contents = Protobuf::Compiler.new.create_rpc('test/proto/rpc.proto', '.', 'test/proto', false)
 
-    assert_source <<-eos, file_contents['./test/proto/address_book_service.rb']
+    assert_source <<-eos, file_contents['test/proto/address_book_service.rb']
 require 'protobuf/rpc/server'
 require 'protobuf/rpc/handler'
 require 'test/proto/rpc.pb'
@@ -177,14 +191,14 @@ class Tutorial::AddressBookService < Protobuf::Rpc::Server
 end
     eos
 
-    assert_source <<-eos, file_contents['./test/proto/start_address_book_service']
+    assert_source <<-eos, file_contents['test/proto/start_address_book_service']
 #!/usr/bin/env ruby
 require 'address_book_service'
 
 Tutorial::AddressBookService.new(:port => 9999).start
     eos
 
-    assert_source <<-eos, file_contents['./test/proto/client_search.rb']
+    assert_source <<-eos, file_contents['test/proto/client_search.rb']
 #!/usr/bin/env ruby
 require 'protobuf/rpc/client'
 require 'test/proto/rpc.pb'
@@ -204,7 +218,7 @@ Protobuf::Rpc::Client.new('localhost', 9999).call :search, request, response
 puts response
     eos
 
-    assert_source <<-eos, file_contents['./test/proto/client_add.rb']
+    assert_source <<-eos, file_contents['test/proto/client_add.rb']
 #!/usr/bin/env ruby
 require 'protobuf/rpc/client'
 require 'test/proto/rpc.pb'

data/test/test_message.rb

@@ -36,6 +36,22 @@ class MessageTest < Test::Unit::TestCase
     assert_equal 'Jiro', person.name
     assert_equal 300, person.id
     assert_equal 'jiro@ema.il', person.email
+
+    # initialize with array of hash
+    person = Tutorial::Person.new(:phone => [{:number => 'phone1'}, {:number => 'phone2'}])
+    assert_equal 'phone1', person.phone[0].number
+    assert_equal 'phone2', person.phone[1].number
+
+    # initalize with hash in hash
+    message = Test::MergeMessage.new(:require_message => { :name => 'name1', :repeate_message => [{:name => 'name2'}] })
+    assert_equal 'name1', message.require_message.name
+    assert_equal 'name2', message.require_message.repeate_message[0].name
+
+    message.require_message = { :name => 'name21' }
+    message.require_message.repeate_message = [ {:name => 'name22'} ]
+    assert_equal 'name21', message.require_message.name
+    assert_equal 'name22', message.require_message.repeate_message[0].name
+    assert_equal 1,        message.require_message.repeate_message.size
   end
 
   def test_defined_filenames

data/test/test_optional_field.rb

@@ -15,6 +15,9 @@ class OptionalFieldTest < Test::Unit::TestCase
     assert !message.has_field?(:enum)
     assert_equal 2, message.enum
 
+    assert !message.has_field?(:signed)
+    assert_equal(-100, message.signed)
+
     # assign values
     assert_nothing_raised { message.number = 100 }
     assert message.has_field?(:number)
@@ -27,6 +30,10 @@ class OptionalFieldTest < Test::Unit::TestCase
     assert_nothing_raised { message.enum = Test::Optional_field::Message::Enum::A }
     assert message.has_field?(:enum)
     assert_equal 1, message.enum
+
+    assert_nothing_raised { message.signed = -20 }
+    assert message.has_field?(:signed)
+    assert_equal(-20, message.signed)
   end
 
   def test_serialize
@@ -40,15 +47,18 @@ class OptionalFieldTest < Test::Unit::TestCase
     assert_equal message1.number, message2.number
     assert_equal message1.text,   message2.text
     assert_equal message1.enum,   message2.enum
+    assert_equal message1.signed, message2.signed
     assert !message2.has_field?(:number)
     assert !message2.has_field?(:text)
     assert !message2.has_field?(:enum)
+    assert !message2.has_field?(:signed)
 
     # assign the value whith is equal to default value
     message1 = Test::Optional_field::Message.new
     message1.number = message1.number
     message1.text   = message1.text
     message1.enum   = message1.enum
+    message1.signed = message1.signed
     serialized_string = message1.to_s
     assert !serialized_string.empty?
 
@@ -61,8 +71,10 @@ class OptionalFieldTest < Test::Unit::TestCase
     assert_equal message1.number, message2.number
     assert_equal message1.text,   message2.text
     assert_equal message1.enum,   message2.enum
+    assert_equal message1.signed, message2.signed
     assert  message2.has_field?(:number)
     assert  message2.has_field?(:text)
     assert !message2.has_field?(:enum)
+    assert !message2.has_field?(:signed)
   end
 end

data/test/test_repeated_types.rb

@@ -0,0 +1,106 @@
+require 'test/unit'
+require 'test/types'
+
+class RepeatedTypesTest < Test::Unit::TestCase
+  def test_serialize
+    # empty set
+    types = Test::Types::RepeatedTypes.new
+    assert_equal('', types.to_s)
+
+    # has 1 member
+    types = Test::Types::RepeatedTypes.new
+    types.type1 << 0.01
+    types.type2 << 0.1 
+    types.type3 << 1
+    types.type4 << 10 
+    types.type5 << 100
+    types.type6 << 1000
+    types.type7 << -1
+    types.type8 << -10
+    types.type9 << 10000
+    types.type10 << 100000
+    types.type11 << false
+    types.type12 << 'hello all types'
+    image_bin = File.open('test/data/unk.png', 'r+b'){|f| f.read}
+    types.type13 << image_bin
+    types.type14 << -100
+    types.type15 << -1000
+
+    serialized_string = types.serialize_to_string
+
+    types2 = Test::Types::RepeatedTypes.new
+    types2.parse_from_string serialized_string
+    assert_in_delta(0.01, types2.type1[0], 0.00001)
+    assert_in_delta(0.1, types2.type2[0], 0.00001)
+    assert_equal(1, types2.type3[0])
+    assert_equal(10, types2.type4[0])
+    assert_equal(100, types2.type5[0])
+    assert_equal(1000, types2.type6[0])
+    assert_equal(-1, types2.type7[0])
+    assert_equal(-10, types2.type8[0])
+    assert_equal(10000, types2.type9[0])
+    assert_equal(100000, types2.type10[0])
+    assert(!types2.type11[0])
+    assert_equal('hello all types', types2.type12[0])
+    assert_equal(10938, types2.type13[0].size)
+    assert_equal(image_bin, types2.type13[0])
+    assert_equal(-100, types2.type14[0])
+    assert_equal(-1000, types2.type15[0])
+
+    # has 2 members
+    types.type1 << 1.0/0   # double (Inf)
+    types.type2 << -1.0/0  # float (-Inf)
+    types.type3 << -1      # int32
+    types.type4 << -10     # int64
+    types.type5 << 100     # uint32
+    types.type6 << 1000    # uint64
+    types.type7 << -1000   # sint32
+    types.type8 << -10000  # sint64
+    types.type9 << 10000   # fixed32
+    types.type10 << 100000 # fixed64
+    types.type11 << true
+    types.type12 << 'hello all types'
+    image_bin = File.open('test/data/unk.png', 'r+b'){|f| f.read}
+    types.type13 << image_bin
+    types.type14 << -2_000_000_000  # sfixed32
+    types.type15 << -8_000_000_000_000_000_000  # sfixed64
+
+    serialized_string = types.serialize_to_string
+
+    types2 = Test::Types::RepeatedTypes.new
+    types2.parse_from_string serialized_string
+    assert_in_delta(0.01, types2.type1[0], 0.00001)
+    assert_in_delta(0.1, types2.type2[0], 0.00001)
+    assert_equal(1, types2.type3[0])
+    assert_equal(10, types2.type4[0])
+    assert_equal(100, types2.type5[0])
+    assert_equal(1000, types2.type6[0])
+    assert_equal(-1, types2.type7[0])
+    assert_equal(-10, types2.type8[0])
+    assert_equal(10000, types2.type9[0])
+    assert_equal(100000, types2.type10[0])
+    assert(!types2.type11[0])
+    assert_equal('hello all types', types2.type12[0])
+    assert_equal(10938, types2.type13[0].size)
+    assert_equal(image_bin, types2.type13[0])
+    assert_equal(-100, types2.type14[0])
+    assert_equal(-1000, types2.type15[0])
+
+    assert_equal(1.0/0.0, types2.type1[1])
+    assert_equal(-1.0/0.0, types2.type2[1])
+    assert_equal(-1, types2.type3[1])
+    assert_equal(-10, types2.type4[1])
+    assert_equal(100, types2.type5[1])
+    assert_equal(1000, types2.type6[1])
+    assert_equal(-1000, types2.type7[1])
+    assert_equal(-10000, types2.type8[1])
+    assert_equal(10000, types2.type9[1])
+    assert_equal(100000, types2.type10[1])
+    assert types2.type11[1]
+    assert_equal('hello all types', types2.type12[1])
+    assert_equal(10938, types2.type13[1].size)
+    assert_equal(image_bin, types2.type13[1])
+    assert_equal(-2_000_000_000, types2.type14[1])
+    assert_equal(-8_000_000_000_000_000_000, types2.type15[1])
+  end
+end

data/test/test_serialize.rb

@@ -39,4 +39,23 @@ class SerializeTest < Test::Unit::TestCase
     assert_equal 1234, person2.id
     assert_equal '山田 太郎', person2.name
   end
+
+  def test_unknown_field
+    person = Tutorial::Person.new
+    person.id = 1234
+    person.name = 'a b c'
+    serialized_string = person.serialize_to_string
+
+    # add invalid field
+    tag = 1000
+    wire_type = Protobuf::WireType::VARINT
+    serialized_string << Protobuf::Field::VarintField.encode((tag << 3) | wire_type)
+    serialized_string << Protobuf::Field::VarintField.encode(100)
+
+    # decode
+    person2 = Tutorial::Person.new
+    person2.parse_from_string serialized_string
+
+    assert_equal(person, person2)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: macks-ruby_protobuf
 version: !ruby/object:Gem::Version 
-  version: 0.3.2.3
+  version: 0.3.3
 platform: ruby
 authors: 
 - MATSUYAMA Kengo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-22 00:00:00 -07:00
+date: 2009-07-16 00:00:00 -07:00
 default_executable: rprotoc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,10 +20,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.1
+        version: 2.3.2
     version: 
 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: macksx@gmail.com
+email: 
+- macksx@gmail.com
 executables: 
 - rprotoc
 extensions: []
@@ -37,6 +38,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- script/mk_parser
 - bin/rprotoc
 - examples/addressbook.proto
 - examples/addressbook.pb.rb
@@ -71,7 +73,6 @@ files:
 - lib/protobuf/rpc/handler.rb
 - lib/protobuf/rpc/server.rb
 - lib/ruby_protobuf.rb
-- script/mk_parser
 - test/addressbook.rb
 - test/addressbook_base.rb
 - test/addressbook_ext.rb
@@ -108,8 +109,9 @@ files:
 - test/test_types.rb
 - test/types.rb
 - test/test_optional_field.rb
+- test/test_repeated_types.rb
 has_rdoc: true
-homepage: http://github.com/macks/ruby-protobuf
+homepage: http://code.google.com/p/ruby-protobuf
 post_install_message: 
 rdoc_options: 
 - --main
@@ -130,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: ruby-protobuf
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
@@ -140,6 +142,7 @@ test_files:
 - test/test_ruby_protobuf.rb
 - test/test_message.rb
 - test/test_optional_field.rb
+- test/test_repeated_types.rb
 - test/test_extension.rb
 - test/test_addressbook.rb
 - test/test_types.rb