protip 0.18.4 → 0.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7871c4e08b4d4cdadd1a2282403f76d02c41682
-  data.tar.gz: 907e4f9fd8f6683ee95c16837a3758b9ab525772
+  metadata.gz: 8aa9bb432c7fae05ac9e7f790545b1f50868bba1
+  data.tar.gz: d1abe3cf1d8a52ca3a13002ec89e520831cc8ed6
 SHA512:
-  metadata.gz: f69694b7ece927b37a851a5d88a96d4170325a45e6c69240707a46c1dfd5bc967314a7ba8ad3993ea3d6576e078d91a8851b10f3811698b033b59e0841866d60
-  data.tar.gz: 7f6d85a802d9483abc354ccfd5d25b565d4a7affa0a7075e00f6a394af50716f60eaaedcae280b3583f11c0f9115384e16c57ad5d49d44bd07d6c8be4a837493
+  metadata.gz: 207674ca4d193805cab007b1ec73303d3ec3701186f3471245cd86f366fd6d967b25ad44982d02fcc5e0b44e1257e7bac93501db953de5acc1ae2047b5ca079a
+  data.tar.gz: 136aca0f48b4d564370bfe6674758ea8e67d2c32b29c2cc9d922e240d70cf9ccd4400ca590a2aed8eaa234a7d9a8bcd318a49cbcc1686b514d38bfb485391750

data/lib/protip/wrapper.rb

@@ -18,34 +18,47 @@ module Protip
 
     def respond_to?(name)
       if super
-        true
+        return true
       else
         # Responds to calls to oneof groups by name
         return true if message.class.descriptor.lookup_oneof(name.to_s)
 
         # Responds to field getters, setters, and in the scalar enum case, query methods
-        message.class.descriptor.any? do |field|
-          regex = /^#{field.name}[=#{self.class.matchable?(field) ? '\\?' : ''}]?$/
-          name.to_s =~ regex
+        field = message.class.descriptor.lookup(name.to_s.gsub(/[=?]$/, ''))
+        return false if !field
+        if name[-1, 1] == '?'
+          # For query methods, only respond  if the field is matchable
+          return self.class.matchable?(field)
+        else
+          return true
         end
       end
+      false
     end
 
     def method_missing(name, *args)
       descriptor = message.class.descriptor
+      name = name.to_s
+      last_char = name[-1, 1]
 
-      is_setter_method = name =~ /=$/
-      return method_missing_setter(name, *args) if is_setter_method
+      if last_char == '='
+        return method_missing_set(name, *args)
+      end
 
-      is_query_method = name =~ /\?$/
-      return method_missing_query(name, *args) if is_query_method
+      if last_char == '?'
+        return method_missing_query(name, *args)
+      end
 
-      field = descriptor.detect{|field| field.name.to_sym == name}
-      return method_missing_field(field, *args) if field
+      field = descriptor.lookup(name)
+      if field
+        return method_missing_field(field, *args)
+      end
 
-      oneof_descriptor = descriptor.lookup_oneof(name.to_s)
+      oneof = descriptor.lookup_oneof(name)
       # For calls to a oneof group, return the active oneof field, or nil if there isn't one
-      return method_missing_oneof(oneof_descriptor) if oneof_descriptor
+      if oneof
+        return method_missing_oneof(oneof, *args)
+      end
 
       super
     end
@@ -99,10 +112,8 @@ module Protip
     # @return [NilClass]
     def assign_attributes(attributes)
       attributes.each do |field_name, value|
-        field = message.class.descriptor.detect{|field| field.name == field_name.to_s}
-        if !field
-          raise ArgumentError.new("Unrecognized field: #{field_name}")
-        end
+        field = message.class.descriptor.lookup(field_name.to_s) ||
+          (raise ArgumentError.new("Unrecognized field: #{field_name}"))
 
         # For inconvertible nested messages, the value should be either a hash or a message
         if field.type == :message && !converter.convertible?(field.subtype.msgclass)
@@ -235,44 +246,36 @@ module Protip
 
     end
 
-    def method_missing_oneof(oneof_descriptor)
-      oneof_field_name = message.send(oneof_descriptor.name)
-      return if oneof_field_name.nil?
-      oneof_field_name = oneof_field_name.to_s
-      oneof_field = oneof_descriptor.detect {|field| field.name == oneof_field_name}
-      oneof_field ? get(oneof_field) : nil
+    def method_missing_oneof(oneof, *args)
+      raise ArgumentError unless args.length == 0
+      field_name = message.public_send(oneof.name)
+
+      field_name ? get(message.class.descriptor.lookup(field_name.to_s)) : nil
     end
 
     def method_missing_field(field, *args)
