rast 0.18.0 → 0.19.0

data/lib/rast/spec_dsl.rb

@@ -7,11 +7,12 @@ require 'rast/parameter_generator'
 class SpecDSL
   include FactoryGirl::Syntax::Methods
 
-  attr_accessor :subject, :rspec_methods, :execute_block,
-                :prepare_block, :transients, :outcomes, :fixtures, :spec_id
+  attr_accessor :subject, :execute_block,
+                :prepare_block, :outcomes, :fixtures, :spec_id
 
   # # yaml-less
-  attr_writer :variables, :exclude, :include, :converters, :rules, :pair, :default_outcome
+  attr_writer :variables, :exclude, :include, :converters, :rules, :pair,
+              :default_outcome
 
   # @subject the sut instance
   # @name the sut name to be displayed with -fd
@@ -23,9 +24,6 @@ class SpecDSL
     @subject_name = name || subject.class
     @fixtures = fixtures
 
-    @transients = []
-    @rspec_methods = []
-
     instance_eval(&block)
   end
 
@@ -34,10 +32,14 @@ class SpecDSL
     @variables = vars
   end
 
-  def exclude(clause)
+  def exclusion(clause)
     @exclude = clause
   end
 
+  def inclusion(clause)
+    @include = clause
+  end
+
   def rules(rules)
     @rules = {}
 
@@ -52,11 +54,14 @@ class SpecDSL
     rules(outcomes)
   end
 
+  def default(default)
+    @default_outcome = default
+  end
+
   # yaml-less end
 
   def prepare(&block)
     @prepare_block = block
-    @transients
   end
 
   def execute(&block)
@@ -69,24 +74,23 @@ class SpecDSL
         'pair' => @pair,
         'converters' => @converters,
         'rules' => @rules,
-        'exclude' => @exclude
+        'exclude' => @exclude,
+        'include' => @include,
+        'default' => @default_outcome
       } }
 
       @fixtures = parameter_generator.generate_fixtures(spec_id: @spec_id)
     end
 
     @fixtures.sort_by! do |fixture|
-
-      if fixture[:expected_outcome].nil?
-        raise 'Broken initialization, check your single rule/else/default configuration'
+      if fixture[:expected].nil?
+        raise "Expected outcome not found for #{fixture[:scenario]}, check" \
+              ' your single rule/else/default configuration'
       end
 
-      fixture[:expected_outcome] + fixture[:scenario].to_s
-      # fixture[:scenario].to_s + fixture[:expected_outcome]
+      fixture[:expected] + fixture[:scenario].to_s
     end
 
-    # @fixtures.reverse!
-
     generate_rspecs
   end
 
@@ -95,35 +99,39 @@ class SpecDSL
   def generate_rspecs
     main_scope = self
 
-    title = "#{@subject_name}: #{@fixtures.first[:spec].description}"
-
-    exclusion = fixtures.first[:spec].exclude_clause
-    exclusion = exclusion.join if exclusion.is_a? Array
-    title += ", EXCLUDE: '#{exclusion}'" if exclusion
-    inclusion = fixtures.first[:spec].include_clause
-    inclusion = inclusion.join if inclusion.is_a? Array
-    title += ", ONLY: '#{inclusion}'" if inclusion
-
-    RSpec.describe title do
+    RSpec.describe build_title do
       main_scope.fixtures.each do |fixture|
         generate_rspec(
           scope: main_scope,
           scenario: fixture[:scenario],
-          expected: fixture[:expected_outcome]
+          expected: fixture[:expected]
         )
       end
     end
   end
 end
 
-def generate_rspec(scope: nil, scenario: {}, expected: '')
-  spec_params = scenario.keys.inject('') do |output, key|
-    output += ', ' unless output == ''
-    calc_key = scenario[key].nil? ? nil : scenario[key]
-    output + "#{key}: #{calc_key}"
-  end
+def build_title
+  title = "#{@subject_name}: #{@fixtures.first[:spec].description}"
+  title += append_exclusion_title
+  title += append_inclusion_title
+  title
+end
 
