asker-tool 2.7.2 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04fea4738c097db67a060121841ec075ce611ceceec3c31fb49819cd03924db0
-  data.tar.gz: 89e0185e69dac3e5f66dec08331de9c64dfe49801a33cf587293d93f03163263
+  metadata.gz: cb6924c54cad0b4b8a04231d21f5b4e5e419f2150f6457b080eaa56ec45fc5bb
+  data.tar.gz: d6fac1e84e3e4c7f1e836acac9a050fd36b300960e122e993f4af676905b8aaa
 SHA512:
-  metadata.gz: 13c0dbaceeb204e6b8263f15ba5ccd240a8c3ec7909575a6ace921d8bf8f74554c673d350bf02dc14aca22edd935d5e1f820d74714fddaaf4a33fce93c38a26a
-  data.tar.gz: 9698ad8f849a346b0e9abb86a6be4e64c17922c0e22a35daa423dda2c2b08d679c6ae5d8edc2d3edbb7f64c26026c2f7dd1d66e0538187244d0e2f8d66f8fdee
+  metadata.gz: ee6ac3134f616e98e63f3ad2160325defc99b80e15082c62e8da378e401e3768bb6f75696e96d79f9e48ce1f652b0eeef8767796b8f61d53d717c1eaa405bebc
+  data.tar.gz: 766d487ea2ca668819b6dd0c27459843d20be17ec4c1c54f7f114024b68b12c95e63f8aeff9c81b8016efbbd70cc74a32fb513549ad6c10255e1e9d36be4200c

data/lib/asker/ai/problem/customizer.rb

@@ -0,0 +1,36 @@
+require_relative "../../logger"
+
+class Customizer
+  def initialize(problem)
+    @problem = problem
+  end
+
+  def call(text:, custom:, type: nil)
+    output = text.clone
+    custom.each_pair { |oldvalue, newvalue| output.gsub!(oldvalue, newvalue) }
+    
+    if type.nil?
+      return output 
+    elsif type == "formula"
+      begin
+        return eval(output).to_s
+      rescue SyntaxError => e
+        Logger.error "Problem.name = #{@problem.name}"
+        Logger.error "Customizer: Wrong formula '#{text}' or wrong values '#{output}'"
+        Logger.error e.to_s
+        exit 1
+      end
+    else
+      Logger.error "Customizer: Wrong answer type (#{type})"
+      exit 1
+    end
+  end
+
+  def min(*args)
+    args.min
+  end
+
+  def max(*args)
+    args.max
+  end
+end

data/lib/asker/ai/problem/problem_ai.rb

@@ -1,252 +1,22 @@
 require_relative "../../lang/lang_factory"
 require_relative "../question"
+require_relative "stage_answers"
+require_relative "stage_steps"
 
 class ProblemAI
   attr_accessor :problem
 
   def call(problem)
     @problem = problem
-    make_questions
-    @problem
-  end
-
-  def make_questions
-    @counter = 0
-    @questions = []
-    @customs = get_customs(@problem)
-    make_questions_with_aswers
-    make_questions_with_steps
-    @problem.questions = @questions
-  end
-
-  private
-
-  def counter
-    @counter += 1
-  end
-
-  def customize(text:, custom:)
-    output = text.clone
-    custom.each_pair { |oldvalue, newvalue| output.gsub!(oldvalue, newvalue) }
-    output
-  end
-
-  def get_customs(problem)
-    customs = []
-    vars = problem.varnames
-    problem.cases.each do |acase|
-      custom = {}
-      vars.each_with_index { |varname, index| custom[varname] = acase[index] }
-      customs << custom
-    end
-    customs
-  end
-
-  def lines_to_s(lines)
-    output = ""
-    lines.each_with_index do |line, index|
-      output << "%2d: #{line}\n" % (index + 1)
-    end
-    output
-  end
-
-  def make_questions_with_aswers
-    name = @problem.name
-    lang = @problem.lang
-
-    @customs.each do |custom|
-      desc = customize(text: @problem.desc, custom: custom)
-
-      @problem.asks.each do |ask|
-        next if ask[:text].nil?
-        asktext = customize(text: ask[:text], custom: custom)
-        next if ask[:answer].nil?
-        correct_answer = customize(text: ask[:answer], custom: custom)
-
-        # Question boolean => true
-        q = Question.new(:boolean)
-        q.name = "#{name}-#{counter}-01pa1true"
-        q.text = lang.text_for(:pa1, desc, asktext, correct_answer)
-        q.good = "TRUE"
-        @questions << q
 
-        # Locate incorrect answers
-        incorrect_answers = []
-        @customs.each do |aux|
-          next if aux == custom
-          incorrect = customize(text: ask[:answer], custom: aux)
-          incorrect_answers << incorrect if incorrect != correct_answer
-        end
+    questions = StageAnswers.new(@problem).make_questions
+    @problem.stats[:answer] = questions.size
+    @problem.questions = questions
 
-        # Question boolean => true
-        if incorrect_answers.size > 0
-          q = Question.new(:boolean)
-          q.name = "#{name}-#{counter}-02pa1false"
-          q.text = lang.text_for(:pa1, desc, asktext, incorrect_answers.first)
-          q.good = "FALSE"
-          @questions << q
-        end
+    questions = StageSteps.new(@problem).make_questions
+    @problem.stats[:steps] = questions.size
+    @problem.questions += questions
 
-        # Question choice NONE
-        if incorrect_answers.size > 2
-          q = Question.new(:choice)
-          q.name = "#{name}-#{counter}-03pa2-choice-none"
-          q.text = lang.text_for(:pa2, desc, asktext)
-          q.good = lang.text_for(:none)
-          incorrect_answers.shuffle!
-          q.bads << incorrect_answers[0]
-          q.bads << incorrect_answers[1]
-          q.bads << incorrect_answers[2]
-          q.feedback = "Correct answer is #{correct_answer}."
-          @questions << q
-        end
-
-        # Question choice OK
-        if incorrect_answers.size > 2
-          q = Question.new(:choice)
-          q.name = "#{name}-#{counter}-04pa2choice"
-          q.text = lang.text_for(:pa2, desc, asktext)
-          q.good = correct_answer
-          incorrect_answers.shuffle!
-          q.bads << incorrect_answers[0]
-          q.bads << incorrect_answers[1]
-          q.bads << incorrect_answers[2]
-          q.feedback = "Correct answer is #{correct_answer}."
-          @questions << q
-        end
-
-        if incorrect_answers.size > 1
-          q = Question.new(:choice)
-          q.name = "#{name}-#{counter}-05pa2choice"
-          q.text = lang.text_for(:pa2, desc, asktext)
-          q.good = correct_answer
-          incorrect_answers.shuffle!
-          q.bads << incorrect_answers[0]
-          q.bads << incorrect_answers[1]
-          q.bads << lang.text_for(:none)
-          q.feedback = "Correct answer is #{correct_answer}."
-          @questions << q
-        end
-
-        # Question short
-        q = Question.new(:short)
-        q.name = "#{name}-#{counter}-06pa2short"
-        q.text = lang.text_for(:pa2, desc, asktext)
-        q.shorts << correct_answer
-        q.feedback = "Correct answer is #{correct_answer}."
-        @questions << q
-      end
-    end
-
-    def make_questions_with_steps
-      name = @problem.name
-      lang = @problem.lang
-
-      @customs.each do |custom|
-        desc = customize(text: @problem.desc, custom: custom)
-
-        @problem.asks.each do |ask|
-          next if ask[:text].nil?
-          asktext = customize(text: ask[:text], custom: custom)
-          next if ask[:steps].nil? || ask[:steps].empty?
-          steps = ask[:steps].map { |step| customize(text: step, custom: custom) }
-
-          # Question steps ok
-          q = Question.new(:short)
-          q.name = "#{name}-#{counter}-07ps3short-ok"
-          q.text = lang.text_for(:ps3, desc, asktext, lines_to_s(steps))
-          q.shorts << 0
-          @questions << q
-
-          # Question steps ordering
-          if steps.size > 3
-            q = Question.new(:ordering)
-            q.name = "#{name}-#{counter}-08ps6ordering"
-            q.text = lang.text_for(:ps6, desc, asktext, lines_to_s(steps))
-            steps.each { |step| q.ordering << step }
-            @questions << q
-          end
-
-          # Question steps hide
-          if steps.size > 3
-            (0...(steps.size)).each do |index|
-              q = Question.new(:short)
-              q.name = "#{name}-#{counter}-09ps7short-hide"
-              hide_steps = steps.clone
-              hide_steps[index] = hide(steps[index])
-              q.text = lang.text_for(:ps7, desc, asktext, lines_to_s(hide_steps))
-              q.shorts << steps[index]
-              @questions << q
-            end
-          end
-
-          # Using diferents wrong steps sequences
-          max = steps.size - 1
-          (0..max).each do |index|
-            change = rand(max + 1)
-            bads = steps.clone
-
-            minor = index
-            major = change
-            if minor > major
-              minor, major = major, minor
-            elsif minor == major
-              next
-            end
-            bads[minor], bads[major] = bads[major], bads[minor]
-
-            # Question steps error
-            q = Question.new(:short)
-            q.name = "#{name}-#{counter}-10ps3short-error"
-            q.text = lang.text_for(:ps3, desc, asktext, lines_to_s(bads))
-            q.shorts << minor + 1
-            q.feedback = lang.text_for(:ps4, minor + 1, major + 1)
-            @questions << q
-          end
-
-          # Match questions
-          indexes = (0..(steps.size - 1)).to_a.shuffle
-          (0..(steps.size - 4)).each do |first|
-            incomplete_steps = steps.clone
-            incomplete_steps[indexes[first]] = "?"
-            incomplete_steps[indexes[first + 1]] = "?"
-            incomplete_steps[indexes[first + 2]] = "?"
-            incomplete_steps[indexes[first + 3]] = "?"
-
-            q = Question.new(:match)
-            q.name = "#{name}-#{counter}-11ps5match"
-            q.text = lang.text_for(:ps5, desc,  asktext, lines_to_s(incomplete_steps))
-            q.matching << [steps[indexes[first]], (indexes[first] + 1).to_s]
-            q.matching << [steps[indexes[first + 1]], (indexes[first + 1] + 1).to_s]
-            q.matching << [steps[indexes[first + 2]], (indexes[first + 2] + 1).to_s]
-            q.matching << [steps[indexes[first + 3]], (indexes[first + 3] + 1).to_s]
-            q.matching << ["", lang.text_for(:error)]
-            @questions << q
-
-            q = Question.new(:ddmatch)
-            q.name = "#{name}-#{counter}-12ps5ddmatch"
-            q.text = lang.text_for(:ps5, desc,  asktext, lines_to_s(incomplete_steps))
-            q.matching << [(indexes[first] + 1).to_s, steps[indexes[first]]]
-            q.matching << [(indexes[first + 1] + 1).to_s, steps[indexes[first + 1]]]
-            q.matching << [(indexes[first + 2] + 1).to_s, steps[indexes[first + 2]]]
-            q.matching << [(indexes[first + 3] + 1).to_s, steps[indexes[first + 3]]]
-            q.matching << ["", lang.text_for(:error)]
-            @questions << q
-          end
-        end
-      end
-    end
-
-    def hide(text)
-      output = []
-      text.chars do |c|
-        output << if c == " "
-          c
-        else
-          "?"
-        end
-      end
-      output.join
-    end
+    @problem
   end
 end

data/lib/asker/ai/problem/stage_answers.rb

@@ -0,0 +1,104 @@
+require_relative "../question"
+require_relative "stage_base"
+
+class StageAnswers < StageBase
+  def make_questions
+    name = @problem.name
+    lang = @problem.lang
+    questions = []
+
+    @customs.each do |custom|
+      desc = customize(text: @problem.desc, custom: custom)
+
+      @problem.asks.each do |ask|
+        next if ask[:text].nil?
+        asktext = customize(text: ask[:text], custom: custom)
+        next if ask[:answer].nil?
+
+        correct_answer = customize(
+          text: ask[:answer], 
+          custom: custom,
+          type: ask[:answer_type]
+        )
+
+        # Question boolean => true
+        q = Question.new(:boolean)
+        q.name = "#{name}-#{counter}-01pa1true"
+        q.text = lang.text_for(:pa1, desc, asktext, correct_answer)
+        q.good = "TRUE"
+        questions << q
+
+        # Locate incorrect answers
+        incorrect_answers = []
+        @customs.each do |aux|
+          next if aux == custom
+          incorrect = customize(
+            text: ask[:answer], 
+            custom: aux,
+            type: ask[:answer_type]
+            )
+          incorrect_answers << incorrect if incorrect != correct_answer
+        end
+
+        # Question boolean => true
+        if incorrect_answers.size > 0
+          q = Question.new(:boolean)
+          q.name = "#{name}-#{counter}-02pa1false"
+          q.text = lang.text_for(:pa1, desc, asktext, incorrect_answers.first)
+          q.good = "FALSE"
+          questions << q
+        end
+
+        # Question choice NONE
+        if incorrect_answers.size > 2
+          q = Question.new(:choice)
+          q.name = "#{name}-#{counter}-03pa2-choice-none"
+          q.text = lang.text_for(:pa2, desc, asktext)
+          q.good = lang.text_for(:none)
+          incorrect_answers.shuffle!
+          q.bads << incorrect_answers[0]
+          q.bads << incorrect_answers[1]
+          q.bads << incorrect_answers[2]
+          q.feedback = "Correct answer is #{correct_answer}."
+          questions << q
+        end
+
+        # Question choice OK
+        if incorrect_answers.size > 2
+          q = Question.new(:choice)
+          q.name = "#{name}-#{counter}-04pa2choice"
+          q.text = lang.text_for(:pa2, desc, asktext)
+          q.good = correct_answer
+          incorrect_answers.shuffle!
+          q.bads << incorrect_answers[0]
+          q.bads << incorrect_answers[1]
+          q.bads << incorrect_answers[2]
+          q.feedback = "Correct answer is #{correct_answer}."
+          questions << q
+        end
+
+        if incorrect_answers.size > 1
+          q = Question.new(:choice)
+          q.name = "#{name}-#{counter}-05pa2choice"
+          q.text = lang.text_for(:pa2, desc, asktext)
+          q.good = correct_answer
+          incorrect_answers.shuffle!
+          q.bads << incorrect_answers[0]
+          q.bads << incorrect_answers[1]
+          q.bads << lang.text_for(:none)
+          q.feedback = "Correct answer is #{correct_answer}."
+          questions << q
+        end
+
+        # Question short
+        q = Question.new(:short)
+        q.name = "#{name}-#{counter}-06pa2short"
+        q.text = lang.text_for(:pa2, desc, asktext)
+        q.shorts << correct_answer
+        q.feedback = "Correct answer is #{correct_answer}."
+        questions << q
+      end
+    end
+    questions
+  end
+end

data/lib/asker/ai/problem/stage_base.rb

@@ -0,0 +1,34 @@
+require_relative "../../logger"
+require_relative "customizer"
+
+class StageBase
+  def initialize(problem)
+    @problem = problem
+    @customs = get_customs(@problem)
+    @customizer = Customizer.new(@problem)
+    @counter = @problem.questions.size
+  end
+
+  def counter
+    @counter += 1
+  end
+
+  def customize(...)
+    @customizer.call(...)
+  end
+  
+  private
+  
+  def get_customs(problem)
+    return [] if problem.cases.nil?
+    
+    customs = []
+    vars = problem.varnames
+    problem.cases.each do |acase|
+      custom = {}
+      vars.each_with_index { |varname, index| custom[varname] = acase[index] }
+      customs << custom
+    end
+    customs
+  end  
+end

data/lib/asker/ai/problem/stage_steps.rb

@@ -0,0 +1,121 @@
+require_relative "../question"
+require_relative "stage_base"
+
+class StageSteps < StageBase
+  def make_questions
+    name = @problem.name
+    lang = @problem.lang
+    questions = []
+
+    @customs.each do |custom|
+      desc = customize(text: @problem.desc, custom: custom)
+
+      @problem.asks.each do |ask|
+        next if ask[:text].nil?
+        asktext = customize(text: ask[:text], custom: custom)
+        next if ask[:steps].nil? || ask[:steps].empty?
+        steps = ask[:steps].map { |step| customize(text: step, custom: custom) }
+
+        # Question steps ok
+        q = Question.new(:short)
+        q.name = "#{name}-#{counter}-07ps3short-ok"
+        q.text = lang.text_for(:ps3, desc, asktext, lines_to_s(steps))
+        q.shorts << 0
+        questions << q
+
+        # Question steps ordering
+        if steps.size > 3
+          q = Question.new(:ordering)
+          q.name = "#{name}-#{counter}-08ps6ordering"
+          q.text = lang.text_for(:ps6, desc, asktext, lines_to_s(steps))
+          steps.each { |step| q.ordering << step }
+          questions << q
+        end
+
+        # Question steps hide
+        if steps.size > 3
+          (0...(steps.size)).each do |index|
+            q = Question.new(:short)
+            q.name = "#{name}-#{counter}-09ps7short-hide"
+            hide_steps = steps.clone
+            hide_steps[index] = hide(steps[index])
+            q.text = lang.text_for(:ps7, desc, asktext, lines_to_s(hide_steps))
+            q.shorts << steps[index]
+            questions << q
+          end
+        end
+
+        # Using diferents wrong steps sequences
+        indexes = (0...(steps.size)).to_a
+        combinations = indexes.combination(2).to_a
+
+        combinations.each do |minor, major|
+          bads = steps.clone
+          bads[minor], bads[major] = bads[major], bads[minor]
+
+          # Question steps error
+          q = Question.new(:short)
+          q.name = "#{name}-#{counter}-10ps3short-error"
+          q.text = lang.text_for(:ps3, desc, asktext, lines_to_s(bads))
+          q.shorts << minor + 1
+          q.feedback = lang.text_for(:ps4, minor + 1, major + 1)
+          questions << q
+        end
+
+        # Match questions
+        indexes = (0..(steps.size - 1)).to_a.shuffle
+        (0..(steps.size - 4)).each do |first|
+          incomplete_steps = steps.clone
+          incomplete_steps[indexes[first]] = "?"
+          incomplete_steps[indexes[first + 1]] = "?"
+          incomplete_steps[indexes[first + 2]] = "?"
+          incomplete_steps[indexes[first + 3]] = "?"
+
+          q = Question.new(:match)
+          q.name = "#{name}-#{counter}-11ps5match"
+          q.text = lang.text_for(:ps5, desc,  asktext, lines_to_s(incomplete_steps))
+          q.matching << [steps[indexes[first]], (indexes[first] + 1).to_s]
+          q.matching << [steps[indexes[first + 1]], (indexes[first + 1] + 1).to_s]
+          q.matching << [steps[indexes[first + 2]], (indexes[first + 2] + 1).to_s]
+          q.matching << [steps[indexes[first + 3]], (indexes[first + 3] + 1).to_s]
+          q.matching << ["", lang.text_for(:error)]
+          questions << q
+
+          q = Question.new(:ddmatch)
+          q.name = "#{name}-#{counter}-12ps5ddmatch"
+          q.text = lang.text_for(:ps5, desc,  asktext, lines_to_s(incomplete_steps))
+          q.matching << [(indexes[first] + 1).to_s, steps[indexes[first]]]
+          q.matching << [(indexes[first + 1] + 1).to_s, steps[indexes[first + 1]]]
+          q.matching << [(indexes[first + 2] + 1).to_s, steps[indexes[first + 2]]]
+          q.matching << [(indexes[first + 3] + 1).to_s, steps[indexes[first + 3]]]
+          q.matching << ["", lang.text_for(:error)]
+          questions << q
+        end
+      end
+    end
+    questions
+  end
+
+  private
+
+  def hide(text)
+    output = []
+    text.chars do |c|
+      output << if c == " "
+        c
+      else
+        "?"
+      end
+    end
+    output.join
+  end
+
+  def lines_to_s(lines)
+    output = ""
+    lines.each_with_index do |line, index|
+      output << "%2d: #{line}\n" % (index + 1)
+    end
+    output
+  end
+
+end

data/lib/asker/application.rb

@@ -1,5 +1,6 @@
 require "singleton"
 require "inifile"
+require "rainbow"
 require_relative "logger"
 require_relative "version"
 

data/lib/asker/check_input/check_haml_data.rb

@@ -359,9 +359,9 @@ class CheckHamlData
     if find_parent(index) != :ask
       @outputs[index][:state] = :err
       @outputs[index][:msg] = "Parent(ask) not found!"
-    elsif !line.match(/^\s\s\s\s\s\s%answer\s/)
+    elsif !line.match(/^\s\s\s\s\s\s%answer[\s|\{type:]/)
       @outputs[index][:state] = :err
-      @outputs[index][:msg] = "Write 6 spaces before %answer"
+      @outputs[index][:msg] = "Write 6 spaces before %answer, then space or {type:"
     end
   end
 

data/lib/asker/cli.rb

@@ -45,6 +45,7 @@ class CLI < Thor
   end
 
   map ["--check"] => "check"
+  option :color, type: :boolean
   desc "check FILEPATH", "Check HAML input file syntax"
   long_desc <<-LONGDESC
 
@@ -64,6 +65,7 @@ class CLI < Thor
   end
 
   map ["f", "-f", "--file"] => "file"
+  option :color, type: :boolean
   desc "[file] FILEPATH", "Build output files, from HAML/XML input file."
   long_desc <<-LONGDESC
 

data/lib/asker/data/concept.rb

@@ -1,7 +1,7 @@
 require "rexml/document"
 
 require_relative "../lang/lang_factory"
-require_relative "../loader/embedded_file"
+require_relative "../loader/embedded_file/loader"
 require_relative "../logger"
 require_relative "table"
 require_relative "data_field"
@@ -37,8 +37,8 @@ class Concept
 
     @data = {}
     @data[:tags] = []
-    @data[:texts] = []          # Used by standard def inputs
-    @data[:images] = []         # Used by [type => file and type => image_url] def inputs
+    @data[:texts] = []  # Used by standard def inputs
+    @data[:images] = [] # Used by [type => file and type => image_url] def inputs
     @data[:tables] = []
     @data[:neighbors] = []
     @data[:reference_to] = []
@@ -173,10 +173,10 @@ class Concept
     case value.attributes["type"]
     when "image_url"
       # Link with remote image
-      @data[:images] << EmbeddedFile.load(value.text.strip, File.dirname(@filename))
+      @data[:images] << EmbeddedFile::Loader.new.call(value.text.strip, File.dirname(@filename))
     when "file"
       # Load local images and text files
-      @data[:images] << EmbeddedFile.load(value.text.strip, File.dirname(@filename))
+      @data[:images] << EmbeddedFile::Loader.new.call(value.text.strip, File.dirname(@filename))
     when nil
       if value.text.nil?
         Logger.warn "Concept: def/text empty!"

data/lib/asker/data/problem.rb

@@ -1,4 +1,5 @@
 require_relative "../logger"
+require_relative "../lang/lang_factory"
 
 class Problem
   attr_accessor :lang
@@ -10,12 +11,13 @@ class Problem
   attr_accessor :descs
   attr_accessor :asks
   attr_accessor :questions
+  attr_accessor :stats
 
   @@id = 0
   def initialize
     @@id += 1
     @id = @@id
-    @lang = nil
+    @lang = LangFactory.instance.get("en")
     @context = nil
     @process = false
     @filename = "?"
@@ -24,6 +26,7 @@ class Problem
     @descs = []
     @asks = []
     @questions = []
+    @stats = { answer: 0, steps: 0}
   end
 
   def self.from(values)
@@ -46,7 +49,8 @@ class Problem
   end
 
   def name
-    "problem#{@id}"
+    firstword = @descs[0]&.strip&.split(" ")&.first&.downcase || "problem"
+    "#{firstword}#{@id}"
   end
 
   def validate
@@ -59,6 +63,8 @@ class Problem
   private
 
   def validate_varnames
+    return if @varnames.nil?
+
     if !@varnames.size.zero? && @cases.size.zero?
       Logger.warn "Problem: No problem/varnames defined with no problem/case"
     end
@@ -75,6 +81,8 @@ class Problem
   end
 
   def validate_cases
+    return if @cases.nil?
+    
     @cases.each do |acase|
       if acase.size != @varnames.size
         Logger.error "Problem: problem/cases size not equal to problem/varnames size"