numeric.rb in csv_decision-0.0.4

- old
+ new
@@ -3,44 +3,16 @@
 # CSV Decision: CSV based Ruby decision tables.
 # Created December 2017 by Brett Vickers
 # See LICENSE and README.md for details.
 module CSVDecision
   # Methods to assign a matcher to data cells
-  module Matchers
-    # Cell constant specified by prefixing the value with these symbols
-    CELL_CONSTANT = Set.new(%w[== := =]).freeze
-
-    # Match cell against a Ruby-like numeric comparison or a numeric constant
+  class Matchers
+    # Recognise numeric comparison expressions - e.g., +> 100+ or +!= 0+
     class Numeric < Matcher
-      # For example: >= 100 or != 0
-      COMPARISON = /\A(?<comparator><=|>=|<|>|!=|:=|==|=)\s*(?<value>\S.*)\z/
-
-      # Coerce the input value to a numeric representation before invoking the comparison.
-      # If the coercion fails, it will produce a nil value which always fails to match.
-      COMPARATORS = {
-        '>'  => proc { |numeric_cell, value| Matchers.numeric(value) &.>  numeric_cell },
-        '>=' => proc { |numeric_cell, value| Matchers.numeric(value) &.>= numeric_cell },
-        '<'  => proc { |numeric_cell, value| Matchers.numeric(value) &.<  numeric_cell },
-        '<=' => proc { |numeric_cell, value| Matchers.numeric(value) &.<= numeric_cell },
-        '!=' => proc { |numeric_cell, value| Matchers.numeric(value) &.!= numeric_cell }
-      }.freeze
-
+      # @param (see Matchers::Matcher#matches?)
+      # @return (see Matchers::Matcher#matches?)
       def matches?(cell)
-        match = COMPARISON.match(cell)
-        return false unless match
-
-        numeric_cell = Matchers.numeric(match['value'])
-        return false unless numeric_cell
-
-        comparator = match['comparator']
-
-        # If the comparator is assignment/equality, then just treat as a simple constant
-        if CELL_CONSTANT.member?(comparator)
-          return Proc.with(type: :constant, function: numeric_cell)
-        end
-
-        Proc.with(type: :proc,
-                  function: COMPARATORS[comparator].curry[numeric_cell])
+        CSVDecision::Numeric.matches?(cell)
       end
     end
   end
 end
\ No newline at end of file