protip 0.20.3 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e6ad392a69e26b1ea54bb38810e681ddc18d90b
-  data.tar.gz: 5ce3ef3d23b68795bf8d25fb951bc67c8a974c19
+  metadata.gz: 13a134ef5d4a02a13ede10452e95e7971d3a983a
+  data.tar.gz: f00fe632579adf72c55660f62256a8277a847e2c
 SHA512:
-  metadata.gz: 2323e59b4e659b8c61d86b8a782e1e116fead8051e3cb30b75ac57669561a845fa5c63837b04e01bb80f33252471be472a7e1a124b531c397a897bdb32deba4a
-  data.tar.gz: 243e701afabec75aa012a3d8186e84dc36adaf36de24d960902460564c142d73734b424357e926ffc855875a415343059ec5d7c2d4a8b5d2ec374c11a949709e
+  metadata.gz: be84e24f6e21db21420d04a623ce090759bd56f6dd9e28d438f145dafac76944c87761c88e568da2e256e595aa01fafb7a54a9b406b51606415538f34b505fcc
+  data.tar.gz: 18817a7340e471b6b3ba3319bac499711b85baf114cdf86b977b2e1269afe09b8db1aaaebca091dc9c4ba7d7200dde66d029d7139e11e71dfdcac2c27fa98325

data/lib/protip/standard_converter.rb

@@ -165,10 +165,9 @@ module Protip
         value
       end
 
-      private
       def enum_for_field(field)
         Google::Protobuf::DescriptorPool.generated_pool.lookup(field.instance_variable_get(:'@_protip_enum_value'))
       end
     end
   end
-end
+end

data/lib/protip/wrapper.rb

@@ -162,11 +162,21 @@ module Protip
         field.type == :bool || (field.type == :message && field.subtype.name == 'google.protobuf.BoolValue')
       end
 
+      def enum_for_field(field)
+        if field.type == :enum
+          field.subtype
+        elsif field.type == :message && field.subtype.name == 'protip.messages.EnumValue'
+          Protip::StandardConverter.enum_for_field(field)
+        else
+          nil
+        end
+      end
+
       # Semi-private check for whether a field should have an associated query method (e.g. +field_name?+).
       # @return [Boolean] Whether the field should have an associated query method on wrappers.
       def matchable?(field)
         return false if field.label == :repeated
-        field.type == :enum || boolean?(field)
+        (nil != enum_for_field(field)) || boolean?(field)
       end
     end
 
@@ -231,7 +241,7 @@ module Protip
     end
 
     def matches?(field, value)
-      enum = field.subtype
+      enum = Protip::Wrapper.enum_for_field(field)
       if value.is_a?(Fixnum)
         sym = enum.lookup_value(value)
       else
@@ -258,7 +268,7 @@ module Protip
     def method_missing_query(name, *args)
       field = message.class.descriptor.lookup(name[0, name.length - 1])
       raise NoMethodError if !field || !self.class.matchable?(field)
-      if field.type == :enum
+      if nil != Protip::Wrapper.enum_for_field(field)
         raise ArgumentError unless args.length == 1
         return matches?(field, args[0])
       elsif self.class.boolean?(field)

data/test/unit/protip/wrapper_test.rb

@@ -26,6 +26,9 @@ module Protip::WrapperTest # namespace for internal constants
         add_message 'google.protobuf.BoolValue' do
           optional :value, :bool, 1
         end
+        add_message 'protip.messages.EnumValue' do
+          optional :value, :int32, 1
+        end
 
         add_message 'message' do
           optional :inner, :message, 1, 'inner_message'
@@ -38,16 +41,17 @@ module Protip::WrapperTest # namespace for internal constants
 
           optional :number, :enum, 6, 'number'
           repeated :numbers, :enum, 7, 'number'
+          optional :number_message, :message, 8, 'protip.messages.EnumValue'
 
-          optional :boolean, :bool, 8
-          repeated :booleans, :bool, 9
+          optional :boolean, :bool, 9
+          repeated :booleans, :bool, 10
 
-          optional :google_bool_value, :message, 10, 'google.protobuf.BoolValue'
-          repeated :google_bool_values, :message, 11, 'google.protobuf.BoolValue'
+          optional :google_bool_value, :message, 11, 'google.protobuf.BoolValue'
+          repeated :google_bool_values, :message, 12, 'google.protobuf.BoolValue'
 
           oneof :oneof_group do
-            optional :oneof_string1, :string, 12
-            optional :oneof_string2, :string, 13
+            optional :oneof_string1, :string, 13
+            optional :oneof_string2, :string, 14
           end
         end
       end
@@ -59,6 +63,9 @@ module Protip::WrapperTest # namespace for internal constants
         pool.lookup(name).msgclass
       end
     end
+    let(:enum_message_class) do
+      pool.lookup('protip.messages.EnumValue').msgclass
+    end
     let (:inner_message_field) { message_class.descriptor.lookup('inner') }
 
     # Stubbed API client
@@ -87,6 +94,13 @@ module Protip::WrapperTest # namespace for internal constants
       Protip::Wrapper.new(wrapped_message, converter)
     end
 
+    # Stub the wrapped-enum fetcher method - probably rethink this once the
+    # instance variable hack is no longer necessary
+    before do
+      Protip::StandardConverter.stubs(:enum_for_field)
+        .returns(pool.lookup('number') || raise('unexpected - no enum field found'))
+    end
+
     describe '#respond_to?' do
       it 'adds setters for message fields' do
         assert_respond_to wrapper, :string=
@@ -103,6 +117,7 @@ module Protip::WrapperTest # namespace for internal constants
       end
       it 'adds queries for scalar matchable fields' do
         assert_respond_to wrapper, :number?, 'enum field should respond to query'
+        assert_respond_to wrapper, :number_message?, 'enum message field should respond to query'
         assert_respond_to wrapper, :boolean?, 'bool field should respond to query'
         assert_respond_to wrapper, :google_bool_value?, 'google.protobuf.BoolValue field should respond to query'
       end
@@ -346,7 +361,7 @@ module Protip::WrapperTest # namespace for internal constants
         end
 
         it 'contains keys for all fields of the parent message' do
-          keys = %i(string strings inner inners inner_blank number numbers boolean booleans
+          keys = %i(string strings inner inners inner_blank number numbers number_message boolean booleans
                     google_bool_value google_bool_values oneof_string1 oneof_string2)
           assert_equal keys.sort, wrapper.to_h.keys.sort
         end
@@ -596,6 +611,36 @@ module Protip::WrapperTest # namespace for internal constants
           end
         end
       end
+
+      describe 'for a wrapped enum' do
+        let :enum_message do
+          enum_message_class.new value: 1
+        end
+
+        before do
+          converter.stubs(:convertible?).with(enum_message_class).returns true
+          converter.stubs(:to_object).with(enum_message, anything).returns :ONE
+          wrapper.message.number_message = enum_message
+        end
+
+        it 'returns true when its symbolized argument matches the value' do
+          m = mock
+          m.expects(:to_sym).returns :ONE
+          assert wrapper.number_message?(m)
+        end
+
+        it 'returns false when its symbolized argument does not match the value' do
+          m = mock
+          m.expects(:to_sym).returns :TWO
+          refute wrapper.number_message?(m)
+        end
+
+        it 'returns true when a Fixnum argument matches the value' do
+          assert wrapper.number_message?(1)
+        end
+
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protip
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.20.4
 platform: ruby
 authors:
 - AngelList
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel