constrain 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fda0b95a5d43c197c9df1134d68dbe4fbc1f8f71ad9dc7a8e995daf729eaea2c
-  data.tar.gz: 2fe722e5085bc9b396e203b3f3514a1f123c18843e293f902392519ef6a3d5ed
+  metadata.gz: 7128a60ecb2625da98babc6d2e193593b456b1facfe036be66549f6ae7f1c511
+  data.tar.gz: 94bb05e8469ceb9ef8291e0c0f09ef01ce965b7ba73ec426b66ff758f1abe8a5
 SHA512:
-  metadata.gz: bc98410262f21b5fea23182cad7c9e80e48a4aff7ff64dc7ff2113581440a191bfa9b77a28045624caf4f6e3102251e175841604c64461287ea7eb1062174bf2
-  data.tar.gz: c19a11b5ab9e22b49ad2204b276658d26b109296815e06298620fdb53104f6ce70625095b4ac5b3fbd3aff79664866de7afb3507cea1b5d1737aaf714c902c7e
+  metadata.gz: 6526db1c067478b13e834e7f5d74f868ecb39f79faf8454b95f543d6e9ea495d1735b981a6dec28b6eede26f13a4adbaadd2ca02e1125cc01fca7ec6dd313d6a
+  data.tar.gz: e199e4808f5eccdb63d183fc2fdce9cb9d6b258e3ae786c5009da3e4f49e1e3a0d36babb1424e14b92e3a7a3efa1072b49fa7a3d5cbd9b21a597b6eaf83fa901

data/README.md

@@ -104,7 +104,7 @@ means you can use regular expressions too:
 
 ```ruby
 # Simple email regular expression (https://stackoverflow.com/a/719543)
-EMAIL_RE = /^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$/
+EMAIL_RE = /^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9.-]+$/
 
 def email(address)
   constrain address, EMAIL_RE

data/TODO

@@ -1,6 +1,9 @@
 
+o A tuple method: "Symbol => constrain.tuple(String, Integer)"
+o An array and hash method: "Symbol => constrain.array(Integer), String => constrain.hash(Symbol, Integer)"
 o Class | Class syntax
-o attr_reader :variable, ClassExpr
-o 'constrain arg, :one_value, :another_value, 1, 2, 3'
+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'

data/lib/constrain/version.rb

@@ -1,3 +1,3 @@
 module Constrain
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/constrain.rb

@@ -40,8 +40,6 @@ module Constrain
 
   # Return true if the value matches the class expression. Raises a
   # Constrain::Error if the expression is invalid
-  #
-  # TODO: Allow *exprs
   def self.constrain?(value, expr)
     do_constrain?(value, expr)
   end
@@ -65,9 +63,10 @@ module Constrain
       unwind = 1
     end
     msg = exprs.pop if exprs.last.is_a?(String)
+    
     begin
-      !exprs.empty? or raise Error, "Empty class expression"
-      exprs.any? { |expr| Constrain.do_constrain?(value, expr) } or 
+      !exprs.empty? or raise Error, "Empty constraint"
+      exprs.any? { |expr| Constrain.do_constrain_value?(value, expr) } or 
           raise MatchError.new(value, exprs, msg, unwind: unwind)
     rescue Error => ex
       ex.set_backtrace(caller[1 + unwind..-1])
@@ -76,12 +75,19 @@ module Constrain
     value
   end
 
-  def self.do_constrain?(value, expr)
+  def self.do_constrain?(value, *exprs)
+    begin
+      !exprs.empty? or raise Error, "Empty constraint"
+      exprs.any? { |expr| Constrain.do_constrain_value?(value, expr) }
+    end
+  end
+
+  def self.do_constrain_value?(value, expr)
     case expr
       when Class, Module
         value.is_a?(expr)
       when Array
-        !expr.empty? or raise Error, "Empty array"
+        !expr.empty? or raise Error, "Empty array in constraint"
         value.is_a?(Array) && value.all? { |elem| expr.any? { |e| Constrain.constrain?(elem, e) } }
       when Hash
         value.is_a?(Hash) && value.all? { |key, value|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constrain
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Dynamic in-file type checking