defmastership 1.0.5 → 1.0.6

data/lib/defmastership.rb

@@ -7,10 +7,18 @@ require('defmastership/version')
 # you just need to require this one file in your bin file
 require('defmastership/constants')
 require('defmastership/definition')
+require('defmastership/definition_parser')
+require('defmastership/filters')
 require('defmastership/document')
 require('defmastership/comment_filter')
 require('defmastership/csv_formatter')
 
-require('defmastership/ref_changer')
-require('defmastership/batch_changer')
-require('defmastership/project_ref_changer')
+require('defmastership/modifier_base')
+require('defmastership/line_modifier_base')
+require('defmastership/batch_modifier')
+
+require('defmastership/change_ref_modifier')
+require('defmastership/change_ref_line_modifier')
+
+require('defmastership/rename_included_files_modifier')
+require('defmastership/rename_included_files_line_modifier')

data/lib/defmastership/batch_modifier.rb

@@ -0,0 +1,33 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
+# frozen_string_literal: true
+
+module DefMastership
+  # Change references from temporary to definitive with multiple RefChangers
+  class BatchModifier
+    attr_reader :config, :adoc_texts, :changes
+
+    def initialize(config, adoc_texts)
+      @config = config
+      @adoc_texts = adoc_texts
+      @changes = []
+    end
+
+    def apply(modifs)
+      modifs.split(/\s*,\s*/).each do |modif|
+        modifier = modifier_from(modif)
+        @adoc_texts = modifier.do_modifications(@adoc_texts)
+        @config[modif.to_sym][:config] = modifier.config
+        modifier.changes.each do |change|
+          @changes << [modif] + change
+        end
+      end
+    end
+
+    private
+
+    def modifier_from(modif)
+      class_name = "#{@config[modif.to_sym][:type].split('_').map(&:capitalize).join}Modifier"
+      DefMastership.const_get(class_name).new(@config[modif.to_sym][:config])
+    end
+  end
+end

data/lib/defmastership/{ref_changer.rb → change_ref_line_modifier.rb}

@@ -2,12 +2,10 @@
 # frozen_string_literal: true
 
 module DefMastership
-  # Change references from temporary to definitive
-  class RefChanger
-    attr_reader :changes
-
-    def self.from_h(hash)
-      new.from_h(hash)
+  # Change references from temporary to definitive with multiple RefChangers
+  class ChangeRefLineModifier < LineModifierBase
+    def self.from_config(hash)
+      new.from_config(hash)
     end
 
     REGEXP_FROM = {
@@ -24,32 +22,17 @@ module DefMastership
     private_constant :REGEXP_FROM
 
     def initialize
-      @h = {
+      super
+      @config = {
         from_regexp: '',
         to_template: '',
         next_ref: 0
       }
-      @changes = []
       @in_literal = false
     end
 
-    def method_missing(method_name, *args, &block)
-      return @h[method_name] if @h[method_name]
-
-      super
-    end
-
-    def respond_to_missing?(method_name, *args)
-      @h[method_name] || super
-    end
-
-    def from_h(hash)
-      @h.merge!(hash)
-      self
-    end
-
-    def to_h
-      @h
+    def replace(method, line)
+      public_send("replace_#{method}".to_sym, line)
     end
 
     def replace_refdef(line)
@@ -70,6 +53,15 @@ module DefMastership
 
     private
 
+    def do_replace_refdef(line)
+      line.gsub(regexp_from(:definition, from_regexp)) do
+        replacement = to_template % hmerge(Regexp.last_match)
+        changes << [Regexp.last_match[:from], replacement]
+        @config[:next_ref] += 1
+        text_with(Regexp.last_match, replacement)
+      end
+    end
+
     def regexp_from(const, from)
       regexp_str =
         "(?<before>#{REGEXP_FROM[const][:before]})" \
@@ -83,21 +75,12 @@ module DefMastership
     end
 
     def hmerge(match)
-      @h.merge(Hash[match.names.map(&:to_sym).zip(match.captures)])
+      @config.merge(match.names.map(&:to_sym).zip(match.captures).to_h)
     end
 
     def in_literal(line)
       @in_literal ^= true if line.chomp == '....'
       @in_literal
     end
-
-    def do_replace_refdef(line)
-      line.gsub(regexp_from(:definition, from_regexp)) do
-        replacement = to_template % hmerge(Regexp.last_match)
-        changes << [Regexp.last_match[:from], replacement]
-        @h[:next_ref] += 1
-        text_with(Regexp.last_match, replacement)
-      end
-    end
   end
 end

data/lib/defmastership/change_ref_modifier.rb

@@ -0,0 +1,15 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
+# frozen_string_literal: true
+
+module DefMastership
+  # Change all refs of a given project
+  class ChangeRefModifier < ModifierBase
+    def replacements
+      %i[replace_refdef replace_irefs]
+    end
+
+    def line_modifier_class
+      ChangeRefLineModifier
+    end
+  end
+end

data/lib/defmastership/constants.rb

@@ -19,8 +19,11 @@ module DefMastership
       \s*
       (,\s*\[\s*(?<labels>.*?)\s*\])?\s*\]
     AFT
+
+    DEF_CHECKSUM = '(\((?<explicit_checksum>[[:alnum:]]+)\))?'
+
     DEFINITION = Regexp.new(
-      "#{DEF_BEFORE_REF}(?<reference>[\\w:_-]+)#{DEF_AFTER_REF}",
+      "#{DEF_BEFORE_REF}(?<reference>[\\w:_-]+)#{DEF_CHECKSUM}#{DEF_AFTER_REF}",
       Regexp::EXTENDED
     )
 
@@ -56,6 +59,16 @@ module DefMastership
 
     WHATEVER = //.freeze
 
+    INCLUDE_KEYWORD  = '\binclude::'
+    INCLUDE_PATH     = '(?<path>.*/)?'
+    INCLUDE_FILENAME = '(?<filename>[^\\/]+)'
+    INCLUDE_OPTIONS  = '\[(?<options>[\]]*)\]'
+
+    INCLUDE = Regexp.new(
+      INCLUDE_KEYWORD + INCLUDE_PATH + INCLUDE_FILENAME + INCLUDE_OPTIONS,
+      Regexp::EXTENDED
+    )
+
     public_constant :SINGLE_LINE_COMMENT,
                     :MULTI_LINE_COMMENT_DELIM,
                     :DEF_BEFORE_REF,

data/lib/defmastership/csv_formatter.rb

@@ -8,36 +8,35 @@ require('defmastership/csv_formatter_body')
 module DefMastership
   # to export a CSV file
   class CSVFormatter
-    COLUMN_LIST = %w[fixed labels eref iref attributes].freeze
-    private_constant :COLUMN_LIST
+    COLUMN_LIST1 = %i[fixed wrong_explicit_checksum labels eref iref attributes].freeze
+    COLUMN_LIST2 = %i[fixed labels eref iref attributes].freeze
+    private_constant :COLUMN_LIST1
+    private_constant :COLUMN_LIST2
 
     def initialize(doc, sep = ',')
       @doc = doc
       @sep = sep
-      @header_formatter = CSVFormatterHeader.new(@doc)
-      @body_formatter = CSVFormatterBody.new(@doc)
     end
 
     def export_to(output_file)
+      column_list = @doc.wrong_explicit_checksum? ? COLUMN_LIST1 : COLUMN_LIST2
       CSV.open(output_file, 'w:ISO-8859-1', { col_sep: @sep }) do |csv|
-        csv << header
-        @doc.definitions.each { |definition| csv << body(definition) }
+        csv << header(column_list)
+        @doc.definitions.each { |definition| csv << body(definition, column_list) }
       end
     end
 
-    def header
-      header_line =
-        COLUMN_LIST.map do |part|
-          @header_formatter.public_send("#{part}_header".to_sym)
-        end
+    private
+
+    def header(column_list)
+      header_formatter = CSVFormatterHeader.new(@doc)
+      header_line = column_list.map { |part| header_formatter.public_send(part) }
       header_line.reduce(:+)
     end
 
-    def body(definition)
-      body_line =
-        COLUMN_LIST.map do |part|
-          @body_formatter.public_send("#{part}_body".to_sym, definition)
-        end
+    def body(definition, column_list)
+      body_formatter = CSVFormatterBody.new(@doc)
+      body_line = column_list.map { |part| body_formatter.public_send(part, definition) }
       body_line.reduce(:+)
     end
   end

data/lib/defmastership/csv_formatter_body.rb

@@ -10,23 +10,28 @@ module DefMastership
       @doc = doc
     end
 
-    def fixed_body(definition)
-      [definition.type, definition.reference, definition.value]
+    def fixed(definition)
+      [definition.type, definition.reference, definition.value, definition.sha256]
     end
 
-    def labels_body(definition)
+    def wrong_explicit_checksum(definition)
+      wrong_explicit_checksum = definition.wrong_explicit_checksum
+      wrong_explicit_checksum ? [wrong_explicit_checksum] : ['']
+    end
+
+    def labels(definition)
       @doc.labels.empty? ? [] : [definition.labels.to_a.join("\n")]
     end
 
-    def eref_body(definition)
+    def eref(definition)
       @doc.eref.map { |key, _| definition.eref[key].join("\n") }
     end
 
-    def iref_body(definition)
+    def iref(definition)
       @doc.iref ? [definition.iref.join("\n")] : []
     end
 
-    def attributes_body(definition)
+    def attributes(definition)
       @doc.attributes.map do |key, _|
         definition.attributes[key]
       end

data/lib/defmastership/csv_formatter_header.rb

@@ -10,26 +10,27 @@ module DefMastership
       @doc = doc
     end
 
-    def fixed_header
-      %w[Type Reference Value]
+    def fixed
+      %w[Type Reference Value sha256]
     end
 
-    def labels_header
+    def wrong_explicit_checksum
+      @doc.wrong_explicit_checksum? ? ['Wrong explicit checksum'] : []
+    end
+
+    def labels
       @doc.labels.empty? ? [] : %w[Labels]
     end
 
-    def eref_header
-      @doc.eref.map do |_, ref|
-        ref[:prefix] +
-          (ref[:url].nil? || ref[:url] == 'none' ? '' : " #{ref[:url]}")
-      end
+    def eref
+      @doc.eref.map { |_, ref| ref[:prefix] }
     end
 
-    def iref_header
+    def iref
       @doc.iref ? ['Internal links'] : []
     end
 
-    def attributes_header
+    def attributes
       @doc.attributes.map { |_, value| value }
     end
   end

data/lib/defmastership/definition.rb

@@ -1,6 +1,8 @@
 # Copyright (c) 2020 Jerome Arbez-Gindre
 # frozen_string_literal: true
 
+require 'digest'
+
 module DefMastership
   # DefMastership definition: contains all data of a definition
   class Definition
@@ -16,6 +18,7 @@ module DefMastership
       @eref = Hash.new([])
       @iref = []
       @attributes = {}
+      @explicit_checksum = match[:explicit_checksum]
     end
 
     def <<(new_line)
@@ -27,6 +30,14 @@ module DefMastership
       @lines.join("\n")
     end
 
+    def sha256
+      Digest::SHA2.new(256).hexdigest(value).split(//).last(8).join
+    end
+
+    def wrong_explicit_checksum
+      @explicit_checksum if @explicit_checksum != sha256
+    end
+
     def add_eref(refname, extrefs)
       @eref[refname] = extrefs.strip.split(/\s*,\s*/)
     end

data/lib/defmastership/definition_parser.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
+# frozen_string_literal: true
+
+require('aasm')
+
+module DefMastership
+  # DefMastership definition: contains all data of a definition
+  class DefinitionParser
+    include AASM
+
+    def initialize(document)
+      @document = document
+    end
+
+    aasm do
+      state :idle, initial: true
+      state :wait_content
+      state :in_block
+      state :single_para
+
+      event :new_definition do
+        transitions from: :idle, to: :wait_content, after: ->(*args) { @document.add_new_definition(*args) }
+      end
+
+      event :block_delimiter do
+        transitions from: :wait_content,                 to: :in_block
+        transitions from: %i[in_block idle single_para], to: :idle
+      end
+
+      event :new_line do
+        transitions from: %i[wait_content single_para],
+                    to: :single_para,
+                    after: ->(*args) { @document.add_line(*args) }
+        transitions from: :in_block,
+                    to: :in_block,
+                    after: ->(*args) { @document.add_line(*args) }
+        transitions from: :idle, to: :idle
+      end
+
+      event :empty_line do
+        transitions from: %i[wait_content single_para idle], to: :idle
+        transitions from: :in_block, to: :in_block
+      end
+    end
+  end
+end

data/lib/defmastership/document.rb

@@ -1,41 +1,11 @@
 # Copyright (c) 2020 Jerome Arbez-Gindre
 # frozen_string_literal: true
 
-require('aasm')
-
 module DefMastership
   # Contains the content of a DefMastership document: mainly definitions
-  # TODO: make this class smaller by defining a separated parser
-
-  # Contains regexp / action couples
-  Filter = Struct.new(:regexp, :event, :consumed_line)
-  private_constant :Filter
-
-  FILTERS_IN_LITERAL = [
-    Filter.new(DMRegexp::LITERAL_BLOCK, :code_block_delimiter, false),
-    Filter.new(DMRegexp::WHATEVER,      :new_line,             true)
-  ].freeze
-  private_constant :FILTERS_IN_LITERAL
-
-  FILTERS = [
-    Filter.new(DMRegexp::VARIABLE_DEF,  :new_variable_def,     false),
-    Filter.new(DMRegexp::VARIABLE_USE,  :new_variable_use,     false),
-    Filter.new(DMRegexp::DEFINITION,    :new_definition,       true),
-    Filter.new(DMRegexp::EREF_CONFIG,   :new_eref_setup,       true),
-    Filter.new(DMRegexp::EREF_DEF,      :new_eref_def,         false),
-    Filter.new(DMRegexp::IREF_DEF,      :new_iref_def,         false),
-    Filter.new(DMRegexp::ATTR_CONFIG,   :new_attribute_conf,   true),
-    Filter.new(DMRegexp::ATTR_SET,      :new_attribute_value,  false),
-    Filter.new(DMRegexp::BLOCK,         :block_delimiter,      true),
-    Filter.new(DMRegexp::LITERAL_BLOCK, :code_block_delimiter, true),
-    Filter.new(DMRegexp::EMPTY_LINE,    :empty_line,           false),
-    Filter.new(DMRegexp::WHATEVER,      :new_line,             true)
-  ].freeze
-  private_constant :FILTERS
 
   # Reflects document structure from a definition point of view
   class Document
-    include AASM
     attr_reader :definitions, :labels, :eref, :iref, :attributes, :variables
 
     def initialize
@@ -45,110 +15,108 @@ module DefMastership
       @iref          = false
       @attributes    = {}
       @in_literal    = true
-      @current_line  = nil
       @variables     = {}
-    end
-
-    aasm do
-      state :idle, initial: true
-      state :wait_content
-      state :in_block
-      state :single_para
-
-      event :new_definition do
-        transitions from: :idle, to: :wait_content, after: :add_new_definition
-      end
-
-      event :block_delimiter do
-        transitions from: :wait_content,     to: :in_block
-        transitions from: %i[in_block idle], to: :idle
-        transitions from: :single_para, to: :idle
-      end
 
-      event :new_line do
-        transitions from: :wait_content, to: :single_para, after: :add_line
-        transitions from: :single_para, to: :single_para, after: :add_line
-        transitions from: :in_block, to: :in_block, after: :add_line
-        transitions from: :idle, to: :idle
-      end
+      @definition_parser = DefinitionParser.new(self)
+    end
 
-      event :empty_line do
-        transitions from: %i[wait_content single_para idle], to: :idle
-        transitions from: :in_block, to: :in_block
+    def wrong_explicit_checksum?
+      @definitions.reduce(false) do |res, definition|
+        res || !definition.wrong_explicit_checksum.nil?
       end
     end
 
-    def code_block_delimiter(_match)
+    def code_block_delimiter(_match, line)
       @in_literal ^= true
+      line
     end
 
-    def add_new_definition(match)
+    def add_new_definition(match, line)
       definition = Definition.new(match)
       @labels.merge(definition.labels)
       @definitions << definition
+      line
     end
 
-    def add_line(_match)
-      @definitions.last << @current_line
+    def add_line(_match, line)
+      @definitions.last << line
+      line
     end
 
-    def new_eref_setup(match)
+    def new_eref_setup(match, line)
       @eref[match[:refname].to_sym] ||= {}
 
       @eref[match[:refname].to_sym][match[:symb].to_sym] =
         match[:value]
+      line
     end
 
-    def new_eref_def(match)
+    def new_eref_def(match, line)
       @definitions.last.add_eref(
         match[:refname].to_sym,
         match[:extrefs]
       )
+      line
     end
 
-    def new_iref_def(_match)
+    def new_iref_def(_match, line)
       @iref = true
-      @current_line.scan(DMRegexp::IREF_DEF) do |_|
+      line.scan(DMRegexp::IREF_DEF) do |_|
         @definitions.last.add_iref(Regexp.last_match[:intref])
       end
+      line
     end
 
-    def new_attribute_conf(match)
+    def new_attribute_conf(match, line)
       @attributes[match[:attr].to_sym] = match[:prefix]
+      line
     end
 
-    def new_attribute_value(match)
+    def new_attribute_value(match, line)
       @definitions.last.set_attribute(
         match[:attr].to_sym,
         match[:value]
       )
+      line
     end
 
-    def new_variable_def(match)
+    def new_variable_def(match, line)
       @variables[match[:varname].to_sym] = match[:value]
+      line
     end
 
-    def new_variable_use(_match)
-      @current_line.scan(DMRegexp::VARIABLE_USE) do |_|
+    def new_variable_use(_match, line)
+      new_line = line.dup
+      line.scan(DMRegexp::VARIABLE_USE) do |_|
         varname = Regexp.last_match[:varname]
         next if @variables[varname.to_sym].nil?
 
-        @current_line = @current_line.gsub(
-          "{#{varname}}", @variables[varname.to_sym]
-        )
+        new_line.gsub!("{#{varname}}", @variables[varname.to_sym])
       end
+      new_line
     end
 
     def parse(lines)
       lines.reject(&:commented?).each do |line|
-        @current_line = line
         (@in_literal ? FILTERS : FILTERS_IN_LITERAL).each do |filter|
           next unless line.match(filter.regexp)
 
-          public_send(filter.event, Regexp.last_match)
+          line = generate_event(filter.event, Regexp.last_match, line)
+
           break if filter.consumed_line
         end
       end
     end
+
+    private
+
+    def generate_event(event, match, line)
+      if respond_to?(event)
+        line = public_send(event, match, line)
+      else
+        @definition_parser.public_send(event, match, line)
+      end
+      line
+    end
   end
 end