asker-tool 2.6.0 → 2.7.0

data/lib/asker/loader/input_loader.rb

@@ -1,34 +1,48 @@
 require_relative "directory_loader"
 require_relative "../ai/concept_ai"
+require_relative "../ai/code/code_ai_factory"
+require_relative "../ai/problem/problem_ai"
 require_relative "../data/world"
 
-module InputLoader
+class InputLoader
   ##
   # Load input data from every input directory
   # @param inputdirs (Array)
-  def self.load(inputdirs, internet = true)
-    data = {concepts: [], codes: [], world: nil, concepts_ai: [], codes_ai: []}
+  def call(inputdirs, internet = true)
+    data = {
+      world: nil,
+      concepts: [], codes: [], problems: [],
+      concepts_ai: [], codes_ai: []
+    }
     inputdirs.each do |dirname|
-      temp = DirectoryLoader.load(dirname)
-      data[:concepts] += temp[:concepts]
-      data[:codes] += temp[:codes]
+      loaded = DirectoryLoader.call(dirname)
+      data[:concepts] += loaded[:concepts]
+      data[:codes] += loaded[:codes]
+      data[:problems] += loaded[:problems]
     end
     create_questions(data, internet)
   end
 
-  private_class_method def self.create_questions(data, internet)
-    # Create World data
-    # * Calculate concept neighbours
-    # * TO-DO: Calculate code neighbours
+  private
+
+  def create_questions(data, internet)
+    # Create World data. Calculate concept neighbours
+    # TODO: Calculate code and problem neighbours
     data[:world] = World.new(data[:concepts], internet)
+
     # Create ConceptAI data (ConceptAI = concept + questions)
     data[:concepts].each do |concept|
       data[:concepts_ai] << ConceptAI.new(concept, data[:world])
     end
+
     # Create CodeAI data (CodeAI = code + questions)
     data[:codes].each do |code|
       data[:codes_ai] << CodeAIFactory.get(code)
     end
+
+    # Fill problem with questions
+    data[:problems].each { |problem| ProblemAI.new.call(problem) }
+
     data
   end
 end

data/lib/asker/loader/problem_loader.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "rexml/document"
+require_relative "../logger"
+require_relative "../data/problem"
+
+class ProblemLoader
+  def initialize(lang, context)
+    @lang = lang
+    @context = context
+  end
+
+  ##
+  # Load XML data about Problem object
+  # @param xmldata (XML Object)
+  # @param filepath (String)
+  # @return Problem object
+  def call(xmldata, filepath)
+    data = read_problemdata_from_xml(xmldata, File.basename(filepath))
+    problem = Problem.from(data)
+    problem.lang = @lang
+    problem.context = @context
+    problem
+  end
+
+  private
+
+  def read_problemdata_from_xml(xmldata, filename)
+    data = {
+      filename: filename,
+      varnames: [],
+      cases: [],
+      descs: [],
+      asks: [],
+      formats: {}
+    }
+    xmldata.elements.each do |i|
+      case i.name
+      when "cases"
+        sep = i.attributes["sep"]&.strip || ","
+        data[:varnames] = i.attributes["varnames"].split(sep)
+        data[:varnames].map! { _1.strip }
+        data[:cases] = read_cases(i, filename, sep)
+      when "desc"
+        data[:descs] << i.text
+        type = i.attributes["type"]
+        unless type.nil?
+          key = "desc#{data[:descs].size}"
+          data[:formats][key] = type
+        end
+      when "ask"
+        data[:asks] << read_ask(i, filename)
+      else
+        Logger.warn "ProblemLoader: Unkown tag problem/#{i.name} (#{filename})"
+      end
+    end
+    data
+  end
+
+  def read_ask(xmldata, filename)
+    ask = {text: nil, answer: nil, steps: []}
+    xmldata.elements.each do |i|
+      if i.name == "text"
+        ask[:text] = i.text
+      elsif i.name == "answer"
+        ask[:answer] = i.text
+      elsif i.name == "step"
+        ask[:steps] << i.text
+      else
+        Logger.warn "ProblemLoader: Unkown tag problem/ask/#{i.name} (#{filename})"
+      end
+    end
+    ask
+  end
+
+  def read_cases(xmldata, filename, sep)
+    cases = []
+
+    xmldata.elements.each do |i|
+      if i.name == "case"
+        cases << i.text.split(sep).map { _1.strip }
+      else
+        Logger.warn "ProblemLoader: Unkown tag problem/cases/#{i.name} (#{filename})"
+      end
+    end
+    cases
+  end
+end

data/lib/asker/loader/project_loader.rb

@@ -2,13 +2,12 @@
 
 require "yaml"
 require_relative "../data/project_data"
+require_relative "../logger"
 
-# Load params into Project class using arg input
 module ProjectLoader
   ##
   # Load project from args
   # @param args (String or Hash)
-  # rubocop:disable Metrics/MethodLength
   def self.load(args)
     project = ProjectData.instance
 
@@ -22,10 +21,8 @@ module ProjectLoader
       return project
     end
 
-    msg = "[ERROR] ProjectLoader:"
-    msg += "Configuration params format is <#{pArgs.class}>!"
-    puts Rainbow(msg).red
-    raise msg
+    Logger.error "ProjectLoader: loading args with incorrect type (#{args.class})"
+    exit 1
   end
 
   ##
@@ -34,13 +31,10 @@ module ProjectLoader
   # * XML filepath
   # * YAML filepath
   # @param filepath (String)
-  # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/AbcSize
   def self.load_from_string(filepath)
     project = ProjectData.instance
     unless File.exist?(filepath)
-      msg = Rainbow("[ERROR] #{filepath} not found!").red.bright
-      puts msg
+      Logger.error "ProjectLoader: #{filepath} not found!"
       exit 1
     end
 
@@ -65,8 +59,7 @@ module ProjectLoader
   ##
   # Error found and exit application.
   def self.error_loading(arg)
-    msg = Rainbow("[ERROR] Loading... #{arg}").red.bright
-    puts msg
+    Logger.error  "ProjectLoader: Loading... #{arg}"
     exit 1
   end
 end

data/lib/asker/logger.rb

@@ -3,27 +3,36 @@ require_relative "version"
 
 class Logger
   include Singleton
-  @attr_verbose = "yes"
+  @verbose = true
 
   def set_verbose(value)
-    @attr_verbose = value
+    @verbose = (value == "yes")
   end
 
-  def self.verbose(msg)
-    print msg if @attr_verbose == "yes"
+  def self.info(msg)
+    puts msg if @verbose
     @logfile&.write(msg)
   end
 
-  def self.verboseln(msg)
-    verbose(msg + "\n")
+  def self.warn(msg)
+    msg = Rainbow("[WARN] #{msg}\n").yellow.bright
+    puts msg if @verbose
+    @logfile&.write(msg)
   end
 
-  def log(msg)
-    verbose(msg)
+  def self.error(msg)
+    msg = Rainbow("[ERROR] #{msg}\n").red.bright
+    Warning.warn msg if @verbose
+    @logfile&.write(msg)
   end
 
-  def logln(msg)
-    verboseln(msg)
+  def self.verbose(msg)
+    print msg if @verbose
+    @logfile&.write(msg)
+  end
+
+  def self.verboseln(msg)
+    verbose(msg + "\n")
   end
 
   def self.create(logpath)

data/lib/asker/skeleton.rb

@@ -4,19 +4,16 @@ require "fileutils"
 require "rainbow"
 require_relative "version"
 
-# Skeleton: create skeleton for asker input files
-# * create
-# * create_main_dir_and_files
-# * create_dir
-# * create_dirs
-# * copyfile
-module Skeleton
-  ##
-  # Create skeleton for asker input files
-  # @param inputpath (String)
-  # rubocop:disable Metrics/MethodLength
-  def self.create_input(inputpath)
-    puts "\n[INFO] Creating example input #{Rainbow(inputpath).bright}"
+class Skeleton
+  def create_configuration
+    puts "\nCreating configuration files"
+    src = File.join(File.dirname(__FILE__), "files", Asker::CONFIGFILE)
+    dst = File.join(Asker::CONFIGFILE)
+    copyfile(src, dst)
+  end
+
+  def create_input(inputpath)
+    puts "\nCreating example input #{Rainbow(inputpath).bright}"
     if File.extname(inputpath) == ".haml"
       dirpath = File.dirname(inputpath)
       filename = File.basename(inputpath)
@@ -28,47 +25,34 @@ module Skeleton
     source = File.join(File.dirname(__FILE__), "files", "example-concept.haml")
     copyfile(source, File.join(dirpath, filename))
   end
-  # rubocop:enable Metrics/MethodLength
 
-  ##
-  # Create default configuration files
-  def self.create_configuration
-    puts "\n[INFO] Creating configuration files"
-    src = File.join(File.dirname(__FILE__), "files", Asker::CONFIGFILE)
-    dst = File.join(Asker::CONFIGFILE)
-    copyfile(src, dst)
-  end
+  private
 
-  ##
-  # Create folder
-  # @param dirpath (String)
-  private_class_method def self.create_dir(dirpath)
+  def create_dir(dirpath)
     if Dir.exist? dirpath
-      puts "* Exists dir!       => #{Rainbow(dirpath).yellow}"
+      puts "* Exists dir!       => #{Rainbow(dirpath).yellow.bright}"
     else
       begin
         FileUtils.mkdir_p(dirpath)
         puts "* Create dir        => #{Rainbow(dirpath).green}"
       rescue
-        puts "* Create dir  ERROR => #{Rainbow(dirpath).red}"
+        warn "* Create dir  ERROR => #{Rainbow(dirpath).red}"
+        exit 1
       end
     end
   end
 
-  ##
-  # Copy target file to dest
-  # @param target (String)
-  # @param dest (String)
-  private_class_method def self.copyfile(target, dest)
+  def copyfile(target, dest)
     if File.exist? dest
-      puts "* Exists file!      => #{Rainbow(dest).yellow}"
+      puts "* Exists file!      => #{Rainbow(dest).yellow.bright}"
       return true
     end
     begin
       FileUtils.cp(target, dest)
       puts "* Create file       => #{Rainbow(dest).green}"
     rescue
-      puts "* Create file ERROR => #{Rainbow(dest).red}"
+      warn "* Create file ERROR => #{Rainbow(dest).red}"
+      exit 1
     end
   end
 end

data/lib/asker/start.rb

@@ -0,0 +1,44 @@
+require_relative "application"
+require_relative "logger"
+require_relative "displayer/concept_displayer"
+require_relative "displayer/stats_displayer"
+require_relative "exporter/output_file_exporter"
+require_relative "loader/project_loader"
+require_relative "loader/input_loader"
+
+class Start
+  def call(filepath)
+    project_data, data = load_input(filepath)
+    ConceptDisplayer.show(data[:concepts])
+    create_output(project_data, data)
+  end
+
+  private
+
+  def load_input(args)
+    init_project_data
+    project_data = ProjectLoader.load(args)
+    Logger.create(project_data.get(:logpath))
+    Logger.instance.set_verbose(Application.instance.config["verbose"])
+
+    inputdirs = project_data.get(:inputdirs).split(",")
+    internet = Application.instance.config["global"]["internet"] == "yes"
+    data = InputLoader.new.call(inputdirs, internet)
+    [project_data, data]
+  end
+
+  def init_project_data
+    project_data = ProjectData.instance
+    outputdir = Application.instance.config["output"]["folder"]
+    project_data.set(:outputdir, outputdir)
+
+    formula_weights = Application.instance.config["ai"]["formula_weights"]
+    project_data.set(:weights, formula_weights)
+  end
+
+  def create_output(project, data)
+    OutputFileExporter.export(data, project)
+    StatsDisplayer.show(data)
+    Logger.close
+  end
+end

data/lib/asker/version.rb

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

data/lib/asker.rb

@@ -1,66 +1,21 @@
-require 'rainbow'
-
-require_relative 'asker/skeleton'
-require_relative 'asker/check_input'
-
-require_relative 'asker/displayer/concept_displayer'
-require_relative 'asker/displayer/stats_displayer'
-require_relative 'asker/exporter/output_file_exporter'
-require_relative 'asker/logger'
-
-require_relative 'asker/loader/project_loader'
-require_relative 'asker/loader/input_loader'
+require_relative "asker/check_input"
+require_relative "asker/skeleton"
+require_relative "asker/start"
 
 class Asker
   def self.init
-    Skeleton.create_configuration
+    Skeleton.new.create_configuration
   end
 
   def self.create_input(dirpath)
-    Skeleton.create_input(dirpath)
+    Skeleton.new.create_input(dirpath)
   end
 
   def self.check(filepath)
-    CheckInput.new.file(filepath).check
+    CheckInput.new.check(filepath)
   end
 
   def self.start(filepath)
-    project_data, data = load_input(filepath)
-    ConceptDisplayer.show(data[:concepts])
-    create_output(project_data, data)
-  end
-
-  private_class_method def self.load_input(args)
-    init_project_data
-    project_data = ProjectLoader.load(args)
-    init_logger(project_data)
-
-    inputdirs = project_data.get(:inputdirs).split(',')
-    internet = Application.instance.config['global']['internet'] == 'yes'
-    data = InputLoader.load(inputdirs, internet)
-    [project_data, data]
-  end
-
-  private_class_method def self.init_project_data()
-    project_data = ProjectData.instance
-    outputdir = Application.instance.config['output']['folder']
-    project_data.set(:outputdir, outputdir)
-
-    formula_weights = Application.instance.config['ai']['formula_weights']
-    project_data.set(:weights, formula_weights)
-  end
-
-  private_class_method def self.init_logger(project)
-    Logger.create(project.get(:logpath))
-    Logger.instance.set_verbose(Application.instance.config['verbose'])
-    Logger.verboseln '[INFO] Project open'
-    Logger.verboseln '   ├── inputdirs    = ' + Rainbow(project.get(:inputdirs)).bright
-    Logger.verboseln '   └── process_file = ' + Rainbow(project.get(:process_file)).bright
-  end
-
-  private_class_method def self.create_output(project, data)
-    OutputFileExporter.export(data, project)
-    StatsDisplayer.show(data)
-    Logger.close
+    Start.new.call(filepath)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asker-tool
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -113,11 +113,11 @@ files:
 - lib/asker/ai/code/base_code_ai.rb
 - lib/asker/ai/code/code_ai_factory.rb
 - lib/asker/ai/code/javascript_code_ai.rb
-- lib/asker/ai/code/problem_code_ai.rb
 - lib/asker/ai/code/python_code_ai.rb
 - lib/asker/ai/code/ruby_code_ai.rb
 - lib/asker/ai/code/sql_code_ai.rb
 - lib/asker/ai/concept_ai.rb
+- lib/asker/ai/problem/problem_ai.rb
 - lib/asker/ai/question.rb
 - lib/asker/ai/stages/base_stage.rb
 - lib/asker/ai/stages/main.rb
@@ -136,25 +136,27 @@ files:
 - lib/asker/data/column.rb
 - lib/asker/data/concept.rb
 - lib/asker/data/data_field.rb
+- lib/asker/data/problem.rb
 - lib/asker/data/project_data.rb
 - lib/asker/data/row.rb
 - lib/asker/data/table.rb
 - lib/asker/data/template.rb
 - lib/asker/data/world.rb
+- lib/asker/deprecated/question_moodlexml_formatter.rb
 - lib/asker/displayer/code_displayer.rb
 - lib/asker/displayer/concept_ai_displayer.erb
 - lib/asker/displayer/concept_ai_displayer.rb
 - lib/asker/displayer/concept_displayer.rb
+- lib/asker/displayer/problem_displayer.rb
 - lib/asker/displayer/stats_displayer.rb
 - lib/asker/exporter/code_gift_exporter.rb
-- lib/asker/exporter/code_moodle_exporter.rb
 - lib/asker/exporter/concept_ai_gift_exporter.rb
-- lib/asker/exporter/concept_ai_moodle_exporter.rb
 - lib/asker/exporter/concept_ai_yaml_exporter.rb
 - lib/asker/exporter/concept_doc_exporter.rb
 - lib/asker/exporter/data_gift_exporter.rb
 - lib/asker/exporter/data_moodle_exporter.rb
 - lib/asker/exporter/output_file_exporter.rb
+- lib/asker/exporter/problem_gift_exporter.rb
 - lib/asker/files/asker.ini
 - lib/asker/files/example-code.haml
 - lib/asker/files/example-concept.haml
@@ -191,14 +193,16 @@ files:
 - lib/asker/formatter/code_string_formatter.rb
 - lib/asker/formatter/concept_doc_formatter.rb
 - lib/asker/formatter/concept_string_formatter.rb
+- lib/asker/formatter/moodle/ddmatch.erb
+- lib/asker/formatter/moodle/gapfill.erb
 - lib/asker/formatter/moodle/matching.erb
 - lib/asker/formatter/moodle/multichoice.erb
+- lib/asker/formatter/moodle/ordering.erb
 - lib/asker/formatter/moodle/shortanswer.erb
 - lib/asker/formatter/moodle/truefalse.erb
 - lib/asker/formatter/question_gift_formatter.rb
 - lib/asker/formatter/question_hash_formatter.rb
 - lib/asker/formatter/question_moodle_formatter.rb
-- lib/asker/formatter/question_moodlexml_formatter.rb
 - lib/asker/formatter/rb2haml_formatter.rb
 - lib/asker/lang/lang.rb
 - lib/asker/lang/lang_factory.rb
@@ -211,9 +215,11 @@ files:
 - lib/asker/loader/haml_loader.rb
 - lib/asker/loader/image_url_loader.rb
 - lib/asker/loader/input_loader.rb
+- lib/asker/loader/problem_loader.rb
 - lib/asker/loader/project_loader.rb
 - lib/asker/logger.rb
 - lib/asker/skeleton.rb
+- lib/asker/start.rb
 - lib/asker/version.rb
 homepage: https://github.com/teuton-software/asker
 licenses: