sorbet-coerce 0.2.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 017a474302bad34d6523e0140f0a221419874ddb6488f5cde3075458c54a245e
-  data.tar.gz: '0822f50c595a31bd377ff359d7e05f42ef60a2c4a9dd46915527dcf47c344081'
+  metadata.gz: 459ea1a3f906360f8a0e0d33969f49110476a1aa8d1772a1adc4dc1fc704140c
+  data.tar.gz: 7e2bf805fcb1d89de859312576d7e9e4eb782d03e4e7ff5929205c0fb676e377
 SHA512:
-  metadata.gz: e105f8b039d77562b9a03ed58cc55cebb2e55a526917d1965c2fce7e410869d8bb9ea1d94e50f8086d298bf818eb63b5fb6293326e073621f6dc66450d6632c8
-  data.tar.gz: 2c0be667253b77c2e84930cf1fa526b01ed79c3cb603b708e2256958d3def7679adb275cbeccee3f5e7e6649408445c43d3bb6892281fe42efaa511464963fbc
+  metadata.gz: c75dfa39c75773bd161fc67f2ee145192bc6431f58db621a39eadd2c02948d39a117f3d1a5c8ad277338cf1ab0342a6f4153f20326bd379e28e8a734ca1d190c
+  data.tar.gz: d9c87f91c2586aac705089fe519d6c58e28854fe8cf87019468f46ad4421e8166d5f042c6f512c983d25b120e4b31f699f755706694a47a29c91b2d38c1a5a78

data/lib/bundled_rbi/sorbet-coerce.rbi

@@ -1,4 +1,4 @@
-# typed: true
+# typed: false
 module SafeType
   class CoercionError < StandardError; end
 end

data/lib/sorbet-coerce/converter.rb

@@ -100,6 +100,10 @@ class TypeCoerce::Converter
 
       args = _build_args(value, type, raise_coercion_error)
       type.new(args)
+    elsif type.respond_to?(:<) && type < T::Enum
+      return value if value.is_a?(type)
+
+      _convert_enum(value, type, raise_coercion_error)
     else
       return value if value.is_a?(type)
 
@@ -107,6 +111,16 @@ class TypeCoerce::Converter
     end
   end
 
+  def _convert_enum(value, type, raise_coercion_error)
+    if raise_coercion_error
+      type.deserialize(value)
+    else
+      type.try_deserialize(value)
+    end
+  rescue KeyError
+    raise TypeCoerce::CoercionError.new(value, type)
+  end
+
   def _convert_simple(value, type, raise_coercion_error)
     return nil if _nil_like?(value, type)
 
@@ -116,6 +130,8 @@ class TypeCoerce::Converter
       safe_type_rule = SafeType::Boolean.strict
     elsif value.is_a?(type)
       return value
+    elsif type == BigDecimal
+      return BigDecimal(value)
     elsif PRIMITIVE_TYPES.include?(type)
       safe_type_rule = SafeType.const_get(type.name).strict
     else

data/spec/coerce_spec.rb

@@ -19,6 +19,7 @@ describe TypeCoerce do
     class Param < T::Struct
       const :id, Integer
       const :role, String, default: 'wizard'
+      const :price, BigDecimal
       const :info, ParamInfo
       const :opt, T.nilable(ParamInfo2)
     end
@@ -35,6 +36,17 @@ describe TypeCoerce do
       const :myhash, T::Hash[String, Integer], default: Hash['a' => 1]
     end
 
+    class TestEnum < T::Enum
+      enums do
+        Test = new
+        Other = new
+      end
+    end
+
+    class WithEnum < T::Struct
+      const :myenum, TestEnum
+    end
+
     class CustomType
       attr_reader :a
 
@@ -54,6 +66,7 @@ describe TypeCoerce do
     let!(:param) {
       TypeCoerce[Param].new.from({
         id: 1,
+        price: BigDecimal('98.76'),
         info: {
           name: 'mango',
           lvl: 100,
@@ -70,6 +83,7 @@ describe TypeCoerce do
     let!(:param2) {
       TypeCoerce[Param].new.from({
         id: '2',
+        price: '98.76',
         info: {
           name: 'honeydew',
           lvl: '5',
@@ -86,6 +100,7 @@ describe TypeCoerce do
     it 'reveals the right type' do
       T.assert_type!(param, Param)
       T.assert_type!(param.id, Integer)
+      T.assert_type!(param.price, BigDecimal)
       T.assert_type!(param.info, ParamInfo)
       T.assert_type!(param.info.name,String)
       T.assert_type!(param.info.lvl, Integer)
@@ -95,6 +110,7 @@ describe TypeCoerce do
     it 'coerces correctly' do
       expect(param.id).to eql 1
       expect(param.role).to eql 'wizard'
+      expect(param.price).to eql BigDecimal('98.76')
       expect(param.info.lvl).to eql 100
       expect(param.info.name).to eql 'mango'
       expect(param.info.skill_ids).to eql [123, 456]
@@ -102,6 +118,7 @@ describe TypeCoerce do
       expect(TypeCoerce[Param].new.from(param)).to eq(param)
 
       expect(param2.id).to eql 2
+      expect(param2.price).to eql BigDecimal('98.76')
       expect(param2.info.name).to eql 'honeydew'
       expect(param2.info.lvl).to eql 5
       expect(param2.info.skill_ids).to eql []
@@ -254,6 +271,24 @@ describe TypeCoerce do
     end
   end
 
+  context 'when dealing with enums' do
+    it 'coerces a serialized enum correctly' do
+      coerced = TypeCoerce[WithEnum].new.from(myenum: "test")
+      expect(coerced.myenum).to eq(TestEnum::Test)
+    end
+
+    it 'handles a real enum correctly' do
+      coerced = TypeCoerce[WithEnum].new.from(myenum: TestEnum::Test)
+      expect(coerced.myenum).to eq(TestEnum::Test)
+    end
+
+    it 'handles bad enum' do
+      expect {
+        TypeCoerce[WithEnum].new.from(myenum: "bad_key")
+      }.to raise_error(TypeCoerce::CoercionError)
+    end
+  end
+
   it 'works with T.untyped' do
     expect(TypeCoerce[T.untyped].new.from(1)).to eql 1
 

data/spec/soft_error_spec.rb

@@ -4,6 +4,12 @@ require 'sorbet-runtime'
 
 describe TypeCoerce do
   context 'when type errors are soft errors' do
+    class SoftErrorTestEnum < T::Enum
+      enums do
+        Other = new
+      end
+    end
+
     let(:ignore_error) { Proc.new {} }
 
     before(:each) do
@@ -48,6 +54,7 @@ describe TypeCoerce do
 
     it 'works as expected' do
       expect(TypeCoerce[Integer].new.from(invalid_arg)).to eql(nil)
+      expect(TypeCoerce[SoftErrorTestEnum].new.from('bad_key')).to eql(nil)
 
       expect{TypeCoerce[T::Array[Integer]].new.from(1)}.to raise_error(TypeCoerce::ShapeError)
       expect(TypeCoerce[T::Array[Integer]].new.from({a: 1})).to eql([nil])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-coerce
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sorbet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.4704
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.4704
 - !ruby/object:Gem::Dependency
   name: polyfill
   requirement: !ruby/object:Gem::Requirement
@@ -72,44 +58,58 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4704
+- !ruby/object:Gem::Dependency
+  name: sorbet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.4704
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.4704
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.8'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.8'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.0.1
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 11.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.0.1
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 11.0.1
 description: 
@@ -146,8 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A type coercion lib works with Sorbet's static type checker and type definitions;