csv_decision 0.0.9 → 0.1.0

data/doc/method_list.html

@@ -53,6 +53,14 @@
   
 
   <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="CSVDecision/Dictionary.html#add_name-class_method" title="CSVDecision::Dictionary.add_name (method)">add_name</a></span>
+      <small>CSVDecision::Dictionary</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Result.html#add_outs-instance_method" title="CSVDecision::Result#add_outs (method)">#add_outs</a></span>
       <small>CSVDecision::Result</small>
@@ -60,7 +68,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Result.html#attributes-instance_method" title="CSVDecision::Result#attributes (method)">#attributes</a></span>
       <small>CSVDecision::Result</small>
@@ -68,7 +76,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Dictionary.html#build-class_method" title="CSVDecision::Dictionary.build (method)">build</a></span>
       <small>CSVDecision::Dictionary</small>
@@ -76,7 +84,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Table.html#columns-instance_method" title="CSVDecision::Table#columns (method)">#columns</a></span>
       <small>CSVDecision::Table</small>
@@ -84,6 +92,14 @@
   </li>
   
 
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="CSVDecision/Columns/Dictionary.html#columns-instance_method" title="CSVDecision::Columns::Dictionary#columns (method)">#columns</a></span>
+      <small>CSVDecision::Columns::Dictionary</small>
+    </div>
+  </li>
+  
+
   <li class="even ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/ScanRow.html#constants-instance_method" title="CSVDecision::ScanRow#constants (method)">#constants</a></span>
@@ -189,6 +205,14 @@
   
 
   <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="CSVDecision/Matchers/Proc.html#function-instance_method" title="CSVDecision::Matchers::Proc#function (method)">#function</a></span>
+      <small>CSVDecision::Matchers::Proc</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Table.html#if_rows-instance_method" title="CSVDecision::Table#if_rows (method)">#if_rows</a></span>
       <small>CSVDecision::Table</small>
@@ -196,7 +220,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Columns.html#ifs-instance_method" title="CSVDecision::Columns#ifs (method)">#ifs</a></span>
       <small>CSVDecision::Columns</small>
@@ -204,7 +228,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Columns/Dictionary.html#ifs-instance_method" title="CSVDecision::Columns::Dictionary#ifs (method)">#ifs</a></span>
       <small>CSVDecision::Columns::Dictionary</small>
@@ -212,34 +236,42 @@
   </li>
   
 
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="CSVDecision/Matchers/Proc.html#initialize-instance_method" title="CSVDecision::Matchers::Proc#initialize (method)">#initialize</a></span>
+      <small>CSVDecision::Matchers::Proc</small>
+    </div>
+  </li>
+  
+
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Matchers/Function.html#initialize-instance_method" title="CSVDecision::Matchers::Function#initialize (method)">#initialize</a></span>
-      <small>CSVDecision::Matchers::Function</small>
+      <span class='object_link'><a href="CSVDecision/Table.html#initialize-instance_method" title="CSVDecision::Table#initialize (method)">#initialize</a></span>
+      <small>CSVDecision::Table</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Matchers/Matcher.html#initialize-instance_method" title="CSVDecision::Matchers::Matcher#initialize (method)">#initialize</a></span>
-      <small>CSVDecision::Matchers::Matcher</small>
+      <span class='object_link'><a href="CSVDecision/Matchers/Function.html#initialize-instance_method" title="CSVDecision::Matchers::Function#initialize (method)">#initialize</a></span>
+      <small>CSVDecision::Matchers::Function</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Matchers.html#initialize-instance_method" title="CSVDecision::Matchers#initialize (method)">#initialize</a></span>
-      <small>CSVDecision::Matchers</small>
+      <span class='object_link'><a href="CSVDecision/Matchers/Matcher.html#initialize-instance_method" title="CSVDecision::Matchers::Matcher#initialize (method)">#initialize</a></span>
+      <small>CSVDecision::Matchers::Matcher</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/ScanRow.html#initialize-instance_method" title="CSVDecision::ScanRow#initialize (method)">#initialize</a></span>
-      <small>CSVDecision::ScanRow</small>
+      <span class='object_link'><a href="CSVDecision/Matchers.html#initialize-instance_method" title="CSVDecision::Matchers#initialize (method)">#initialize</a></span>
+      <small>CSVDecision::Matchers</small>
     </div>
   </li>
   
