rast 0.6.1.pre → 0.6.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9c4a7088f327bf84d6eaf26c5a52b0e4f232522a0114e302b22bbc26bff8247
-  data.tar.gz: fcbbd503e41761eb57543b66940ba680bec5710f1c05ed69690858b103db8de4
+  metadata.gz: 0eaf03a698891eb852079e41704e991c2d5e2732376f7966a785e1ca38f8a67f
+  data.tar.gz: 856abb598e0e163878109683e26cc301f3398498b091373a5b26e19f3dacc021
 SHA512:
-  metadata.gz: 106f21c7e0cb06bb010719fe1adc17923ff1753f74fba1691ed7f63d9b91580761b71d51c3abda0a1e978eb30b76f24a9a18274287ca11bf1204f9042e125b83
-  data.tar.gz: 194bbd079a183ee340edbeace605315227529e1d99374232494209cfcb91a3f3fa429d92b1988a798af7deccbbce1a40a525ebf3120e2e459b228deb2f497219
+  metadata.gz: 53b66163427b7fa80ffc986dc27ce26d5c01406fcf5c15362b164dc8d96ee9af49a29c1554555a8a100b7e5a7379ad2c0feebc55ddc4b24d31d52ffd961ec409
+  data.tar.gz: 6026193252d5c2829c68fbeee17932dec81102879edba3feccce0e76fef574ae612116c6a20f06be75216fadfb421874e4da1583d67f89c7a70f2c95245eb856

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Change log
 
+- 0.6.2.pre - Bugfix for 1D array of numbers scenario.
 - 0.6.1.pre - Bugfix on the converters when used with rule exclusion.
 - 0.6.0.pre - Reverted redesign.
 - 0.5.0.pre - Redesigned to have subject as first block parameter. Everything inside

data/examples/positive.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Example single number answer
+class Positive
+  def positive?(number)
+    number > 0
+  end
+end

data/lib/rast/rules/rule.rb

@@ -28,11 +28,11 @@ class Rule
       end
 
       duplicates << outcome
-      clause = remove_spaces(string: clause, separator: '\(')
-      clause = remove_spaces(string: clause, separator: '\)')
-      clause = remove_spaces(string: clause, separator: '&')
-      clause = remove_spaces(string: clause, separator: '\|')
-      clause = remove_spaces(string: 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: '\|')
+      clause = remove_spaces(token: clause, separator: '!')
       @outcome_clause_hash[outcome.to_s] = clause.strip
     end
   end
@@ -47,8 +47,8 @@ class Rule
   #  * @param string rule clause.
   #  * @param separator rule clause token.
   #  */
-  def remove_spaces(string: '', separator: '')
-    string.gsub(Regexp.new("\\s*#{separator} \\s*"), separator)
+  def remove_spaces(token: nil, separator: '')
+    token.to_s.gsub(Regexp.new("\\s*#{separator} \\s*"), separator)
   end
 
   # /**

data/lib/rast/rules/rule_evaluator.rb

@@ -29,6 +29,7 @@ class RuleEvaluator
   DEFAULT_CONVERT_HASH = {
     Integer => IntConverter.new,
     Float => FloatConverter.new,
+    Fixnum => FloatConverter.new,
     TrueClass => BoolConverter.new,
     FalseClass => BoolConverter.new,
     String => StrConverter.new
@@ -77,7 +78,7 @@ class RuleEvaluator
     if @stack_rpn.empty?
       true
     elsif @stack_rpn.size == 1
-      evaluate_one_rpn(scenario: scenario)
+      evaluate_one_rpn(scenario: scenario).to_s
     else
       evaluate_multi_rpn(
         scenario: scenario,
@@ -258,11 +259,11 @@ class RuleEvaluator
   def evaluate_one_rpn(scenario: [])
     single = @stack_rpn.last
     subscript = extract_subscript(token: single)
+    default_converter = DEFAULT_CONVERT_HASH[scenario.first.class]
     if subscript > -1
-      default_converter = DEFAULT_CONVERT_HASH[scenario.first.class]
       scenario[subscript] == default_converter.convert(single[RE_TOKEN_BODY])
     else
-      scenario.include? single
+      scenario.include?(default_converter.convert(single))
     end
   end
 

data/rast.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rast
 version: !ruby/object:Gem::Version
-  version: 0.6.1.pre
+  version: 0.6.2.pre
 platform: ruby
 authors:
 - Royce Remulla
@@ -31,6 +31,7 @@ files:
 - examples/logic_checker.rb
 - examples/logic_four.rb
 - examples/phone.rb
+- examples/positive.rb
 - examples/prime_number.rb
 - examples/recruiter.rb
 - examples/worker.rb