constrain 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76b91e6d73a1c5d2f7c44fc98f372f5b911c08e6a6d4203a3be646019aaa1a3
-  data.tar.gz: da85fb71b85da4e54913cb227a162c901ef3fe88c61d091e3489a63a3a97a9e5
+  metadata.gz: 48a0683db5a9b95baaf0ca8ee0f59322ffadbfe9f8b524a9e6e3d53cf7d1f06c
+  data.tar.gz: 3d07bc32462abdd359a85130301a29680f108dfe30f9af43ae1cda10f2a21d7d
 SHA512:
-  metadata.gz: 3db8dbbb8a0b2eb8d0c8de705b85533a630748f9e02c4e82f324c8f705d9f01d251b4d9b9866d977b71aaef4beb29f1834f1ff058728055ef545d77ece25a506
-  data.tar.gz: 52a2ec74e4709506d7be7813b48d5a7ece977dc7314d591db5830033f2e477cab39d2dc26129e7d0d27727f57966b0c0957faf5ba701ef9f6754ca16123f342a
+  metadata.gz: fd9457aab6e64780ade38a804b914a3519a5c5f6cabf62cd35f94a5823eced188e2e9e89deb0980319ce6c6d565ebd97456f67b6a0657648226396b7476a0be2
+  data.tar.gz: 4f4fcedad8e23c7dcf7a1c52cc69c9f9361fbb95cd3e889c7295c6d0dbc85d67a547a0b9b9e4368d632a122ce1b6b3532a2ef89b00a92ea448a772360a47815a

data/lib/constrain/version.rb

@@ -1,3 +1,3 @@
 module Constrain
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/constrain.rb

@@ -3,8 +3,8 @@ require "constrain/version"
 module Constrain
   # Raised if types doesn't match a class expression
   class MatchError < StandardError
-    def initialize(value, exprs, msg = nil, unwind: 0)
-      super msg || "Expected #{value.inspect} to match #{Constrain.fmt_exprs(exprs)}"
+    def initialize(value, exprs, message: nil, unwind: 0)
+      super message || "Expected #{value.inspect} to match #{Constrain.fmt_exprs(exprs)}"
     end
   end
 
@@ -28,7 +28,7 @@ module Constrain
   #   constrain(value, *values, unwind: 0)
   #
   # Check that value matches one of the class expressions. Raises a
-  # Constrain::ArgumentError if the expression is invalid and a Constrain::MatchError if
+  # ArgumentError if the expression is invalid and a Constrain::MatchError if
   # the value doesn't match. The exception's backtrace skips :unwind number of
   # entries
   def self.constrain(value, *exprs)
@@ -36,14 +36,16 @@ module Constrain
   end
 
   # Return true if the value matches the class expression. Raises a
-  # Constrain::ArgumentError if the expression is invalid
+  # ArgumentError if the expression is invalid
   def self.constrain?(value, *exprs)
     do_constrain?(value, *exprs)
   end
 
   module ClassMethods
     # See Constrain.constrain
-    def constrain(*args) Constrain.do_constrain(*args) end
+    def constrain(*args) 
+
+    Constrain.do_constrain(*args) end
 
     # See Constrain.constrain?
     def constrain?(*args) Constrain.do_constrain?(*args) end
@@ -55,16 +57,17 @@ module Constrain
   def self.do_constrain(value, *exprs)
     if exprs.last.is_a?(Hash)
       unwind = (exprs.last.delete(:unwind) || 0) + 1
-      !exprs.last.empty? or exprs.pop
+      message = exprs.last.delete(:message)
+      !exprs.last.empty? or exprs.pop # Remove option hash if empty
     else
       unwind = 1
+      message = nil
     end
-    msg = exprs.pop if exprs.last.is_a?(String)
     
     begin
       !exprs.empty? or raise ArgumentError, "Empty constraint"
       exprs.any? { |expr| Constrain.do_constrain_value?(value, expr) } or 
-          raise MatchError.new(value, exprs, msg, unwind: unwind)
+          raise MatchError.new(value, exprs, message: message, unwind: unwind)
     rescue ArgumentError, Constrain::MatchError => ex
       ex.set_backtrace(caller[1 + unwind..-1])
       raise

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constrain
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov