protip 0.30.8 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b700562f8cedc2912054670d12c0c41a5ad3f84
-  data.tar.gz: 0d7570c79be4b391c252482d161aa10acf739fc1
+  metadata.gz: 942ae2f8166273c93dda19be2e9e27252bc508fc
+  data.tar.gz: e47259c27cca062b7b72052a1e20fcdd6505c2ff
 SHA512:
-  metadata.gz: 42fdc7f6b8a8b18128edae66d2af7d62f7e83ac7556bfd3dd4ebaabe26161daecde74932762f39da43fee776225cc66257240668bbbb16611c6c733f65ac3cfa
-  data.tar.gz: f58984dd3bbc99af11bee730cc577fca94e1623c1b282c17b32ea0f292b7095086835a53f544d641625af5313538d22edd331c993214dc69acc62283b3e62afa
+  metadata.gz: 2e2c0c8055391b79e00fbb3ef947316a7ad8fc6140c6cf9ed5f13f1dc3c45aedeb5ae897cab55dc1cb08c34343244054b7b2b425831d9619f453228e7ab92b0c
+  data.tar.gz: 16684e44a0768fa4fed229ce553621b4b265760c0698b076d0d9e012418000dde423f3fc6e79c047dd67bfe29268ddff52d780750a55c462a3521bb225425c1f

data/lib/protip/error.rb

@@ -1,6 +1,6 @@
 # Runtime exceptions for the library (protip/messages/errors defines the messages backing resource errors).
 
-require 'protip/messages/errors'
+require 'protip/messages/errors_pb'
 
 module Protip
   class Error < RuntimeError

data/lib/protip/messages/active_support/time_with_zone_pb.rb

@@ -0,0 +1,19 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: protip/messages/active_support/time_with_zone.proto
+
+require 'google/protobuf'
+
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_message "protip.messages.ActiveSupport.TimeWithZone" do
+    optional :utc_timestamp, :int64, 1
+    optional :time_zone_name, :string, 2
+  end
+end
+
+module Protip
+  module Messages
+    module ActiveSupport
+      TimeWithZone = Google::Protobuf::DescriptorPool.generated_pool.lookup("protip.messages.ActiveSupport.TimeWithZone").msgclass
+    end
+  end
+end

data/lib/protip/messages/{money.rb → money_pb.rb}

@@ -3,7 +3,7 @@
 
 require 'google/protobuf'
 
-require 'protip/messages/currency'
+require 'protip/messages/currency_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "protip.messages.Money" do
     optional :amount_cents, :int64, 1

data/lib/protip/messages/{repeated_wrappers.rb → repeated_wrappers_pb.rb}

@@ -3,7 +3,7 @@
 
 require 'google/protobuf'
 
-require 'protip/extensions'
+require 'protip/extensions_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "protip.messages.RepeatedDouble" do
     repeated :values, :double, 1

data/lib/protip/messages/{test.rb → test_pb.rb}

@@ -3,8 +3,8 @@
 
 require 'google/protobuf'
 
-require 'protip/messages/repeated_wrappers'
-require 'protip/messages/wrappers'
+require 'protip/messages/repeated_wrappers_pb'
+require 'protip/messages/wrappers_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "protip.messages.EnumTest" do
     optional :enum, :message, 1, "protip.messages.EnumValue"

data/lib/protip/messages/{wrappers.rb → wrappers_pb.rb}

@@ -3,7 +3,7 @@
 
 require 'google/protobuf'
 
-require 'protip/extensions'
+require 'protip/extensions_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "protip.messages.EnumValue" do
     optional :value, :int32, 1

data/lib/protip/messages_pb.rb

@@ -0,0 +1,18 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: protip/messages.proto
+
+require 'google/protobuf'
+
+require 'protip/messages/array_pb'
+require 'protip/messages/big_decimal_value_pb'
+require 'protip/messages/currency_pb'
+require 'protip/messages/errors_pb'
+require 'protip/messages/money_pb'
+require 'protip/messages/range_pb'
+require 'protip/messages/repeated_wrappers_pb'
+require 'protip/messages/types_pb'
+require 'protip/messages/wrappers_pb'
+require 'protip/messages/active_support/time_with_zone_pb'
+Google::Protobuf::DescriptorPool.generated_pool.build do
+end
+

data/lib/protip/resource.rb

@@ -25,7 +25,7 @@ require 'protip/error'
 require 'protip/decorator'
 require 'protip/transformers/default_transformer'
 
-require 'protip/messages/array'
+require 'protip/messages/array_pb'
 
 require 'protip/resource/creatable'
 require 'protip/resource/updateable'
@@ -302,19 +302,7 @@ module Protip
       keys.each do |key|
         old_value = old_attributes[key]
         new_value = message[key]
-        begin
-          changed = !(old_value.class == new_value.class && old_value == new_value)
-        rescue TypeError => e
-
-          # Workaround for a protip bug when comparing messages with
-          # nested messages where the left side is non-nil and the
-          # right side is nil.
-          if e.message == 'wrong argument type nil (expected Message)'
-            changed = true
-          else
-            raise e
-          end
-        end
+        changed = !(old_value.class == new_value.class && old_value == new_value)
 
         if changed
           send "#{key}_will_change!"

data/lib/protip/tasks/compile.rake

@@ -9,14 +9,14 @@ namespace :protip do
 
     filename = args[:filename] || raise(ArgumentError.new 'filename argument is required')
 
-    command = "protoc #{proto_path.map{|p| "--proto_path=#{Shellwords.escape p}"}.join ' '} --ruby_out=#{Shellwords.escape ruby_path} #{Shellwords.escape filename}"
+    command = "grpc_tools_ruby_protoc #{proto_path.map{|p| "--proto_path=#{Shellwords.escape p}"}.join ' '} --ruby_out=#{Shellwords.escape ruby_path} #{Shellwords.escape filename}"
     puts command
     system command
 
     ## ridiculous hack around missing options in Ruby, remove when https://github.com/google/protobuf/issues/1198 is resolved
     package_match = File.read(filename).match(/package "?([a-zA-Z0-9\.]+)"?;/)
     package = (package_match ? package_match[1] : nil)
-    ruby_file = filename.gsub(/^#{proto_path.first}\/?/, "#{ruby_path}/").gsub(/proto$/, 'rb') # Relies on a relative filename and proto path, which protoc requires anyway at this point
+    ruby_file = filename.gsub(/^#{proto_path.first}\/?/, "#{ruby_path}/").gsub(/\.proto$/, '_pb.rb') # Relies on a relative filename and proto path, which protoc requires anyway at this point
     raise "cannot find generated Ruby file (#{ruby_file})" unless File.exists?(ruby_file)
 
     # Push/pop message names as we move through the protobuf file

data/test/functional/protip/decorator_test.rb

@@ -4,9 +4,9 @@ require 'protip/decorator'
 require 'protip/transformers/default_transformer'
 
 require 'google/protobuf'
-require 'google/protobuf/wrappers'
+require 'google/protobuf/wrappers_pb'
 
-require 'protip/messages/test' # For the enum hack
+require 'protip/messages/test_pb' # For the enum hack
 
 # Tests the whole decoration/transformation process with the default
 # transformer, using well-known types and other transformable message

data/test/functional/protip/resource_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 require 'protip'
-require 'google/protobuf/wrappers'
+require 'google/protobuf/wrappers_pb'
 
 describe 'Protip::Resource (functional)' do
 

data/test/unit/protip/decorator_test.rb

@@ -437,7 +437,7 @@ describe Protip::Decorator do
 
     it 'returns nil for messages that have not been set' do
       transformer.expects(:to_object).never
-      assert_equal nil, decorator.inner_blank
+      assert_nil decorator.inner_blank
     end
 
     it 'returns the underlying assigned value for oneof fields' do

data/test/unit/protip/resource/associations/belongs_to_polymorphic_association_test.rb

@@ -141,8 +141,9 @@ describe Protip::Resource::Associations::BelongsToPolymorphicAssociation do
 
         association.write(resource, nil)
 
-        assert_nil resource.rick_ross_id
-        assert_nil resource.fetty_wap_id
+        assert_nil resource.message.reference_id
+        assert resource.rick_ross_id.blank?
+        assert resource.fetty_wap_id.blank?
       end
     end
   end

data/test/unit/protip/resource_test.rb

@@ -571,8 +571,13 @@ module Protip::ResourceTest # Namespace for internal constants
               returns(72)
 
             transformer.stubs(:to_object).
-              with(double_nested_message_class.any_instance, anything).
-              returns(100)
+              # Convert any +double_nested_message+ (with the correct
+              # associated field) to the same value, since we don't
+              # really care about testing it.
+              with do |value, field|
+                value.is_a?(double_nested_message_class) &&
+                  field.name == 'double_nested_message'
+              end.returns(100)
           end
           it 'marks messages as changed if they are changed as Ruby values' do
             setter.set nested_message: 42
@@ -602,18 +607,26 @@ module Protip::ResourceTest # Namespace for internal constants
             refute resource.string_changed?, 'field was marked as changed'
           end
 
-          # Test our workaround for a protobuf bug when comparing
-          # messages with sub-messages that are non-nil on the left,
-          # nil on the right.
-          it 'recognizes when double-nested messages are changed to nil values' do
+          # Test that we don't trigger an old protobuf bug when
+          # comparing messages with sub-messages that are non-nil on
+          # the left, nil on the right. (We used to work around this
+          # bug explicitly in our equality check, now just leaving the
+          # test in to make sure it doesn't come back.)
+          it 'recognizes_when_double-nested_messages_are_changed_to_nil_values' do
             # Initially the field should have its nested message set.
             resource.message.double_nested_message = double_nested_message_class.new(
               nested_message: nested_message_class.new(number: 10)
             )
 
+            # Sanity check
+            refute resource.double_nested_message_changed?
+
             # Then give it a field with a nil nested message to
             # trigger the protobuf bug.
             setter.set double_nested_message: double_nested_message_class.new
+
+            # Sanity check
+            assert resource.double_nested_message_changed?
           end
         end
       end

data/test/unit/protip/transformers/big_decimal_transformer_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'protip/transformers/big_decimal_transformer'
 
-require 'protip/messages'
+require 'protip/messages_pb'
 
 describe Protip::Transformers::BigDecimalTransformer do
   let(:transformer) { Protip::Transformers::BigDecimalTransformer.new }

data/test/unit/protip/transformers/deprecated_transformer_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 require 'protip/transformers/deprecated_transformer'
 
-require 'protip/messages'
+require 'protip/messages_pb'
 
 describe Protip::Transformers::DeprecatedTransformer do
   let(:transformer) { Protip::Transformers::DeprecatedTransformer.new }

data/test/unit/protip/transformers/enum_transformer_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 require 'protip/transformers/enum_transformer'
 
-require 'protip/messages'
+require 'protip/messages_pb'
 
 describe Protip::Transformers::EnumTransformer do
   let(:transformer) { Protip::Transformers::EnumTransformer.new }

data/test/unit/protip/transformers/primitives_transformer_test.rb

@@ -3,8 +3,8 @@ require 'base64'
 
 require 'protip/transformers/primitives_transformer'
 
-require 'google/protobuf/wrappers'
-require 'protip/messages'
+require 'google/protobuf/wrappers_pb'
+require 'protip/messages/errors_pb'
 
 describe ::Protip::Transformers::PrimitivesTransformer do
   let(:transformer) { ::Protip::Transformers::PrimitivesTransformer.new }

data/test/unit/protip/transformers/timestamp_transformer_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 require 'protip/transformers/timestamp_transformer'
-require 'google/protobuf/timestamp'
+require 'google/protobuf/timestamp_pb'
 
 describe Protip::Transformers::TimestampTransformer do
   let(:transformer) { Protip::Transformers::TimestampTransformer.new }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protip
 version: !ruby/object:Gem::Version
-  version: 0.30.8
+  version: 0.31.0
 platform: ruby
 authors:
 - AngelList
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,9 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,23 +47,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha.5.0.5.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha.5.0.5.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +84,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: grpc-tools
+  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
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +168,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -195,19 +223,20 @@ files:
 - lib/protip/client.rb
 - lib/protip/decorator.rb
 - lib/protip/error.rb
-- lib/protip/extensions.rb
-- lib/protip/messages.rb
+- lib/protip/extensions_pb.rb
 - lib/protip/messages/active_support/time_with_zone.rb
-- lib/protip/messages/array.rb
-- lib/protip/messages/big_decimal_value.rb
-- lib/protip/messages/currency.rb
-- lib/protip/messages/errors.rb
-- lib/protip/messages/money.rb
-- lib/protip/messages/range.rb
-- lib/protip/messages/repeated_wrappers.rb
-- lib/protip/messages/test.rb
-- lib/protip/messages/types.rb
-- lib/protip/messages/wrappers.rb
+- lib/protip/messages/active_support/time_with_zone_pb.rb
+- lib/protip/messages/array_pb.rb
+- lib/protip/messages/big_decimal_value_pb.rb
+- lib/protip/messages/currency_pb.rb
+- lib/protip/messages/errors_pb.rb
+- lib/protip/messages/money_pb.rb
+- lib/protip/messages/range_pb.rb
+- lib/protip/messages/repeated_wrappers_pb.rb
+- lib/protip/messages/test_pb.rb
+- lib/protip/messages/types_pb.rb
+- lib/protip/messages/wrappers_pb.rb
+- lib/protip/messages_pb.rb
 - lib/protip/resource.rb
 - lib/protip/resource/associations/association.rb
 - lib/protip/resource/associations/belongs_to_association.rb
@@ -266,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Resources backed by protobuf messages

data/lib/protip/messages.rb

@@ -1,18 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: protip/messages.proto
-
-require 'google/protobuf'
-
-require 'protip/messages/array'
-require 'protip/messages/big_decimal_value'
-require 'protip/messages/currency'
-require 'protip/messages/errors'
-require 'protip/messages/money'
-require 'protip/messages/range'
-require 'protip/messages/repeated_wrappers'
-require 'protip/messages/types'
-require 'protip/messages/wrappers'
-require 'protip/messages/active_support/time_with_zone'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-end
-