ruby_protobuf 0.4.8 → 0.4.9

data/History.txt

@@ -1,5 +1,14 @@
-=== 0.4.7 / 2010-09-28
+=== 0.4.9 / 2011-01-17
 
+* 0.4.9
+  * Bug fixes.
+    * EnumValue object in Message#to_hash.
+  * Optimized for speed.
+* 0.4.8
+  * Bug fixes.
+    * Compilation was failed when rpc service name was on top-level.
+    * Options for rpc service methods are silently ignored.
+    * Frozen message object causes an exception on inspect method.
 * 0.4.7
   * Bug fixes.
     * Compilation error for importing message.

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/lib/protobuf/message/message.rb

@@ -43,6 +43,7 @@ module Protobuf
           raise TagCollisionError, "Field tag #{tag} has already been used in #{self.name}."
         end
         fields[tag] = Field.build(self, rule, type, fname, tag, options)
+        clear_field_cache
       end
 
       def extension_tag?(tag)
@@ -58,27 +59,40 @@ module Protobuf
       def sorted_fields
         @sorted_fields ||= fields.sort_by {|tag, _| tag}
       end
-
-      # Find a field object by +name+.
-      def get_field_by_name(name)
-        name = name.to_sym
-        fields.values.find {|field| field.name == name}
+      private :sorted_fields
+
+      #:nodoc:
+      def field_dictionary
+        return @field_dictionary if @field_dictionary
+        @field_dictionary = fields.dup
+        fields.each do |_, field|
+          @field_dictionary[field.name] = field
+          @field_dictionary[field.name.to_s] = field
+        end
+        @field_dictionary
       end
+      private :field_dictionary
 
-      # Find a field object by +tag+ number.
-      def get_field_by_tag(tag)
-        fields[tag]
+      #:nodoc:
+      def clear_field_cache
+        @field_dictionary = nil
+        @sorted_fields = nil
       end
+      private :clear_field_cache
 
       # Find a field object by +tag_or_name+.
       def get_field(tag_or_name)
         case tag_or_name
-        when Integer        then get_field_by_tag(tag_or_name)
-        when String, Symbol then get_field_by_name(tag_or_name)
-        else                     raise TypeError, tag_or_name.class
+        when Integer, String, Symbol
+          field_dictionary[tag_or_name]
+        else
+          raise TypeError, tag_or_name.class
         end
       end
 
+      alias get_field_by_tag  get_field  # for compatibility
+      alias get_field_by_name get_field  # for compatibility
+
       def descriptor
         @descriptor ||= Descriptor::Descriptor.new(self)
       end
@@ -91,6 +105,7 @@ module Protobuf
         unless field.ready?
           field = field.setup
           self.class.fields[tag] = field
+          self.class.__send__(:clear_field_cache)
         end
         if field.repeated?
           @values[field.name] = Field::FieldArray.new(field)
@@ -163,7 +178,7 @@ module Protobuf
       i = '  ' * indent
       field_value_to_string = lambda {|field, value|
         result << \
-          if field.optional? && ! has_field?(field.name)
+          if field.optional? && ! @values.has_key?(field.name)
             ''
           else
             case field
@@ -282,7 +297,7 @@ module Protobuf
     #     # do something
     #   end
     def each_field
-      self.class.sorted_fields.each do |_, field|
+      self.class.__send__(:sorted_fields).each do |_, field|
         value = __send__(field.name)
         yield(field, value)
       end
@@ -291,13 +306,15 @@ module Protobuf
     def to_hash
       hash = {}
       each_field do |field, value|
-        next unless has_field?(field.tag)
+        next unless @values.has_key?(field.name)
         case value
         when Array
           next if value.empty?
           hash[field.name] = value.map {|val| val.is_a?(Message) ? val.to_hash : val}
         when Message
           hash[field.name] = value.to_hash
+        when EnumValue
+          hash[field.name] = value.name
         else
           hash[field.name] = value
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_protobuf
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 4
-  - 8
-  version: 0.4.8
+  - 9
+  version: 0.4.9
 platform: ruby
 authors: 
 - MATSUYAMA Kengo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 +09:00
+date: 2011-01-14 00:00:00 +09:00
 default_executable: rprotoc
 dependencies: []