Merge pull request #117 from localshred/bj/fix_frozen_string_encode

Dup string value when encoding if it is frozen

lib/protobuf/field/string_field.rb

@@ -10,8 +10,9 @@ def decode(bytes)
         bytes
       end
 
+      # TODO: make replace character configurable?
       def encode(value)
-        # TODO: make replace character configurable?
+        value = value.dup if value.frozen?
         value.encode!(::Protobuf::Field::StringField::ENCODING, :invalid => :replace, :undef => :replace, :replace => "")
         value.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
 

spec/lib/protobuf/field/string_field_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe ::Protobuf::Field::StringField do
+  describe '#encode' do
+    context 'when a repeated string field contains frozen strings' do
+      it 'does not raise an encoding error' do
+        expect {
+          frozen_strings = [ "foo".freeze, "bar".freeze, "baz".freeze ]
+          ::Test::ResourceFindRequest.encode(:name => 'resource', :widgets => frozen_strings)
+        }.not_to raise_error
+      end
+    end
+
+    context 'when a repeated bytes field contains frozen strings' do
+      it 'does not raise an encoding error' do
+        expect {
+          frozen_strings = [ "foo".freeze, "bar".freeze, "baz".freeze ]
+          ::Test::ResourceFindRequest.encode(:name => 'resource', :widget_bytes => frozen_strings)
+        }.not_to raise_error
+      end
+    end
+  end
+end

spec/support/test/resource.pb.rb

@@ -49,6 +49,8 @@ class NestedLevelOne < ::Protobuf::Message; end
   class ResourceFindRequest
     required ::Protobuf::Field::StringField, :name, 1
     optional ::Protobuf::Field::BoolField, :active, 2
+    repeated ::Protobuf::Field::StringField, :widgets, 3
+    repeated ::Protobuf::Field::BytesField, :widget_bytes, 4
   end
 
   class ResourceSleepRequest

spec/support/test/resource.proto

@@ -10,6 +10,8 @@ enum StatusType {
 message ResourceFindRequest {
   required string name = 1;
   optional bool active = 2;
+  repeated string widgets = 3;
+  repeated bytes widget_bytes = 4;
 }
 
 message ResourceSleepRequest {