ruby_protobuf 0.3.2 → 0.3.3

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'test/unit'
 require 'test/addressbook'
 
@@ -24,4 +25,37 @@ class SerializeTest < Test::Unit::TestCase
     assert_equal '555-4321', person2.phone[0].number
     assert_equal Tutorial::Person::PhoneType::HOME, person2.phone[0].type
   end
+
+  def test_serialize_utf8string
+    # serialize to string
+    person = Tutorial::Person.new
+    person.id = 1234
+    person.name = '山田 太郎' # kanji characters
+    serialized_string = person.serialize_to_string
+
+    # parse the serialized string
+    person2 = Tutorial::Person.new
+    person2.parse_from_string serialized_string
+    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

data/test/test_standard_message.rb

@@ -11,6 +11,12 @@ class StandardMessageTest < Test::Unit::TestCase
     assert !person.initialized?
     person.id = 12
     assert person.initialized?
+
+    # repeated field
+    person.phone << Tutorial::Person::PhoneNumber.new
+    assert !person.initialized?
+    person.phone.last.number = '123-456'
+    assert  person.initialized?
   end
 
   def test_clear
@@ -25,6 +31,10 @@ class StandardMessageTest < Test::Unit::TestCase
     assert_nil person.id
     assert_equal '', person.email
     assert_equal 0, person.phone.size
+
+    assert !person.has_field?(:name)
+    assert !person.has_field?(:id)
+    assert !person.has_field?(:email)
   end
 
   def test_dup

data/test/test_types.rb

@@ -18,6 +18,8 @@ class TypesTest < Test::Unit::TestCase
     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
 
@@ -37,6 +39,49 @@ class TypesTest < Test::Unit::TestCase
     assert_equal 'hello all types', types2.type12
     assert_equal 10938, types2.type13.size
     assert_equal image_bin, types2.type13
+    assert_equal(-100, types2.type14)
+    assert_equal(-1000, types2.type15)
+  end
+
+  def test_serialize2
+    types = Test::Types::TestTypes.new
+    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::TestTypes.new
+    types2.parse_from_string serialized_string
+    assert_equal(1.0/0.0, types2.type1)
+    assert_equal(-1.0/0.0, types2.type2)
+    assert_equal(-1, types2.type3)
+    assert_equal(-10, types2.type4)
+    assert_equal(100, types2.type5)
+    assert_equal(1000, types2.type6)
+    assert_equal(-1000, types2.type7)
+    assert_equal(-10000, types2.type8)
+    assert_equal(10000, types2.type9)
+    assert_equal(100000, types2.type10)
+    assert types2.type11
+    assert_equal('hello all types', types2.type12)
+    assert_equal(10938, types2.type13.size)
+    assert_equal(image_bin, types2.type13)
+    assert_equal(-2_000_000_000, types2.type14)
+    assert_equal(-8_000_000_000_000_000_000, types2.type15)
   end
 
   def test_parse
@@ -64,9 +109,7 @@ class TypesTest < Test::Unit::TestCase
     assert_nothing_raised do types.type1 = 1.0 end
     assert_raise TypeError do types.type1 = '' end
     assert_nothing_raised do types.type1 = Protobuf::Field::DoubleField.max end
-    assert_raise RangeError do types.type1 = Protobuf::Field::DoubleField.max * 2 end
     assert_nothing_raised do types.type1 = Protobuf::Field::DoubleField.min end
-    assert_raise RangeError do types.type1 = Protobuf::Field::DoubleField.min * 2 end
   end
 
   def test_float
@@ -76,9 +119,7 @@ class TypesTest < Test::Unit::TestCase
     assert_nothing_raised do types.type2 = 1.0 end
     assert_raise TypeError do types.type2 = '' end
     assert_nothing_raised do types.type2 = Protobuf::Field::FloatField.max end
-    assert_raise RangeError do types.type2 = Protobuf::Field::FloatField.max * 2 end
     assert_nothing_raised do types.type2 = Protobuf::Field::FloatField.min end
-    assert_raise RangeError do types.type2 = Protobuf::Field::FloatField.min * 2 end
   end
 
   def test_int32
@@ -178,4 +219,8 @@ class TypesTest < Test::Unit::TestCase
     assert_raise TypeError do types.type13 = true end
     assert_raise TypeError do types.type13 = [] end
   end
+
+  def test_varint_getbytes
+    assert_equal "\xac\x02", Protobuf::Field::VarintField.encode(300)
+  end
 end

data/test/types.rb

@@ -1,9 +1,10 @@
 require 'protobuf/message/message'
+require 'protobuf/message/enum'
 
 module Test
   module Types
-    
-    class TestTypes < Protobuf::Message
+    class TestTypes < ::Protobuf::Message
+      defined_in __FILE__
       required :double, :type1, 1
       required :float, :type2, 2
       required :int32, :type3, 3
@@ -17,6 +18,26 @@ module Test
       required :bool, :type11, 11
       required :string, :type12, 12
       required :bytes, :type13, 13
+      required :sfixed32, :type14, 14
+      required :sfixed64, :type15, 15
+    end
+    class RepeatedTypes < ::Protobuf::Message
+      defined_in __FILE__
+      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
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_protobuf
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
-- ANDO Yasushi
+- MATSUYAMA Kengo
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-09-30 00:00:00 -04:00
+date: 2009-07-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,27 +20,32 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 2.2.0
     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: andyjpn@gmail.com
+email: 
+- macksx@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
+- script/mk_parser
 - bin/rprotoc
+- examples/addressbook.proto
+- examples/addressbook.pb.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
@@ -82,17 +87,12 @@ files:
 - 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
@@ -109,7 +109,7 @@ files:
 - test/test_types.rb
 - test/types.rb
 has_rdoc: true
-homepage: 
+homepage: http://code.google.com/p/ruby-protobuf
 post_install_message: 
 rdoc_options: 
 - --main
@@ -131,18 +131,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-protobuf
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Protocol Buffers for Ruby
 test_files: 
 - test/test_descriptor.rb
-- test/test_message.rb
-- test/test_ruby_protobuf.rb
+- test/test_optional_field.rb
+- test/test_repeated_types.rb
+- test/test_types.rb
 - test/test_extension.rb
-- test/test_parse.rb
 - test/test_serialize.rb
-- test/test_types.rb
+- test/test_standard_message.rb
 - test/test_compiler.rb
+- test/test_message.rb
+- test/test_parse.rb
 - test/test_addressbook.rb
-- test/test_standard_message.rb
+- test/test_ruby_protobuf.rb

data/lib/protobuf/compiler/compiler_old.rb

@@ -1,123 +0,0 @@
-# This is a quite temporary implementation.
-# I'll create a compiler class using Racc.
-
-require 'fileutils'
-
-module Protobuf
-  class Compiler
-    INDENT_UNIT = '  '
-
-    def self.compile(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      self.new.compile proto_file, proto_dir, out_dir, file_create
-    end
-
-    def initialize
-      @indent_level = 0
-      @ret = <<-eos
-require 'protobuf/message/message'
-require 'protobuf/message/enum'
-require 'protobuf/message/service'
-require 'protobuf/message/extend'
-
-      eos
-    end
-
-    def indent
-      INDENT_UNIT * @indent_level
-    end
-
-    def puts_with_indent(string)
-      #puts "#{indent}#{string}"
-      @ret += "#{indent}#{string}\n"
-    end
-    alias putswi puts_with_indent
-
-    def compile(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      rb_file = "#{out_dir}/#{proto_file.sub(/\.proto$/, '.rb')}"
-      proto_path = validate_existence proto_file, proto_dir
-      File.open proto_path, 'r' do |file|
-        file.each_line do |line|
-          line.sub!(/^(.*)\/\/.*/, '\1')
-          line.strip!
-          case line
-          when /^package\s+(\w+(\.\w+)?)\s*;$/
-            $1.split('.').each do |path|
-              putswi "module #{path.capitalize}"
-              @indent_level += 1
-            end
-          when /^import\s+"((?:[^"\\]+|\\.)*)"\s*;$/
-            putswi "require '#{required_message_from_proto $1, proto_dir, out_dir}'"
-          when /^message\s+(\w+)\s*\{$/
-            putswi "class #{$1} < ::Protobuf::Message"
-            @extension = false
-            @indent_level += 1
-          when /^(required|optional|repeated)\s+(\w+(\.\w+)?)\s+(\w+)\s*=\s*(\d+)\s*(\[\s*default\s*=\s*(\w+)\s*\])?\s*;$/
-            rule, type, name, tag, default = $1, $2, $4, $5, $7
-            if default
-              default = default =~ /\d+(\.\d+)/ \
-                ? ", {:default => #{default}}" \
-                : ", {:default => :#{default}}"
-            end
-            extension = @extension ? ', :extension => true' : ''
-            putswi "#{rule} :#{type}, :#{name}, #{tag}#{default}#{extension}"
-          when /^enum\s+(\w+)\s*\{$/
-            putswi "class #{$1} < ::Protobuf::Enum"
-            @indent_level += 1
-          when /^(\w+)\s*=\s*(\w+)\s*;$/
-            putswi "#{$1} = #{$2}"
-          when /^extensions\s+(\w+)\s+to\s+(\w+)\s*;/
-            low, high = $1, $2
-            low = '::Protobuf::Extend.MIN' if low == 'min'
-            high = '::Protobuf::Extend.MAX' if high == 'max'
-            putswi "extensions #{low}..#{high}"
-          when /^extend\s+(\w+)\s*\{/
-            putswi "class #{$1} < ::Protobuf::Message"
-            @extension = true
-            @indent_level += 1
-          when /^service\s+(\w+)\s*\{/
-            putswi "class #{$1} < ::Protobuf::Service"
-            @indent_level += 1
-          when /^rpc\s+(\w+)\s+\(\s*(\w+)\s*\)\s+returns\s+\(\s*(\w+)\s*\)\s*;/
-            putswi "rpc :#{$1} => :#{$2}, :#{$3} => :#{$4}"
-          when /^option\s+(\w+)\s*=\s*(.+)\s*;/
-            putswi "::Protobuf::OPTIONS[:#{$1}] = :#{$2}"
-          when /^\}\s*;?$/
-            @indent_level -= 1
-            putswi "end"
-          when ''
-            putswi ''
-          end
-        end
-        while 0 < @indent_level 
-          @indent_level -= 1
-          putswi "end"
-        end
-      end
-      if file_create
-        puts "#{rb_file} writing..."
-        FileUtils.mkpath File.dirname(rb_file)
-        File.open(rb_file, 'w') {|f| f.write @ret}
-      end
-      @ret
-    end
-
-    def validate_existence(path, base_dir)
-      if File.exist? path
-      elsif File.exist?(path = "#{base_dir or '.'}/#{path}")
-      else
-        raise ArgumentError.new("File does not exist: #{path}")
-      end
-      path
-    end
-
-    def required_message_from_proto(proto_file, proto_dir, out_dir)
-      rb_path = proto_file.sub(/\.proto$/, '.rb')
-      proto_dir ||= '.'
-      out_dir ||= '.'
-      unless File.exist?("#{out_dir}/#{rb_path}")
-        Compiler.compile proto_file, proto_dir, out_dir
-      end
-      rb_path
-    end
-  end
-end