protobuf 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ad445d76d68be198e63dfba389d2b5deaf314ee
-  data.tar.gz: 3d36e1ce0747a04e82419c2a1ea8670fff05ace9
+  metadata.gz: 8e5a341fcb307dfd13d03e56530493f316dadff4
+  data.tar.gz: 1dde8b64fe387bd0bcd87e5823e02bec8322bf25
 SHA512:
-  metadata.gz: a9f9e6009fc897608088233604949cbde5353950a2984108185e7b167e00335f53156ba46e0c60b1945a2d13052ce96508932b43e6aaf2b22964378485ec9701
-  data.tar.gz: d1b13590c827e3208b8a41bc267faf40e98aa1371f08255cfe02e490e77fb73f9b2667ee3c94a0430db7c274dcda2c5889c6d2810d3a56b0f04b69436845267f
+  metadata.gz: 5511c46d74eb0e669400ab394fef865e4e1a8c0a919a967a1d1b97fba19e0dcb8073c08155b9a4fada0043bafb803adaad1d3019f3f293e367c41d9873ba6c10
+  data.tar.gz: 9c5f985a0ab726096f1bb662e48b2a9fe78133a5d523421ccdb93b43aad6aabc1fd45cce0e7d9643c9176ff0bc2bf02f16b2b8ad82e3ab99a176539ce392acbf

data/lib/protobuf.rb

@@ -83,6 +83,19 @@ module Protobuf
     @_print_deprecation_warnings = !!value
   end
 
+  # Permit unknown field on Message initialization
+  #
+  # Default: true
+  #
+  # Simple boolean to define whether we want to permit unknown fields
+  # on Message intialization; otherwise a ::Protobuf::FieldNotDefinedError is thrown.
+  def self.ignore_unknown_fields?
+    !defined?(@_ignore_unknown_fields) || @_ignore_unknown_fields
+  end
+
+  def self.ignore_unknown_fields=(value)
+    @_ignore_unknown_fields = !!value
+  end
 end
 
 unless ENV.key?('PB_NO_NETWORKING')

data/lib/protobuf/message.rb

@@ -30,7 +30,7 @@ module Protobuf
       @values = {}
 
       fields.to_hash.each_pair do |name, value|
-        self[name] = value unless value.nil?
+        self[name] = value
       end
     end
 
@@ -135,7 +135,11 @@ module Protobuf
 
     def []=(name, value)
       if field = self.class.get_field(name, true)
-        __send__(field.setter_method_name, value)
+        __send__(field.setter_method_name, value) unless value.nil?
+      else
+        unless ::Protobuf.ignore_unknown_fields?
+          raise ::Protobuf::FieldNotDefinedError, name
+        end
       end
     end
 

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/spec/lib/protobuf/message_spec.rb

@@ -157,6 +157,55 @@ describe Protobuf::Message do
       test_enum = Test::EnumTestMessage.new(hashie_object)
       expect(test_enum.non_default_enum).to eq(2)
     end
+
+    context 'ignoring unknown fields' do
+      before { ::Protobuf.ignore_unknown_fields = true }
+
+      context 'with valid fields' do
+        let(:values) { { :name => "Jim" } }
+
+        it "does not raise an error" do
+          expect { ::Test::Resource.new(values) }.to_not raise_error
+        end
+      end
+
+      context 'with non-existent field' do
+        let(:values) { { :name => "Jim", :othername => "invalid" } }
+
+        it "does not raise an error" do
+          expect { ::Test::Resource.new(values) }.to_not raise_error
+        end
+      end
+    end
+
+    context 'not ignoring unknown fields' do
+      before { ::Protobuf.ignore_unknown_fields = false }
+      after { ::Protobuf.ignore_unknown_fields = true }
+
+      context 'with valid fields' do
+        let(:values) { { :name => "Jim" } }
+
+        it "does not raise an error" do
+          expect { ::Test::Resource.new(values) }.to_not raise_error
+        end
+      end
+
+      context 'with non-existent field' do
+        let(:values) { { :name => "Jim", :othername => "invalid" } }
+
+        it "raises an error and mentions the erroneous field" do
+          expect { ::Test::Resource.new(values) }.to raise_error(::Protobuf::FieldNotDefinedError, /othername/)
+        end
+
+        context 'with a nil value' do
+          let(:values) { { :name => "Jim", :othername => nil } }
+
+          it "raises an error and mentions the erroneous field" do
+            expect { ::Test::Resource.new(values) }.to raise_error(::Protobuf::FieldNotDefinedError, /othername/)
+          end
+        end
+      end
+    end
   end
 
   describe '#encode' do

data/spec/lib/protobuf_spec.rb

@@ -75,4 +75,24 @@ describe ::Protobuf do
     end
   end
 
+  describe '.ignore_unknown_fields?' do
+    before do
+      if described_class.instance_variable_defined?(:@_ignore_unknown_fields)
+        described_class.send(:remove_instance_variable, :@_ignore_unknown_fields)
+      end
+    end
+
+    it 'defaults to a true value' do
+      expect(described_class.ignore_unknown_fields?).to be true
+    end
+
+    it 'is settable' do
+      expect {
+        described_class.ignore_unknown_fields = false
+      }.to change {
+        described_class.ignore_unknown_fields?
+      }.from(true).to(false)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport