my-last-cv 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c3e91fc809c66ce9bff0a797dbc4701562502617080a3dfc1980ff72d6d7a8
-  data.tar.gz: 0d92a8897223468db3de303b7a23e312873cc2da76d3b0976e2f642e7863e442
+  metadata.gz: 56c56926e52415beebd4ff21594a85a4ef86be44f2ebe1716b5454204714f0e9
+  data.tar.gz: c75b9746a02372e488fd237f9d6ee667f9136b126826716b870c3f74816a0a1d
 SHA512:
-  metadata.gz: cdfc99a9a7ae9d9145c643df109dedb8f9c02860e1d2d92c859a4d28a55a82bb8aff49e5d1fd478683b1e8d98f952d43d88a243749c12691f39a31489c000c4d
-  data.tar.gz: b8970a939e5ff4f47640dc3021cb743e4794e58a96d41db4c74ce4ed75949cc4481fd274d7b9a708a2c3badb8d257fe5982308f7b3fa931b1329cfb9d260fb20
+  metadata.gz: 229b38de93a8b39be1ba36ae5f3de149e3bdef877967ee0dd2d6c4cf8db14003de54f804438da98d4711d9f37c6249d92c0a8c3a17e190fdd66d227736c1af08
+  data.tar.gz: 9426974cfee0e9c7abbf5759bb95a449ecf210ab24bc7c57db04889a5480f8a27a2ff9c2ccd4dab7efb201a4f60089673e1b118890fa61e6ea9bc02a5f10aa42

data/lib/my_last_cv/icons.rb

@@ -0,0 +1,14 @@
+module MyLastCV
+  module Icons
+    MAP = {
+      name: "fas-user",
+      title: "fas-briefcase",
+      email: "fas-envelope",
+      phone: "fas-phone",
+      linkedin: "fab-linkedin",
+      github: "fab-github",
+      website: "fas-globe",
+      location: "fas-location-dot"
+    }.freeze
+  end
+end

data/lib/my_last_cv/parser.rb

@@ -1,62 +1,169 @@
+require 'yaml'
+
 module MyLastCV
   class Parser
+    LineHandler = Struct.new(:pattern, :method)
+
+    HANDLERS = [
+      LineHandler.new(/^(name|title|email|phone|linkedin|github|website|location):\s*(.+)/i, :handle_contact),
+      LineHandler.new(/^#\s+(.*)/, :handle_title),
+      LineHandler.new(/^##\s+(.*)/, :handle_section),
+      LineHandler.new(/^###\s+(.*)/, :handle_element),
+      LineHandler.new(/^[-*]\s+(.*)/, :handle_bullet)
+    ].freeze
+
+    CONTACT_KEYS = %w[name title email phone linkedin github website location].freeze
+
     def initialize(markdown)
       @markdown = markdown
     end
 
     def parse
-      lignes = @markdown.lines.map(&:chomp)
-      resultat = { sections: [] }
-      section_actuelle = nil
-      element_actuel  = nil
-
-      lignes.each do |ligne|
-        line = ligne
-        next if line.strip.empty?
-
-        if (m = line.match(/^#\s+(.*)/))
-          resultat[:name] = m[1].strip
-          section_actuelle = nil
-          element_actuel   = nil
-
-        elsif (m = line.match(/^(email|phone|location):\s*(.+)/i))
-          (resultat[:contact] ||= []) << m[2].strip
-
-        elsif (m = line.match(/^##\s+(.*)/))
-          section_actuelle = { title: m[1].strip, items: [], elements: [] }
-          resultat[:sections] << section_actuelle
-          element_actuel = nil
-
-        elsif (m = line.match(/^###\s+(.*)/))
-          section_actuelle ||= { title: "Divers", items: [], elements: [] }
-          resultat[:sections] << section_actuelle unless resultat[:sections].include?(section_actuelle)
-
-          element_actuel = { title: m[1].strip, items: [] }
-          section_actuelle[:elements] ||= []
-          section_actuelle[:elements] << element_actuel
-
-        elsif (m = line.match(/^[-*]\s+(.*)/))
-          if element_actuel
-            element_actuel[:items] << m[1].strip
-          else
-            section_actuelle ||= { title: "Divers", items: [], elements: [] }
-            resultat[:sections] << section_actuelle unless resultat[:sections].include?(section_actuelle)
-            section_actuelle[:items] << m[1].strip
-          end
+      setup_state
+      extract_front_matter!
+      @markdown.each_line do |raw|
+        line = raw.rstrip
+
+        stripped = line.strip
+        next if stripped.empty? || stripped == '---'
+
+        handler = HANDLERS.find { |h| h.pattern.match?(line) }
+        if handler
+          send(handler.method, line)
         else
-          if element_actuel && !element_actuel[:items].empty?
-            element_actuel[:items][-1] += " " + line.strip
-          elsif section_actuelle && !section_actuelle[:items].empty?
-            section_actuelle[:items][-1] += " " + line.strip
-          else
-            section_actuelle ||= { title: "Divers", items: [], elements: [] }
-            section_actuelle[:items] << line.strip
-          end
+          handle_text(line)
+        end
+      end
+
+      finalize
+      @result
+    end
+
+    private
+
+    def setup_state
+      @result = { sections: [] }
+      @current_section = nil
+      @current_element = nil
+      @pending = []
+    end
+
+    def extract_front_matter!
+      lines = @markdown.lines
+      return if lines.empty?
+      return unless lines.first&.strip == '---'
+
+      closing_index = lines[1..]&.find_index { |l| l.strip == '---' }
+      return unless closing_index
+
+      closing_index += 1
+
+      yaml_content = lines[1...closing_index].join
+      rest = lines[(closing_index + 1)..] || []
+
+      begin
+        data = YAML.safe_load(yaml_content) || {}
+      rescue StandardError
+        data = {}
+      end
+
+      if data.is_a?(Hash)
+        # Prefer explicit YAML title if present
+        @result[:title] = data['title'].to_s.strip unless data['title'].to_s.strip.empty?
+
+        CONTACT_KEYS.each do |k|
+          v = data[k]
+          next if v.nil? || v.to_s.strip.empty?
+          @result[:contact] ||= {}
+          @result[:contact][k] = v.to_s.strip
         end
       end
 
-      resultat[:contact] = (resultat[:contact] || []).join(" · ")
-      resultat
+      @markdown = rest.join
+    end
+
+    def flush_pending_to(target)
+      return if @pending.empty?
+      text = @pending.join(" ").strip
+      @pending.clear
+      return if text.empty?
+      target[:items] ||= []
+      target[:items] << { type: :paragraph, text: text }
+    end
+
+    def flush_pending_nowhere
+      return if @pending.empty?
+      text = @pending.join(" ").strip
+      @pending.clear
+      return if text.empty?
+      (@result[:intro] ||= []) << text
+    end
+
+    def finalize
+      if @current_element
+        flush_pending_to(@current_element)
+      elsif @current_section
+        flush_pending_to(@current_section)
+      else
+        flush_pending_nowhere
+      end
+    end
+
+    def flush_pending_current
+      if @current_element
+        flush_pending_to(@current_element)
+      elsif @current_section
+        flush_pending_to(@current_section)
+      else
+        flush_pending_nowhere
+      end
+    end
+
+    def handle_title(line)
+      flush_pending_current
+      @result[:title] = line.sub(/^#\s+/, "").strip
+      @current_section = nil
+      @current_element = nil
+    end
+
+    def handle_contact(line)
+      key, value = line.split(":", 2)
+      @result[:contact] ||= {}
+      @result[:contact][key] = value.strip
+    end
+
+    def handle_section(line)
+      flush_pending_current
+      @current_section = { title: line.sub(/^##\s+/, "").strip, items: [], elements: [] }
+      @result[:sections] << @current_section
+      @current_element = nil
+    end
+
+    def handle_element(line)
+      flush_pending_current
+      @current_section ||= { title: "Divers", items: [], elements: [] }
+      @result[:sections] << @current_section unless @result[:sections].include?(@current_section)
+      @current_element = { title: line.sub(/^###\s+/, "").strip, items: [] }
+      @current_section[:elements] ||= []
+      @current_section[:elements] << @current_element
+    end
+
+    def handle_bullet(line)
+      item = { type: :bullet, text: line.sub(/^[-*]\s+/, "").strip }
+      if @current_element
+        flush_pending_to(@current_element)
+        @current_element[:items] << item
+      elsif @current_section
+        flush_pending_to(@current_section)
+        @current_section[:items] << item
+      else
+        @current_section = { title: "Divers", items: [item], elements: [] }
+        @result[:sections] << @current_section
+      end
+    end
+
+    def handle_text(line)
+      @pending << line.strip
     end
   end
 end

data/lib/my_last_cv/renderer.rb

@@ -1,5 +1,7 @@
 require 'prawn'
-require "fileutils"
+require 'prawn/icon'
+require 'fileutils'
+require_relative 'icons'
 
 module MyLastCV
   class Renderer
@@ -35,7 +37,7 @@ module MyLastCV
       fonts_dir = resolved_fonts_dir
       return unless fonts_dir
 
-      # Exemple : Inter (Regular / Bold)
+      # Example : Inter (Regular / Bold)
       pdf.font_families.update(
         "Inter" => {
           normal: File.join(fonts_dir, "Inter-Regular.ttf"),
@@ -49,48 +51,71 @@ module MyLastCV
     end
 
     def render_header(pdf)
-      pdf.font(@style.header_font)
       pdf.move_down 12
-      with_color(pdf, @style.accent_color) do
-        pdf.text(@parsed_cv[:name] || '-', size: @style.header_size, align: :center)
+      pdf.font(@style.body_font)
+      @parsed_cv[:contact].each_key do |key|
+        icon = "<icon size=\"#{@style.body_size}\">#{MyLastCV::Icons::MAP[key.to_sym]}</icon>"
+        pdf.icon("#{icon}  #{@parsed_cv[:contact][key]}", inline_format: true)
       end
+
       pdf.move_down 6
-      pdf.font(@style.body_font)
-      pdf.text(@parsed_cv[:contact] || '', size: @style.body_size, align: :center)
+      pdf.font(@style.header_font)
       with_color(pdf, @style.accent_color) do
-        pdf.stroke_horizontal_rule
+        pdf.text(@parsed_cv[:title] || '-', size: @style.header_size, align: :center)
       end
-      pdf.move_down 12
+
+      pdf.move_down 4
+      pdf.stroke_color(@style.accent_color)
+      pdf.stroke_horizontal_rule
+
+      if @parsed_cv[:intro]&.any?
+        pdf.move_down 10
+        @parsed_cv[:intro].each do |p|
+          pdf.text(p, size: @style.body_size, leading: 2)
+        end
+      end
+      pdf.move_down 10
     end
 
     def render_sections(pdf)
-      @parsed_cv[:sections].each do |section|
+      (@parsed_cv[:sections] || []).each do |section|
         pdf.move_down 8
         pdf.font(@style.section_font)
-        pdf.text(section[:title], size: @style.section_size, style: :bold)
 
-        unless section[:items].nil? || section[:items].empty?
-          pdf.move_down 4
-          pdf.font(@style.body_font)
-          section[:items].each do |item|
-            pdf.text("• #{item}", size: @style.body_size, indent_paragraphs: 16)
-          end
+        with_color(pdf, @style.accent_color) do
+          pdf.text(section[:title], size: @style.section_size, style: :bold)
         end
 
+        render_items(pdf, section[:items])
+
         (section[:elements] || []).each do |el|
           pdf.move_down 6
           pdf.font(@style.section_font)
           pdf.text(el[:title], size: (@style.section_size - 3), style: :bold)
-
-          pdf.move_down 2
-          pdf.font(@style.body_font)
-          (el[:items] || []).each do |item|
-            pdf.text("• #{item}", size: @style.body_size, indent_paragraphs: 20)
-          end
+          render_items(pdf, el[:items])
         end
       end
     end
 
+    def render_items(pdf, items)
+      return if items.nil? || items.empty?
+
+      pdf.move_down 4
+      pdf.font(@style.body_font)
+
+      (items || []).each do |item|
+        case item[:type]
+        when :bullet
+          pdf.text("• #{item[:text]}", size: @style.body_size, indent_paragraphs: 16)
+        when :paragraph
+          pdf.text(item[:text], size: @style.body_size, leading: 2)
+          pdf.move_down 4
+        else
+          # fallback (au cas où)
+          pdf.text(item.to_s, size: @style.body_size)
+        end
+      end
+    end
 
     def with_color(pdf, hex)
       return yield if hex.to_s.strip.empty?

data/lib/my_last_cv/version.rb

@@ -1,3 +1,3 @@
   module MyLastCV
-    VERSION = "0.0.5"
+    VERSION = "0.0.7"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my-last-cv
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Maxime Hanicotte
@@ -23,6 +23,50 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: prawn-icon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+description: MyLastCV turns a Markdown CV into a styled PDF using Prawn. Configurable
+  styles (fonts, sizes, margins, accent color) and project-level custom fonts support.
 email:
 - max_hanicotte@msn.com
 executables:
@@ -33,6 +77,7 @@ files:
 - README.md
 - exe/my_last_cv
 - lib/my_last_cv.rb
+- lib/my_last_cv/icons.rb
 - lib/my_last_cv/parser.rb
 - lib/my_last_cv/renderer.rb
 - lib/my_last_cv/style.rb
@@ -40,7 +85,13 @@ files:
 homepage: https://www.maxime.hanicotte.net/my-last-cv/
 licenses:
 - GPL-3.0-or-later
-metadata: {}
+metadata:
+  homepage_uri: https://www.maxime.hanicotte.net/my-last-cv/
+  source_code_uri: https://github.com/maxime-hanicotte/my-last-cv
+  changelog_uri: https://github.com/maxime-hanicotte/my_last_cv/blob/main/CHANGELOG.md
+  bug_tracker_uri: https://github.com/maxime-hanicotte/my_last_cv/issues
+  documentation_uri: https://github.com/maxime-hanicotte/my_last_cv#readme
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib