protip 0.20.5 → 0.20.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdaba74e3426217913cecb429128773ec0f99a11
-  data.tar.gz: f6b4e4a12759c456d03cc03b46370e50da93936b
+  metadata.gz: aefcea9ce37ffdc3bd5efcbea6aee568e3118715
+  data.tar.gz: 278db3d2ee173853e20822fb91ccb3c5b1640ae0
 SHA512:
-  metadata.gz: 0e52cd22f6aa297ccce908a0493f6c3bc579c71f65c2324e1254d672aef4f1e14af34c098e473c7320d45a237e83eb6035bf6c8200bb4799cf513ee3fe63f22e
-  data.tar.gz: 84212878c954c59a44d1eeca73c554138848da69ce075187b170e7630a3294380ba15cd03b447193d85f14026f47b02492f75ccee6712506fe6dd460dfe2aa9e
+  metadata.gz: 641d74e159b5c2faf1ee52e4c8bdf6de21a4ad4ab4c5da88c2b8945bb7c82dab79f6b511e85204dede81357be84399b3f3358e1865242d83ad10059723bca4cd
+  data.tar.gz: 44b654905cf19cc006452765fc5d1920841710bbc48c1a93c6c89525d8bdddf4edfd09a905b384b1c7ebc2a32bbc4898c3bf1cacb2c08281255a862cedbb8e45

data/lib/protip/standard_converter.rb

@@ -59,17 +59,29 @@ module Protip
     }
 
     ## Standard wrappers
-    %w(Int64 Int32 UInt64 UInt32 Double Float String Bytes).each do |type|
+    {
+      Int64: :to_i,
+      Int32: :to_i,
+      UInt64: :to_i,
+      UInt32: :to_i,
+      Double: :to_f,
+      Float: :to_f,
+      String: :to_s,
+      Bytes: nil,
+    }.each do |type, conversion|
       @conversions["google.protobuf.#{type}Value"] = {
         to_object: ->(message, field) { message.value },
         to_message: lambda do |value, message_class, field|
-          message_class.new value: value
+          message_class.new value: (conversion ? value.public_send(conversion) : value)
         end
       }
       @conversions["protip.messages.Repeated#{type}"] = {
         to_object: ->(message, field) { message.values.to_a.freeze },
         to_message: lambda do |value, message_class, field|
-          message_class.new values: (value.is_a?(Enumerable) ? value : [value])
+          values = (value.is_a?(Enumerable) ? value : [value]).map do |v|
+            conversion ? v.public_send(conversion) : v
+          end
+          message_class.new values: values
         end
       }
     end

data/test/unit/protip/standard_converter_test.rb

@@ -228,6 +228,28 @@ describe Protip::StandardConverter do
       end
     end
 
+    it 'converts wrapper types when set as a non-native type' do
+      # Convert from string
+      {
+        integer_value => integer_types,
+        float_value   => float_types,
+        bool_value    => bool_types,
+      }.each do |value, message_types|
+        message_types.each do |message_class|
+          assert_equal message_class.new(value: value), converter.to_message(value.to_s, message_class, field)
+        end
+      end
+
+      # Convert from integer
+      {
+        '4' => string_types,
+      }.each do |value, message_types|
+        message_types.each do |message_class|
+          assert_equal message_class.new(value: value), converter.to_message(value.to_i, message_class, field)
+        end
+      end
+    end
+
     it 'converts repeated types when set with a scalar value' do
       {
         integer_value => repeated_integer_types,
@@ -242,6 +264,29 @@ describe Protip::StandardConverter do
       end
     end
 
+    it 'converts repeated types when set with a non-native scalar type' do
+      # Convert from string
+      {
+        integer_value => repeated_integer_types,
+        float_value   => repeated_float_types,
+        bool_value    => repeated_bool_types,
+      }.each do |value, message_types|
+        message_types.each do |message_class|
+          assert_equal message_class.new(values: [value]), converter.to_message(value.to_s, message_class, field)
+        end
+      end
+
+      # Convert from integer
+      {
+        '4' => repeated_string_types,
+      }.each do |value, message_types|
+        message_types.each do |message_class|
+          assert_equal message_class.new(values: [value]), converter.to_message(value.to_i, message_class, field)
+        end
+      end
+
+    end
+
     it 'converts repeated types when set with an enumerable value' do
       {
         integer_value => repeated_integer_types,
@@ -258,6 +303,33 @@ describe Protip::StandardConverter do
       end
     end
 
+    it 'converts repeated types when set with a non-native enumerable type' do
+      # Convert from string
+      {
+        integer_value => repeated_integer_types,
+        float_value   => repeated_float_types,
+        bool_value    => repeated_bool_types,
+      }.each do |value, message_types|
+        message_types.each do |message_class|
+          assert_equal message_class.new(values: [value, value]), converter.to_message(
+            [value.to_s, value.to_s], message_class, field
+          )
+        end
+      end
+
+      # Convert from integer
+      {
+        '4' => repeated_string_types,
+      }.each do |value, message_types|
+        message_types.each do |message_class|
+          assert_equal message_class.new(values: [value, value]), converter.to_message(
+            [value.to_i, value.to_i], message_class, field
+          )
+        end
+      end
+
+    end
+
     it 'converts dates' do
       date = ::Date.new(2012, 5, 7)
       assert_equal 7, date.day # Sanity check argument order
@@ -427,4 +499,4 @@ describe Protip::StandardConverter do
 
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protip
 version: !ruby/object:Gem::Version
-  version: 0.20.5
+  version: 0.20.6
 platform: ruby
 authors:
 - AngelList
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel