protobuf 2.8.3 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99faa34dcab90672042c22bf0d26d6f4c0a4c744
-  data.tar.gz: 20ebf82a6795eae334a29e5bcc1e8f6e4256bfd5
+  metadata.gz: ce09086e344463e2c1193ad642e5ddf90186a40b
+  data.tar.gz: e215cd2b66f2a290ed0193a4dae2ec7329780de5
 SHA512:
-  metadata.gz: f28ad5326df4358721e6ffd7924f2acdfd6cd5931b8a2fff9b7d57bd44e8adb67e3617a79d03621437c7206c1f4c3e56b2e1bc64ff1ca85ae8158a7d7bb71cfb
-  data.tar.gz: 88dcfaa540f8d5357eb0825cba17c60d4197cf57bd8345f39053f2e00a4fbe341fedb494e783e97ea722477cd4f789d30b4effb925df8e5bb945714b19d79554
+  metadata.gz: 51c1d0bea9a61d7d6b921ec859419ebbdac79a75efc54987b5cbaa7a378069d75755e6d04c47ab2c2d1b5f4fd71d206b2a89d5fe069db5e6b6e607b1cfc9428f
+  data.tar.gz: 172872992b14d0b53d1375789a4c2ea76519c4bc8b560fcc9b752fbc68822ada11cea4987ff2b5319a79bd68295d8fc7b71100510f73d49383ea8d79fe7af61b

data/CHANGES.md

@@ -1,3 +1,8 @@
+2.8.4
+----------
+
+- Fix issue where frozen strings assigned in a repeated field would cause encoding runtime errors. (#117)
+
 2.8.3
 ----------
 

data/lib/protobuf/field/string_field.rb

@@ -10,8 +10,9 @@ module Protobuf
         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)
 

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.8.3'
+  VERSION = '2.8.4'
   PROTOC_VERSION = '2.5.0'
 end

data/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

data/spec/support/test/resource.pb.rb

@@ -49,6 +49,8 @@ module Test
   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

data/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 {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.4
 platform: ruby
 authors:
 - BJ Neilsen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -292,6 +292,7 @@ files:
 - spec/lib/protobuf/enum_spec.rb
 - spec/lib/protobuf/enum_value_spec.rb
 - spec/lib/protobuf/field/int32_field_spec.rb
+- spec/lib/protobuf/field/string_field_spec.rb
 - spec/lib/protobuf/generators/base_spec.rb
 - spec/lib/protobuf/generators/enum_generator_spec.rb
 - spec/lib/protobuf/generators/extension_generator_spec.rb
@@ -385,6 +386,7 @@ test_files:
 - spec/lib/protobuf/enum_spec.rb
 - spec/lib/protobuf/enum_value_spec.rb
 - spec/lib/protobuf/field/int32_field_spec.rb
+- spec/lib/protobuf/field/string_field_spec.rb
 - spec/lib/protobuf/generators/base_spec.rb
 - spec/lib/protobuf/generators/enum_generator_spec.rb
 - spec/lib/protobuf/generators/extension_generator_spec.rb