curriculum-generator 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35549f211438e86fe041498e882c7869b61d5f99
-  data.tar.gz: c11c2225c8bd3b934c33c1a0cd023b3d958efa9f
+  metadata.gz: 4ca48dcc11780c66bb696b872897abb8b9b94c84
+  data.tar.gz: 69d410306cf74b85962261c54f5a2da1d4926baf
 SHA512:
-  metadata.gz: 4d4364d64e1631b1c7d6cf3d45e3a169f16e14f9de4d8e971492cb3be51691a9a71f2a7c2eefe9b1a2bd1e75865215fcce175da24d7da7b61dd2f437c79f6d1c
-  data.tar.gz: 276ca0fbfe4463bb8b606aafcfe65a408e893461d178dbf0289ca0fc69a2ba6f7db0d3a03ae6e8e9fdae06122d02b6b7bf04c66ef0b69abcef17530a311abc97
+  metadata.gz: 380be4c4ed32c3502b01de9dba5ca46326b904f79865b4b9b11ad09a8b616b5d027c6e666f44e4d665ce17dc273fb9a93b7bfce8b110b18ee9fe61697e79aa6c
+  data.tar.gz: 1c192889f053696e106d8c5b7a60b18f9c07d01eba34a247a83021df75a6dc4812d51483ffa368264094626b8ab87cbc0db0e6d67c30f93d0c6a6880b9bf9fb4

data/lib/curriculum-generator.rb

@@ -1,8 +1,8 @@
-# ==> Require the core dependencies.
+# Require the core dependencies.
 require "tmpdir"
 require "pathname"
 
-# ==> Require all of the external dependencies.
+# Require all of the external dependencies.
 require "hash_deep_merge"
 require "monadic"
 require "awesome_print"
@@ -10,7 +10,7 @@ require "colorize"
 require "highline/import"
 require "erubis"
 
-# ==> Require the project stuff.
+# Require the project stuff.
 require "curriculum-generator/version"
 require "curriculum-generator/util"
 require "curriculum-generator/compiler"

data/lib/curriculum-generator/data_loader/yaml_data_loader.rb

@@ -1,31 +1,37 @@
-require 'yaml'
+require "yaml"
 
 
-class CurriculumGenerator::DataLoader::YamlDataLoader
+module CurriculumGenerator
+  module DataLoader
+    class YamlDataLoader
 
-  # Load the localized data from the directory `data_dir_pth`, following the convention that the localized data for
-  # a language are in a subdirectory of `data_dir_pth` named with the same name of the language.
-  # The target language name (which is also the subdirectory name) is `trgt_lang`, which fallbacks to the `master_lang`
-  def load_data(data_dir_pth, trgt_lang, master_lang)
-    CurriculumGenerator::Util::Logging.log(:loading_curriculum_data, trgt_lang: trgt_lang, master_lang: master_lang)
+      # Load the localized data from the directory `data_dir_pth`, following the convention that the localized data for
+      # a language are in a subdirectory of `data_dir_pth` named with the same name of the language.
+      # The target language name (which is also the subdirectory name) is `trgt_lang`, which fallbacks to the `master_lang`
+      def load_data(data_dir_pth, trgt_lang, master_lang)
+        CurriculumGenerator::Util::Logging.log(:loading_curriculum_data, trgt_lang: trgt_lang, master_lang: master_lang)
 
-    trgt_lang_data_dir_pth = data_dir_pth.join(trgt_lang.to_s)
-    master_lang_data_dir_pth = data_dir_pth.join(master_lang.to_s)
+        trgt_lang_data_dir_pth = data_dir_pth.join(trgt_lang.to_s)
+        master_lang_data_dir_pth = data_dir_pth.join(master_lang.to_s)
 
-    master_data = load_recursive_from_pth(trgt_lang_data_dir_pth)
-    trgt_data = load_recursive_from_pth(master_lang_data_dir_pth)
+        master_data = load_recursive_from_pth(trgt_lang_data_dir_pth)
+        trgt_data = load_recursive_from_pth(master_lang_data_dir_pth)
 
-    trgt_data.deep_merge(master_data) # return
-  end
+        trgt_data.deep_merge(master_data)
+      end
+
+      # Load all of the YAML file starting from the given `base_dir_pth` and merges all of the data into an `Hash` and
+      # returns it
+      def load_recursive_from_pth(base_dir_pth)
+        data = {}
+
+        Dir.glob(base_dir_pth.join('**').join('*.yml')) do |yml_file_pth|
+          File.open(yml_file_pth, 'r') { |yml_file| data.merge!(YAML::load(yml_file)) }
+        end
+
+        data
+      end
 
-  # Load all of the YAML file starting from the given `base_dir_pth` and merges all of the data into an `Hash` and
-  # returns it
-  def load_recursive_from_pth(base_dir_pth)
-    data = {}
-    Dir.glob(base_dir_pth.join('**').join('*.yml')) do |yml_file_pth|
-      File.open(yml_file_pth, 'r') { |yml_file| data.merge!(YAML::load(yml_file)) }
     end
-    data # return
   end
-
 end

data/lib/curriculum-generator/generator/cv_item_with_comment.rb

@@ -1,32 +1,36 @@
-class CurriculumGenerator::Generator::CvItemWithComment < CurriculumGenerator::Generator::BasicGenerator
+module CurriculumGenerator
+  module Generator
+    class CvItemWithComment < BasicGenerator
 
-  def initialize(param, data, lang)
-    super(param, data, lang)
-  end
+      def initialize(param, data, lang)
+        super(param, data, lang)
+      end
 
-  def generate
-    value = get_value(param)
-    value = Array[value] unless value.is_a?(Array)
+      def generate
+        value = get_value(param)
+        value = Array[value] unless value.is_a?(Array)
 
-    inst = self
-    value.collect do |elem|
-      result = Either.chain do
-        bind -> { elem.is_a?(Hash) }
-        bind -> {
-          elem.has_key?('title') &&
-              elem.has_key?('content') &&
-              elem.has_key?('comment')
-        }
-        bind -> {
-          inst.get_cv_item_with_comment(elem['title'], elem['content'], elem['comment'])
-        }
+        inst = self
+        value.collect do |elem|
+          result = Either.chain do
+            bind -> { elem.is_a?(Hash) }
+            bind -> {
+              elem.has_key?('title') &&
+                  elem.has_key?('content') &&
+                  elem.has_key?('comment')
+            }
+            bind -> {
+              inst.get_cv_item_with_comment(elem['title'], elem['content'], elem['comment'])
+            }
+          end
+          result.success? ? result.fetch : ''
+        end.join("\n")
       end
-      result.success? ? result.fetch : ''
-    end.join("\n")
-  end
 
-  def get_cv_item_with_comment(title, content, comment)
-    "\\cvitemwithcomment{#{title}}{#{content}}{#{comment}}"
-  end
+      def get_cv_item_with_comment(title, content, comment)
+        "\\cvitemwithcomment{#{title}}{#{content}}{#{comment}}"
+      end
 
+    end
+  end
 end

data/lib/curriculum-generator/generator/cv_list_double_item.rb

@@ -1,31 +1,35 @@
-class CurriculumGenerator::Generator::CvListDoubleItem < CurriculumGenerator::Generator::BasicGenerator
+module CurriculumGenerator
+  module Generator
+    class CvListDoubleItem < BasicGenerator
 
-  def initialize(param, data, lang)
-    super(param, data, lang)
-  end
+      def initialize(param, data, lang)
+        super(param, data, lang)
+      end
 
-  def generate
-    value = get_value(param)
-    unless value.is_a?(Array)
-      value = Array[value]
-    end
-    value.collect do |elem|
-      instance = self
-      result = Either.chain do
-        bind -> { elem.is_a?(Hash) }
-        bind -> { elem.has_key?('item_0') && elem.has_key?('item_1') }
-        bind -> {
-          instance.get_cv_list_double_item(elem['item_0'], elem['item_1'])
-        }
+      def generate
+        value = get_value(param)
+        unless value.is_a?(Array)
+          value = Array[value]
+        end
+        value.collect do |elem|
+          instance = self
+          result = Either.chain do
+            bind -> { elem.is_a?(Hash) }
+            bind -> { elem.has_key?('item_0') && elem.has_key?('item_1') }
+            bind -> {
+              instance.get_cv_list_double_item(elem['item_0'], elem['item_1'])
+            }
+          end
+          result.success? ? result.fetch : ''
+        end.join("\n")
       end
-      result.success? ? result.fetch : ''
-    end.join("\n")
-  end
 
-  protected
+      protected
 
-  def get_cv_list_double_item(item_0, item_1)
-    "\\cvlistdoubleitem{#{item_0}}{#{item_1}}"
-  end
+      def get_cv_list_double_item(item_0, item_1)
+        "\\cvlistdoubleitem{#{item_0}}{#{item_1}}"
+      end
 
+    end
+  end
 end

data/lib/curriculum-generator/generator/cv_list_item.rb

@@ -1,23 +1,27 @@
-class CurriculumGenerator::Generator::CvListItem < CurriculumGenerator::Generator::BasicGenerator
+class CurriculumGenerator
+  module Generator
+    class CvListItem < BasicGenerator
 
-  def initialize(param, data, lang)
-    super(param, data, lang)
-  end
+      def initialize(param, data, lang)
+        super(param, data, lang)
+      end
 
-  def generate
-    value = get_value(param)
-    unless value.is_a?(Array)
-      value = Array[value]
-    end
-    value.collect do |content|
-      get_cv_list_item(content)
-    end.join("\n")
-  end
+      def generate
+        value = get_value(param)
+        unless value.is_a?(Array)
+          value = Array[value]
+        end
+        value.collect do |content|
+          get_cv_list_item(content)
+        end.join("\n")
+      end
 
-  protected
+      protected
 
-  def get_cv_list_item(content)
-    "\\cvlistitem{#{content}}"
-  end
+      def get_cv_list_item(content)
+        "\\cvlistitem{#{content}}"
+      end
 
+    end
+  end
 end

data/lib/curriculum-generator/generator/list.rb

@@ -1,25 +1,29 @@
-class CurriculumGenerator::Generator::List < CurriculumGenerator::Generator::BasicGenerator
+module CurriculumGenerator
+  module Generator
+    class List < BasicGenerator
 
-  def initialize(param, data, lang)
-    super(param, data, lang)
-  end
+      def initialize(param, data, lang)
+        super(param, data, lang)
+      end
 
-  def generate
-    value = get_value(param)
-    unless value.is_a?(Array)
-      value = Array[value]
-    end
-    '\begin{itemize}' +
-    value.collect do |item|
-      get_list(item)
-    end.join('') +
-    '\end{itemize}'
-  end
+      def generate
+        value = get_value(param)
+        unless value.is_a?(Array)
+          value = Array[value]
+        end
+        '\begin{itemize}' +
+        value.collect do |item|
+          get_list(item)
+        end.join('') +
+        '\end{itemize}'
+      end
 
-  protected
+      protected
 
-  def get_list(item)
-    "\\item #{item}"
-  end
+      def get_list(item)
+        "\\item #{item}"
+      end
 
+    end
+  end
 end

data/lib/curriculum-generator/generator/macro_substitution.rb

@@ -1,11 +1,15 @@
-class CurriculumGenerator::Generator::MacroSubstitution < CurriculumGenerator::Generator::BasicGenerator
+module CurriculumGenerator
+  module Generator
+    class MacroSubstitution < BasicGenerator
 
-  def initialize(param, data, lang)
-    super(param, data, lang)
-  end
+      def initialize(param, data, lang)
+        super(param, data, lang)
+      end
 
-  def generate
-    get_value(param)
-  end
+      def generate
+        get_value(param)
+      end
 
+    end
+  end
 end

data/lib/curriculum-generator/generator/specific/education.rb

@@ -1,95 +1,99 @@
-class CurriculumGenerator::Generator::Education < CurriculumGenerator::Generator::BasicGenerator
+module CurriculumGenerator
+  module Generator
+    class Education < BasicGenerator
 
-  def initialize(param, data, lang)
-    super(param, data, lang)
-  end
+      def initialize(param, data, lang)
+        super(param, data, lang)
+      end
 
-  def generate
-    value = get_value(param)
-    value.collect do |elem|
-      get_education(elem)
-    end.join('')
-  end
+      def generate
+        value = get_value(param)
+        value.collect do |elem|
+          get_education(elem)
+        end.join('')
+      end
 
-  protected
+      protected
 
-  def get_education(context)
-    context.merge!({'titles' => get_value('titles')})
+      def get_education(context)
+        context.merge!({'titles' => get_value('titles')})
 
-    input = <<-CODE
+        input = <<-CODE
 
-    \\cventry
+        \\cventry
 
-    <% if @date.nil? %>
-      {}
-    <% elsif @date.is_a?(Hash) && @date.has_key?('from') && @date.has_key?('to') %>
-      {<%= @date['from'] %>\\\\<%= @date['to'] %>}
-    <% else %>
-      {<%= @date %>}
-    <% end %>
+        <% if @date.nil? %>
+          {}
+        <% elsif @date.is_a?(Hash) && @date.has_key?('from') && @date.has_key?('to') %>
+          {<%= @date['from'] %>\\\\<%= @date['to'] %>}
+        <% else %>
+          {<%= @date %>}
+        <% end %>
 
-    {<%= @title.nil? ? '' : @title %>}
+        {<%= @title.nil? ? '' : @title %>}
 
-    {}{}{}
+        {}{}{}
 
-    {\\begin{itemize}
+        {\\begin{itemize}
 
-    <% if @qualification %>
-      \\item \\textit{<%= @titles['S_4']['qualification'] %>}: <%= @qualification %>
-    <% end %>
+        <% if @qualification %>
+          \\item \\textit{<%= @titles['S_4']['qualification'] %>}: <%= @qualification %>
+        <% end %>
 
-    <% if @organisation %>
-      \\item \\textit{<%= @titles['S_4']['organisation'] %>}: <%= @organisation %>
-    <% end %>
+        <% if @organisation %>
+          \\item \\textit{<%= @titles['S_4']['organisation'] %>}: <%= @organisation %>
+        <% end %>
+
+        <% if @level %>
+          \\item \\textit{<%= @titles['S_4']['level'] %>}: <%= @level %>
+        <% end %>
 
-    <% if @level %>
-      \\item \\textit{<%= @titles['S_4']['level'] %>}: <%= @level %>
-    <% end %>
+        <% if @lessons %>
+          \\item \\textit{<%= @titles['S_4']['lessons'] %>}: <%= @lessons %>
+        <% end %>
 
-    <% if @lessons %>
-      \\item \\textit{<%= @titles['S_4']['lessons'] %>}: <%= @lessons %>
-    <% end %>
+        <% if @validity %>
+          \\item \\textit{<%= @titles['S_4']['validity'] %>}: <%= @validity %>
+        <% end %>
 
-    <% if @validity %>
-      \\item \\textit{<%= @titles['S_4']['validity'] %>}: <%= @validity %>
-    <% end %>
+        <% if @location %>
+          \\item \\textit{<%= @titles['S_4']['location'] %>}: <%= @location %>
+        <% end %>
 
-    <% if @location %>
-      \\item \\textit{<%= @titles['S_4']['location'] %>}: <%= @location %>
-    <% end %>
+        <% if @teacher %>
+          \\item \\textit{<%= @titles['S_4']['teacher'] %>}: <%= @teacher %>
+        <% end %>
 
-    <% if @teacher %>
-      \\item \\textit{<%= @titles['S_4']['teacher'] %>}: <%= @teacher %>
-    <% end %>
+        <% if @skills_covered %>
 
-    <% if @skills_covered %>
+          <% unless @skills_covered.is_a?(Array) %>
+            <% @skills_covered = Array[@skills_covered] %>
+          <% end %>
 
-      <% unless @skills_covered.is_a?(Array) %>
-        <% @skills_covered = Array[@skills_covered] %>
-      <% end %>
+          <% @skills_covered.compact! %>
 
-      <% @skills_covered.compact! %>
+          <% if @skills_covered.length > 0 %>
 
-      <% if @skills_covered.length > 0 %>
+            \\item \\textit{<%= @titles['S_4']['skills_covered'] %>}:
+            \\begin{itemize}
 
-        \\item \\textit{<%= @titles['S_4']['skills_covered'] %>}:
-        \\begin{itemize}
+            <% @skills_covered.each do |skill_covered| %>
+              \\item <%= skill_covered %>
+            <% end %>
 
-        <% @skills_covered.each do |skill_covered| %>
-          \\item <%= skill_covered %>
-        <% end %>
+            \\end{itemize}
 
-        \\end{itemize}
+          <% end %>
 
-      <% end %>
+        <% end %>
 
-    <% end %>
+        \\end{itemize}}
 
-    \\end{itemize}}
+        CODE
 
-    CODE
+        evaluate(input, context).gsub(/^\s+/,'').gsub(/\n/,'') + "\n\n"
+      end
 
-    evaluate(input, context).gsub(/^\s+/,'').gsub(/\n/,'') + "\n\n"
+    end
   end
-
 end

data/lib/curriculum-generator/generator/specific/self_assessment.rb

@@ -1,61 +1,65 @@
-class CurriculumGenerator::Generator::SelfAssessment < CurriculumGenerator::Generator::BasicGenerator
+module CurriculumGenerator
+  module Generator
+    class SelfAssessment < BasicGenerator
 
-  def initialize(param, data, lang)
-    super(param, data, lang)
-  end
+      def initialize(param, data, lang)
+        super(param, data, lang)
+      end
 
-  def generate
-    get_self_assessment(get_value(param))
-  end
+      def generate
+        get_self_assessment(get_value(param))
+      end
 
-  protected
-
-  def get_self_assessment(context)
-    context.merge!({'titles' => get_value('titles')})
-
-    input = <<-CODE
-
-    \\cvitem{<%= @titles['S_5']['self_assessment'] %>}
-
-    {
-    \\scriptsize
-    \\begin{tabular}{l|l|l|l|l|l|l|l|l|l|l}
-
-      \\multicolumn{1}{c|}{<%= ' ' %>} &
-      \\multicolumn{4}{|c|}{\\textbf{<%= @titles['S_5']['understanding'] %>}} &
-      \\multicolumn{4}{|c|}{\\textbf{<%= @titles['S_5']['speaking'] %>}} &
-      \\multicolumn{2}{|c|}{\\textbf{<%= @titles['S_5']['writing'] %>}} \\\\
-
-      \\multicolumn{1}{c|}{<%= ' ' %>} &
-      \\multicolumn{2}{|c|}{<%= @titles['S_5']['listening'] %>} &
-      \\multicolumn{2}{|c|}{<%= @titles['S_5']['reading'] %>} &
-      \\multicolumn{2}{|c|}{<%= @titles['S_5']['spoken_interaction'] %>} &
-      \\multicolumn{2}{|c|}{<%= @titles['S_5']['spoken_production'] %>} &
-      \\multicolumn{2}{|c|}{<%= @titles['S_5']['written_production'] %>} \\\\
-      \\hline
-
-      <% @languages.each do |language| %>
-        \\hline
-        \\textbf{<%= language['name'] %>} &
-        <%= language['listening']['level'] %> &
-        <%= language['listening']['description'] %> &
-        <%= language['reading']['level'] %> &
-        <%= language['reading']['description'] %> &
-        <%= language['spoken_interaction']['level'] %> &
-        <%= language['spoken_interaction']['description'] %> &
-        <%= language['spoken_production']['level'] %> &
-        <%= language['spoken_production']['description'] %> &
-        <%= language['written_production']['level'] %> &
-        <%= language['written_production']['description'] %> \\\\
-      <% end %>
-      \\hline
-
-    \\end{tabular}
-    }
-
-    CODE
-
-    evaluate(input, context).gsub(/^\s+/,'').gsub(/\n/,'') + "\n\n"
-  end
+      protected
+
+      def get_self_assessment(context)
+        context.merge!({'titles' => get_value('titles')})
+
+        input = <<-CODE
+
+        \\cvitem{<%= @titles['S_5']['self_assessment'] %>}
+
+        {
+        \\scriptsize
+        \\begin{tabular}{l|l|l|l|l|l|l|l|l|l|l}
 
+          \\multicolumn{1}{c|}{<%= ' ' %>} &
+          \\multicolumn{4}{|c|}{\\textbf{<%= @titles['S_5']['understanding'] %>}} &
+          \\multicolumn{4}{|c|}{\\textbf{<%= @titles['S_5']['speaking'] %>}} &
+          \\multicolumn{2}{|c|}{\\textbf{<%= @titles['S_5']['writing'] %>}} \\\\
+
+          \\multicolumn{1}{c|}{<%= ' ' %>} &
+          \\multicolumn{2}{|c|}{<%= @titles['S_5']['listening'] %>} &
+          \\multicolumn{2}{|c|}{<%= @titles['S_5']['reading'] %>} &
+          \\multicolumn{2}{|c|}{<%= @titles['S_5']['spoken_interaction'] %>} &
+          \\multicolumn{2}{|c|}{<%= @titles['S_5']['spoken_production'] %>} &
+          \\multicolumn{2}{|c|}{<%= @titles['S_5']['written_production'] %>} \\\\
+          \\hline
+
+          <% @languages.each do |language| %>
+            \\hline
+            \\textbf{<%= language['name'] %>} &
+            <%= language['listening']['level'] %> &
+            <%= language['listening']['description'] %> &
+            <%= language['reading']['level'] %> &
+            <%= language['reading']['description'] %> &
+            <%= language['spoken_interaction']['level'] %> &
+            <%= language['spoken_interaction']['description'] %> &
+            <%= language['spoken_production']['level'] %> &
+            <%= language['spoken_production']['description'] %> &
+            <%= language['written_production']['level'] %> &
+            <%= language['written_production']['description'] %> \\\\
+          <% end %>
+          \\hline
+
+        \\end{tabular}
+        }
+
+        CODE
+
+        evaluate(input, context).gsub(/^\s+/,'').gsub(/\n/,'') + "\n\n"
+      end
+
+    end
+  end
 end

data/lib/curriculum-generator/generator/specific/work_experience.rb

@@ -1,81 +1,85 @@
-class CurriculumGenerator::Generator::WorkExperience < CurriculumGenerator::Generator::BasicGenerator
+module CurriculumGenerator
+  module Generator
+    class WorkExperience < BasicGenerator
 
-  def initialize(param, data, lang)
-    super(param, data, lang)
-  end
+      def initialize(param, data, lang)
+        super(param, data, lang)
+      end
 
-  def generate
-    value = get_value(param)
-    value.collect do |elem|
-      get_work_experience(elem)
-    end.join("\n")
-  end
+      def generate
+        value = get_value(param)
+        value.collect do |elem|
+          get_work_experience(elem)
+        end.join("\n")
+      end
 
-  protected
+      protected
 
-  def get_work_experience(context)
+      def get_work_experience(context)
 
-    context.merge!({'titles' => get_value('titles')})
+        context.merge!({'titles' => get_value('titles')})
 
-    input = <<-CODE
+        input = <<-CODE
 
-    \\cventry
+        \\cventry
+
+        <% if @date.nil? %>
+          {}
+        <% elsif @date.is_a?(Hash) && @date.has_key?('from') && @date.has_key?('to') %>
+          {<%= @date['from'] %>\\\\<%= @date['to'] %>}
+        <% else %>
+          {<%= @date %>}
+        <% end %>
 
-    <% if @date.nil? %>
-      {}
-    <% elsif @date.is_a?(Hash) && @date.has_key?('from') && @date.has_key?('to') %>
-      {<%= @date['from'] %>\\\\<%= @date['to'] %>}
-    <% else %>
-      {<%= @date %>}
-    <% end %>
+        {<%= @occupation.nil? ? '' : @occupation %>}
 
-    {<%= @occupation.nil? ? '' : @occupation %>}
+        <% if @employer_name %>
 
-    <% if @employer_name %>
+          {
+          <%= @employer_name %>
+          <% if @type_of_business %>
+            (<%= @type_of_business %>)
+          <% end %>
+          }
 
-      {
-      <%= @employer_name %>
-      <% if @type_of_business %>
-        (<%= @type_of_business %>)
-      <% end %>
-      }
+          <% if @employer_address %>
+            {<%= @employer_address %>}
+          <% end %>
 
-      <% if @employer_address %>
-        {<%= @employer_address %>}
-      <% end %>
+        <% end %>
 
-    <% end %>
+        {}
 
-    {}
+        {
+        <% if @main_activities %>
 
-    {
-    <% if @main_activities %>
+          <% unless @main_activities.is_a?(Array) %>
+            <% @main_activities = Array[@main_activities] %>
+          <% end %>
 
-      <% unless @main_activities.is_a?(Array) %>
-        <% @main_activities = Array[@main_activities] %>
-      <% end %>
+          <% @main_activities.compact! %>
 
-      <% @main_activities.compact! %>
+          <% if @main_activities.length > 0 %>
 
-      <% if @main_activities.length > 0 %>
+            \\textit{<%= @titles['S_3']['main_activities'] %>}:
+            \\begin{itemize}
 
-        \\textit{<%= @titles['S_3']['main_activities'] %>}:
-        \\begin{itemize}
+            <% @main_activities.each do |main_activity| %>
+              \\item <%= main_activity %>
+            <% end %>
 
-        <% @main_activities.each do |main_activity| %>
-          \\item <%= main_activity %>
-        <% end %>
+            \\end{itemize}
 
-        \\end{itemize}
+          <% end %>
 
-      <% end %>
+        <% end %>
+        }
 
-    <% end %>
-    }
+        CODE
 
-    CODE
+        evaluate(input, context).gsub(/^\s+/,'').gsub(/\n/,'') + "\n\n"
+      end
 
-    evaluate(input, context).gsub(/^\s+/,'').gsub(/\n/,'') + "\n\n"
+    end
   end
-
 end

data/lib/curriculum-generator/util/latex_to_pdf.rb

@@ -1,61 +1,65 @@
-class CurriculumGenerator::Util::LatexToPdf
-
-  def initialize(
-      input_file_name, input_dir, resources_pths, out_dir, log_file,
-      halt_on_error=true, shell_enabled=true, interpreter='xelatex', additional_args=[])
-    @interpreter = interpreter
-    @halt_on_error = !!halt_on_error
-    @shell_enabled = !!shell_enabled
-    @out_dir = out_dir
-    @input_file_name = input_file_name
-    @input_dir = input_dir
-    @resources_pths = resources_pths
-    @log_file = log_file
-    @additional_args = additional_args.is_a?(Array) ? additional_args : []
-  end
+module CurriculumGenerator
+  module Util
+    class LatexToPdf
 
-  def generate
-
-    # Store the starting resources for later cleanup
-    starting_resources = resources_files
-
-    # Create the command used to generate the PDF
-    gen_pdf_cmd = CurriculumGenerator::Util::ShellCommand.new(get_tex_cmd, @input_dir, @log_file)
-    # Create the command used to generate the bibliography
-    gen_bib_cmd = CurriculumGenerator::Util::ShellCommand.new(get_bibtex_cmd, @out_dir, @log_file)
-
-    Either.chain do
-      bind -> { gen_pdf_cmd.run }
-      bind -> { gen_bib_cmd.run }
-      bind -> { gen_pdf_cmd.run }
-      bind -> { gen_pdf_cmd.run }
-      bind -> {
-        # ==> Cleanup resources files
-        dirty_files = resources_files - starting_resources
-        dirty_files.length > 0 ? system("rm #{dirty_files.join(' ')}") : false
-      }
-    end
-  end
+      def initialize(
+          input_file_name, input_dir, resources_pths, out_dir, log_file,
+          halt_on_error=true, shell_enabled=true, interpreter='xelatex', additional_args=[])
+        @interpreter = interpreter
+        @halt_on_error = !!halt_on_error
+        @shell_enabled = !!shell_enabled
+        @out_dir = out_dir
+        @input_file_name = input_file_name
+        @input_dir = input_dir
+        @resources_pths = resources_pths
+        @log_file = log_file
+        @additional_args = additional_args.is_a?(Array) ? additional_args : []
+      end
 
-  protected
+      def generate
 
-  def get_tex_cmd
-    args = %w(-synctex=1 -interaction=batchmode)                 # default arguments
-    args << '-halt-on-error' if @halt_on_error                   # halt on error
-    args += %w(-shell-escape --enable-write18) if @shell_enabled # shell escape
-    args << "-output-directory=#{@out_dir}"                      # output directory
-    args += @additional_args                                     # add the additional arguments to the computed ones
-    args << @input_file_name
+        # Store the starting resources for later cleanup
+        starting_resources = resources_files
 
-    "#{@interpreter} #{args.join(' ')}"                          # build the tex command and return it
-  end
+        # Create the command used to generate the PDF
+        gen_pdf_cmd = ShellCommand.new(get_tex_cmd, @input_dir, @log_file)
+        # Create the command used to generate the bibliography
+        gen_bib_cmd = ShellCommand.new(get_bibtex_cmd, @out_dir, @log_file)
 
-  def get_bibtex_cmd
-    "BIBINPUTS=\"#{@input_dir}\" " + "bibtex #{@input_file_name}" # build the bibtex command and return it
-  end
+        Either.chain do
+          bind -> { gen_pdf_cmd.run }
+          bind -> { gen_bib_cmd.run }
+          bind -> { gen_pdf_cmd.run }
+          bind -> { gen_pdf_cmd.run }
+          bind -> {
+            # ==> Cleanup resources files
+            dirty_files = resources_files - starting_resources
+            dirty_files.length > 0 ? system("rm #{dirty_files.join(' ')}") : false
+          }
+        end
+      end
 
-  def resources_files
-    Dir.glob(@resources_pths)
-  end
+      protected
 
+      def get_tex_cmd
+        args = %w(-synctex=1 -interaction=batchmode)                 # default arguments
+        args << '-halt-on-error' if @halt_on_error                   # halt on error
+        args += %w(-shell-escape --enable-write18) if @shell_enabled # shell escape
+        args << "-output-directory=#{@out_dir}"                      # output directory
+        args += @additional_args                                     # add the additional arguments to the computed ones
+        args << @input_file_name
+
+        "#{@interpreter} #{args.join(' ')}"                          # build the tex command and return it
+      end
+
+      def get_bibtex_cmd
+        "BIBINPUTS=\"#{@input_dir}\" " + "bibtex #{@input_file_name}" # build the bibtex command and return it
+      end
+
+      def resources_files
+        Dir.glob(@resources_pths)
+      end
+
+    end
+  end
 end

data/lib/curriculum-generator/util/logging.rb

@@ -1,27 +1,31 @@
-module CurriculumGenerator::Util::Logging
+module CurriculumGenerator
+  module Util
+    class Logging
 
-  def self.log(name, opts={})
-    case name
-      when :fatal_error
-        puts "#{prefix} Fatal error: #{opts[:msg].light_black}. Aborting...".red
-      when :loading_curriculum_data
-        puts "#{prefix} Loading the curriculum data for ".cyan + opts[:trgt_lang].to_s.light_black
-        puts "#{indent} using ".cyan + opts[:master_lang].to_s.light_black + ' as the default'.cyan
-      when :executing_command
-        puts "#{prefix} Executing          ".cyan + opts[:cmd].to_s.light_black
-        puts "#{indent} from the directory ".cyan + opts[:exec_dir].to_s.light_black if opts.has_key? :exec_dir
-        puts "#{indent} logging to         ".cyan + opts[:log_file].to_s.light_black if opts.has_key? :log_file
-      else
-        # nothing to do
-    end
-  end
+      def self.log(name, opts={})
+        case name
+          when :fatal_error
+            puts "#{prefix} Fatal error: #{opts[:msg].light_black}. Aborting...".red
+          when :loading_curriculum_data
+            puts "#{prefix} Loading the curriculum data for ".cyan + opts[:trgt_lang].to_s.light_black
+            puts "#{indent} using ".cyan + opts[:master_lang].to_s.light_black + ' as the default'.cyan
+          when :executing_command
+            puts "#{prefix} Executing          ".cyan + opts[:cmd].to_s.light_black
+            puts "#{indent} from the directory ".cyan + opts[:exec_dir].to_s.light_black if opts.has_key? :exec_dir
+            puts "#{indent} logging to         ".cyan + opts[:log_file].to_s.light_black if opts.has_key? :log_file
+          else
+            # nothing to do
+        end
+      end
 
-  def self.prefix
-    '>>'
-  end
+      def self.prefix
+        ">>"
+      end
 
-  def self.indent
-    '  '
-  end
+      def self.indent
+        "  "
+      end
 
+    end
+  end
 end

data/lib/curriculum-generator/util/shell_command.rb

@@ -1,48 +1,52 @@
-class CurriculumGenerator::Util::ShellCommand
+module CurriculumGenerator
+  module Util
+    class ShellCommand
+
+      def initialize(command, execution_dir, log_file=nil)
+        @command = command
+        @execution_dir = execution_dir
+        @log_file = log_file
+      end
 
-  def initialize(command, execution_dir, log_file=nil)
-    @command = command
-    @execution_dir = execution_dir
-    @log_file = log_file
-  end
+      def run
+        Logging.log(:executing_command, cmd: @command, exec_dir: @execution_dir, log_file: @log_file)
 
-  def run
-    CurriculumGenerator::Util::Logging.log(:executing_command, cmd: @command, exec_dir: @execution_dir, log_file: @log_file)
+        status = true
 
-    status = true
+        Process.waitpid(
+            fork do
+              original_stdout, original_stderr = $stdout, $stderr
+              FileUtils.chdir @execution_dir do
+                File.open(@log_file, 'a') do |log_file|
+                  $stderr = $stdout = log_file
+                  system @command
+                  $stdout, $stderr = original_stdout, original_stderr
+                end
+              end
+            end)
 
-    Process.waitpid(
-        fork do
-          original_stdout, original_stderr = $stdout, $stderr
-          FileUtils.chdir @execution_dir do
-            File.open(@log_file, 'a') do |log_file|
-              $stderr = $stdout = log_file
-              system @command
-              $stdout, $stderr = original_stdout, original_stderr
-            end
-          end
-        end)
+        status # return
+      end
 
-    status # return
-  end
+      def self.exist?(command)
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.collect do |ext|
+            exe = File.join(path, "#{command}#{ext}")
+            return true if File.executable? exe
+          end
+        end
+        false # return
+      end
 
-  def self.exist?(command)
-    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-      exts.collect do |ext|
-        exe = File.join(path, "#{command}#{ext}")
-        return true if File.executable? exe
+      def exist?
+        self.class.exist? @command
       end
-    end
-    false # return
-  end
 
-  def exist?
-    self.class.exist? @command
-  end
+      def find_executable_part(command)
+        command.split(' ').first
+      end
 
-  def find_executable_part(command)
-    command.split(' ').first
+    end
   end
-
 end

data/lib/curriculum-generator/version.rb

@@ -1,6 +1,6 @@
 module CurriculumGenerator
 
   # This is the current version of `CurriculumGenerator`.
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curriculum-generator
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Alessandro Molari