bm-typed 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28fd1838d9a1659a003182955c8bb7d72e15cd231a0d68ab536373b188d200dc
-  data.tar.gz: f40f3685b87a1271f2d516ca9b0718f5543da5422f106bf27d81f42404bf6dfc
+  metadata.gz: 9f429141987a2845ff72402f8fb9b49e052f92da390b4c7922a35c14f936cbfc
+  data.tar.gz: bd6e44b3def8e439828aeedad4b64cc4397d3bfdd1b90fe54ca0b3b733fa4de3
 SHA512:
-  metadata.gz: d9d8e1a676753700e5301b84ebc14d0c63593958b6ff71e997e08d9053049956a34700bd566441b96e0048918bd6ad95bae7fae723be1d9c031edc36c59dee50
-  data.tar.gz: e28ef39291fb44dd1f75e72773288c12d61c77aeab0d0d6be97aa4567e342bc0491dbbb731410a406113f23fbe191b7654f97730502f9dd41b8d951eaa3e1e22
+  metadata.gz: 7eea4da91207c22cda05f28bc37fd10990e0a582b1fae2acb238edbb5861dcc32a07dc94da543efa779b2309ffeaa0566f5aa088b00ebd811359cd9934a88660
+  data.tar.gz: a4f708f98dfcbb1e8cbb03188b6d6aa49969e8e22d6ea31a22d0cc95d1c7d4b7b32f030851a5e92f1988826a2d9150f58cb1c044becb879706202a4ed208bad0

data/lib/typed.rb

@@ -28,7 +28,7 @@ module Typed
         end
 
         def value(expected_value)
-            dry_constrained(eql: call(expected_value))
+            constrained(eql: call(expected_value))
         end
     end
 
@@ -99,8 +99,8 @@ module Typed
         }
         .constructor(input: Int | Float, swallow: [TypeError, ArgumentError]) { |value| ::Time.at(value) }
 
-    UUID = String.dry_constrained(format: /\A[a-f\d]{8}(-[a-f\d]{4}){3}-[a-f\d]{12}\z/)
+    UUID = String.constrained(format: /\A[a-f\d]{8}(-[a-f\d]{4}){3}-[a-f\d]{12}\z/)
         .constructor(input: String, &:downcase)
 
-    URL = String.dry_constrained(format: URI::DEFAULT_PARSER.make_regexp(%w[http https]))
+    URL = String.constrained(format: URI::DEFAULT_PARSER.make_regexp(%w[http https]))
 end

data/lib/typed/builder.rb

@@ -52,11 +52,11 @@ module Typed
             end
 
             def instance(expected_class)
-                dry_constrained(type: expected_class)
+                constrained(type: expected_class)
             end
 
             def enum(*values)
-                dry_constrained(included_in: values.map { |value| call(value) })
+                constrained(included_in: values.map { |value| call(value) })
             end
 
             def |(other)
@@ -72,6 +72,25 @@ module Typed
                 CoerceType.new(input, self, swallow, &block)
             end
 
+            def constrained(**dry_options, &constraint)
+                base = constraint ? ConstrainedType.new(self, &constraint) : self
+                base = base.dry_constrained(**dry_options) unless dry_options.empty?
+                base
+            end
+
+            def call(*args)
+                result = process((args + [Typed::Undefined]).first)
+                return result.value if result.ok
+
+                raise InvalidValue, result.message
+            end
+
+            def process(value)
+                Typed::Builder::Result.success(value)
+            end
+
+            protected
+
             def dry_constrained(**options)
                 predicate = ::Dry::Logic::RuleCompiler.new(::Dry::Logic::Predicates).call(
                     options.map { |key, val|
@@ -86,23 +105,6 @@ module Typed
                 end
             end
 
-            def constrained(&constraint)
-                return self unless constraint
-
-                ConstrainedType.new(self, &constraint)
-            end
-
-            def call(*args)
-                result = process((args + [Typed::Undefined]).first)
-                return result.value if result.ok
-
-                raise InvalidValue, result.message
-            end
-
-            def process(value)
-                Typed::Builder::Result.success(value)
-            end
-
             private
 
             def expected_type(type)

data/lib/typed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Typed
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bm-typed
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Frederic Terrazzoni