asker-tool 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e5cbcd35b27392a56444a2bdae4036445ac8b7b8404c6601e006764fbe0dae8
-  data.tar.gz: 04de6c0757edfba5abf31744d53844fd51f766c5287413d387c309fa3c95131e
+  metadata.gz: 04fea4738c097db67a060121841ec075ce611ceceec3c31fb49819cd03924db0
+  data.tar.gz: 89e0185e69dac3e5f66dec08331de9c64dfe49801a33cf587293d93f03163263
 SHA512:
-  metadata.gz: b0305dfd9e98c0f92cf05cf567f1ab71b2522db32f930865e623dadc84fa9601623269a095fe590e4d7be9cc77c842590fd03848ad961c9047be786bfae6c7d6
-  data.tar.gz: 833a34e6159b81f68919944a9fbc412c6870634d3d5eb6614e23c470c9d1bea5d4bf4a2c57bc70c836b06a75ad914f411710200cc2bde8070e5c8d32f04cb745
+  metadata.gz: 13c0dbaceeb204e6b8263f15ba5ccd240a8c3ec7909575a6ace921d8bf8f74554c673d350bf02dc14aca22edd935d5e1f820d74714fddaaf4a33fce93c38a26a
+  data.tar.gz: 9698ad8f849a346b0e9abb86a6be4e64c17922c0e22a35daa423dda2c2b08d679c6ae5d8edc2d3edbb7f64c26026c2f7dd1d66e0538187244d0e2f8d66f8fdee

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

@@ -65,7 +65,7 @@ class ProblemAI
 
         # Question boolean => true
         q = Question.new(:boolean)
-        q.name = "#{name}-#{counter}-pa1true1"
+        q.name = "#{name}-#{counter}-01pa1true"
         q.text = lang.text_for(:pa1, desc, asktext, correct_answer)
         q.good = "TRUE"
         @questions << q
@@ -81,7 +81,7 @@ class ProblemAI
         # Question boolean => true
         if incorrect_answers.size > 0
           q = Question.new(:boolean)
-          q.name = "#{name}-#{counter}-pa2false2"
+          q.name = "#{name}-#{counter}-02pa1false"
           q.text = lang.text_for(:pa1, desc, asktext, incorrect_answers.first)
           q.good = "FALSE"
           @questions << q
@@ -90,7 +90,7 @@ class ProblemAI
         # Question choice NONE
         if incorrect_answers.size > 2
           q = Question.new(:choice)
-          q.name = "#{name}-#{counter}-pa2-choice-none3"
+          q.name = "#{name}-#{counter}-03pa2-choice-none"
           q.text = lang.text_for(:pa2, desc, asktext)
           q.good = lang.text_for(:none)
           incorrect_answers.shuffle!
@@ -104,7 +104,7 @@ class ProblemAI
         # Question choice OK
         if incorrect_answers.size > 2
           q = Question.new(:choice)
-          q.name = "#{name}-#{counter}-pa2choice4"
+          q.name = "#{name}-#{counter}-04pa2choice"
           q.text = lang.text_for(:pa2, desc, asktext)
           q.good = correct_answer
           incorrect_answers.shuffle!
@@ -117,7 +117,7 @@ class ProblemAI
 
         if incorrect_answers.size > 1
           q = Question.new(:choice)
-          q.name = "#{name}-#{counter}-pa2choice5"
+          q.name = "#{name}-#{counter}-05pa2choice"
           q.text = lang.text_for(:pa2, desc, asktext)
           q.good = correct_answer
           incorrect_answers.shuffle!
@@ -130,7 +130,7 @@ class ProblemAI
 
         # Question short
         q = Question.new(:short)
-        q.name = "#{name}-#{counter}-pa2short6"
+        q.name = "#{name}-#{counter}-06pa2short"
         q.text = lang.text_for(:pa2, desc, asktext)
         q.shorts << correct_answer
         q.feedback = "Correct answer is #{correct_answer}."
@@ -153,19 +153,33 @@ class ProblemAI
 
           # Question steps ok
           q = Question.new(:short)
-          q.name = "#{name}-#{counter}-ps3short7"
+          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}-ps6ordering8"
+            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|
@@ -183,7 +197,7 @@ class ProblemAI
 
             # Question steps error
             q = Question.new(:short)
-            q.name = "#{name}-#{counter}-ps3short-error9"
+            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)
@@ -200,7 +214,7 @@ class ProblemAI
             incomplete_steps[indexes[first + 3]] = "?"
 
             q = Question.new(:match)
-            q.name = "#{name}-#{counter}-ps5match10"
+            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]
@@ -210,7 +224,7 @@ class ProblemAI
             @questions << q
 
             q = Question.new(:ddmatch)
-            q.name = "#{name}-#{counter}-ps5ddmatch11"
+            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]]]
@@ -222,5 +236,17 @@ class ProblemAI
         end
       end
     end
+
+    def hide(text)
+      output = []
+      text.chars do |c|
+        output << if c == " "
+          c
+        else
+          "?"
+        end
+      end
+      output.join
+    end
   end
 end

data/lib/asker/check_input/check_haml_data.rb

@@ -73,6 +73,14 @@ class CheckHamlData
       check_type(line, index)
       check_path(line, index)
       check_features(line, index)
+      check_problem(line, index)
+      check_cases(line, index)
+      check_case(line, index)
+      check_desc(line, index)
+      check_ask(line, index)
+      check_text(line, index)
+      check_answer(line, index)
+      check_step(line, index)
       check_unknown(line, index)
       @ok = false unless @outputs[index][:state] == :ok
       @ok = false if @outputs[index][:type] == :unkown
@@ -245,6 +253,134 @@ class CheckHamlData
     end
   end
 
+  def check_problem(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? "%problem"
+
+    @outputs[index][:type] = :problem
+    @outputs[index][:level] = 1
+    @outputs[index][:state] = :ok
+    if find_parent(index) != :map
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Parent(map) not found!"
+    elsif !line.match(/^\s\s%problem\s*$/)
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Write 2 spaces before %problem, and no text after"
+    end
+  end
+
+  def check_cases(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? "%cases"
+
+    @outputs[index][:type] = :cases
+    @outputs[index][:level] = 2
+    @outputs[index][:state] = :ok
+    if find_parent(index) != :problem
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Parent(problem) not found!"
+    elsif !line.match(/^\s\s\s\s%cases{\s/)
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Write 4 spaces before %cases"
+    end
+  end
+
+  def check_case(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? "%case "
+
+    @outputs[index][:type] = :case
+    @outputs[index][:level] = 3
+    @outputs[index][:state] = :ok
+    if find_parent(index) != :cases
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Parent(cases) not found!"
+    elsif !line.match(/^\s\s\s\s\s\s%case\s/)
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Write 6 spaces before %case"
+    end
+  end
+
+  def check_desc(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? "%desc"
+
+    @outputs[index][:type] = :desc
+    @outputs[index][:level] = 2
+    @outputs[index][:state] = :ok
+    if find_parent(index) != :problem
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Parent(problem) not found!"
+    elsif !line.match(/^\s\s\s\s%desc\s/)
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Write 4 spaces before %desc"
+    end
+  end
+
+  def check_ask(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? "%ask"
+
+    @outputs[index][:type] = :ask
+    @outputs[index][:level] = 2
+    @outputs[index][:state] = :ok
+    if find_parent(index) != :problem
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Parent(problem) not found!"
+    elsif !line.match(/^\s\s\s\s%ask/)
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Write 4 spaces before %ask"
+    end
+  end
+
+  def check_text(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? "%text"
+
+    @outputs[index][:type] = :text
+    @outputs[index][:level] = 3
+    @outputs[index][:state] = :ok
+    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%text\s/)
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Write 6 spaces before %text"
+    end
+  end
+
+  def check_answer(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? "%answer"
+
+    @outputs[index][:type] = :answer
+    @outputs[index][:level] = 3
+    @outputs[index][:state] = :ok
+    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/)
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Write 6 spaces before %answer"
+    end
+  end
+
+  def check_step(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? "%step"
+
+    @outputs[index][:type] = :step
+    @outputs[index][:level] = 3
+    @outputs[index][:state] = :ok
+    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%step\s/)
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = "Write 6 spaces before %step"
+    end
+  end
+
   def check_unknown(line, index)
     return unless @outputs[index][:state] == :none
 

data/lib/asker/check_input.rb

@@ -2,34 +2,39 @@ require_relative "check_input/check_haml_data"
 require_relative "logger"
 
 class CheckInput
+  attr_accessor :verbose
+
+  def initialize
+    @verbose = true
+  end
+
   def check(filepath)
-    @filepath = filepath
     # Check HAML file syntax
-    exist = check_file_exist
+    exist = check_file_exist(filepath)
     return false unless exist
-    check_file_content
+    check_file_content(filepath)
   end
 
   private
 
-  def check_file_exist
-    if @filepath.nil?
+  def check_file_exist(filepath)
+    if filepath.nil?
       Logger.error "CheckInput: Unknown filename"
       exit 1
     end
-    unless File.exist? @filepath
-      Logger.error "CheckInput: File not found! (#{@filepath})"
+    unless File.exist? filepath
+      Logger.error "CheckInput: File not found! (#{filepath})"
       exit 1
     end
-    unless File.extname(@filepath) == ".haml"
+    unless File.extname(filepath) == ".haml"
       Logger.error "CheckInput: Check works with HAML files!"
       exit 1
     end
     true
   end
 
-  def check_file_content
-    data = CheckHamlData.new(@filepath)
+  def check_file_content(filepath)
+    data = CheckHamlData.new(filepath)
     data.check
     data.show_errors if @verbose
     data.ok?

data/lib/asker/files/language/ca/templates.yaml

@@ -33,3 +33,4 @@
 :ps4: 'Canvia el pas <%=text1%> pel pas <%=text2%>'
 :ps5: '<p><%=text1%></p><p><b>Pregunta:</b> <%=text2%></p><p><b>Resposta:</b ></p><pre><%=text3%></pre><br/><i>(Col·loca cada pas en la seva posició correcta dins de la seqüència)</i>'
 :ps6: '<p><%=text1%></p><p><b>Pregunta:</b> <%=text2%></p><br/><i>(Posa cada pas en la posició correcta dins de la seqüència)</i>'
+:ps7: '<p><%=text1%></p><p><b>Pregunta:</b> <%=text2%></p><p><b>Resposta:</b ></p><pre><%=text3%></pre><br/><i>(Nota: Cada símbol ? representa una lletra/símbol, i cada * represent una o diverses paraules.)</i >'

data/lib/asker/files/language/du/templates.yaml

@@ -33,3 +33,4 @@
 :ps4: 'Ändere Schritt <%=text1%> in Schritt <%=text2%>'
 :ps5: '<p><%=text1%></p><p><b>Frage:</b> <%=text2%></p><p><b>Antwort:</b ></p><pre><%=text3%></pre><br/><i>(Platzieren Sie jeden Schritt an der richtigen Position innerhalb der Sequenz)</i>'
 :ps6: '<p><%=text1%></p><p><b>Frage:</b> <%=text2%></p><br/><i>(Platzieren Sie jeden Schritt an der richtigen Position innerhalb der Sequenz)</i>'
+:ps7: '<p><%=text1%></p><p><b>Frage:</b> <%=text2%></p><p><b>Antwort:</b ></p><pre><%=text3%></pre><br/><i>(Hinweis: Jedes ? steht für einen Buchstaben/ein Symbol und jedes * steht für ein oder mehrere Wörter.)</i > '

data/lib/asker/files/language/en/templates.yaml

@@ -33,3 +33,4 @@
 :ps4: 'Change step <%=text1%> by step <%=text2%>'
 :ps5: '<p><%=text1%></p><p><b>Question:</b> <%=text2%></p><p><b>Answer:</b></p><pre><%=text3%></pre><br/><i>(Place each step in its correct position within the sequence)</i>'
 :ps6: '<p><%=text1%></p><p><b>Question:</b> <%=text2%></p><br/><i>(Place each step in its correct position within the sequence)</i>'
+:ps7: '<p><%=text1%></p><p><b>Question:</b> <%=text2%></p><p><b>Answer:</b ></p><pre><%=text3%></pre><br/><i>(Note: Each ? represents a letter/symbol, and each * represents one or more words.)</i>'

data/lib/asker/files/language/es/templates.yaml

@@ -33,3 +33,4 @@
 :ps4: 'Cambia el paso <%=text1%> por el paso <%=text2%>'
 :ps5: '<p><%=text1%></p><p><b>Pregunta:</b> <%=text2%></p><p><b>Respuesta:</b></p><pre><%=text3%></pre><br/><i>(Coloca cada paso en su posición correcta dentro de la secuencia)</i>'
 :ps6: '<p><%=text1%></p><p><b>Pregunta:</b> <%=text2%></p><br/><i>(Coloca cada paso en su posición correcta dentro de la secuencia)</i>'
+:ps7: '<p><%=text1%></p><p><b>Pregunta:</b> <%=text2%></p><p><b>Respuesta:</b></p><pre><%=text3%></pre><br/><i>(Nota: Cada símbolo ? representa una letra/símbolo, y cada * represent una o varias palabras.)</i>'

data/lib/asker/files/language/fr/templates.yaml

@@ -33,3 +33,4 @@
 :ps4: "Changer l'étape <%=text1%> en étape <%=text2%>"
 :ps5 : "<p><%=text1%></p><p><b>Question :</b> <%=text2%></p><p><b>Réponse :</b ></p><pre><%=text3%></pre><br/><i>(Placez chaque étape dans sa position correcte dans la séquence)</i>"
 :ps6 : "<p><%=text1%></p><p><b>Question :</b> <%=text2%></p><br/><i>(Placez chaque étape dans sa position correcte dans la séquence)</i>"
+:ps7 : '<p><%=text1%></p><p><b>Question :</b> <%=text2%></p><p><b>Réponse :</b ></p><pre><%=text3%></pre><br/><i>(Remarque : chaque ? représente une lettre/un symbole, et chaque * représente un ou plusieurs mots.)</i > '

data/lib/asker/loader/content_loader.rb

@@ -6,12 +6,12 @@ require_relative "../data/project_data"
 require_relative "../lang/lang_factory"
 require_relative "../logger"
 
-module ContentLoader
+class ContentLoader
   ##
   # Load XML content into Asker data objects
   # @param filepath (String) File path
   # @param content (String) XML plane text content
-  def self.call(filepath, content)
+  def call(filepath, content)
     begin
       xmlcontent = REXML::Document.new(content)
     rescue REXML::ParseException
@@ -39,7 +39,9 @@ module ContentLoader
     {concepts: concepts, codes: codes, problems: problems}
   end
 
-  private_class_method def self.read_lang_attribute(xmldata)
+  private
+
+  def read_lang_attribute(xmldata)
     begin
       lang_code = xmldata.root.attributes["lang"]
     rescue itself
@@ -49,7 +51,7 @@ module ContentLoader
     LangFactory.instance.get(lang_code)
   end
 
-  private_class_method def self.read_context_attribute(xmldata)
+  def read_context_attribute(xmldata)
     begin
       context = xmldata.root.attributes["context"].split(",")
       context.collect!(&:strip)
@@ -60,7 +62,7 @@ module ContentLoader
     context
   end
 
-  private_class_method def self.read_concept(xmldata, filepath, lang, context)
+  def read_concept(xmldata, filepath, lang, context)
     project = ProjectData.instance
     concept = Concept.new(xmldata, filepath, lang, context)
     cond = [File.basename(filepath), :default].include? project.get(:process_file)
@@ -68,7 +70,7 @@ module ContentLoader
     concept
   end
 
-  private_class_method def self.read_code(xmldata, filepath)
+  def read_code(xmldata, filepath)
     project = ProjectData.instance
     code = CodeLoader.call(xmldata, filepath)
     cond =  [File.basename(filepath), :default].include? project.get(:process_file)
@@ -76,7 +78,7 @@ module ContentLoader
     code
   end
 
-  private_class_method def self.read_problem(xmldata, filepath, lang, context)
+  def read_problem(xmldata, filepath, lang, context)
     project = ProjectData.instance
     problem = ProblemLoader.new(lang, context).call(xmldata, filepath)
     cond = [File.basename(filepath), :default].include? project.get(:process_file)
@@ -84,7 +86,7 @@ module ContentLoader
     problem
   end
 
-  private_class_method def self.raise_error_with(filepath, content)
+  def raise_error_with(filepath, content)
     Logger.error "ContentLoader: Format error (#{filepath})"
     Logger.error "             : Revise output file (ouput/error.xml)"
     f = File.open("output/error.xml", "w")

data/lib/asker/loader/file_loader.rb

@@ -7,6 +7,7 @@ require_relative "../logger"
 # return { concepts: [], codes: [] }
 module FileLoader
   def self.call(filename)
+    Logger.debug "==> Loading #{filename}"
     if File.extname(filename).casecmp(".haml").zero?
       file_content = HamlLoader.load filename
     elsif File.extname(filename).casecmp(".xml").zero?
@@ -15,6 +16,6 @@ module FileLoader
       Logger.error "FileLoader: HAML or XML required (#{filename})"
       exit 1
     end
-    ContentLoader.call(filename, file_content)
+    ContentLoader.new.call(filename, file_content)
   end
 end

data/lib/asker/logger.rb

@@ -1,14 +1,18 @@
-require "singleton"
 require_relative "version"
 
 class Logger
-  include Singleton
   @verbose = true
 
-  def set_verbose(value)
+  def self.set_verbose(value)
     @verbose = (value == "yes")
   end
 
+  def self.debug(msg)
+    msg = Rainbow("#{msg}").white
+    puts msg if @verbose
+    @logfile&.write(msg)
+  end
+
   def self.info(msg)
     puts msg if @verbose
     @logfile&.write(msg)

data/lib/asker/start.rb

@@ -19,7 +19,7 @@ class Start
     init_project_data
     project_data = ProjectLoader.load(args)
     Logger.create(project_data.get(:logpath))
-    Logger.instance.set_verbose(Application.instance.config["verbose"])
+    Logger.set_verbose(Application.instance.config["global"]["verbose"])
 
     inputdirs = project_data.get(:inputdirs).split(",")
     internet = Application.instance.config["global"]["internet"] == "yes"

data/lib/asker/version.rb

@@ -1,5 +1,5 @@
 class Asker
-  VERSION = "2.7.1"
+  VERSION = "2.7.2"
   NAME = "asker"
   GEM = "asker-tool"
   CONFIGFILE = "asker.ini"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asker-tool
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-23 00:00:00.000000000 Z
+date: 2023-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml