protip 0.10.7 → 0.11.0

data/test/unit/protip/standard_converter_test.rb

@@ -1,36 +1,39 @@
 require 'test_helper'
 
+require 'google/protobuf/wrappers'
 require 'protip/standard_converter'
 
 describe Protip::StandardConverter do
   let(:converter) { Protip::StandardConverter.new }
 
   let(:integer_types) do
-    [Protip::Int64Value, Protip::Int32Value, Protip::UInt64Value, Protip::UInt32Value]
+    [Google::Protobuf::Int64Value, Google::Protobuf::Int32Value, Google::Protobuf::UInt64Value, Google::Protobuf::UInt32Value]
   end
 
   let(:float_types) do
-    [Protip::FloatValue, Protip::DoubleValue]
+    [Google::Protobuf::FloatValue, Google::Protobuf::DoubleValue]
   end
 
   let(:bool_types) do
-    [Protip::BoolValue]
+    [Google::Protobuf::BoolValue]
   end
 
   let(:string_types) do
-    [Protip::StringValue, Protip::BytesValue]
+    [Google::Protobuf::StringValue, Google::Protobuf::BytesValue]
   end
 
 
   describe '#convertible?' do
     it 'converts all standard types' do
-      (integer_types + float_types + string_types + bool_types + [Protip::Date]).each do |message_class|
-        assert converter.convertible?(message_class), 'expected type not convertible'
+      (integer_types + float_types + string_types + bool_types + [Protip::Messages::Date]).each do |message_class|
+        assert converter.convertible?(message_class), "expected type #{message_class.descriptor.name} not convertible"
       end
     end
 
     it 'does not convert other message types' do
-      refute converter.convertible?(Class.new(::Protobuf::Message))
+      pool = Google::Protobuf::DescriptorPool.new
+      pool.build { add_message('test_message') { optional :id, :string, 1 } }
+      refute converter.convertible?(pool.lookup('test_message').msgclass)
     end
   end
 
@@ -49,9 +52,9 @@ describe Protip::StandardConverter do
     end
 
     it 'converts dates' do
-      date = converter.to_object(Protip::Date.new year: 2015, month: 2, day: 9)
-      assert_instance_of Date, date
-      assert_equal 'Mon, 09 Feb 2015', date.inspect
+      date = converter.to_object(::Protip::Messages::Date.new year: 2015, month: 2, day: 9)
+      assert_instance_of ::Date, date
+      assert_equal '2015-02-09', date.strftime
     end
   end
 
@@ -72,7 +75,7 @@ describe Protip::StandardConverter do
     it 'converts dates' do
       date = ::Date.new(2012, 5, 7)
       assert_equal 7, date.day # Sanity check argument order
-      assert_equal Protip::Date.new(year: 2012, month: 5, day: 7), converter.to_message(date, Protip::Date)
+      assert_equal ::Protip::Messages::Date.new(year: 2012, month: 5, day: 7), converter.to_message(date, ::Protip::Messages::Date)
     end
   end
 end

data/test/unit/protip/wrapper_test.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
 
+require 'google/protobuf'
+require 'protip/converter'
 require 'protip/wrapper'
 
 module Protip::WrapperTest # namespace for internal constants
@@ -9,18 +11,35 @@ module Protip::WrapperTest # namespace for internal constants
         include Protip::Converter
       end.new
     end
+    let :pool do
+      pool = Google::Protobuf::DescriptorPool.new
+      pool.build do
+        add_message 'inner_message' do
+          optional :value, :int64, 1
+          optional :note, :string, 2
+        end
+
+        add_message 'message' do
+          optional :inner, :message, 1, 'inner_message'
+          optional :string, :string, 2
 
-    class InnerMessage < ::Protobuf::Message
-      required :int64, :value, 1
-      optional :string, :note, 2
+          repeated :inners, :message, 3, 'inner_message'
+          repeated :strings, :string, 4
+
+          optional :inner_blank, :message, 5, 'inner_message'
+        end
+      end
+      pool
     end
-    class Message < ::Protobuf::Message
-      optional InnerMessage, :inner, 1
-      optional :string, :string, 2
+
+    %w(inner_message message).each do |name|
+      let(:"#{name}_class") do
+        pool.lookup(name).msgclass
+      end
     end
 
     let(:wrapped_message) do
-      Message.new(inner: {value: 25}, string: 'test')
+      message_class.new(inner: inner_message_class.new(value: 25), string: 'test')
     end
 
     let(:wrapper) do
@@ -31,10 +50,12 @@ module Protip::WrapperTest # namespace for internal constants
       it 'adds setters for message fields' do
         assert_respond_to wrapper, :string=
         assert_respond_to wrapper, :inner=
+        assert_respond_to wrapper, :inner_blank=
       end
       it 'adds getters for message fields' do
         assert_respond_to wrapper, :string
         assert_respond_to wrapper, :inner
+        assert_respond_to wrapper, :inner_blank
       end
       it 'responds to standard defined methods' do
         assert_respond_to wrapper, :as_json
@@ -52,30 +73,38 @@ module Protip::WrapperTest # namespace for internal constants
         end
       end
 
+      it 'raises an error when building a repeated primitive field' do
+        assert_raises RuntimeError do
+          wrapper.build(:strings)
+        end
+      end
+
+      # TODO: How to add a new message to a repeated message field?
+
       it 'raises an error when building a convertible message' do
-        converter.stubs(:convertible?).with(InnerMessage).returns(true)
+        converter.stubs(:convertible?).with(inner_message_class).returns(true)
         assert_raises RuntimeError do
           wrapper.build(:inner)
         end
       end
 
       describe 'with an inconvertible message field' do
-        let(:wrapped_message) { Message.new }
+        let(:wrapped_message) { message_class.new }
 
         before do
-          converter.stubs(:convertible?).with(InnerMessage).returns(false)
+          converter.stubs(:convertible?).with(inner_message_class).returns(false)
         end
 
         it 'builds the message when no attributes are provided' do
           assert_nil wrapped_message.inner # Sanity check
           wrapper.build(:inner)
-          assert_equal InnerMessage.new, wrapped_message.inner
+          assert_equal inner_message_class.new, wrapped_message.inner
         end
 
         it 'overwrites the message if it exists' do
-          wrapped_message.inner = InnerMessage.new(value: 4)
+          wrapped_message.inner = inner_message_class.new(value: 4)
           wrapper.build(:inner)
-          assert_equal InnerMessage.new, wrapped_message.inner
+          assert_equal inner_message_class.new, wrapped_message.inner
         end
 
         it 'delegates to #assign_attributes if attributes are provided' do
@@ -96,11 +125,28 @@ module Protip::WrapperTest # namespace for internal constants
         assert_equal 'another thing', wrapped_message.string
       end
 
-      it 'assigns convertible message fields directly' do
-        converter.stubs(:convertible?).with(InnerMessage).returns(true)
-        converter.expects(:to_message).once.with(45, InnerMessage).returns(InnerMessage.new(value: 43))
-        wrapper.assign_attributes inner: 45
-        assert_equal InnerMessage.new(value: 43), wrapped_message.inner
+      it 'assigns repeated primitive fields from an enumerator' do
+        wrapper.assign_attributes strings: ['one', 'two']
+        assert_equal ['one', 'two'], wrapped_message.strings
+      end
+
+      describe 'when assigning convertible message fields' do
+        before do
+          converter.stubs(:convertible?).with(inner_message_class).returns(true)
+        end
+
+        it 'converts Ruby values to protobuf messages' do
+          converter.stubs(:convertible?).with(inner_message_class).returns(true)
+          converter.expects(:to_message).once.with(45, inner_message_class).returns(inner_message_class.new(value: 43))
+          wrapper.assign_attributes inner: 45
+          assert_equal inner_message_class.new(value: 43), wrapped_message.inner
+        end
+
+        it 'allows messages to be assigned directly' do
+          message = inner_message_class.new
+          wrapper.assign_attributes inner: message
+          assert_same message, wrapper.message.inner
+        end
       end
 
       it 'returns nil' do
@@ -109,27 +155,35 @@ module Protip::WrapperTest # namespace for internal constants
 
       describe 'when assigning inconvertible message fields' do
         before do
-          converter.stubs(:convertible?).with(InnerMessage).returns(false)
+          converter.stubs(:convertible?).with(inner_message_class).returns(false)
         end
 
         it 'sets multiple attributes' do
           wrapper.assign_attributes string: 'test2', inner: {value: 50}
           assert_equal 'test2', wrapped_message.string
-          assert_equal InnerMessage.new(value: 50), wrapped_message.inner
+          assert_equal inner_message_class.new(value: 50), wrapped_message.inner
         end
 
         it 'updates inconvertible message fields which have already been built' do
-          wrapped_message.inner = InnerMessage.new(value: 60)
+          wrapped_message.inner = inner_message_class.new(value: 60)
           wrapper.assign_attributes inner: {note: 'updated'}
-          assert_equal InnerMessage.new(value: 60, note: 'updated'), wrapped_message.inner
+          assert_equal inner_message_class.new(value: 60, note: 'updated'), wrapped_message.inner
         end
 
-        it 'delegates to itself when setting nested attributes on inconvertible message fields' do
+        it 'delegates to #assign_attributes on a nested wrapper when setting nested attributes on inconvertible message fields' do
           inner = mock
-          wrapper.stubs(:get).with(wrapped_message.class.fields.detect{|f| f.name == :inner}).returns(inner)
+          field = wrapped_message.class.descriptor.detect{|f| f.name.to_sym == :inner}
+          raise 'unexpected' if !field
+          wrapper.stubs(:get).with(field).returns(inner)
           inner.expects(:assign_attributes).once.with(value: 50, note: 'noted')
           wrapper.assign_attributes inner: {value: 50, note: 'noted'}
         end
+
+        it 'allows messages to be assigned directly' do
+          message = inner_message_class.new
+          wrapper.assign_attributes inner: message
+          assert_same message, wrapper.message.inner
+        end
       end
     end
 
@@ -140,9 +194,9 @@ module Protip::WrapperTest # namespace for internal constants
       end
 
       it 'returns false when messages are not equal' do
-        alternate_message = Message.new
-        refute_equal alternate_message, wrapped_message # Sanity check
-        refute_equal wrapper, Protip::Wrapper.new(alternate_message, converter)
+        alternate_message = message_class.new
+        refute_equal alternate_message, wrapper.message # Sanity check
+        refute_equal wrapper, Protip::Wrapper.new(alternate_message, wrapper.converter)
       end
 
       it 'returns false when converters are not equal' do
@@ -169,15 +223,21 @@ module Protip::WrapperTest # namespace for internal constants
       end
 
       it 'converts convertible messages' do
-        converter.expects(:convertible?).with(InnerMessage).once.returns(true)
-        converter.expects(:to_object).with(InnerMessage.new(value: 25)).returns 40
+        converter.expects(:convertible?).with(inner_message_class).once.returns(true)
+        converter.expects(:to_object).once.with(inner_message_class.new(value: 25)).returns 40
         assert_equal 40, wrapper.inner
       end
 
       it 'wraps inconvertible messages' do
-        converter.expects(:convertible?).with(InnerMessage).once.returns(false)
+        converter.expects(:convertible?).with(inner_message_class).once.returns(false)
         converter.expects(:to_object).never
-        assert_equal Protip::Wrapper.new(InnerMessage.new(value: 25), converter), wrapper.inner
+        assert_equal Protip::Wrapper.new(inner_message_class.new(value: 25), converter), wrapper.inner
+      end
+
+      it 'returns nil for messages that have not been set' do
+        converter.expects(:convertible?).never
+        converter.expects(:to_object).never
+        assert_equal nil, wrapper.inner_blank
       end
     end
 
@@ -191,15 +251,23 @@ module Protip::WrapperTest # namespace for internal constants
       end
 
       it 'converts convertible messages' do
-        converter.expects(:convertible?).with(InnerMessage).once.returns(true)
-        converter.expects(:to_message).with(40, InnerMessage).returns(InnerMessage.new(value: 30))
+        converter.expects(:convertible?).with(inner_message_class).once.returns(true)
+        converter.expects(:to_message).with(40, inner_message_class).returns(inner_message_class.new(value: 30))
 
         wrapper.inner = 40
-        assert_equal InnerMessage.new(value: 30), wrapper.message.inner
+        assert_equal inner_message_class.new(value: 30), wrapper.message.inner
+      end
+
+      it 'removes message fields when assigning nil' do
+        converter.expects(:convertible?).never
+        converter.expects(:to_message).never
+
+        wrapper.inner = nil
+        assert_equal nil, wrapper.message.inner
       end
 
       it 'raises an error when setting inconvertible messages' do
-        converter.expects(:convertible?).with(InnerMessage).once.returns(false)
+        converter.expects(:convertible?).with(inner_message_class).once.returns(false)
         converter.expects(:to_message).never
         assert_raises ArgumentError do
           wrapper.inner = 'cannot convert me'
@@ -210,8 +278,8 @@ module Protip::WrapperTest # namespace for internal constants
         converter.expects(:convertible?).never
         converter.expects(:to_message).never
 
-        wrapper.inner = InnerMessage.new(value: 50)
-        assert_equal InnerMessage.new(value: 50), wrapper.message.inner
+        wrapper.inner = inner_message_class.new(value: 50)
+        assert_equal inner_message_class.new(value: 50), wrapper.message.inner
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protip
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.11.0
 platform: ruby
 authors:
 - AngelList
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -51,19 +51,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: protobuf
+  name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.0.0.alpha.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.0.0.alpha.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -142,18 +142,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- definitions/google/protobuf/wrappers.proto
 - definitions/protip/messages/array.proto
 - definitions/protip/messages/errors.proto
 - definitions/protip/messages/types.proto
-- definitions/protip/messages/wrappers.proto
+- lib/google/protobuf/wrappers.rb
 - lib/protip.rb
 - lib/protip/client.rb
 - lib/protip/converter.rb
 - lib/protip/error.rb
-- lib/protip/messages/array.pb.rb
-- lib/protip/messages/errors.pb.rb
-- lib/protip/messages/types.pb.rb
-- lib/protip/messages/wrappers.pb.rb
+- lib/protip/messages/array.rb
+- lib/protip/messages/errors.rb
+- lib/protip/messages/types.rb
 - lib/protip/resource.rb
 - lib/protip/standard_converter.rb
 - lib/protip/wrapper.rb

data/definitions/protip/messages/wrappers.proto

@@ -1,60 +0,0 @@
-package protip;
-
-/////
-// Wrappers, copied from https://github.com/google/protobuf/blob/master/src/google/protobuf/wrappers.proto
-// These should exactly match the structure of those built-in types, so that users can safely swap them in
-// when upgrading to proto3.
-
-// Wrapper message for double.
-message DoubleValue {
-  // The double value.
-  required double value = 1;
-}
-
-// Wrapper message for float.
-message FloatValue {
-  // The float value.
-  required float value = 1;
-}
-
-// Wrapper message for int64.
-message Int64Value {
-  // The int64 value.
-  required int64 value = 1;
-}
-
-// Wrapper message for uint64.
-message UInt64Value {
-  // The uint64 value.
-  required uint64 value = 1;
-}
-
-// Wrapper message for int32.
-message Int32Value {
-  // The int32 value.
-  required int32 value = 1;
-}
-
-// Wrapper message for uint32.
-message UInt32Value {
-  // The uint32 value.
-  required uint32 value = 1;
-}
-
-// Wrapper message for bool.
-message BoolValue {
-  // The bool value.
-  required bool value = 1;
-}
-
-// Wrapper message for string.
-message StringValue {
-  // The string value.
-  required string value = 1;
-}
-
-// Wrapper message for bytes.
-message BytesValue {
-  // The bytes value.
-  required bytes value = 1;
-}