ruby-protocol-buffers 1.2.3.beta1 → 1.2.3.beta2

data/VERSION

@@ -1 +1 @@
-1.2.3.beta1
+1.2.3.beta2

data/lib/protocol_buffers/runtime/field.rb

@@ -290,22 +290,18 @@ module ProtocolBuffers
     end
 
     class StringField < BytesField
-      # TODO: UTF-8 validation
-      # Make sure to handle this weird case: strings are mutable, so a UTF-8
-      # valid string could be assigned to a repeated field and then modified in
-      # place later on to not be valid UTF-8 anymore.
-      #
-      # Maybe we just punt on this except in Ruby 1.9 where we can rely on the
-      # language ensuring the string is always UTF-8?
+      HAS_ENCODING = (''.respond_to?(:valid_encoding?) && ''.respond_to?(:force_encoding))
+
+      def check_value(value)
+        if HAS_ENCODING
+          value.valid_encoding? || raise(ArgumentError, "string value is not valid utf-8")
+        end
+      end
 
       def deserialize(value)
-        # To get bytes, the value was being read as ASCII.  Ruby 1.9 stores an encoding
-        # with its strings, and they were getting returned with Encoding ASCII-8BIT.
-        # Protobuffers are supposed to only return UTF-8 strings.  This attempts to
-        # force the encoding to UTF-8 if on Ruby 1.9 (force_encoding is defined on String).
         read_value = value.read.to_s
-        if read_value.respond_to?("force_encoding")
-          read_value.force_encoding("UTF-8")
+        if HAS_ENCODING
+          read_value.force_encoding("utf-8")
         end
         read_value
       end

data/lib/protocol_buffers/runtime/message.rb

@@ -209,7 +209,7 @@ module ProtocolBuffers
   #   module Foo
   #     VALUE_A = 1
   #     VALUE_B = 5
-  #     VALUE_C 1234
+  #     VALUE_C = 1234
   #   end
   #
   # An exception will be thrown if an enum field is assigned a value not in the
@@ -387,7 +387,12 @@ module ProtocolBuffers
       ret = ProtocolBuffers.bin_sio
       ret << "#<#{self.class.name}"
       fields.each do |tag, field|
-        ret << " #{field.name}=#{field.inspect_value(self.__send__(field.name))}"
+        if value_for_tag?(tag)
+          value = field.inspect_value(self.__send__(field.name))
+        else
+          value = "<unset>"
+        end
+        ret << " #{field.name}=#{value}"
       end
       ret << ">"
       return ret.string

data/spec/fields_spec.rb

@@ -37,12 +37,24 @@ describe ProtocolBuffers, "fields" do
   end
 
   it "verifies UTF-8 for string fields" do
-    pending("do UTF-8 validation") do
+    if RUBY_VERSION < "1.9"
+      pending "UTF-8 validation only happens in ruby 1.9+"
+    else
+      good = proc { StringIO.new("hello") }
+      bad  = proc { StringIO.new("\xff\xff") }
+
       s1 = mkfield(:StringField)
-      proc { s1.check_valid("hello") }.should_not raise_error()
-      proc { s1.check_valid("\xff\xff") }.should raise_error(ArgumentError)
+      s1.deserialize(good[]).should == "hello"
+      s1.deserialize(good[]).encoding.should == Encoding.find('utf-8')
+      proc { s1.check_valid(s1.deserialize(good[])) }.should_not raise_error()
+      s1.deserialize(bad[]).encoding.should == Encoding.find('utf-8')
+      proc { s1.check_valid(s1.deserialize(bad[])) }.should raise_error(ArgumentError)
+
       b1 = mkfield(:BytesField)
-      proc { b1.check_valid("\xff\xff") }.should_not raise_error()
+      b1.deserialize(good[]).should == "hello"
+      b1.deserialize(good[]).encoding.should == Encoding.find("us-ascii")
+      b1.deserialize(bad[]).encoding.should == Encoding.find("binary")
+      proc { b1.check_valid(b1.deserialize(bad[])) }.should_not raise_error()
     end
   end
 

data/spec/proto_files/simple.proto

@@ -3,3 +3,8 @@ package simple;
 message Test1 {
   optional string test_field = 1;
 };
+
+message Foo {}
+message Bar {
+  optional Foo foo = 1;
+};

data/spec/runtime_spec.rb

@@ -65,6 +65,15 @@ describe ProtocolBuffers, "runtime" do
     a1.has_sub2?.should == true
   end
 
+  describe "#inspect" do
+    it "should leave out un-set fields" do
+      b1 = Simple::Bar.new
+      b1.inspect.should == "#<Simple::Bar foo=<unset>>"
+      b1.foo = Simple::Foo.new
+      b1.inspect.should == "#<Simple::Bar foo=#<Simple::Foo>>"
+    end
+  end
+
   it "detects changes to a sub-message and flags it as set if it wasn't" do
     a1 = Featureful::A.new
     a1.has_sub2?.should == false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-protocol-buffers
 version: !ruby/object:Gem::Version
-  version: 1.2.3.beta1
+  version: 1.2.3.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70124285265220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,15 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70124285265220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: autotest-standalone
-  requirement: &70124285264800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124285264800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70124285264340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124285264340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70124285263920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124285263920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70124285263480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +87,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124285263480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - brian@codekitchen.net
@@ -146,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby compiler and runtime for the google protocol buffers library.
@@ -166,3 +191,4 @@ test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unicode_string_spec.rb
+has_rdoc: