asker-tool 2.1.3 → 2.1.5

data/lib/asker/{exporter/code_screen_exporter.rb → displayer/code_displayer.rb}

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'terminal-table'
+require_relative '../logger'
 
 # Export Code into Screen
-module CodeScreenExporter
-  def self.export_all(codes)
-    project = Project.instance
-    return if project.show_mode == :none || codes.nil? || codes.size.zero?
+module CodeDisplayer
+  def self.show(codes)
+    return if codes.nil? || codes.size.zero?
 
     total_c = total_q = total_e = 0
     my_screen_table = Terminal::Table.new do |st|
@@ -39,7 +39,7 @@ module CodeScreenExporter
                              Rainbow((total_q / total_e.to_f).round(2)).bright]
     return unless total_c.positive?
 
-    project.verboseln "\n[INFO] Showing CODE statistics"
-    project.verboseln my_screen_table.to_s
+    Logger.verboseln "\n[INFO] Showing CODE statistics"
+    Logger.verboseln my_screen_table.to_s
   end
 end

data/lib/asker/{exporter/concept_ai_screen_exporter.rb → displayer/concept_ai_displayer.rb}

@@ -1,28 +1,27 @@
 # frozen_string_literal: true
 
 require 'terminal-table'
+require_relative '../logger'
 
-# Show ConceptAI info on screen
-class ConceptAIScreenExporter
-  def self.export_all(concepts_ai)
-    @concepts_ai = concepts_ai
-	  project = Project.instance
-    return if project.show_mode == :none
-
+# Display ConceptAI stat on screen
+class ConceptAIDisplayer
+  ##
+  # Display ConceptAI stat on screen
+  # @param concepts_ai (Array)
+  def self.show(concepts_ai)
     # Create table HEAD
     screen_table = Terminal::Table.new do |st|
       st << ['Concept','Questions','Entries','xFactor',
              'd','b','f','i','s','t']
       st << :separator
     end
-
     # Create table BODY
     total = {}
     total[:q] = total[:e] = total[:c] = 0
     total[:sd] = total[:sb] = total[:sf] = 0
     total[:si] = total[:ss] = total[:st] = 0
 
-    @concepts_ai.each do |concept_ai|
+    concepts_ai.each do |concept_ai|
       if concept_ai.process?
         e = concept_ai.texts.size
         concept_ai.tables.each { |t| e += t.fields.size * t.rows.size }
@@ -51,7 +50,7 @@ class ConceptAIScreenExporter
     return if total[:c] == 0 # No concepts to be process?
 
     # Add row with excluded questions
-    export_excluded_questions(screen_table, @concepts_ai)
+    export_excluded_questions(screen_table, concepts_ai)
 
     # Create table TAIL
     screen_table.add_separator
@@ -62,10 +61,10 @@ class ConceptAIScreenExporter
                           total[:sd], total[:sb], total[:sf],
                           total[:si], total[:ss], total[:st]]
     export_notes
-    project.verbose screen_table.to_s + "\n"
+    Logger.verbose "#{screen_table}\n"
   end
 
-  def self.export_excluded_questions(screen_table, concepts_ai)
+  private_class_method def self.export_excluded_questions(screen_table, concepts_ai)
     # Create table BODY
     total = {}
     total[:q] = total[:c] = 0
@@ -94,22 +93,21 @@ class ConceptAIScreenExporter
                           total[:ss], total[:st]]
   end
 
-  def self.export_notes
-    p = Project.instance
-    p.verbose "\n[INFO] Showing CONCEPT statistics\n"
-    p.verbose ' * Exclude questions: ' +
-              Application.instance.config['questions']['exclude'].to_s
-    p.verbose ' * Annotations:'
-    p.verbose '   ├── (d) Definitions     <= Concept.def'
-    p.verbose '   ├── (b) Table Matching  <= ' \
-              'Concept.table.rows.columns'
-    p.verbose '   ├── (f) Tables 1 Field  <= Concept.table.fields.size==1'
-    p.verbose '   ├── (i) Images URL      <= ' \
-              "Concept.def{:type => 'image_url'}"
-    p.verbose '   ├── (s) Sequences       <= ' \
-              "Concept.table{:sequence => '...'}"
-    p.verbose '   └── (t) Table Rows&Cols <= ' \
-              'Concept.table.rows.columns'
-    p.verbose "\n"
+  private_class_method def self.export_notes
+    Logger.verbose "\n[INFO] Showing CONCEPT statistics\n"
+    Logger.verbose ' * Exclude questions: ' +
+                   Application.instance.config['questions']['exclude'].to_s
+    Logger.verbose ' * Annotations:'
+    Logger.verbose '   ├── (d) Definitions     <= Concept.def'
+    Logger.verbose '   ├── (b) Table Matching  <= ' \
+                   'Concept.table.rows.columns'
+    Logger.verbose '   ├── (f) Tables 1 Field  <= Concept.table.fields.size==1'
+    Logger.verbose '   ├── (i) Images URL      <= ' \
+                   "Concept.def{:type => 'image_url'}"
+    Logger.verbose '   ├── (s) Sequences       <= ' \
+                   "Concept.table{:sequence => '...'}"
+    Logger.verbose '   └── (t) Table Rows&Cols <= ' \
+                  'Concept.table.rows.columns'
+    Logger.verbose "\n"
   end
 end

data/lib/asker/displayer/concept_displayer.rb

@@ -0,0 +1,27 @@
+
+require_relative '../formatter/concept_string_formatter'
+require_relative '../logger'
+
+# Show Concept Data on screen
+module ConceptDisplayer
+  ##
+  # Show concepts on screen
+  # @param concepts (Array)
+  # @param show_mode (Symbol)
+  def self.show(concepts, show_mode = :default)
+    return if show_mode == :none
+    msg = "\n[INFO] Showing concept data (#{Rainbow(show_mode).bright})"
+    Logger.verbose msg
+    case show_mode
+    when :resume
+      s = "* Concepts (#{concepts.count}): "
+      concepts.each { |c| s += c.name + ', ' }
+      Logger.verbose s
+    when :default
+      # Only show Concepts with process attr true
+      concepts.each do |c|
+        Logger.verbose ConceptStringFormatter.to_s(c) if c.process?
+      end
+    end
+  end
+end

data/lib/asker/displayer/stats_displayer.rb

@@ -0,0 +1,13 @@
+require_relative 'concept_ai_displayer'
+require_relative 'code_displayer'
+
+# Display Stats on screen.
+module StatsDisplayer
+  def self.show(data, show_mode)
+    return if show_mode == :none
+
+    # show_final_results
+    ConceptAIDisplayer.show(data[:concepts_ai])
+    CodeDisplayer.show(data[:codes])
+  end
+end

data/lib/asker/exporter/code_gift_exporter.rb

@@ -1,31 +1,30 @@
 # frozen_string_literal: true
 
-require_relative '../project'
 require_relative '../formatter/question_gift_formatter'
 
-# UNDER DEVELOPMENT
 # Use to export questions from Code to gift format
 module CodeGiftExporter
-  def self.export_all(codes)
-    codes.each do |code|
-      code.make_questions
-      export code
-    end
+  ##
+  # Export an Array of codes to gift format file
+  # @param codes (Array)
+  def self.export_all(codes, file)
+    codes.each { |code| export(code, file) }
   end
 
-  def self.export(code)
+  ##
+  # Export 1 code to gift format file
+  # @param code (Code)
+  def self.export(code, file)
     return false unless code.process?
 
-    file = Project.instance.outputfile
     file.write head(code)
-
     code.questions.each do |question|
       file.write QuestionGiftFormatter.to_s(question)
     end
     true
   end
 
-  def self.head(code)
+  private_class_method def self.head(code)
     s = "\n"
     s += '// ' + '=' * 50 + "\n"
     s += "// Code #{code.type}: #{code.filename} (#{code.questions.size})\n"

data/lib/asker/exporter/concept_ai_gift_exporter.rb

@@ -3,20 +3,20 @@
 require_relative '../project'
 require_relative '../formatter/question_gift_formatter'
 
-# Use to export data from ConceptIA to gift format
+# Export ConceptIA data to gift to outputfile
 module ConceptAIGiftExporter
-  def self.export_all(concepts_ai)
-    concepts_ai.each { |concept_ai| export(concept_ai) }
+  ##
+  # Export list of ConceptAI into outpufile
+  def self.export_all(concepts_ai, project)
+    concepts_ai.each { |concept_ai| export(concept_ai, project) }
   end
-  
-  def self.export(concept_ai)
+
+  def self.export(concept_ai, project)
     return unless concept_ai.process?
 
-    file = Project.instance.outputfile
+    file = project.get(:outputfile)
     file.write head(concept_ai.name)
-
-    stages = Project.instance.stages
-    stages.each_key do |stage|
+    project.stages.each_key do |stage|
       concept_ai.questions[stage].each do |question|
         file.write(QuestionGiftFormatter.to_s(question))
       end

data/lib/asker/exporter/concept_ai_yaml_exporter.rb

@@ -1,21 +1,19 @@
 # encoding: utf-8
 
 require 'yaml'
-require_relative '../project'
 require_relative '../formatter/question_hash_formatter'
 
 # Use to export data from ConceptIA to YAML format
 module ConceptAIYAMLExporter
-  def self.export_all(concepts_ai)
+  def self.export_all(concepts_ai, project)
     questions = []
     concepts_ai.each do |concept_ai|
       questions += get_questions_from concept_ai
     end
-    project = Project.instance
     params = { lang: project.get(:lang) ,
                projectname: project.get(:projectname) }
     output = { params: params, questions: questions }
-    project.yamlfile.write(output.to_yaml)
+    project.get(:yamlfile).write(output.to_yaml)
   end
 
   def self.get_questions_from(concept_ai)

data/lib/asker/exporter/concept_doc_exporter.rb

@@ -1,21 +1,15 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require_relative '../project'
 require_relative '../formatter/concept_doc_formatter'
 
-class ConceptDocExporter
-
-  def initialize(concepts)
-    @concepts = concepts
-  end
-
-  def export
-    file = Project.instance.lessonfile
-    @concepts.each do |concept|
-      if concept.process
-        file.write(ConceptDocFormatter.to_s(concept))
-      end
+##
+# Export Concept to Doc file
+module ConceptDocExporter
+  ##
+  # Export arrya of concepts to doc
+  def self.export_all(concepts, file)
+    concepts.each do |concept|
+      file.write(ConceptDocFormatter.to_s(concept)) if concept.process
     end
   end
-
 end

data/lib/asker/exporter/output_file_exporter.rb

@@ -0,0 +1,18 @@
+require_relative 'concept_ai_gift_exporter'
+require_relative 'code_gift_exporter'
+require_relative 'concept_ai_yaml_exporter'
+require_relative 'concept_doc_exporter'
+
+# Export Output data:
+# * Gift (ConceptAI, Code)
+# * YAML
+# * Doc (txt)
+module OutputFileExporter
+  def self.export(data, project)
+    ConceptAIGiftExporter.export_all(data[:concepts_ai], project)
+    # UNDER DEVELOPMENT
+    CodeGiftExporter.export_all(data[:codes], project.get(:outputfile))
+    ConceptAIYAMLExporter.export_all(data[:concepts_ai], project)
+    ConceptDocExporter.export_all(data[:concepts], project.get(:lessonfile))
+  end
+end

data/lib/asker/files/example-concept.haml

@@ -1,13 +1,30 @@
-%map{ :lang => 'en', :context => 'list,of,words,to,define,context', :version => '1'}
+%map{ :lang => 'en', :context => 'music, band', :version => '1'}
 
   %concept
-    %names Example1
-    %tags list,of,words,to,define,this,concept
-    %def Definition 1 of Example1
+    %names AC/DC, ACDC
+    %tags single, seat, leg, backrest
+    %tags rock, band, australia
+    %def Australian rock band formed by Scottish-born brothers Malcolm and Angus Young
+    %table{ :fields => 'members'}
+      %row Bon Scott
+      %row Angus Young
+      %row Malcolm Young
+      %row Phil Rudd
+      %row Cliff Williams
     %table{ :fields => 'attribute, value'}
       %row
-        %col attr1
-        %col value1
+        %col Genres
+        %col Hard rock blues rock rock and roll
       %row
-        %col attr2
-        %col value2
+        %col Years active
+        %col 1973-present
+      %row
+        %col Formed in
+        %col Sydney
+    %table{ :fields => 'Albums', :sequence => 'Albums sorted by date'}
+      %row Albums High Voltage
+      %row Powerage
+      %row Highway to Hell
+      %row Back in Black
+      %row Ballbreaker
+      %row Rock or Bust

data/lib/asker/formatter/concept_string_formatter.rb

@@ -11,14 +11,14 @@ module ConceptStringFormatter
   # @return String
   def self.to_s(concept)
     tt = Terminal::Table.new
-    rows = get_tt_rows(concept)
-    rows.each { |row| tt.add_row row }
+    get_tt_rows(concept).each { |row| tt.add_row row }
     "#{tt}\n"
   end
 
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/MethodLength
-  def self.get_tt_rows(concept)
+  # rubocop:disable Layout/LineLength
+  private_class_method def self.get_tt_rows(concept)
     rows = []
     rows << [Rainbow(concept.id.to_s).bright,
              Rainbow(concept.name(:screen)).white.bg(:blue).bright +
@@ -31,14 +31,15 @@ module ConceptStringFormatter
     rows << [Rainbow('Referenced by').blue,
              concept.referenced_by.join(', ')[0...70].to_s]
     rows << format_texts(concept)
-    rows << [Rainbow('.def(images)').blue, concept.images.size.to_s]
-    rows << format_tables(concept)
+    rows << [Rainbow('.def(images)').blue, concept.images.size.to_s] unless concept.images.size.zero?
+    rows << format_tables(concept) unless concept.tables.count.zero?
     rows << format_neighbors(concept)
   end
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Layout/LineLength
 
-  def self.format_texts(concept)
+  private_class_method def self.format_texts(concept)
     list = []
     concept.texts.each do |i|
       if i.size < 60
@@ -50,14 +51,14 @@ module ConceptStringFormatter
     [Rainbow('.def(text)').blue, list.join("\n")]
   end
 
-  def self.format_tables(concept)
+  private_class_method def self.format_tables(concept)
     return [] if concept.tables.count.zero?
 
     list = concept.tables.map(&:to_s)
     [Rainbow('.tables').color(:blue), list.join("\n")]
   end
 
-  def self.format_neighbors(concept)
+  private_class_method def self.format_neighbors(concept)
     list = concept.neighbors[0..4].map do |i|
       i[:concept].name(:screen) + '(' + i[:value].to_s[0..4] + ')'
     end

data/lib/asker/lang/lang.rb

@@ -3,6 +3,7 @@
 require 'erb'
 require 'yaml'
 require_relative 'text_actions'
+require_relative '../logger'
 
 # Lang#lang
 class Lang
@@ -27,9 +28,8 @@ class Lang
     begin
       @templates = YAML.load(File.new(filename))
     rescue StandardError => e
-      p = Project.instance
-      p.vervose "[ERROR] lang.initialize(): Reading YAML file <#{filename}>"
-      p.vervose "[ADVISE] Revise apostrophe into string without \\ char\n"
+      Logger.verboseln "[ERROR] lang.initialize(): Reading YAML file <#{filename}>"
+      Logger.verboseln "[ADVISE] Revise apostrophe into string without \\ char\n"
       raise e
     end
     filename = File.join(dirbase, 'locales', @code, 'connectors.yaml')
@@ -38,5 +38,4 @@ class Lang
     filename = File.join(dirbase, 'locales', @code, 'mistakes.yaml')
     @mistakes = YAML.load(File.new(filename))
   end
-
 end

data/lib/asker/lang/locales/du/templates.yaml

@@ -0,0 +1,50 @@
+---
+:none:	keine Antwort ist richtig
+:error: Fehler
+:misspelling: Rechtschreibfehler
+:true: richtig
+:false: falsch
+:d1: 'Bedeutung \: <i><%=text1%></i><br/> Wählen Sie die dazu passende Option aus, die am besten zu der vorstehenden Bedeutung passt.<br/>'
+:d2: 'Bedeutung des Begriffs <b><%=text1%></b>\:<br/> <i><%=text2%></i><br/>'
+:d3: 'Bedeutung des Begriffs <b><%=text1%></b>\:<br/> <i><%=text2%></i><br/></br><p> Bemerkung: Ein Fragezeichnen stellt einen Buchstaben dar, und ein Sternchen steht für ein Wort oder mehrere Wörter.</p>'
+:d4: 'Bedeutung des Begriffs <b><%=text1%></b>\:<br/> <i><%=text2%></i><br/><br/>(Setzen Sie die Wörter in die Lücken ein)'
+
+:b1: 'En relación al concepto <b><%=text1%></b>, asocia cada "<%=text2%>" con su "<%=text3%>".<br/>'
+:f1: 'Los siguientes elementos son "<%=text2%>" del concepto <b><%=text1%></b>\:<ul><li><%=text3%></li></ul>'
+:f2: 'Los siguientes elementos son "<%=text2%>".<br/>Selecciona la opción que no pertenezca al concepto <b><%=text1%></b>.'
+:f3: 'Los siguientes elementos son "<%=text2%>" del concepto <b><%=text1%></b>\:<br><p><%=text3%></p>(Coloca cada palabra en su posición correcta dentro del texto)'
+:i1: '<img src="<%=text1%>" alt\="image" width="400" height="300"><br/>Elige la opción que mejor se corresponda con la imagen anterior.<br/>'
+:i2: '<img src="<%=text1%>" alt\="image" width="400" height="300"><br/>La imagen anterior corresponde a <b><%=text2%></b>.'
+:i3: '<img src="<%=text1%>" alt\="image" width="400" height="300"><br/>Escribe la opción <%=text2%>, que mejor corresponda con la imagen anterior.<br/>'
+:i4: '<img src="<%=text1%>" alt\="image" width="400" height="300"><br/>Definición\: <i><%=text2%></i><br/><br/>(Coloca cada palabra en su posición correcta dentro del texto)'
+:s1: 'En relación al concepto <b><%=text1%></b>, ordena cada "<%=text2%>" de modo que se cumpla el criterio "<%=text3%>".<br/>'
+:t1table: 'Concepto <b><%=text1%></b><br/><%=text2%>\: [*]<br/><%=text3%>\: "<%=text4%>"<br/>Elige la opción correcta.<br/>'
+:t2table: 'Concepto <b><%=text1%></b><br/><%=text2%>\: [*]<br/><%=text3%>\: "<%=text4%>"<br/>Elige la opción correcta.<br/>'
+:t3table: 'Concepto <b><%=text1%></b><br/><%=text2%>\: "<%=text3%>"<br/><%=text4%>: [*]<br/>Elige la opción correcta.<br/>'
+:t4table: 'Concepto <b><%=text1%></b><br/><%=text2%>\: "<%=text3%>"<br/><%=text4%>: [*]<br/>Elige la opción correcta.<br/>'
+:t5table: 'Concepto <b><%=text1%></b><br/>La asociación siguiente es correcta\:<br/><ul><li><%=text2%>\: "<%=text3%>"</li><li><%=text4%>\: "<%=text5%>"</li></ul>'
+:t6table: 'Concepto <b><%=text1%></b><br/>La asociación siguiente es correcta\:<br/><ul><li><%=text2%>\: "<%=text3%>"</li><li><%=text4%>\: "<%=text5%>"</li></ul>'
+:t7table: 'Concepto <b><%=text1%></b><br/>La asociación siguiente es correcta\:<br/><ul><li><%=text2%>\: "<%=text3%>"</li><li><%=text4%>\: "<%=text5%>"</li></ul>'
+:t8table: 'Concepto <b><%=text1%></b><br/>Completa la siguiente asociación\:<br/><ul><li><%=text2%>\: "<%=text3%>"</li><li><%=text4%>\: [*]</li></ul>Escribir una palabra.<br/>'
+:t9table: 'Concepto <b><%=text1%></b><br/>Completa la siguiente asociación\:<br/><ul><li><%=text2%>\: "<%=text3%>"</li><li><%=text4%>\: <%=text5%></li></ul>Escribir <%=text6%> palabras.<br/>'
+:code1: '<pre><%=text1%></pre><br/><p>Escribir el número de línea donde está el primer error. Escribir 0 si no hay ningún error.</p>'
+
+B1: In Bezug auf den Begriff (+++++), verbinden Sie die passenden Begriffe.
+F1: Die folgenden Elemente sind (+++++) des Begriffs (++++)
+F2: Die folgenden Elemente sind (+++++)  Wählen Sie die Antwortmöglichkeit aus, die nicht zum Begriff  (++++) passt
+F3: Die folgenden Elemente sind  (+++++) des Begriffs (++++) (Setzen Sie die Wörter in die Lücken ein)
+I1: Wählen Sie die Antwortmöglichkeit, die am besten zu dem gezeigten Bild passt.
+I2: Das gezeigte Bild gehört zu (++++)
+I3: Setzen Sie die Antwort ein (+++), die am besten zu dem gezeigten Bild passt.
+I4: Bedeutung (Setzen Sie die Wörter in die Lücken ein)
+S1: Beziehen Sie sich auf den Begriff (+++++) und ordnen Sie die richtigen Lösungen zu.
+T1: Begriff / Wählen Sie die richtige Lösung aus.
+T2: Begriff / Wählen Sie die richtige Lösung aus.
+T3: Begriff / Wählen Sie die richtige Lösung aus.
+T4: Begriff / Wählen Sie die richtige Lösung aus.
+T5: Begriff / Die Lösung ist richtig
+T6: Begriff / Die Lösung ist richtig
+T7: Begriff / Die Lösung ist richtig
+T8: Begriff / Vervollständigen Sie / Schreiben Sie einen Begriff
+T9: Begriff / Verbinden Sie / Schreiben Sie fogende Begriffe
+Code1: Nennen Sie die Nummer der Zeile, in der sich der erste Fehler befindet / Wenn es keinen Fehler gibt, setzen Sie 0 ein.