macks-ruby_protobuf 0.3.2.2 → 0.3.2.3

data/lib/protobuf/message/field.rb

@@ -36,6 +36,7 @@ module Protobuf
         @message_class, @rule, @type, @name, @tag, @default, @extension =
           message_class, rule, type, name, tag, opts[:default], opts[:extension]
         @error_message = 'Type invalid'
+        define_accessor
       end
 
       def ready?; true end
@@ -80,16 +81,16 @@ module Protobuf
         default or self.class.default
       end
 
-      def define_accessor(message_instance)
-        message_instance.instance_variable_get(:@values)[name] = default_value if rule == :repeated
-        define_getter message_instance
-        define_setter message_instance unless rule == :repeated
+      private
+
+      def define_accessor
+        define_getter
+        define_setter unless rule == :repeated
       end
 
-      def define_getter(message_instance)
+      def define_getter
         field = self
-        metaclass = (class << message_instance; self; end)
-        metaclass.class_eval do
+        @message_class.class_eval do
           define_method(field.name) do
             if @values.has_key?(field.name)
               @values[field.name]
@@ -100,10 +101,9 @@ module Protobuf
         end
       end
 
-      def define_setter(message_instance)
+      def define_setter
         field = self
-        metaclass = (class << message_instance; self; end)
-        metaclass.class_eval do
+        @message_class.class_eval do
           define_method("#{field.name}=") do |val|
             if val.nil?
               @values.delete(field.name)
@@ -114,6 +114,8 @@ module Protobuf
         end
       end
 
+      public
+
       # encoder/decoder related methods
 
       def set(message_instance, bytes)

data/lib/protobuf/message/message.rb

@@ -64,7 +64,8 @@ module Protobuf
       end
 
       def get_field_by_name(name)
-        fields.values.find {|field| field.name == name.to_sym}
+        name = name.to_sym
+        fields.values.find {|field| field.name == name}
       end
 
       def get_field_by_tag(tag)
@@ -81,7 +82,8 @@ module Protobuf
 
       #TODO merge to get_field_by_name
       def get_ext_field_by_name(name)
-        extension_fields.values.find {|field| field.name == name.to_sym}
+        name = name.to_sym
+        extension_fields.values.find {|field| field.name == name}
       end
 
       #TODO merge to get_field_by_tag
@@ -106,12 +108,14 @@ module Protobuf
     def initialize(values={})
       @values = {}
 
-      fields.each do |tag, field|
+      self.class.fields.each do |tag, field|
         unless field.ready?
           field = field.setup
           self.class.class_eval {@fields[tag] = field}
         end
-        field.define_accessor self
+        if field.repeated?
+          @values[field.name] = Protobuf::Field::FieldArray.new(field)
+        end
       end
 
       # TODO
@@ -120,7 +124,9 @@ module Protobuf
           field = field.setup
           self.class.class_eval {@extension_fields[tag] = field}
         end
-        field.define_accessor self
+        if field.repeated?
+          @values[field.name] = Protobuf::Field::FieldArray.new(field)
+        end
       end
 
       values.each {|tag, val| self[tag] = val}
@@ -140,7 +146,7 @@ module Protobuf
     def ==(obj)
       return false unless obj.is_a? self.class
       each_field do |field, value|
-        return false unless value == obj[field.name]
+        return false unless value == obj.send(field.name)
       end
       true
     end
@@ -155,11 +161,12 @@ module Protobuf
       ret = self.class.new
       each_field do |field, value|
         if field.repeated?
+          field_array = ret.send(field.name)
           value.each do |v|
-            ret[field.name] << (v.is_a?(Numeric) ? v : v.dup)
+            field_array << (v.is_a?(Numeric) ? v : v.dup)
           end
         else
-          ret[field.name] = value.is_a?(Numeric) ? value : value.dup
+          ret.send("#{field.name}=", value.is_a?(Numeric) ? value : value.dup)
         end
       end
       ret
@@ -295,9 +302,9 @@ module Protobuf
     def get_ext_field_by_tag(tag); self.class.get_ext_field_by_tag(tag) end
     def get_ext_field(tag_or_name); self.class.get_ext_field(tag_or_name) end
 
-    def each_field(&block)
-      (fields.merge extension_fields).to_a.sort{|(t1, f1), (t2, f2)| t1 <=> t2}.each do |tag, field|
-        block.call field, self[tag]
+    def each_field
+      (fields.merge extension_fields).sort_by {|tag, field| tag}.each do |tag, field|
+        yield field, send(field.name)
       end
     end
   end

data/lib/ruby_protobuf.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: macks-ruby_protobuf
 version: !ruby/object:Gem::Version 
-  version: 0.3.2.2
+  version: 0.3.2.3
 platform: ruby
 authors: 
 - MATSUYAMA Kengo