asker-tool 2.5.9 → 2.7.0

data/lib/asker/check_input/check_table.rb

@@ -1,19 +1,17 @@
-
 module CheckTable
-
   def check_table(line, index)
     return unless @outputs[index][:state] == :none
-    return unless line.include? '%table'
+    return unless line.include? "%table"
 
     @outputs[index][:type] = :table
     @outputs[index][:level] = 2
     @outputs[index][:state] = :ok
     if find_parent(index) != :concept
       @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Parent(concept) not found!'
+      @outputs[index][:msg] = "Parent(concept) not found!"
     elsif !line.match(/^\s\s\s\s%table\s*/)
       @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 4 spaces before %table'
+      @outputs[index][:msg] = "Write 4 spaces before %table"
     end
 
     unless line.include? "%table{"
@@ -29,7 +27,7 @@ module CheckTable
 
   def check_row(line, index)
     return unless @outputs[index][:state] == :none
-    return unless line.include? '%row'
+    return unless line.include? "%row"
 
     @outputs[index][:type] = :row
     @outputs[index][:state] = :ok
@@ -38,44 +36,53 @@ module CheckTable
     when 6
       @outputs[index][:level] = 3
       parent = find_parent(index)
-      unless %i[table features].include? parent
+      unless %i[table template features].include? parent
         @outputs[index][:state] = :err
-        @outputs[index][:msg] = 'Parent(table/features) not found!'
+        @outputs[index][:msg] = "Parent(table/template/features) not found!"
       end
     when 8
       @outputs[index][:level] = 4
       if find_parent(index) != :template
         @outputs[index][:state] = :err
-        @outputs[index][:msg] = 'Parent(template) not found!'
+        @outputs[index][:msg] = "Parent(template) not found!"
       end
     else
       @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 6 or 8 spaces before %row'
+      @outputs[index][:msg] = "Write 6 or 8 spaces before %row"
     end
   end
 
   def check_col(line, index)
     return unless @outputs[index][:state] == :none
-    return unless line.include? '%col'
+    return unless line.include? "%col"
 
     @outputs[index][:type] = :col
     @outputs[index][:state] = :ok
+
+    # row parent requires empty msg
+    if @outputs[index - 1][:type] == :row
+      if @outputs[index - 1][:source].strip != "%row"
+        @outputs[index - 1][:state] = :err
+        @outputs[index - 1][:msg] = "Row with cols requires empty text!"
+      end
+    end
+
     case count_spaces(line)
     when 8
       @outputs[index][:level] = 4
       if find_parent(index) != :row
         @outputs[index][:state] = :err
-        @outputs[index][:msg] = 'Parent(row) not found!'
+        @outputs[index][:msg] = "Parent(row) not found!"
       end
     when 10
       @outputs[index][:level] = 5
       if find_parent(index) != :row
         @outputs[index][:state] = :err
-        @outputs[index][:msg] = 'Parent(row) not found!'
+        @outputs[index][:msg] = "Parent(row) not found!"
       end
     else
       @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 8 or 10 spaces before %col'
+      @outputs[index][:msg] = "Write 8 or 10 spaces before %col"
     end
     check_text(line, index)
   end
@@ -83,11 +90,11 @@ module CheckTable
   def check_text(line, index)
     return unless @outputs[index][:state] == :ok
 
-    ok = ''
+    ok = ""
     %w[< >].each do |char|
       ok = char if line.include? char
     end
-    return if ok == ''
+    return if ok == ""
 
     @outputs[index][:state] = :err
     @outputs[index][:msg] = "Char #{ok} not allow!"
@@ -95,17 +102,17 @@ module CheckTable
 
   def check_template(line, index)
     return unless @outputs[index][:state] == :none
-    return unless line.include? '%template'
+    return unless line.include? "%template"
 
     @outputs[index][:type] = :template
     @outputs[index][:level] = 3
     @outputs[index][:state] = :ok
     if find_parent(index) != :table
       @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Parent(concept) not found!'
+      @outputs[index][:msg] = "Parent(concept) not found!"
     elsif !line.match(/^\s\s\s\s\s\s%template\s*/)
       @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 6 spaces before %template'
+      @outputs[index][:msg] = "Write 6 spaces before %template"
     end
   end
 end

data/lib/asker/check_input.rb

@@ -1,22 +1,9 @@
-require 'rainbow'
-require_relative 'check_input/check_haml_data'
+require_relative "check_input/check_haml_data"
+require_relative "logger"
 
 class CheckInput
-  def initialize(verbose = true)
-    @verbose = verbose
-  end
-
-  def file(filepath)
+  def check(filepath)
     @filepath = filepath
-    self
-  end
-
-  def verbose(verbose)
-    @verbose = verbose
-    self
-  end
-
-  def check
     # Check HAML file syntax
     exist = check_file_exist
     return false unless exist
@@ -27,15 +14,16 @@ class CheckInput
 
   def check_file_exist
     if @filepath.nil?
-      raise Rainbow("Can't check nil filename")
+      Logger.error "CheckInput: Unkown filename"
+      exit 1
     end
     unless File.exist? @filepath
-      puts Rainbow('File not found!').red.bright if @verbose
-      return false
+      Logger.error "CheckInput: File not found! (#{@filepath})"
+      exit 1
     end
-    unless File.extname(@filepath) == '.haml'
-      puts Rainbow('Only check HAML files!').yellow.bright if @verbose
-      return false
+    unless File.extname(@filepath) == ".haml"
+      Logger.error "CheckInput: Check works with HAML files!"
+      exit 1
     end
     true
   end

data/lib/asker/cli.rb

@@ -1,50 +1,70 @@
 # frozen_string_literal: true
 
-require 'rainbow'
-require 'thor'
-require_relative 'version'
-require_relative '../asker'
+require "rainbow"
+require "thor"
+require_relative "version"
+require_relative "../asker"
 
 ##
 # Command Line User Interface
 class CLI < Thor
-  map ['-h', '--help'] => 'help'
+  map ["-h", "--help"] => "help"
 
-  map ['-v', '--version'] => 'version'
-  desc 'version', 'Show the program version'
+  map ["-v", "--version"] => "version"
+  desc "version", "Show the program version"
   def version
     puts "#{Asker::NAME} version #{Asker::VERSION}"
     exit 0
   end
 
-  map ['--init'] => 'init'
-  desc 'init', 'Create default INI config file'
+  map ["--init"] => "init"
+  desc "init", "Create default INI config file"
   def init
     Asker.init
     exit 0
   end
 
-  map ['new','--new'] => 'create_input'
-  desc 'new DIRPATH', 'Create Asker demo input files'
-  ##
-  # Create Asker demo input files
-  # @param dirname (String) Path to folder
+  map ["new", "--new"] => "create_input"
+  desc "new PATH", "Create Asker sample input file"
+  long_desc <<-LONGDESC
+
+  Create Asker sample input file (HAML format).
+
+  Examples:
+
+  (1) #{Rainbow("asker new foo/bar.haml").aqua}, Create "foo" dir and "bar.haml" file.
+  Path to input file can be relative or absolute.
+
+  (2) #{Rainbow("asker new foo").aqua}, Create "foo" dir and sample HAML file.
+  Path to directory can be relative or absolute.
+
+  LONGDESC
   def create_input(dirname)
     Asker.create_input(dirname)
     exit 0
   end
 
-  map ['--check'] => 'check'
-  desc 'check FILEPATH', 'Check input HAML file syntax'
+  map ["--check"] => "check"
+  desc "check FILEPATH", "Check HAML input file syntax"
+  long_desc <<-LONGDESC
+
+  Check HAML input file syntax.
+
+  Examples:
+
+  (*) #{Rainbow("asker check foo/bar.haml").aqua}, Check "bar.haml" input file.
+  Path to input file can be relative or absolute.
+
+  LONGDESC
   def check(filename)
     # Enable/disable color output
-    Rainbow.enabled = false if options['color'] == false
+    Rainbow.enabled = false if options["color"] == false
     # Asker start processing input file
     Asker.check(filename)
   end
 
-  map ['f', '-f', '--file'] => 'file'
-  desc '[file] FILEPATH', 'Build output files, from HAML/XML input file.'
+  map ["f", "-f", "--file"] => "file"
+  desc "[file] FILEPATH", "Build output files, from HAML/XML input file."
   long_desc <<-LONGDESC
 
   Build questions about contents defined into input file specified.
@@ -53,15 +73,14 @@ class CLI < Thor
 
   Examples:
 
-  (1) #{Rainbow('asker input/foo/foo.haml').aqua}, Build questions from HAML file.
+  (1) #{Rainbow("asker foo/bar.haml").aqua}, Build questions from HAML input file.
+  Path to input file can be relative or absolute.
 
-  (2) #{Rainbow('asker input/foo/foo.xml').aqua}, Build questions from XML file.
-
-  (3) #{Rainbow('asker projects/foo/foo.yaml').aqua}, Build questions from YAML project file.
+  (2) #{Rainbow("asker foo/bar.xml").aqua}, Build questions from XML input file.
+  Path to input file can be relative or absolute.
 
   LONGDESC
   def file(filename)
-    # Asker start processing input file
     Asker.start(filename)
   end
 

data/lib/asker/data/code.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../ai/code/code_ai_factory'
+require_relative "../ai/code/code_ai_factory"
+require_relative "../logger"
 
 class Code
   attr_reader :dirname, :filename, :type
@@ -23,7 +24,7 @@ class Code
   end
 
   def lines_to_s(lines)
-    out = ''
+    out = ""
     lines.each_with_index do |line, index|
       out << format("%2d| #{line}\n", (index + 1))
     end
@@ -36,7 +37,7 @@ class Code
     return if filepath.nil?
 
     unless File.exist? filepath
-      puts Rainbow("[ERROR] Unkown file #{filepath}").red.bright
+      Logger.warn "Code: Unkown file (#{filepath})"
       return
     end
     content = File.read(filepath)
@@ -45,16 +46,16 @@ class Code
 
   def encode_and_split(text, encoding = :default)
     # Convert text to UTF-8 deleting unknown chars
-    text ||= '' # Ensure text is not nil
-    flag = [:default, 'UTF-8'].include? encoding
-    return text.encode('UTF-8', invalid: :replace).split("\n") if flag
+    text ||= "" # Ensure text is not nil
+    flag = [:default, "UTF-8"].include? encoding
+    return text.encode("UTF-8", invalid: :replace).split("\n") if flag
 
     # Convert text from input ENCODING to UTF-8
-    ec = Encoding::Converter.new(encoding.to_s, 'UTF-8')
+    ec = Encoding::Converter.new(encoding.to_s, "UTF-8")
     begin
       text = ec.convert(text)
-    rescue StandardError => e
-      puts "[ERROR] Encoding: #{e}"
+    rescue => e
+      Logger.warn "Code: Encoding error (#{e}) with filename (#{@filename})"
     end
 
     text.split("\n")

data/lib/asker/data/column.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../logger"
+
 # Contain data information for every column
 # Params:
 # * +pRow+ - Parent row for this column
@@ -9,28 +11,27 @@ class Column
   attr_reader :row, :index, :id, :raw, :lang, :type, :simple
 
   ##
-  # initialize Column
   # @param row (Row)
   # @param index (Integer)
   # @param xml_data (XMLdata)
   def initialize(row, index, xml_data)
-    @row    = row
-    @index  = index
-    @id     = "#{@row.id}.#{@index}"
-    @raw    = ''
-    @lang   = @row.langs[@index]
-    @type   = @row.types[@index]
-    @simple = { lang: true, type: true }
+    @row = row
+    @index = index
+    @id = "#{@row.id}.#{@index}"
+    @raw = ""
+    @lang = @row.langs[@index]
+    @type = @row.types[@index]
+    @simple = {lang: true, type: true}
     read_data_from_xml(xml_data)
   end
 
   def to_html
     case @type
-    when 'text'
+    when "text"
       return @raw
-    when 'image_url'
-      return "<img src=\"#{raw}\" alt\=\"image\">"
-    when 'textfile_path'
+    when "image_url"
+      return "<img src=\"#{raw}\" alt=\"image\">"
+    when "textfile_path"
       return "<pre>#{raw}</pre>"
     end
     "ERROR type #{@type}"
@@ -39,7 +40,10 @@ class Column
   private
 
   def read_data_from_xml(xml_data)
-    raise '[ERROR] Column with elements!' if xml_data.elements.count.positive?
+    if xml_data.elements.count.positive?
+      Logger.error "Column: Do not use elements!"
+      exit 1
+    end
 
     @raw = xml_data.text.strip.to_s
 
@@ -49,9 +53,9 @@ class Column
   end
 
   def read_lang_from_xml(xml_data)
-    return unless xml_data.attributes['lang']
+    return unless xml_data.attributes["lang"]
 
-    code = xml_data.attributes['lang'].strip
+    code = xml_data.attributes["lang"].strip
     return if code == @lang.code
 
     @lang = LangFactory.instance.get(code)
@@ -60,9 +64,9 @@ class Column
   end
 
   def read_type_from_xml(xml_data)
-    return unless xml_data.attributes['type']
+    return unless xml_data.attributes["type"]
 
-    type = xml_data.attributes['type'].strip
+    type = xml_data.attributes["type"].strip
     return if type == @type.to_s
 
     @type = type

data/lib/asker/data/concept.rb

@@ -1,14 +1,14 @@
-require 'rainbow'
-require 'rexml/document'
+require "rexml/document"
 
-require_relative '../lang/lang_factory'
-require_relative '../loader/embedded_file'
-require_relative 'table'
-require_relative 'data_field'
+require_relative "../lang/lang_factory"
+require_relative "../loader/embedded_file"
+require_relative "../logger"
+require_relative "table"
+require_relative "data_field"
 
 class Concept
   attr_reader :id        # Unique identifer (Integer)
-  attr_reader :lang      # Lang code (By default is the same as map lang)
+  attr_reader :lang      # Lang object
   attr_reader :context   # Context inherits from map
   attr_reader :names     # Names used to identify or name this concept
   attr_reader :type      # type = text -> Name values are only text
@@ -24,24 +24,16 @@ class Concept
   # @param filename (String)
   # @param lang_code (String)
   # @param context (Array)
-  def initialize(xml_data, filename, lang_code = 'en', context = [])
+  def initialize(xml_data, filename, lang, context)
     @@id += 1
     @id = @@id
 
     @filename = filename
     @process = false
-    @lang = LangFactory.instance.get(lang_code)
-
-    if context.class == Array
-      @context = context
-    elsif context.nil?
-      @context = []
-    else
-      @context = context.split(',')
-      @context.collect!(&:strip)
-    end
-    @names = ['concept.' + @id.to_s]
-    @type  = 'text'
+    @lang = lang # LangFactory.instance.get(lang_code)
+    @context = context
+    @names = ["concept." + @id.to_s]
+    @type = "text"
 
     @data = {}
     @data[:tags] = []
@@ -60,7 +52,7 @@ class Concept
   end
 
   def text
-    @data[:texts][0] || '...'
+    @data[:texts][0] || "..."
   end
 
   def process?
@@ -71,16 +63,14 @@ class Concept
     p = calculate_nearness_to_concept(other)
     return if p.zero?
 
-    @data[:neighbors] << { concept: other, value: p }
+    @data[:neighbors] << {concept: other, value: p}
     # Sort neighbors list
     @data[:neighbors].sort! { |a, b| a[:value] <=> b[:value] }
     @data[:neighbors].reverse!
   end
 
   def calculate_nearness_to_concept(other)
-    a = ProjectData.instance.get(:weights)
-    # Application.instance.config['ai']['formula_weights']
-    weights = a.split(',').map(&:to_f)
+    weights = ProjectData.instance.get(:weights).split(",").map(&:to_f)
 
     max1 = @context.count
     max2 = @data[:tags].count
@@ -105,7 +95,7 @@ class Concept
     end
     @data[:texts].each do |t|
       text = t.clone
-      text.split(' ').each do |word|
+      text.split(" ").each do |word|
         reference_to += 1 unless other.names.index(word.downcase).nil?
       end
     end
@@ -157,26 +147,25 @@ class Concept
       when "table"
         @data[:tables] << Table.new(self, i)
       else
-        text = "   [ERROR] Concept #{name} with unkown attribute: #{i.name}"
-        puts Rainbow(text).color(:red)
+        Logger.warn "Concept #{name} with unkown attribute: #{i.name}"
       end
     end
   end
 
   def process_names(value)
     @names = []
-    j = value.text.split(',')
+    j = value.text.split(",")
     j.each { |k| @names << k.strip }
-    @type = value.attributes['type'].strip if value.attributes['type']
+    @type = value.attributes["type"].strip if value.attributes["type"]
   end
 
   def process_tags(value)
     if value.text.nil? || value.text.size.zero?
-      puts Rainbow("[ERROR] Concept without tags: #{name} ").red.briht
-      exit 1
+      Logger.warn "Concept: Concept #{name} without <tags>"
+      return []
     end
 
-    @data[:tags] = value.text.split(',')
+    @data[:tags] = value.text.split(",")
     @data[:tags].collect!(&:strip)
   end
 
@@ -190,14 +179,12 @@ class Concept
       @data[:images] << EmbeddedFile.load(value.text.strip, File.dirname(@filename))
     when nil
       if value.text.nil?
-        warn Rainbow("[WARN] def: without text!").yellow.bright
+        Logger.warn "Concept: def/text empty!"
       else
         @data[:texts] << value.text.strip
       end
     else
-      msg = "[ERROR] Unknown type: #{value.attributes['type']}"
-      puts Rainbow(msg).red.bright
-      exit 1
+      Logger.warn "Concept: Unknown def/type (#{value.attributes["type"]})"
     end
   end
 end

data/lib/asker/data/data_field.rb

@@ -12,7 +12,7 @@ class DataField
   # initialize DataField
   def initialize(data, id, type)
     @data = data
-    @id   = id.to_i # TODO: revise where it comes from? Is it unique value?
+    @id = id.to_i # TODO: revise where it comes from? Is it unique value?
     @type = type.to_sym
   end
 
@@ -94,7 +94,7 @@ class DataField
   # rubocop:enable Metrics/MethodLength
 
   def to_screen(text)
-    return text[0, 7] + '...' + text[-15, 15] if text.size > 25
+    return text[0, 7] + "..." + text[-15, 15] if text.size > 25
 
     text
   end