macks-ruby_protobuf 0.3.2.1 → 0.3.2.2

data/Manifest.txt

@@ -2,7 +2,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/mk_parser
 bin/rprotoc
 examples/addressbook.proto
 examples/addressbook.pb.rb
@@ -37,6 +36,7 @@ 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/README.txt

@@ -1,7 +1,6 @@
 = RubyProtobuf
 
 * http://github.com/macks/ruby-protobuf
-* http://code.google.com/p/ruby-protobuf
 
 == DESCRIPTION:
 
@@ -23,7 +22,8 @@ Protocol Buffers for Ruby.
 
 == INSTALL:
 
-* rake gem; sudo gem install pkg/ruby_protobuf-*.gem
+* gem source -a http://gems.github.com
+* sudo gem install macks-ruby_protobuf
 
 == AUTHOR:
 
@@ -31,6 +31,7 @@ MATSUYAMA Kengo <macksx@gmail.com>
 
 Original Author:
  ANDO Yasushi <andyjpn@gmail.com>
+ http://code.google.com/p/ruby-protobuf
 
 == LICENSE:
 

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.new('ruby_protobuf', RubyProtobuf::VERSION) do |p|
   p.email = 'macksx@gmail.com'
   p.summary = 'Protocol Buffers for Ruby'
   p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
-  p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
+  p.url = 'http://github.com/macks/ruby-protobuf'
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
 end
 

data/lib/protobuf/compiler/visitors.rb

@@ -24,7 +24,7 @@ module Protobuf
           FileUtils.mkpath File.dirname(filename)
           file.write contents
         end
-       	FileUtils.chmod 0755, filename if executable
+        FileUtils.chmod 0755, filename if executable
       end
 
       def log_writing(filename, message="writing...")

data/lib/protobuf/message/decoder.rb

@@ -42,14 +42,9 @@ module Protobuf
     protected
 
     def read_key(stream)
-      # TODO is there more clear way to do this?
-      bits = 0
       bytes = read_varint stream
-      bytes.each_with_index do |byte, index|
-        byte &= 0b01111111
-        bits |= byte << (7 * index)
-      end
-      wire_type = bits & 0b00000111
+      bits = Protobuf::Field::VarintField.decode bytes
+      wire_type = bits & 0x07
       tag = bits >> 3
       [tag, wire_type]
     end
@@ -59,21 +54,22 @@ module Protobuf
       bytes = []
       begin
         byte = stream.send(read_method)
-        bytes << (byte & 0b01111111)
-      end while byte >> 7 == 1
+        bytes << (byte & 0x7f)
+      end while (byte & 0x80).nonzero?
       bytes
     end
 
+    def read_fixed32(stream)
+      stream.read(4)
+    end
+
     def read_fixed64(stream)
       stream.read(8)
     end
 
     def read_length_delimited(stream)
       bytes = read_varint stream
-      value_length = 0
-      bytes.each_with_index do |byte, index|
-        value_length |= byte << (7 * index)
-      end
+      value_length = Protobuf::Field::VarintField.decode bytes
       value = stream.read value_length
       value.unpack('C*')
     end
@@ -81,13 +77,9 @@ module Protobuf
     def read_start_group(stream)
       raise NotImplementedError.new('Group is duplecated.')
     end
- 
+
     def read_end_group(stream)
       raise NotImplementedError.new('Group is duplecated.')
     end
-
-    def read_fixed32(stream)
-      stream.read(4)
-    end
   end
 end

data/lib/protobuf/message/encoder.rb

@@ -1,6 +1,8 @@
 require 'protobuf/common/wire_type'
 
 module Protobuf
+  class NotInitializedError < StandardError; end
+
   class Encoder
     class <<self
       def encode(stream, message)
@@ -13,6 +15,7 @@ module Protobuf
     end
 
     def encode(stream=@stream, message=@message)
+      raise NotInitializedError unless message.initialized?
       message.each_field do |field, value|
         next unless message.has_field?(field.name)
 
@@ -28,7 +31,7 @@ module Protobuf
 
     def write_pair(field, value, stream)
       key = (field.tag << 3) | field.wire_type
-      key_bytes = Protobuf::Field::VarintField.get_bytes key
+      key_bytes = Protobuf::Field::VarintField.encode key
       stream.write key_bytes
       bytes = field.get value
       stream.write bytes

data/lib/protobuf/message/field.rb

@@ -4,9 +4,9 @@ require 'protobuf/descriptor/field_descriptor'
 module Protobuf
   module Field
     def self.build(message_class, rule, type, name, tag, opts={})
-      field_class = 
-        if [:double, :float, :int32, :int64, :uint32, :uint64, 
-          :sint32, :sint64, :fixed32, :fixed64, :sfixed32, :sfixed64, 
+      field_class =
+        if [:double, :float, :int32, :int64, :uint32, :uint64,
+          :sint32, :sint64, :fixed32, :fixed64, :sfixed32, :sfixed64,
           :bool, :string, :bytes].include? type
           eval "Protobuf::Field::#{type.to_s.capitalize}Field"
         else
@@ -33,7 +33,7 @@ module Protobuf
       end
 
       def initialize(message_class, rule, type, name, tag, opts={})
-        @message_class, @rule, @type, @name, @tag, @default, @extension = 
+        @message_class, @rule, @type, @name, @tag, @default, @extension =
           message_class, rule, type, name, tag, opts[:default], opts[:extension]
         @error_message = 'Type invalid'
       end
@@ -46,9 +46,9 @@ module Protobuf
           return false if message[name].nil?
           return false if is_a?(Protobuf::Field::MessageField) and not message[name].initialized?
         when :repeated
-          return message[name].inject(true) do |result, msg|
-            result and msg.initialized?
-          end
+          return message[name].all? {|msg|
+            (not is_a?(Protobuf::Field::MessageField)) or msg.initialized?
+          }
         when :optional
           return false if message[name] and is_a?(Protobuf::Field::MessageField) and not message[name].initialized?
         end
@@ -91,7 +91,11 @@ module Protobuf
         metaclass = (class << message_instance; self; end)
         metaclass.class_eval do
           define_method(field.name) do
-	    @values[field.name] or field.default_value
+            if @values.has_key?(field.name)
+              @values[field.name]
+            else
+              field.default_value
+            end
           end
         end
       end
@@ -110,29 +114,30 @@ module Protobuf
         end
       end
 
+      # encoder/decoder related methods
+
       def set(message_instance, bytes)
+        value = decode(bytes)
         if repeated?
-          set_array message_instance, bytes
+          message_instance.send(name) << value
         else
-          set_bytes message_instance, bytes
+          message_instance.send("#{name}=", value)
         end
       end
 
-      def set_array(message_instance, bytes)
-        raise NotImplementedError
-      end
-
-      def set_bytes(message_instance, bytes)
-        raise NotImplementedError
+      def get(value)
+        encode(value)
       end
 
-      def get(value)
-        get_bytes value
+      def decode(bytes)
+        raise NotImplementedError.new("#{self.class.name}\#decode")
       end
+      private :decode
 
-      def get_bytes(value)
-        raise NotImplementedError
+      def encode(value)
+        raise NotImplementedError.new("#{self.class.name}\#encode")
       end
+      private :encode
 
       def merge(message_instance, value)
         if repeated?
@@ -143,13 +148,15 @@ module Protobuf
       end
 
       def merge_array(message_instance, value)
-        message_instance[tag].concat value 
+        message_instance[tag].concat value
       end
 
       def merge_value(message_instance, value)
         message_instance[tag] = value
       end
 
+      # utility methods
+
       def repeated?; rule == :repeated end
       def required?; rule == :required end
       def optional?; rule == :optional end
@@ -186,44 +193,27 @@ module Protobuf
           elsif type.superclass == Protobuf::Message
             Protobuf::Field::MessageField
           else
-            raise $!
+            raise TypeError.new(type.inspect)
           end
         field_class.new @message_class, @rule, type, @name, @tag, @opts
       end
 
-      def typename_to_class(message_class, type)
-        modules = message_class.to_s.split('::')
-        while
-          begin
-            type = eval((modules | [type.to_s]).join('::'))
-            break
-          rescue NameError
-            modules.empty? ? raise($!) : modules.pop
-          end
-        end
-        type
-      end
-=begin
       def typename_to_class(message_class, type)
         suffix = type.to_s.split('::')
         modules = message_class.to_s.split('::')
+        args = (Object.method(:const_defined?).arity == 1) ? [] : [nil, false]
         while
           mod = modules.empty? ? Object : eval(modules.join('::'))
-          suffix.each do |s|
-            if mod.const_defined?(s)
-              mod = mod.const_get(s)
-            else
-              mod = nil
-              break
-            end
-          end
+          mod = suffix.inject(mod) {|m, s|
+            args[0] = s
+            m and m.const_defined?(*args) and m.const_get(s)
+          }
           break if mod
           raise NameError.new("type not found: #{type}", type) if modules.empty?
           modules.pop
         end
         mod
       end
-=end
     end
 
     class FieldArray < Array
@@ -260,7 +250,7 @@ module Protobuf
       end
     end
 
-    class StringField < BaseField
+    class BytesField < BaseField
       class <<self
         def default; '' end
       end
@@ -274,96 +264,68 @@ module Protobuf
         true
       end
 
-      def set_bytes(message_instance, bytes)
-        message = bytes.pack('C*')
-        message.force_encoding('UTF-8') if message.respond_to?(:force_encoding)
-        message_instance.send("#{name}=", message)
-      end
- 
-      def set_array(message_instance, bytes)
-        message = bytes.pack('C*')
-        message.force_encoding('UTF-8') if message.respond_to?(:force_encoding)
-        arr = message_instance.send name
-        arr << message
+      def decode(bytes)
+        bytes.pack('C*')
       end
 
-      def get_bytes(value)
-        bytes = value.unpack('C*')
-        string_size = VarintField.get_bytes bytes.size
-        string_size + bytes.pack('C*')
+      def encode(value)
+        value = value.dup
+        value.force_encoding('ASCII-8BIT') if value.respond_to?(:force_encoding)
+        string_size = VarintField.encode(value.size)
+        string_size << value
       end
     end
-    
-    class BytesField < BaseField
-      class <<self
-        def default; '' end
-      end
-
-      def wire_type
-        Protobuf::WireType::LENGTH_DELIMITED
-      end
-
-      def acceptable?(val)
-        raise TypeError unless val.instance_of? String
-        true
-      end
 
-      def set_bytes(message_instance, bytes)
-        message_instance.send("#{name}=", bytes.pack('C*'))
-      end
- 
-      def set_array(message_instance, bytes)
+    class StringField < BytesField
+      def decode(bytes)
         message = bytes.pack('C*')
-        arr = message_instance.send name
-        arr << message
-      end
-
-      def get_bytes(value)
-        string_size = VarintField.get_bytes value.unpack('C*').size
-        string_size + value
+        message.force_encoding('UTF-8') if message.respond_to?(:force_encoding)
+        message
       end
     end
 
     class VarintField < BaseField
+      INT32_MAX  =  2**31 - 1
+      INT32_MIN  = -2**31
+      INT64_MAX  =  2**63 - 1
+      INT64_MIN  = -2**63
+      UINT32_MAX =  2**32 - 1
+      UINT64_MAX =  2**64 - 1
+
       class <<self
         def default; 0 end
+
+        def decode(bytes)
+          value = 0
+          bytes.each_with_index do |byte, index|
+            value |= byte << (7 * index)
+          end
+          value
+        end
+
+        def encode(value)
+          raise RangeError.new(value) if value < 0
+          return [value].pack('C') if value < 128
+          bytes = []
+          until value == 0
+            bytes << (0x80 | (value & 0x7f))
+            value >>= 7
+          end
+          bytes[-1] &= 0x7f
+          bytes.pack('C*')
+        end
       end
 
       def wire_type
         Protobuf::WireType::VARINT
       end
- 
-      def set_bytes(message_instance, bytes)
-        # TODO should refactor using pack('w*')
-        value = 0
-        bytes.each_with_index do |byte, index|
-          value |= byte << (7 * index)
-        end
-        message_instance.send("#{name}=", value)
-      end
-
-      def self.get_bytes(value)
-        # TODO should refactor using unpack('w*')
-        #return [value].pack('w*').unpack('C*')
-        return [0].pack('C') if value == 0
-        bytes = []
-        until value == 0
-          byte = 0
-          7.times do |i|
-            byte |= (value & 1) << i
-            value >>= 1
-          end
-          byte |= 0b10000000
-          bytes << byte
-        end
-        #bytes[0] &= 0b01111111
-        #bytes
-        bytes[bytes.size - 1] &= 0b01111111
-        bytes.pack('C*')
+
+      def decode(bytes)
+        self.class.decode(bytes)
       end
 
-      def get_bytes(value)
-        self.class.get_bytes value
+      def encode(value)
+        self.class.encode(value)
       end
 
       def acceptable?(val)
@@ -372,92 +334,86 @@ module Protobuf
         true
       end
     end
-    
-    class Int32Field < VarintField
-      def self.max; 1.0/0.0 end
-      def self.min; -1.0/0.0 end
+
+    # Base class for int32 and int64
+    class IntegerField < VarintField
+      def encode(value)
+        # original Google's library uses 64bits integer for negative value
+        VarintField.encode(value & 0xffff_ffff_ffff_ffff)
+      end
+
+      def decode(bytes)
+        value  = VarintField.decode(bytes)
+        value -= 0x1_0000_0000_0000_0000 if (value & 0x8000_0000_0000_0000).nonzero?
+        value
+      end
     end
-    
-    class Int64Field < VarintField
-      def self.max; 1.0/0.0 end
-      def self.min; -1.0/0.0 end
+
+    class Int32Field < IntegerField
+      def self.max; INT32_MAX; end
+      def self.min; INT32_MIN; end
     end
-    
+
+    class Int64Field < IntegerField
+      def self.max; INT64_MAX; end
+      def self.min; INT64_MIN; end
+    end
+
     class Uint32Field < VarintField
-      def self.max; 1.0/0.0 end
-      def self.min; 0 end
+      def self.max; UINT32_MAX; end
+      def self.min; 0; end
     end
-    
+
     class Uint64Field < VarintField
-      def self.max; 1.0/0.0 end
-      def self.min; 0 end
+      def self.max; UINT64_MAX; end
+      def self.min; 0; end
     end
-    
-    class Sint32Field < VarintField
-      def self.max; 1.0/0.0 end
-      def self.min; -1.0/0.0 end
- 
-      def set_bytes(message_instance, bytes)
-        # TODO use only bit-operations
-        byte = bytes.first
-        value = 
-          if byte % 2 == 0
-            byte / 2
-          else
-            -(byte + 1) / 2
-          end
-        message_instance.send("#{name}=", value)
+
+    # Base class for sint32 and sint64
+    class SignedIntegerField < VarintField
+      def decode(bytes)
+        value = VarintField.decode(bytes)
+        if (value & 1).zero?
+          value >> 1   # positive value
+        else
+          ~value >> 1  # negative value
+        end
       end
 
-      def get_bytes(value)
-        #(value << 1) ^ (value >> 31)
-        [(value << 1) ^ (value >> 31)].pack('C*')
+      def encode(value)
+        if value >= 0
+          VarintField.encode(value << 1)
+        else
+          VarintField.encode(~(value << 1))
+        end
       end
     end
-    
-    class Sint64Field < VarintField
-      def self.max; 1.0/0.0 end
-      def self.min; -1.0/0.0 end
- 
-      def set_bytes(message_instance, bytes)
-        # TODO use only bit-operations
-        byte = bytes.first
-        value = 
-          if byte % 2 == 0
-            byte / 2
-          else
-            -(byte + 1) / 2
-          end
-        message_instance.send("#{name}=", value)
-      end
 
-      def get_bytes(value)
-        #(value << 1) ^ (value >> 63)
-        [(value << 1) ^ (value >> 63)].pack('C*')
-      end
+    class Sint32Field < SignedIntegerField
+      def self.max; INT32_MAX; end
+      def self.min; INT32_MIN; end
     end
-    
-    class DoubleField < VarintField
+
+    class Sint64Field < SignedIntegerField
+      def self.max; INT64_MAX; end
+      def self.min; INT64_MIN; end
+    end
+
+    class FloatField < BaseField
+      def self.default; 0.0; end
+      def self.max;  1.0/0; end
+      def self.min; -1.0/0; end
+
       def wire_type
-        Protobuf::WireType::FIXED64
-      end
- 
-      #TODO
-      def self.max
-        '0x7fefffffffffffff'.unpack('d').first
+        Protobuf::WireType::FIXED32
       end
 
-      #TODO
-      def self.min
-        -(2**(64/2) - 1)
-      end
- 
-      def set_bytes(message_instance, bytes)
-        message_instance.send("#{name}=", bytes.unpack('E').first)
+      def decode(bytes)
+        bytes.unpack('e').first
       end
 
-      def get_bytes(value)
-        [value].pack('E')
+      def encode(value)
+        [value].pack('e')
       end
 
       def acceptable?(val)
@@ -466,109 +422,87 @@ module Protobuf
         true
       end
     end
-    
-    class FloatField < VarintField
+
+    class DoubleField < FloatField
       def wire_type
-        Protobuf::WireType::FIXED32
-      end
- 
-      #TODO
-      def self.max
-        '0x7fefffffffffffff'.unpack('e').first
+        Protobuf::WireType::FIXED64
       end
 
-      #TODO
-      def self.min
-        -(2**(32/2) - 1)
-      end
- 
-      def set_bytes(message_instance, bytes)
-        message_instance.send("#{name}=", bytes.unpack('e').first)
+      def decode(bytes)
+        bytes.unpack('E').first
       end
 
-      def get_bytes(value)
-        [value].pack('e')
-      end
- 
-      def acceptable?(val)
-        raise TypeError unless val.is_a? Numeric
-        raise RangeError if val < min or max < val
-        true
+      def encode(value)
+        [value].pack('E')
       end
-   end
-    
-    class Fixed32Field < VarintField
+    end
+
+    class Fixed32Field < Uint32Field
       def wire_type
         Protobuf::WireType::FIXED32
       end
 
-      def self.max
-        2**32
+      def decode(bytes)
+        bytes.unpack('V').first
       end
 
-      def self.min
-        0
-      end
- 
-      def set_bytes(message_instance, bytes)
-        message_instance.send("#{name}=", bytes.unpack('L').first)
-      end
-
-      def get_bytes(value)
-        [value].pack('L')
+      def encode(value)
+        [value].pack('V')
       end
     end
-    
-    class Fixed64Field < VarintField
+
+    class Fixed64Field < Uint64Field
       def wire_type
         Protobuf::WireType::FIXED64
       end
 
-      def self.max
-        2**64
+      def decode(bytes)
+        # we don't use 'Q' for pack/unpack. 'Q' is machine-dependent.
+        values = bytes.unpack('VV')
+        values[0] + (values[1] << 32)
       end
 
-      def self.min
-        0
-      end
- 
-      def set_bytes(message_instance, bytes)
-        message_instance.send("#{name}=", bytes.unpack('l').first)
-      end
-
-      def get_bytes(value)
-        [value].pack('Q')
+      def encode(value)
+        # we don't use 'Q' for pack/unpack. 'Q' is machine-dependent.
+        [value & 0xffff_ffff, value >> 32].pack('VV')
       end
     end
-    
-    class Sfinxed32Field < VarintField
+
+    class Sfixed32Field < Int32Field
       def wire_type
         Protobuf::WireType::FIXED32
       end
 
-      def self.max
-        2**(32/2)
+      def decode(bytes)
+        value  = bytes.unpack('V').first
+        value -= 0x1_0000_0000 if (value & 0x8000_0000).nonzero?
+        value
       end
 
-      def self.min
-        -(2**(32/2) - 1)
+      def encode(value)
+        [value].pack('V')
       end
     end
-    
-    class Sfixed64Field < VarintField
+
+    class Sfixed64Field < Int64Field
       def wire_type
         Protobuf::WireType::FIXED64
       end
 
-      def self.max
-        2**(64/2)
+      def decode(bytes)
+        # we don't use 'Q' for pack/unpack. 'Q' is machine-dependent.
+        values = bytes.unpack('VV')
+        value  = values[0] + (values[1] << 32)
+        value -= 0x1_0000_0000_0000_0000 if (value & 0x8000_0000_0000_0000).nonzero?
+        value
       end
 
-      def self.min
-        -(2**(64/2) - 1)
+      def encode(value)
+        # we don't use 'Q' for pack/unpack. 'Q' is machine-dependent.
+        [value & 0xffff_ffff, value >> 32].pack('VV')
       end
     end
-    
+
     class BoolField < VarintField
       class <<self
         def default; false end
@@ -578,16 +512,16 @@ module Protobuf
         raise TypeError unless [TrueClass, FalseClass].include? val.class
         true
       end
- 
-      def set_bytes(message_instance, bytes)
-        message_instance.send("#{name}=", bytes.first == 1)
+
+      def decode(bytes)
+        bytes.first == 1
       end
 
-      def get_bytes(value)
+      def encode(value)
         [value ? 1 : 0].pack('C')
       end
     end
-    
+
     class MessageField < BaseField
       class <<self
         def default; nil end
@@ -609,26 +543,17 @@ module Protobuf
         raise TypeError unless val.instance_of? type
         true
       end
- 
-      def set_bytes(message_instance, bytes)
+
+      def decode(bytes)
         message = type.new
         message.parse_from_string bytes.pack('C*') # TODO
-        message_instance.send("#{name}=", message)
-      end
- 
-      def set_array(message_instance, bytes)
-        message = type.new
-        message.parse_from_string bytes.pack('C*')
-        arr = message_instance.send name
-        arr << message
+        message
       end
 
-      def get_bytes(value)
-        stringio = StringIO.new ''
-        value.serialize_to stringio
-        bytes = stringio.string.unpack 'C*'
-        string_size = VarintField.get_bytes bytes.size
-        string_size + bytes.pack('C*')
+      def encode(value)
+        bytes = value.serialize_to_string
+        string_size = VarintField.encode bytes.size
+        string_size << bytes
       end
 
       def merge_value(message_instance, value)

data/lib/protobuf/message/message.rb

@@ -127,12 +127,8 @@ module Protobuf
     end
 
     def initialized?
-      fields.to_a.inject(true) do |result, (tag, field)|
-        result and field.initialized?(self)
-      end and
-      extension_fields.to_a.inject(true) do |result, (tag, field)|
-        result and field.initialized?(self)
-      end
+      fields.all? {|tag, field| field.initialized?(self) } && \
+      extension_fields.all? {|tag, field| field.initialized?(self) }
     end
 
     def has_field?(tag_or_name)
@@ -185,9 +181,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
@@ -204,10 +200,10 @@ module Protobuf
       end
       each_field do |field, value|
         if field.repeated?
-          value.each do |v| 
+          value.each do |v|
             field_value_to_string.call field, v
           end
-        else 
+        else
           field_value_to_string.call field, value
         end
       end
@@ -263,12 +259,12 @@ module Protobuf
       #get_field_by_tag(tag).set self, bytes # TODO
       (get_field_by_tag(tag) or get_ext_field_by_tag(tag)).set self, bytes
     end
-    
+
     def merge_field(tag, value)
       #get_field_by_tag(tag).merge self, bytes #TODO
       (get_field_by_tag(tag) or get_ext_field_by_tag(tag)).merge self, value
     end
-    
+
     def [](tag_or_name)
       if field = get_field(tag_or_name)
         send field.name

data/lib/ruby_protobuf.rb

@@ -1,3 +1,3 @@
 class RubyProtobuf
-  VERSION = '0.3.2.1'
+  VERSION = '0.3.2.2'
 end

data/test/proto/types.proto

@@ -14,4 +14,24 @@ message TestTypes {
   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;
 }

data/test/test_compiler.rb

@@ -136,7 +136,7 @@ end
   def test_nested_message
     Protobuf::Visitor::CreateMessageVisitor.instance_eval {remove_const :Baaz}
     file_contents = Protobuf::Compiler.new.create_message('test/proto/nested.proto', '.', '.', false)
-    assert_nothing_raised {eval file_contents}
+    assert_nothing_raised {Object.class_eval file_contents}
     assert_raise(TypeError) {Baaz.new.x = 1}
     assert_nothing_raised {Baaz.new.x = Foo::Bar.new}
   end

data/test/test_message.rb

@@ -3,6 +3,9 @@ require 'test/addressbook'
 require 'test/merge'
 require 'test/unit'
 
+# It should not conflict with Test::InnerMessage1 which is included in merge.proto
+class InnerMessage1; end
+
 class MessageTest < Test::Unit::TestCase
   def test_equality
     person1 = Tutorial::Person.new :name => 'ando'

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: macks-ruby_protobuf
 version: !ruby/object:Gem::Version 
-  version: 0.3.2.1
+  version: 0.3.2.2
 platform: ruby
 authors: 
 - MATSUYAMA Kengo
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-21 00:00:00 -07:00
-default_executable: 
+date: 2009-04-22 00:00:00 -07:00
+default_executable: rprotoc
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -25,7 +25,6 @@ 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: macksx@gmail.com
 executables: 
-- mk_parser
 - rprotoc
 extensions: []
 
@@ -38,7 +37,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- bin/mk_parser
 - bin/rprotoc
 - examples/addressbook.proto
 - examples/addressbook.pb.rb
@@ -73,6 +71,7 @@ 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
@@ -110,7 +109,7 @@ files:
 - test/types.rb
 - test/test_optional_field.rb
 has_rdoc: true
-homepage: 
+homepage: http://github.com/macks/ruby-protobuf
 post_install_message: 
 rdoc_options: 
 - --main