protobuf 2.4.3-java → 2.4.4-java

data/lib/protobuf/field/base_field.rb

@@ -175,7 +175,18 @@ module Protobuf
         @message_class.class_eval do
           define_method(field.setter_method_name) do |val|
             field.warn_if_deprecated
-            val.compact! if val.respond_to?(:compact!)
+            
+            if val.is_a?(Array)
+              val = val.dup
+              val.compact!
+            else
+              error_text = <<-TYPE_ERROR
+                Expected value of type '#{field.type}'
+                Got '#{val.class}' for protobuf field #{field.name}
+              TYPE_ERROR
+
+              raise TypeError, error_text
+            end
 
             if val.nil? || (val.respond_to?(:empty?) && val.empty?)
               @values.delete(field.name)

data/lib/protobuf/field/field_array.rb

@@ -29,7 +29,7 @@ module Protobuf
 
       def replace(val)
         raise_type_error(val) unless val.is_a?(Array)
-        val = val.map { |v| normalize(v) }
+        val = val.map! { |v| normalize(v) }
         super(val)
       end
 
@@ -52,6 +52,7 @@ module Protobuf
       #
       def normalize(value)
         raise TypeError unless @field.acceptable?(value)
+
         if @field.is_a?(::Protobuf::Field::EnumField)
           @field.type.fetch(value)
         elsif @field.is_a?(::Protobuf::Field::MessageField) && value.respond_to?(:to_hash)

data/lib/protobuf/version.rb

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

data/spec/lib/protobuf/message_spec.rb

@@ -46,6 +46,18 @@ describe Protobuf::Message do
         message.instance_variable_get("@values")[:repeated_enum].should be_nil
       end
 
+      it "does not compact the edit original array" do 
+        a = [nil].freeze
+        message.repeated_enum = a
+        message.repeated_enum.should eq([])
+        a.should eq([nil].freeze)
+      end
+
+      it "compacts the set array" do 
+        message.repeated_enum = [nil]
+        message.repeated_enum.should eq([])
+      end
+
       it "raises TypeError when a non-array replaces it" do 
         expect {
           message.repeated_enum = 2

metadata

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