protobuf 3.7.0.pre1 → 3.7.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2572788305cda35ff4cc6fde499167d9658d080b
-  data.tar.gz: 941f6a8239dbc36d8bc3e299dd07f37986c0bc11
+  metadata.gz: 4eb324f0fa537308f4f06735a42fe4a73f1483e4
+  data.tar.gz: e1067403611fd86bf86b064115cbd42651aa68d5
 SHA512:
-  metadata.gz: bc704397840f6e029fdc8b7a7cff5cc659ab077998e0f688f1babcbd55473155bf626e953ef7d88fdf17192b38d26256d571284c0c7e028e047b4c59131b138f
-  data.tar.gz: 684348b64a203f308076e1c41f6c76d4442cf7d5edd529a68016139f1cec83a98e37a71c854254fa8edef41a9cf536672708bb8cfb3e0acc4f99ceff108a66d2
+  metadata.gz: 74422c44f167336cb16897fbe21c77eb89f663f5e4217759eff2499ef2889fffd05529f49ef1586378927b23919f7d97d41bc69b9e187694a72366ddb2bff234
+  data.tar.gz: 9a5436e3e9ead8917e9cff660674494a31e6522d4ba53b9ea31c6ad1643b946507dc947c5878678eda997ae2c70543e71923e7b2727b8801c527754bdc71dac4

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Stable (3.x)
 
+3.7.0 (pre2)
+-----------
+- BUG: Track if a repeated field has been deliberately set (#325)
+
 3.7.0 (pre1)
 -----------
 - BUG: Revert to old behavior for setting repeated fields to nil
@@ -16,6 +20,10 @@
 - Refresh google/protobuf/descriptor.{proto,pb.rb}
 - Properly encode and decode negative enum values.
 
+3.6.9
+--------
+- Make protobuf serivce directory pluggable.
+
 3.6.7
 -----
 - An issue was reported with the encode memoization added in #293 with using any array modification

data/lib/protobuf/field/base_field.rb

@@ -176,7 +176,7 @@ module Protobuf
       def define_accessor(simple_field_name, fully_qualified_field_name)
         message_class.class_eval do
           define_method("#{simple_field_name}!") do
-            @values[fully_qualified_field_name]
+            @values[fully_qualified_field_name] if field?(fully_qualified_field_name)
           end
         end
 

data/lib/protobuf/message.rb

@@ -94,7 +94,11 @@ module Protobuf
     def field?(name)
       field = self.class.get_field(name, true)
       return false if field.nil?
-      @values.key?(field.fully_qualified_name)
+      if field.repeated?
+        @values.key?(field.fully_qualified_name) && @values[field.fully_qualified_name].present?
+      else
+        @values.key?(field.fully_qualified_name)
+      end
     end
     ::Protobuf.deprecator.define_deprecated_methods(self, :has_field? => :field?)
 

data/lib/protobuf/rpc/connectors/zmq.rb

@@ -226,7 +226,7 @@ module Protobuf
 
         # Alias for ::Protobuf::Rpc::ServiceDirectory.instance
         def service_directory
-          ::Protobuf::Rpc::ServiceDirectory.instance
+          ::Protobuf::Rpc.service_directory
         end
 
         def snd_timeout

data/lib/protobuf/rpc/service_directory.rb

@@ -9,6 +9,14 @@ require 'protobuf/rpc/dynamic_discovery.pb'
 
 module Protobuf
   module Rpc
+    def self.service_directory
+      @service_directory ||= ::Protobuf::Rpc::ServiceDirectory.instance
+    end
+
+    def self.service_directory=(directory)
+      @service_directory = directory
+    end
+
     class ServiceDirectory
       include ::Singleton
       include ::Protobuf::Logging

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.7.0.pre1'
+  VERSION = '3.7.0.pre2'
 end

data/spec/lib/protobuf/message_spec.rb

@@ -476,6 +476,25 @@ RSpec.describe Protobuf::Message do
         message = ::Test::Resource.new(:ext_is_searchable => false)
         expect(message.ext_is_searchable!).to be(false)
       end
+
+      it 'returns nil for an unset repeated field that has only be read' do
+        message = ::Test::Resource.new
+        expect(message.repeated_enum!).to be_nil
+        message.repeated_enum
+        expect(message.repeated_enum!).to be_nil
+      end
+
+      it 'returns value for an unset repeated field has been read and appended to' do
+        message = ::Test::Resource.new
+        message.repeated_enum << 1
+        expect(message.repeated_enum!).to eq([1])
+      end
+
+      it 'returns value for an unset repeated field has been explicitly set' do
+        message = ::Test::Resource.new
+        message.repeated_enum = [1]
+        expect(message.repeated_enum!).to eq([1])
+      end
     end
   end
 
@@ -562,6 +581,31 @@ RSpec.describe Protobuf::Message do
       message = ::Test::Resource.new(ext_field => false)
       expect(message.field?(100)).to be(true)
     end
+
+    it 'returns false for repeated field that has been read from' do
+      message = ::Test::Resource.new
+      expect(message.field?(:repeated_enum)).to be(false)
+      message.repeated_enum
+      expect(message.field?(:repeated_enum)).to be(false)
+    end
+
+    it 'returns true for a repeated field that has been read from and appended to' do
+      message = ::Test::Resource.new
+      message.repeated_enum << 1
+      expect(message.field?(:repeated_enum)).to be(true)
+    end
+
+    it 'returns true for a repeated field that has been set with the setter' do
+      message = ::Test::Resource.new
+      message.repeated_enum = [1]
+      expect(message.field?(:repeated_enum)).to be(true)
+    end
+
+    it 'returns false for a repeated field that has been replaced with []' do
+      message = ::Test::Resource.new
+      message.repeated_enum.replace([])
+      expect(message.field?(:repeated_enum)).to be(false)
+    end
   end
 
   describe '.get_field' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.7.0.pre1
+  version: 3.7.0.pre2
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport