protobuf 2.8.5 → 2.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a856318d0dafa9da5a88d40dcc319c500e766a13
-  data.tar.gz: 868ee8f458233c1bf2e62a9db3371a4b0f698391
+  metadata.gz: bae0f4fcbb6ab57fe7866db45ea440c29899979d
+  data.tar.gz: 0fb43022f7937ae06df7185a611eead5a9f2b217
 SHA512:
-  metadata.gz: 138f5e2b81b0c2375012bbc6ee4bae97a2af3e53cb83e5f348ee407544c29628a6b4bbc6cdef95f44467ed9180a23ad93a148f6f3b8e2f00bd2768455ea89335
-  data.tar.gz: 3775fad99cbc871003c146c8c86cc2a2e1a9ab29f439bfd5b12e0e0c115fd18ba4f70558095f1b48a3a54910361c47e6de20fcb6c514e3ae0ab470a510217aaa
+  metadata.gz: b063acb75ac9ce464056edc2d418cc588e6b0ac0b885441a57f9dfc8c5795ee87faba8d393c09f6a91a8d12417808a2dd5603643988bd8c821b76dc1fd1608dd
+  data.tar.gz: 310368ac66f9e72150575ef01ec7f6cd7a1fba31a5bf33b926ca0743b1e907b623fd566d4b95f8a19ee4c5fc3b02b5d564049e2dbaae41c3f86997a679dcf847

data/CHANGES.md

@@ -1,3 +1,8 @@
+2.8.6
+---------
+
+- Fix string/byte encoding issue when unicode characters present. Reported by @foxban. This was also backported to v2.7.12. [#120]
+
 2.8.5
 ----------
 
@@ -35,6 +40,11 @@
 - No longer creating `-java` platform gem due to removal of c++ compiler.
 - Added WTFPL license.
 
+2.7.12
+-----------
+
+- Backport string/byte encoding issue when unicode characters present. [code: #122, original issue: #120]
+
 2.0.0
 -----------
 

data/lib/protobuf/field/bytes_field.rb

@@ -18,8 +18,9 @@ module Protobuf
       end
 
       def decode(bytes)
-        bytes.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
-        bytes
+        bytes_to_decode = bytes.dup
+        bytes_to_decode.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
+        bytes_to_decode
       end
 
       def define_setter
@@ -46,11 +47,12 @@ module Protobuf
       end
 
       def encode(value)
-        value = value.encode if value.is_a?(::Protobuf::Message)
-        value.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
+        value_to_encode = value.dup
+        value_to_encode = value.encode if value.is_a?(::Protobuf::Message)
+        value_to_encode.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
 
-        string_size = ::Protobuf::Field::VarintField.encode(value.size)
-        string_size << value
+        string_size = ::Protobuf::Field::VarintField.encode(value_to_encode.size)
+        string_size << value_to_encode
       end
 
       def wire_type

data/lib/protobuf/field/string_field.rb

@@ -6,18 +6,19 @@ module Protobuf
       ENCODING = 'UTF-8'.freeze
 
       def decode(bytes)
-        bytes.force_encoding(::Protobuf::Field::StringField::ENCODING)
-        bytes
+        bytes_to_decode = bytes.dup
+        bytes_to_decode.force_encoding(::Protobuf::Field::StringField::ENCODING)
+        bytes_to_decode
       end
 
       # TODO: make replace character configurable?
       def encode(value)
-        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)
+        value_to_encode = value.dup
+        value_to_encode.encode!(::Protobuf::Field::StringField::ENCODING, :invalid => :replace, :undef => :replace, :replace => "")
+        value_to_encode.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
 
-        string_size = ::Protobuf::Field::VarintField.encode(value.size)
-        string_size << value
+        string_size = ::Protobuf::Field::VarintField.encode(value_to_encode.size)
+        string_size << value_to_encode
       end
     end
   end

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.8.5'
+  VERSION = '2.8.6'
   PROTOC_VERSION = '2.5.0'
 end

data/spec/lib/protobuf/field/string_field_spec.rb

@@ -1,6 +1,9 @@
+# encoding: utf-8
+
 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
@@ -19,5 +22,25 @@ describe ::Protobuf::Field::StringField do
         }.not_to raise_error
       end
     end
+
+    it 'does not alter string values after encoding multiple times' do
+      source_string = "foo"
+      proto = ::Test::Resource.new(:name => source_string)
+      proto.encode
+      proto.name.should eq source_string
+      proto.encode
+      proto.name.should eq source_string
+    end
+
+    it 'does not alter unicode string values after encoding multiple times' do
+      source_string = "¢"
+      proto = ::Test::Resource.new(:name => source_string)
+      proto.encode
+      proto.name.should eq source_string
+      proto.encode
+      proto.name.should eq source_string
+    end
   end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.6
 platform: ruby
 authors:
 - BJ Neilsen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -366,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.1.2
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.