-      if field
-        raise ArgumentError unless args.length == 0
-        get(field)
-      end
+      raise ArgumentError unless args.length == 0
+      get field
     end
 
     def method_missing_query(name, *args)
-      field = message.class.descriptor.detect do |field|
-        self.class.matchable?(field) && :"#{field.name}?" == name
-      end
-      if args.length == 1
-        # this is an enum query, e.g. `state?(:CREATED)`
-        matches? field, args[0]
-      elsif args.length == 0
-        # this is a boolean query, e.g. `approved?`
-        get field
+      field = message.class.descriptor.lookup(name[0, name.length - 1])
+      raise NoMethodError if !field || !self.class.matchable?(field)
+      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')
       else
-        raise ArgumentError
+        raise NoMethodError
       end
     end
 
-    def method_missing_setter(name, *args)
-      field = message.class.descriptor.detect{|field| :"#{field.name}=" == name}
-      if field
-        raise ArgumentError unless args.length == 1
-        attributes = {}.tap { |hash| hash[field.name] = args[0] }
-        assign_attributes attributes
-        return args[0] # return the input value (to match ActiveRecord behavior)
-      end
+    def method_missing_set(name, *args)
+      raise ArgumentError unless args.length == 1
+      field = message.class.descriptor.lookup(name[0, name.length - 1])
+      raise(NoMethodError.new) unless field
+      set(field, args[0])
     end
   end
 end

data/test/test_helper.rb

@@ -2,5 +2,6 @@ require 'minitest/autorun'
 require 'mocha/mini_test'
 require 'webmock/minitest'
 require 'minitest/stub/const'
+require 'minitest/debugger' if ENV['DEBUG']
 
 require 'minitest/pride'

data/test/unit/protip/resource_test.rb

@@ -126,14 +126,13 @@ module Protip::ResourceTest # Namespace for internal constants
 
         it 'returns the active oneof field when a oneof group accessor is called' do
           resource = resource_class.new
-          foo, bar = 'foo', 'bar'
-          resource.oneof_string1 = foo
-          assert_equal resource.oneof_string1, resource.oneof_group
-          resource.oneof_string2 = bar
-          assert_equal resource.oneof_string2, resource.oneof_group
-          resource.oneof_string2 = bar
-          resource.oneof_string1 = foo
-          assert_equal resource.oneof_string1, resource.oneof_group
+          resource.oneof_string1 = 'foo'
+          assert_equal 'foo', resource.oneof_group
+          resource.oneof_string2 = 'bar'
+          assert_equal 'bar', resource.oneof_group
+          resource.oneof_string2 = 'bar'
+          resource.oneof_string1 = 'foo'
+          assert_equal 'foo', resource.oneof_group
         end
 
         it 'sets fields on the underlying message when simple setters are called' do

data/test/unit/protip/wrapper_test.rb

@@ -404,6 +404,22 @@ module Protip::WrapperTest # namespace for internal constants
       end
     end
 
+    describe 'attribute reader' do # generated via method_missing?
+      it 'returns the underlying assigned value for oneof fields' do
+        wrapper.oneof_string1 = 'foo'
+        assert_equal 'foo', wrapper.oneof_group
+        wrapper.oneof_string2 = 'bar'
+        assert_equal 'bar', wrapper.oneof_group
+        wrapper.oneof_string2 = 'bar'
+        wrapper.oneof_string1 = 'foo'
+        assert_equal 'foo', wrapper.oneof_group
+      end
+
+      it 'returns nil for oneof fields that have not been set' do
+        assert_nil wrapper.oneof_group
+      end
+    end
+
     describe 'attribute writer' do # generated via method_missing?
 
       before do
@@ -429,8 +445,8 @@ module Protip::WrapperTest # namespace for internal constants
         assert_equal inner_message_class.new(value: 30), wrapper.message.inner
       end
 
-      it 'removes message fields when assigning nil' do
-        converter.expects(:convertible?).at_least_once.with(inner_message_class).returns(false)
+      it 'removes message fields when assigning nil, without checking with the converter' do
+        converter.expects(:convertible?).never
         converter.expects(:to_message).never
 
         wrapper.inner = nil
@@ -446,7 +462,6 @@ module Protip::WrapperTest # namespace for internal constants
       end
 
       it 'passes through messages without checking whether they are convertible' do
-        converter.expects(:convertible?).once.returns(true)
         message = inner_message_class.new(value: 50)
 
         converter.expects(:convertible?).never

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protip
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.18.5
 platform: ruby
 authors:
 - AngelList
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -98,6 +98,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest-stub-const
   requirement: !ruby/object:Gem::Requirement