constrain 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f6fc2db2a7997351f2df9185e2283863d53c53b806c2f888f0cba637530d62b
-  data.tar.gz: 96ecb2679c16da578365a499bdfe393dd4c9ff72e4121139b18b35d00102019f
+  metadata.gz: 7b497524127f01a38cc3c6f4061e91e0cad65b587538d57f69b194a550d46bf1
+  data.tar.gz: 95cff0709eb06ab088fee635c5629de99d16f521f9d24ea0a603ddb4d0968780
 SHA512:
-  metadata.gz: fdd94bbb07066064239fd7b137d06b7e43465b6c72b80dafc419d846956c11b23c87f2dab3c32fd3e0a27ea45aeafeb00c1bde712ffd61d33f0c53d90c700fdd
-  data.tar.gz: 8c4bce76f79ce7aa93743f7ea33b899ad19a17b3e590e1a2ec9204ec0cc51b33be3d756d070963e3f752326cc3021608b12023611b54c2b92c4f79e125e859a8
+  metadata.gz: f843d4f4b653ab255f52d9c5188b3d9d72c0170e0f4af4522404e4d993b97f6629b0b61c665a9cc47f3fc89a22ca7f7beb9efd68dfdae186c5d1502b320004d7
+  data.tar.gz: 70654e57d920e7f13a92394d57f7b5ddff2529ebe346507de201f47ce9aad77beef17992419dea84f1ba795b4de7d8443a65d3250b9a46298f8b1896d43dbeb4

data/TODO

@@ -1,9 +1,15 @@
 
-o A tuple method: "Symbol => constrain.tuple(String, Integer)"
+o Use | to create class-or expressions
+  o Old: Class | Class syntax
+o Use & to construct tuple expressions
+  o Old: A tuple method: "Symbol => constrain.tuple(String, Integer)"
+o Better error message for 'constrain EXPR'
+o Explain that 'constrain EXPR' can be used for 'constrain SomeClass < AnotherClass'
+o Match ranges and regular expressions
 o An array and hash method: "Symbol => constrain.array(Integer), String => constrain.hash(Symbol, Integer)"
-o Class | Class syntax
 o Constrained attributes: constrain_reader, constrain_writer, constrain_accessor: 
 o Messages should include info about the unexpected element type in arrays (and maybe more): "Expected [#<PgGraph::Data::Record:public.pings[1] {id: 1, name: 'Ping A'}>, #<PgGraph::Data::Record:public.pings[2] {id: 2, name: 'Ping B'}>, nil] to match [PgGraph::Data::Record]
 
 + constrain value, class-expr, "Error message"
 + Check against values: 'constrain arg, :one_value, :another_value, 1, 2, 3'
++ Allow 'constrain EXRP'

data/lib/constrain/version.rb

@@ -1,3 +1,3 @@
 module Constrain
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

data/lib/constrain.rb

@@ -65,9 +65,12 @@ module Constrain
     end
     
     begin
-      !exprs.empty? or raise ArgumentError, "Empty constraint"
-      exprs.any? { |expr| Constrain.do_constrain_value?(value, expr) } or 
-          raise MatchError.new(value, exprs, message: message, unwind: unwind)
+      if exprs.empty?
+        value or raise MatchError.new(value, [], message: message, unwind: unwind)
+      else
+        exprs.any? { |expr| Constrain.do_constrain_value?(value, expr) } or 
+            raise MatchError.new(value, exprs, message: message, unwind: unwind)
+      end
     rescue ArgumentError, Constrain::MatchError => ex
       ex.set_backtrace(caller[1 + unwind..-1])
       raise
@@ -85,7 +88,7 @@ module Constrain
   def self.do_constrain_value?(value, expr)
     case expr
       when Class, Module
-        value.is_a?(expr)
+        expr === value
       when Array
         !expr.empty? or raise ArgumentError, "Empty array in constraint"
         value.is_a?(Array) && value.all? { |elem| expr.any? { |e| Constrain.constrain?(elem, e) } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constrain
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov