protobuf 2.4.1-java → 2.4.2-java

data/lib/protobuf/message.rb

@@ -35,7 +35,7 @@ module Protobuf
         raise TagCollisionError, %!{Field number #{tag} has already been used in "#{self.name}" by field "#{fname}".!
       end
 
-      field_definition = Field.build(self, rule, type, fname, tag, options)
+      field_definition = ::Protobuf::Field.build(self, rule, type, fname, tag, options)
       field_name_hash[fname] = tag
       field_array[tag] = field_definition
     end
@@ -160,24 +160,15 @@ module Protobuf
 
     def each_field_for_serialization
       all_fields.each do |field|
-        next unless has_field?(field.name) || field.required?
+        next unless _field_must_be_serialized?(field)
 
         value = @values[field.name]
 
-        if field.repeated?
-          if !value.nil?
-            value.compact!
-            @values[field.name] = nil if value.empty?
-          end
-        end
-
-        if has_field?(field.name) || field.required?
-          if value.present? || [true, false].include?(value)
-            yield(field, value) 
-          else
-            # Only way you can get here is if you are required and not present
-            raise ::Protobuf::SerializationError, "#{field.name} is required on #{field.message_class}"
-          end
+        if value.present? || [true, false].include?(value)
+          yield(field, value) 
+        else
+          # Only way you can get here is if you are required and not present
+          raise ::Protobuf::SerializationError, "#{field.name} is required on #{field.message_class}"
         end
       end
     end
@@ -347,6 +338,17 @@ module Protobuf
       object
     end
 
+    def _field_must_be_serialized?(field)
+      return true if field.required?
+
+      if field.repeated? && has_field?(field.name)
+        @values[field.name].compact!
+        @values.delete(field.name) if @values[field.name].empty?
+      end
+
+      return has_field?(field.name)
+    end
+
     # Encode key and value, and write to +stream+.
     def write_pair(stream, field, value)
       key = (field.tag << 3) | field.wire_type

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/lib/protobuf/message_spec.rb

@@ -31,6 +31,18 @@ describe Protobuf::Message do
         }.to raise_error(Protobuf::SerializationError, /required/i)
       end
     end
+
+    context "repeated fields" do 
+      let(:message) { ::Test::Resource.new(:name => "something") }
+      let(:stream) { StringIO.new }
+
+      it "does not raise an error when repeated fields are []" do
+        expect {
+          message.repeated_enum = []
+          message.serialize_to(stream)
+        }.to_not raise_error
+      end
+    end
   end
 
   describe "boolean predicate methods" do 

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.4.1
+  version: 2.4.2
 platform: java
 authors: 
   - BJ Neilsen