-  it "[#{expected}]=[#{spec_params}]" do
+def append_exclusion_title
+  exclusion = @fixtures.first[:spec].exclude_clause
+  exclusion = exclusion.join if exclusion.is_a? Array
+  exclusion ? ", EXCLUDE: '#{exclusion}'" : ''
+end
+
+def append_inclusion_title
+  inclusion = @fixtures.first[:spec].include_clause
+  inclusion = inclusion.join if inclusion.is_a? Array
+  inclusion ? ", ONLY: '#{inclusion}'" : ''
+end
+
+def generate_rspec(scope: nil, scenario: {}, expected: '')
+  it _it_title(expected, scenario) do
     block_params = scenario.values
 
     @mysubject = scope.subject
@@ -132,7 +140,7 @@ def generate_rspec(scope: nil, scenario: {}, expected: '')
       define_method(:subject) { @mysubject }
     end
 
-    if scope.rspec_methods.size > 0 || !scope.prepare_block.nil?
+    unless scope.prepare_block.nil?
       instance_exec(*block_params, &scope.prepare_block)
     end
 
@@ -142,6 +150,20 @@ def generate_rspec(scope: nil, scenario: {}, expected: '')
   end
 end
 
+def _it_title(expected, scenario)
+  spec_params = scenario.keys.inject('') do |output, key|
+    build_it(scenario, output, key)
+  end
+
+  "[#{expected}]=[#{spec_params}]"
+end
+
+def build_it(scenario, output, key)
+  output += ', ' unless output == ''
+  calc_key = scenario[key].nil? ? nil : scenario[key]
+  output + "#{key}: #{calc_key}"
+end
+
 # DSL Entry Point
 def spec(subject: nil, name: '', fixtures: [], spec_id: '', &block)
   SpecDSL.new(

data/lib/rast.rb

@@ -34,7 +34,7 @@ class Rast
     raise message unless yield
   end
 
-  def xspec(id, &block)
+  def xspec(id)
     p "xspec skipped #{id}"
   end
 
@@ -53,3 +53,7 @@ end
 def rast(rasted_subject, &block)
   Rast.new(rasted_subject, &block)
 end
+
+def xrast(rasted_subject)
+  p "xrast skipped #{rasted_subject}"
+end

data/lib/template_spec.yml

@@ -1,16 +1,14 @@
 ---
 specs:
+  # spec key uniquely identifies a spec. It has to match the ID when the spec
+  # block is invoked in the ruby spec file. Usually the method name.
   spec_key:
     description: Spec Description
 
     variables:
-      param1:
-        - one
-        - two
+      param1: [one, two]
 
     outcomes:  # required (dictionary)
-      true: true[0]
+      true: one[0]  # sample outcome.
 
-    pair: {true: one}  # optional. (dictionary with 1 mapping)
-
-    default: DEFAULT  # optional (scalar) fall off value, or the else result of the `pair` config.
+    default: DEFAULT  # optional (scalar) fall off value.

data/rast.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'rast'
-  spec.version       = '0.18.0'
+  spec.version       = '0.19.0'
   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.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Royce Remulla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
@@ -35,26 +35,24 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
+- Documentation.md
 - Gemfile
 - Gemfile.lock
+- Getting-Started-Detailed.md
 - Getting-Started.md
 - README.md
-- examples/arithmetic_module.rb
-- examples/double_example.rb
 - examples/enum_module.rb
 - examples/factory_example.rb
+- examples/hotel_finder.rb
 - examples/logic_checker.rb
-- examples/logic_four.rb
-- examples/lohika.rb
-- examples/phone.rb
+- examples/person.rb
 - examples/positive.rb
 - examples/positive2.rb
 - examples/prime_number.rb
-- examples/quiz_module.rb
 - examples/quoted.rb
 - examples/recruiter.rb
-- examples/triple.rb
 - examples/worker.rb
 - lib/rast.rb
 - lib/rast/converters/bool_converter.rb
@@ -70,6 +68,7 @@ files:
 - lib/rast/rules/rule_evaluator.rb
 - lib/rast/rules/rule_processor.rb
 - lib/rast/rules/rule_validator.rb
+- lib/rast/rules/token_util.rb
 - lib/rast/spec_dsl.rb
 - lib/template_spec.yml
 - rast.gemspec

data/examples/arithmetic_module.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-# Example module
-module ArithmeticModule
-  def add(addend1, addend2)
-    addend1 + addend2
-  end
-end

data/examples/double_example.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-# Example
-class DoubleExample
-  def sim; end
-
-  def product; end
-
-  def process
-    return false if sim.nil? || product.nil?
-
-    sim.best? && product.key == 'ayg'
-  end
-end

data/examples/logic_four.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# Checks bug introduced when converters are combined with token converter.
-#
-# @author Royce Remulla
-#
-class LogicFour
-  # Perform logical AND operation on two arguments.
-  #
-  # @param argument1 first argument of Boolean type.
-  # @param argument2 second argument of Boolean type.
-  def process(argument1, argument2, argument3, argument4)
-    !argument1 && !argument2 && !argument3 && argument4 == 'a'
-  end
-end

data/examples/lohika.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-# LogicChecker ported from Java
-#
-# @author Royce Remulla
-#
-class Lohika
-  # Perform logical AND operation on two arguments.
-  #
-  # @param argument1 first argument of Boolean type.
-  # @param argument2 second argument of Boolean type.
-  def at(argument1, argument2)
-    return :oo if argument1 == 'oo' && argument2 == 'oo'
-
-    :hindi
-  end
-
-  # Perform logical OR operation on two arguments.
-  #
-  # @param argument1 first argument of Boolean type.
-  # @param argument2 second argument of Boolean type.
-  def o(argument1, argument2)
-    return :oo if argument1 == 'oo' || argument2 == 'oo'
-
-    :hindi
-  end
-end

data/examples/phone.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-#
-class Phone
-  attr_accessor :first_name, :second_name, :third_name
-end

data/examples/quiz_module.rb

@@ -1,34 +0,0 @@
-# Used to determine if cards form quiz type
-# S postfix means Single option, M postfix means Multiple options
-module QuizModule
-  RE_SELECTED = /(?<=\([*x]\)\s).*/.freeze
-  RE_CHECKED = /(?<=\[[*x]\]\s).*/.freeze
-  RE_WRONG_OPT_S = /(?<=\(\)\s).*/.freeze
-  RE_WRONG_OPT_M = /(?<=\[\]\s).*/.freeze
-
-  RE_QUIZ_OPTION_S = Regexp.new(
-    "#{RE_WRONG_OPT_S}|#{RE_SELECTED}",
-    Regexp::IGNORECASE
-  )
-
-  RE_QUIZ_OPTION_M = Regexp.new(
-    "#{RE_WRONG_OPT_M}|#{RE_CHECKED}",
-    Regexp::IGNORECASE
-  )
-
-  def quiz_multi_choice?(back)
-    if back.is_a?(Array) && back.any?
-      back.each { |element| return false unless element[RE_QUIZ_OPTION_M] }
-
-      # Find at least 1 checked answer
-      return false unless back.find do |element|
-        true if element[RE_CHECKED]
-      end
-
-      @quiz = true
-      @front_only = true
-      return true
-    end
-    false
-  end
-end

data/examples/triple.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# Triple. This example is used to test automatic detection of variable data type in yaml.
-#
-# @author Royce Remulla
-#
-class Triple
-  # Perform logical AND operation on two arguments.
-  #
-  # @param argument1 first argument of Boolean type.
-  # @param argument2 second argument of Boolean type.
-  def triple(argument1, argument2, _argument3)
-    argument1 && argument2
-  end
-end