@@ -262,32 +294,32 @@
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Decision.html#initialize-instance_method" title="CSVDecision::Decision#initialize (method)">#initialize</a></span>
-      <small>CSVDecision::Decision</small>
+      <span class='object_link'><a href="CSVDecision/Columns/Dictionary.html#initialize-instance_method" title="CSVDecision::Columns::Dictionary#initialize (method)">#initialize</a></span>
+      <small>CSVDecision::Columns::Dictionary</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Columns.html#initialize-instance_method" title="CSVDecision::Columns#initialize (method)">#initialize</a></span>
-      <small>CSVDecision::Columns</small>
+      <span class='object_link'><a href="CSVDecision/Decision.html#initialize-instance_method" title="CSVDecision::Decision#initialize (method)">#initialize</a></span>
+      <small>CSVDecision::Decision</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Columns/Dictionary.html#initialize-instance_method" title="CSVDecision::Columns::Dictionary#initialize (method)">#initialize</a></span>
-      <small>CSVDecision::Columns::Dictionary</small>
+      <span class='object_link'><a href="CSVDecision/Columns.html#initialize-instance_method" title="CSVDecision::Columns#initialize (method)">#initialize</a></span>
+      <small>CSVDecision::Columns</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Table.html#initialize-instance_method" title="CSVDecision::Table#initialize (method)">#initialize</a></span>
-      <small>CSVDecision::Table</small>
+      <span class='object_link'><a href="CSVDecision/ScanRow.html#initialize-instance_method" title="CSVDecision::ScanRow#initialize (method)">#initialize</a></span>
+      <small>CSVDecision::ScanRow</small>
     </div>
   </li>
   
@@ -302,8 +334,8 @@
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Matchers.html#ins-instance_method" title="CSVDecision::Matchers#ins (method)">#ins</a></span>
-      <small>CSVDecision::Matchers</small>
+      <span class='object_link'><a href="CSVDecision/Columns.html#input_keys-instance_method" title="CSVDecision::Columns#input_keys (method)">#input_keys</a></span>
+      <small>CSVDecision::Columns</small>
     </div>
   </li>
   
@@ -325,6 +357,14 @@
   
 
   <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="CSVDecision/Matchers.html#ins-instance_method" title="CSVDecision::Matchers#ins (method)">#ins</a></span>
+      <small>CSVDecision::Matchers</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Dictionary/Entry.html#ins%3F-instance_method" title="CSVDecision::Dictionary::Entry#ins? (method)">#ins?</a></span>
       <small>CSVDecision::Dictionary::Entry</small>
@@ -332,7 +372,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Matchers/Matcher.html#ins%3F-instance_method" title="CSVDecision::Matchers::Matcher#ins? (method)">#ins?</a></span>
       <small>CSVDecision::Matchers::Matcher</small>
@@ -340,6 +380,14 @@
   </li>
   
 
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="CSVDecision/Parse.html#invalid_out_ref%3F-class_method" title="CSVDecision::Parse.invalid_out_ref? (method)">invalid_out_ref?</a></span>
+      <small>CSVDecision::Parse</small>
+    </div>
+  </li>
+  
+
   <li class="even ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision.html#load-class_method" title="CSVDecision.load (method)">load</a></span>
@@ -550,48 +598,48 @@
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Columns.html#outs-instance_method" title="CSVDecision::Columns#outs (method)">#outs</a></span>
-      <small>CSVDecision::Columns</small>
+      <span class='object_link'><a href="CSVDecision/Matchers.html#outs-instance_method" title="CSVDecision::Matchers#outs (method)">#outs</a></span>
+      <small>CSVDecision::Matchers</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Matchers.html#outs-instance_method" title="CSVDecision::Matchers#outs (method)">#outs</a></span>
-      <small>CSVDecision::Matchers</small>
+      <span class='object_link'><a href="CSVDecision/Columns/Dictionary.html#outs-instance_method" title="CSVDecision::Columns::Dictionary#outs (method)">#outs</a></span>
+      <small>CSVDecision::Columns::Dictionary</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Columns/Dictionary.html#outs-instance_method" title="CSVDecision::Columns::Dictionary#outs (method)">#outs</a></span>
-      <small>CSVDecision::Columns::Dictionary</small>
+      <span class='object_link'><a href="CSVDecision/Columns.html#outs-instance_method" title="CSVDecision::Columns#outs (method)">#outs</a></span>
+      <small>CSVDecision::Columns</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Matchers/Guard.html#outs%3F-instance_method" title="CSVDecision::Matchers::Guard#outs? (method)">#outs?</a></span>
-      <small>CSVDecision::Matchers::Guard</small>
+      <span class='object_link'><a href="CSVDecision/Matchers/Constant.html#outs%3F-instance_method" title="CSVDecision::Matchers::Constant#outs? (method)">#outs?</a></span>
+      <small>CSVDecision::Matchers::Constant</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Matchers/Matcher.html#outs%3F-instance_method" title="CSVDecision::Matchers::Matcher#outs? (method)">#outs?</a></span>
-      <small>CSVDecision::Matchers::Matcher</small>
+      <span class='object_link'><a href="CSVDecision/Matchers/Guard.html#outs%3F-instance_method" title="CSVDecision::Matchers::Guard#outs? (method)">#outs?</a></span>
+      <small>CSVDecision::Matchers::Guard</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Matchers/Constant.html#outs%3F-instance_method" title="CSVDecision::Matchers::Constant#outs? (method)">#outs?</a></span>
-      <small>CSVDecision::Matchers::Constant</small>
+      <span class='object_link'><a href="CSVDecision/Matchers/Matcher.html#outs%3F-instance_method" title="CSVDecision::Matchers::Matcher#outs? (method)">#outs?</a></span>
+      <small>CSVDecision::Matchers::Matcher</small>
     </div>
   </li>
   
@@ -614,16 +662,16 @@
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Matchers.html#parse-class_method" title="CSVDecision::Matchers.parse (method)">parse</a></span>
-      <small>CSVDecision::Matchers</small>
+      <span class='object_link'><a href="CSVDecision.html#parse-class_method" title="CSVDecision.parse (method)">parse</a></span>
+      <small>CSVDecision</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision.html#parse-class_method" title="CSVDecision.parse (method)">parse</a></span>
-      <small>CSVDecision</small>
+      <span class='object_link'><a href="CSVDecision/Matchers.html#parse-class_method" title="CSVDecision::Matchers.parse (method)">parse</a></span>
+      <small>CSVDecision::Matchers</small>
     </div>
   </li>
   
@@ -710,16 +758,16 @@
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/ScanRow.html#scan-class_method" title="CSVDecision::ScanRow.scan (method)">scan</a></span>
-      <small>CSVDecision::ScanRow</small>
+      <span class='object_link'><a href="CSVDecision/Decision.html#scan-instance_method" title="CSVDecision::Decision#scan (method)">#scan</a></span>
+      <small>CSVDecision::Decision</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="CSVDecision/Decision.html#scan-instance_method" title="CSVDecision::Decision#scan (method)">#scan</a></span>
-      <small>CSVDecision::Decision</small>
+      <span class='object_link'><a href="CSVDecision/ScanRow.html#scan-class_method" title="CSVDecision::ScanRow.scan (method)">scan</a></span>
+      <small>CSVDecision::ScanRow</small>
     </div>
   </li>
   
@@ -765,6 +813,14 @@
   
 
   <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="CSVDecision/Matchers/Proc.html#symbols-instance_method" title="CSVDecision::Matchers::Proc#symbols (method)">#symbols</a></span>
+      <small>CSVDecision::Matchers::Proc</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Parse.html#table-class_method" title="CSVDecision::Parse.table (method)">table</a></span>
       <small>CSVDecision::Parse</small>
@@ -772,7 +828,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Data.html#to_array-class_method" title="CSVDecision::Data.to_array (method)">to_array</a></span>
       <small>CSVDecision::Data</small>
@@ -780,7 +836,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Matchers.html#to_numeric-class_method" title="CSVDecision::Matchers.to_numeric (method)">to_numeric</a></span>
       <small>CSVDecision::Matchers</small>
@@ -788,6 +844,14 @@
   </li>
   
 
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="CSVDecision/Matchers/Proc.html#type-instance_method" title="CSVDecision::Matchers::Proc#type (method)">#type</a></span>
+      <small>CSVDecision::Matchers::Proc</small>
+    </div>
+  </li>
+  
+
   <li class="even ">
     <div class="item">
       <span class='object_link'><a href="CSVDecision/Dictionary/Entry.html#type-instance_method" title="CSVDecision::Dictionary::Entry#type (method)">#type</a></span>

data/doc/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Jan  5 21:43:59 2018 by
+  Generated on Sat Jan  6 20:03:01 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/lib/csv_decision/columns.rb

@@ -15,15 +15,15 @@ module CSVDecision
     # The key of each hash is the header cell's array column index.
     # Note that input and output columns can be interspersed and need not have unique names.
     class Dictionary
-      # Input columns.
+      # @return [Hash{Integer=>Entry}] All column names.
+      attr_accessor :columns
+
       # @return [Hash{Integer=>Entry}] All input column dictionary entries.
       attr_accessor :ins
 
-      # Output columns.
       # @return [Hash{Integer=>Entry}] All output column dictionary entries.
       attr_accessor :outs
 
-      # if: columns.
       # @return [Hash{Integer=>Entry}] All if: column dictionary entries.
       attr_accessor :ifs
 
@@ -34,18 +34,15 @@ module CSVDecision
       # attr_accessor :defaults
 
       def initialize
+        @columns = {}
+        @ifs = {}
         @ins = {}
         @outs = {}
-        @ifs = {}
         # TODO: @path = {}
         # TODO: @defaults = {}
       end
     end
 
-    # Dictionary of all data columns.
-    # @return [Columns::Dictionary]
-    attr_reader :dictionary
-
     # Input columns hash keyed by column index.
     # @return [Hash{Index=>Entry}]
     def ins
@@ -55,7 +52,7 @@ module CSVDecision
     # Output columns hash keyed by column index.
     # @return [Hash{Index=>Entry}]
     def outs
-      @dictionary.outs
+      @dictionary&.outs
     end
 
     # if: columns hash keyed by column index.
@@ -64,6 +61,14 @@ module CSVDecision
       @dictionary.ifs
     end
 
+    def dictionary
+      @dictionary.columns
+    end
+
+    def input_keys
+      @dictionary.columns.select { |_k, v| v == :in }.keys
+    end
+
     # Input columns with defaults specified (planned feature)
     # def defaults
     #   @dictionary.defaults

data/lib/csv_decision/dictionary.rb

@@ -26,9 +26,7 @@ module CSVDecision
       end
     end
 
-    # TODO: implement all anonymous column types
-    # COLUMN_TYPE_ANONYMOUS = Set.new(%i[path if guard]).freeze
-    # These column types do not need a name
+    # These column types do not need a name.
     COLUMN_TYPE_ANONYMOUS = Set.new(%i[guard if]).freeze
     private_constant :COLUMN_TYPE_ANONYMOUS
 
@@ -42,27 +40,21 @@ module CSVDecision
         dictionary = parse_cell(cell: cell, index: index, dictionary: dictionary)
       end
 
-      validate(dictionary)
-    end
-
-    def self.validate(dictionary)
-      dictionary.outs.each_pair do |col, column|
-        validate_out(dictionary: dictionary, column_name: column.name, col: col)
-      end
-
       dictionary
     end
-    private_class_method :validate
-
-    def self.validate_out(dictionary:, column_name:, col:)
-      if dictionary.ins.any? { |_, column| column_name == column.name }
-        raise CellValidationError, "output column name '#{column_name}' is also an input column"
-      end
 
-      return unless dictionary.outs.any? { |key, column| column_name == column.name && col != key }
-      raise CellValidationError, "output column name '#{column_name}' is duplicated"
+    # Add a new symbol to the dictionary of named input and output columns.
+    #
+    # @param columns [{Symbol=>Symbol}] Hash of column names with key values :in or :out.
+    # @param name [Symbol] Symbolized column name.
+    # @param out [false, Index] False if an input column, otherwise the index of the output column.
+    # @return [{Symbol=>Symbol}] Column dictionary updated with the new name.
+    def self.add_name(columns:, name:, out: false)
+      validate_name(columns: columns, name: name, out: out)
+
+      columns[name] = out ? out : :in
+      columns
     end
-    private_class_method :validate_out
 
     def self.validate_column(cell:, index:)
       match = Header::COLUMN_TYPE.match(cell)
@@ -124,12 +116,20 @@ module CSVDecision
       #   # Treat set: as an in: column
       #   dictionary.ins[index] = entry
 
-      when :in, :guard
+      when :in
+        add_name(columns: dictionary.columns, name: entry.name)
+        dictionary.ins[index] = entry
+
+      # A guard column is still added to the ins hash for parsing as an input column.
+      when :guard
         dictionary.ins[index] = entry
 
       when :out
+        add_name(columns: dictionary.columns, name: entry.name, out: index)
         dictionary.outs[index] = entry
 
+      # Add an if: column to both the +outs+ hash for output column parsing, and also
+      # a specialized +ifs+ hash used for evaluating them for row filtering.
       when :if
         dictionary.outs[index] = entry
         dictionary.ifs[index] = entry
@@ -139,6 +139,31 @@ module CSVDecision
     end
     private_class_method :dictionary_entry
 
+    def self.validate_name(columns:, name:, out:)
+      return unless (in_out = columns[name])
+
+      return validate_out_name(in_out: in_out, name: name) if out
+      validate_in_name(in_out: in_out, name: name)
+    end
+    private_class_method :validate_name
+
+    def self.validate_out_name(in_out:, name:)
+      if in_out == :in
+        raise CellValidationError, "output column name '#{name}' is also an input column"
+      end
+
+      raise CellValidationError, "output column name '#{name}' is duplicated"
+    end
+    private_class_method :validate_out_name
+
+    def self.validate_in_name(in_out:, name:)
+      # in: columns may be duped
+      return if in_out == :in
+
+      raise CellValidationError, "output column name '#{name}' is also an input column"
+    end
+    private_class_method :validate_in_name
+
     # def self.default_if(type)
     #   return nil if type == :set
     #   return :nil? if type == :'set/nil'

data/lib/csv_decision/input.rb

@@ -17,18 +17,25 @@ module CSVDecision
     def self.parse(table:, input:, symbolize_keys:)
       validate(input)
 
-      # For safety the default is to symbolize keys and make a copy of the hash.
-      # However, if this is turned off then the keys must already symbolized.
-      input = symbolize_keys ? input.symbolize_keys : input
+      parsed_input =
+        parse_input(table: table, input: input(table, input, symbolize_keys))
 
-      parsed_input = parse_input(table: table, input: input)
-
-      # Freeze the copy of the input hash we just created.
+      # We can freeze it as we made our own copy
       parsed_input[:hash].freeze if symbolize_keys
 
       parsed_input.freeze
     end
 
+    def self.input(table, input, symbolize_keys)
+      return input unless symbolize_keys
+
+      # For safety the default is to symbolize the keys of a copy of the input hash.
+      input = input.symbolize_keys
+      input.slice!(*table.columns.input_keys)
+      input
+    end
+    private_class_method :input
+
     def self.validate(input)
       return if input.is_a?(Hash) && !input.empty?
       raise ArgumentError, 'input must be a non-empty hash'

data/lib/csv_decision/matchers/constant.rb

@@ -38,7 +38,7 @@ module CSVDecision
       end
 
       def self.proc(function:)
-        Matchers::Proc.with(type: :constant, function: function)
+        Matchers::Proc.new(type: :constant, function: function)
       end
       private_class_method :proc
 

data/lib/csv_decision/matchers/guard.rb

@@ -12,21 +12,17 @@ module CSVDecision
     # e.g., +>:column.present?+ or +:column == 100.0+.
     class Guard < Matcher
       # Column symbol expression - e.g., +>:column+ or +:!column+.
-      SYMBOL = "(?<negate>#{Matchers::NEGATE}?)\\s*:(?<name>#{Header::COLUMN_NAME})"
-      private_constant :SYMBOL
-
-      SYMBOL_RE = Matchers.regexp(SYMBOL)
+      SYMBOL_RE =
+        Matchers.regexp("(?<negate>#{Matchers::NEGATE}?)\\s*:(?<name>#{Header::COLUMN_NAME})")
       private_constant :SYMBOL_RE
 
       # Column symbol guard expression - e.g., +>:column.present?+ or +:column == 100.0+.
-      GUARD =
+      GUARD_RE = Matchers.regexp(
         "(?<negate>#{Matchers::NEGATE}?)\\s*" \
         ":(?<name>#{Header::COLUMN_NAME})\\s*" \
         "(?<method>!=|=~|!~|<=|>=|>|<|#{Matchers::EQUALS}|\\.)\\s*" \
         "(?<param>\\S.*)"
-      private_constant :GUARD
-
-      GUARD_RE = Matchers.regexp(GUARD)
+      )
       private_constant :GUARD_RE
 
       # Negated methods
@@ -114,7 +110,7 @@ module CSVDecision
         method = match['negate'].present? ? '!:' : ':'
         proc = SYMBOL_PROC[method]
         symbol = match['name'].to_sym
-        Matchers::Proc.with(type: :guard, function: proc.curry[symbol].freeze)
+        Matchers::Proc.new(type: :guard, symbols: symbol, function: proc.curry[symbol].freeze)
       end
       private_class_method :symbol_proc
 
@@ -124,7 +120,8 @@ module CSVDecision
 
         proc, value = guard_proc(match)
         symbol = match['name'].to_sym
-        Matchers::Proc.with(type: :guard, function: proc.curry[symbol][value].freeze)
+        Matchers::Proc.new(type: :guard, symbols: symbol,
+                           function: proc.curry[symbol][value].freeze)
       end
       private_class_method :symbol_guard
 

data/lib/csv_decision/matchers/numeric.rb

@@ -35,8 +35,8 @@ module CSVDecision
         return false unless numeric_cell
 
         comparator = match['comparator']
-        Matchers::Proc.with(type: :proc,
-                            function: COMPARATORS[comparator].curry[numeric_cell].freeze)
+        Matchers::Proc.new(type: :proc,
+                           function: COMPARATORS[comparator].curry[numeric_cell].freeze)
       end
 
       # @param (see Matchers::Matcher#matches?)