protip 0.18.6 → 0.18.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c25de6d9f409c5bb8c1659951ecc4fa10a5aa4
-  data.tar.gz: aab7d4182c10f0a540dd5762ea3921dac899c2b1
+  metadata.gz: 87a1c6e1b9c82896ae06af88f2e9b4bf27a7050a
+  data.tar.gz: aa8ee22934fca9dd14964a91efeea888572e3513
 SHA512:
-  metadata.gz: 530e2c08bf013f25afea7d4be6eb254b85b192fb8ca374ceb09ef48ce3e9e703926ca07335bac5396edcacc129f29710cb2cb9e1b619508210ba39c8170335f9
-  data.tar.gz: d65a08e07c0365afadfdf614f731bcf5939deed2e463f4e3d4159f70b0691e1d9735567f33dd1edcf0d7c893f919a128f01e0e634aceec33c4761422aa502e81
+  metadata.gz: 1994203036d8aaafcb5d36ee5708d97a88f2c2b16772a4b2c969515884d24a2fc7ec1b4ad00ac09bee83c18ee07c32b5514b70ac9496cee54255e166da33562d
+  data.tar.gz: 654378f70d1bf78adc4a02a246e425f9644347a098c43767e0d3910b31b3bf4218036fdf15f70edbe35ff05d6f4968c995c7474b4944f7a5e44843831c7ec85c

data/lib/protip/wrapper.rb

@@ -156,14 +156,17 @@ module Protip
     end
 
     class << self
+      # Whether the given field returns boolean values. When true, wrappers will respond to +field_name?+
+      # query methods.
+      def boolean?(field)
+        field.type == :bool || (field.type == :message && field.subtype.name == 'google.protobuf.BoolValue')
+      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 ||
-            field.type == :bool ||
-            field.type == :message && (field.subtype.name == "google.protobuf.BoolValue")
+        field.type == :enum || boolean?(field)
       end
     end
 
@@ -258,8 +261,8 @@ module Protip
       if field.type == :enum
         raise ArgumentError unless args.length == 1
         return matches?(field, args[0])
-      elsif field.type == :bool ||
-        (field.type == :message && field.subtype.name == 'google.protobuf.BoolValue')
+      elsif self.class.boolean?(field)
+        !!get(field)
       else
         raise NoMethodError
       end
@@ -272,4 +275,4 @@ module Protip
       set(field, args[0])
     end
   end
-end
+end

data/test/unit/protip/resource_test.rb

@@ -18,7 +18,7 @@ module Protip::ResourceTest # Namespace for internal constants
         add_message 'nested_message' do
           optional :number, :int64, 1
         end
-        add_message "google.protobuf.BoolValue" do
+        add_message 'google.protobuf.BoolValue' do
           optional :value, :bool, 1
         end
         add_message 'resource_message' do
@@ -30,8 +30,8 @@ module Protip::ResourceTest # Namespace for internal constants
           repeated :numbers, :enum, 6, 'number'
           optional :boolean, :bool, 8
           repeated :booleans, :bool, 9
-          optional :google_bool_value, :message, 10, "google.protobuf.BoolValue"
-          repeated :google_bool_values, :message, 11, "google.protobuf.BoolValue"
+          optional :google_bool_value, :message, 10, 'google.protobuf.BoolValue'
+          repeated :google_bool_values, :message, 11, 'google.protobuf.BoolValue'
 
           oneof :oneof_group do
             optional :oneof_string1, :string, 12
@@ -177,13 +177,14 @@ module Protip::ResourceTest # Namespace for internal constants
           end
 
           it 'defines query methods for the booleans on its message' do
+            resource.boolean = true
             assert_respond_to resource, :boolean?
-            refute resource.boolean?
+            assert_equal true, resource.boolean?
           end
 
           it 'defines query methods for the google.protobuf.BoolValues on its message' do
             assert_respond_to resource, :google_bool_value?
-            refute resource.google_bool_value?
+            assert_equal false, resource.google_bool_value?
           end
 
           it 'does not define query methods for repeated enums' do

data/test/unit/protip/wrapper_test.rb

@@ -23,7 +23,7 @@ module Protip::WrapperTest # namespace for internal constants
           optional :value, :int64, 1
           optional :note, :string, 2
         end
-        add_message "google.protobuf.BoolValue" do
+        add_message 'google.protobuf.BoolValue' do
           optional :value, :bool, 1
         end
 
@@ -42,8 +42,8 @@ module Protip::WrapperTest # namespace for internal constants
           optional :boolean, :bool, 8
           repeated :booleans, :bool, 9
 
-          optional :google_bool_value, :message, 10, "google.protobuf.BoolValue"
-          repeated :google_bool_values, :message, 11, "google.protobuf.BoolValue"
+          optional :google_bool_value, :message, 10, 'google.protobuf.BoolValue'
+          repeated :google_bool_values, :message, 11, 'google.protobuf.BoolValue'
 
           oneof :oneof_group do
             optional :oneof_string1, :string, 12
@@ -105,6 +105,12 @@ module Protip::WrapperTest # namespace for internal constants
         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
+      it 'allows .boolean? to be overwritten to add additional queryable fields' do
+        wrapper.class.stubs(:boolean?).returns(true)
+        assert_respond_to wrapper, :string?
+        wrapper.class.stubs(:boolean?).returns(false)
+        refute_respond_to wrapper, :string?
+      end
       it 'does not add queries for repeated fields' do
         refute_respond_to wrapper, :numbers?, 'repeated enum field should not respond to query'
         refute_respond_to wrapper, :booleans?, 'repeated bool field should not respond to query'
@@ -522,6 +528,21 @@ module Protip::WrapperTest # namespace for internal constants
       end
     end
 
+    describe 'boolean query methods' do
+      it 'returns the boolean-ized version of the field' do
+        wrapper.class.stubs(:boolean?).returns(true)
+
+        # Sanity checks
+        raise 'unexpected string' unless wrapper.string == 'test'
+        raise 'unexpected boolean' unless wrapper.boolean == false
+        raise 'unexpected google_bool_value' unless wrapper.google_bool_value == nil
+
+        assert_equal true, wrapper.string?, 'did not convert string to boolean'
+        assert_equal false, wrapper.boolean?, 'did not pass through boolean value'
+        assert_equal false, wrapper.google_bool_value?, 'did not convert nil to boolean'
+      end
+    end
+
     describe '#matches?' do
       it 'is not defined for non-enum fields' do
         assert_raises NoMethodError do

metadata

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