rast 0.8.0.pre → 0.8.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c19a33dffcdb0b41b2e820aa28d087b54a37a1973a4a8bac78f0c4ab69f92316
-  data.tar.gz: f04d91004beec821be368a559e8944df6316502f71223d1314441304ce046cf4
+  metadata.gz: af19f20d8f6fb2930aa29d8c377861249104dd713f28cacf497fdd224003104c
+  data.tar.gz: b4e6f494d21b3e9695af2d933261f08370d4b1eb9e71412ce52d0a0e1fc0f987
 SHA512:
-  metadata.gz: d9ccd1ca66e2a9f4c3c8814bac0839bb808ea608b6b55de543ed46ea436f5f4f4ba9835026c26e3ce7586222233680c4c2d0ff0d29f96bdba0fa17c5bd5b7f92
-  data.tar.gz: e04a6581b873ed8b820bae2bf149ffab342196277af08c2328d6c89195ba8713c3ee5a91b84d084e70ed39e67edcdbb9a2c6331440eca1cc21237f7295bd545a
+  metadata.gz: 1926328be3da258ff3a6e1c15af9c9bbaec293b4a0de1ae229682294f97dc0123f4b86a4fcc0663c176c93185b48077b92215f257e1f03638faff7fdfd2f224c
+  data.tar.gz: 8c5f0153ccb0814bd55302de863eda2aca14c465f90e7a204d6383109dcf0610e5926ddf54ddb56761be99c72b98f96d3281d897a511227ab7b6ea99dee7a835

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Change log
 
+- 0.8.1.pre - Allow spaces in rules.
 - 0.8.0.pre - Auto-detect variable type.
 - 0.7.0.pre - Display exclusion rule in the report
 - 0.6.2.pre - Bugfix for 1D array of numbers scenario.

data/lib/rast/parameter_generator.rb

@@ -45,7 +45,7 @@ class ParameterGenerator
   def valid_case?(scenario, spec)
     return true if spec.exclude_clause.nil?
 
-    exclude_clause = spec.exclude_clause
+    exclude_clause = Rule.sanitize(clause: spec.exclude_clause)
     rule_evaluator = RuleEvaluator.new(converters: spec.converters)
     rule_evaluator.parse(expression: exclude_clause)
 

data/lib/rast/rules/rule.rb

@@ -28,15 +28,19 @@ class Rule
       end
 
       duplicates << outcome
-      clause = remove_spaces(token: clause, separator: '\(')
-      clause = remove_spaces(token: clause, separator: '\)')
-      clause = remove_spaces(token: clause, separator: '&')
-      clause = remove_spaces(token: clause, separator: '\|')
-      clause = remove_spaces(token: clause, separator: '!')
-      @outcome_clause_hash[outcome.to_s] = clause.strip
+
+      @outcome_clause_hash[outcome.to_s] = Rule.sanitize(clause: clause)
     end
   end
 
+  def self.sanitize(clause: '')
+    cleaner = Rule.remove_spaces(token: clause, separator: '(')
+    cleaner = Rule.remove_spaces(token: cleaner, separator: ')')
+    cleaner = Rule.remove_spaces(token: cleaner, separator: '&')
+    cleaner = Rule.remove_spaces(token: cleaner, separator: '|')
+    Rule.remove_spaces(token: cleaner, separator: '!').strip
+  end
+
   def size
     @outcome_clause_hash.size
   end
@@ -47,8 +51,12 @@ class Rule
   #  * @param string rule clause.
   #  * @param separator rule clause token.
   #  */
-  def remove_spaces(token: nil, separator: '')
-    token.to_s.gsub(Regexp.new("\\s*#{separator} \\s*"), separator)
+  def self.remove_spaces(token: nil, separator: '')
+    if ['(',')', '|'].include? separator
+      token.to_s.gsub(Regexp.new("\\s*\\#{separator}\\s*"), separator)
+    else
+      token.to_s.gsub(Regexp.new("\\s*#{separator}\\s*"), separator)
+    end
   end
 
   # /**

data/rast.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'rast'
-  spec.version       = '0.8.0.pre'
+  spec.version       = '0.8.1.pre'
   spec.authors       = ['Royce Remulla']
   spec.email         = ['royce.com@gmail.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rast
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre
+  version: 0.8.1.pre
 platform: ruby
 authors:
 - Royce Remulla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies: []
 description: Extends RSpec functionality by using the catch-all-scenario testing (CAST)
   principle.