fronde 0.6.2 → 0.6.4

data/lib/fronde/config/helpers.rb

@@ -59,4 +59,4 @@ module Fronde
   end
 end
 
-Liquid::Template.register_filter(Fronde::Config::Filters)
+Liquid::Environment.default.register_filter(Fronde::Config::Filters)

data/lib/fronde/config/lisp.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'open-uri'
 require_relative '../version'
 require_relative '../org'
 require_relative 'helpers'
@@ -11,6 +10,19 @@ module Fronde
     # This module contains utilitary methods to ease ~org-config.el~
     # file generation
     module Lisp
+      class << self
+        def theme_directory(theme)
+          # User theme first to allow overwriting
+          directory = File.expand_path("themes/#{theme}")
+          return directory if Dir.exist? directory
+
+          directory = File.expand_path("data/themes/#{theme}", __dir__)
+          return directory if Dir.exist? directory
+
+          raise Errno::ENOENT, "Theme #{theme} not found"
+        end
+      end
+
       # Generate emacs lisp configuration file for Org and write it.
       #
       # This method saves the generated configuration in the file
@@ -41,19 +53,8 @@ module Fronde
 
       private
 
-      def theme_directory(theme)
-        # User theme first to allow overwriting
-        directory = File.expand_path("themes/#{theme}")
-        return directory if Dir.exist? directory
-
-        directory = File.expand_path("data/themes/#{theme}", __dir__)
-        return directory if Dir.exist? directory
-
-        raise Errno::ENOENT, "Theme #{theme} not found"
-      end
-
       def org_theme_config(theme)
-        { 'base-directory' => theme_directory(theme),
+        { 'base-directory' => Lisp.theme_directory(theme),
           # rubocop:disable Layout/LineLength
           'base-extension' => %w[css js gif jpg png svg otf ttf woff2?].join('\\\\|'),
           'publishing-directory' => "#{get('html_public_folder')}/assets/#{theme}",

data/lib/fronde/index/atom_generator.rb

@@ -34,21 +34,16 @@ module Fronde
     # @param entries [Array] the article to list in this file
     # @return [String] the Atom feed as a String
     def atom_file(tag_name, entries)
-      domain = Fronde::CONFIG.get('domain')
       slug = Slug.slug(tag_name)
-      tagurl = "#{domain}#{@project.public_absolute_path}tags/#{slug}.html"
-      Config::Helpers.render_liquid_template(
-        File.read(File.expand_path('./data/template.xml', __dir__)),
+      variables = atom_templating_basics.merge(
         'title' => @tags_names[tag_name],
-        'lang' => Fronde::CONFIG.get('lang'),
-        'domain' => domain,
         'slug' => slug,
-        'tagurl' => tagurl,
-        'upddate' => @date.xmlschema,
-        'author' => Fronde::CONFIG.get('author'),
-        'publication_format' => @project['mime_type'],
         'entries' => entries
       )
+      Config::Helpers.render_liquid_template(
+        File.read(File.expand_path('./data/template.xml', __dir__)),
+        variables
+      )
     end
 
     # Render the main/index Atom feed.
@@ -56,19 +51,26 @@ module Fronde
     # @param entries [Array] the article to list in this file
     # @return [String] the Atom feed as a String
     def atom_index(entries)
-      domain = Fronde::CONFIG.get('domain')
+      variables = atom_templating_basics.merge(
+        'title' => @project['title'],
+        'slug' => '__HOME_PAGE__',
+        'entries' => entries
+      )
       Config::Helpers.render_liquid_template(
         File.read(File.expand_path('./data/template.xml', __dir__)),
-        'title' => @project['title'],
+        variables
+      )
+    end
+
+    def atom_templating_basics
+      {
         'lang' => Fronde::CONFIG.get('lang'),
-        'domain' => domain,
-        'slug' => 'index',
-        'tagurl' => domain,
-        'upddate' => @date.xmlschema,
         'author' => Fronde::CONFIG.get('author'),
-        'publication_format' => @project['mime_type'],
-        'entries' => entries
-      )
+        'domain' => Fronde::CONFIG.get('domain'),
+        'project_path' => @project.public_absolute_path,
+        'upddate' => @date.xmlschema,
+        'publication_format' => @project['mime_type']
+      }
     end
   end
 end

data/lib/fronde/index/data/template.xml

@@ -4,12 +4,17 @@
       xml:lang="{{ lang }}">
 
   <title>{{ title | escape }}</title>
-  <link href="{{ domain }}/feeds/{{ slug }}.xml" rel="self" type="application/atom+xml"/>
-  <link href="{{ tagurl }}" rel="alternate" type="text/html" title="{{ title }}"/>
+{%- if slug == "__HOME_PAGE__" %}
+  <link href="{{ domain }}{{ project_path }}feeds/index.xml" rel="self" type="application/atom+xml"/>
+  <link href="{{ domain }}" rel="alternate" type="text/html" title="{{ title | escape }}"/>
+{%- else %}
+  <link href="{{ domain }}{{ project_path }}feeds/{{ slug }}.xml" rel="self" type="application/atom+xml"/>
+  <link href="{{ domain }}{{ project_path }}tags/{{ slug }}.html" rel="alternate" type="text/html" title="{{ title | escape }}"/>
+{%- endif %}
   <updated>{{ upddate }}</updated>
   <author><name>{{ author }}</name></author>
   <id>urn:md5:{{ domain | md5 }}</id>
-  <generator uri="https://git.umaneti.net/fronde/about/">Fronde</generator>
+  <generator uri="https://git.umaneti.net/fronde">Fronde</generator>
 
   {%- for article in entries %}
 
@@ -17,7 +22,7 @@
     <title>{{ article.title | escape }}</title>
     <link href="{{ article.url }}" rel="alternate"
           type="{{ publication_format }}"
-          title="{{ article.title }}"/>
+          title="{{ article.title | escape }}"/>
     <id>urn:md5:{{ article.timekey | md5 }}</id>
     <published>{{ article.published_xml }}</published>
     <updated>{{ article.updated_xml }}</updated>

data/lib/fronde/index.rb

@@ -96,7 +96,7 @@ module Fronde
       all_keys = all_tags
       {
         by_name: all_keys.sort,
-        by_weight: all_keys.sort_by { [-@index[_1].length, _1] }
+        by_weight: all_keys.sort_by { [-@index[it].length, it] }
       }
     end
   end

data/lib/fronde/org/file.rb

@@ -193,7 +193,7 @@ module Fronde
               .gsub('%l', @data[:lang])
               .gsub('%L', Fronde::CONFIG.get('license', '').gsub(/\s+/, ' ').strip)
               .gsub('%n', "Fronde #{Fronde::VERSION}")
-              .gsub('%N', "<a href=\"https://git.umaneti.net/fronde/about/\">Fronde</a> #{Fronde::VERSION}")
+              .gsub('%N', "<a href=\"https://git.umaneti.net/fronde\">Fronde</a> #{Fronde::VERSION}")
               .gsub('%o', project_data['theme'] || '')
               .gsub('%s', @data[:subtitle])
               .gsub('%t', @data[:title])
@@ -270,7 +270,7 @@ module Fronde
       end
 
       def find_source_for_org_file
-        Fronde::CONFIG.sources.find { _1.source_for? @file }
+        Fronde::CONFIG.sources.find { it.source_for? @file }
       end
 
       def find_source_for_publication_file

data/lib/fronde/org.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'net/http'
+require_relative 'version'
+
 module Fronde
   # Everything related to Org mode
   #
@@ -7,6 +10,8 @@ module Fronde
   # of the Emacs package. It also serves as a namespace for the class
   # responsible for handling Org files: {Fronde::Org::File}.
   module Org
+    GNU_ELPA_URL = 'https://elpa.gnu.org/packages/org'
+
     class << self
       def current_version
         # Do not crash if Org is not yet installed (and thus return nil)
@@ -36,18 +41,27 @@ module Fronde
         org_version
       end
 
+      def http_get_client(uri, &)
+        Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+          request = Net::HTTP::Get.new(uri)
+          request['User-Agent'] = Fronde::USER_AGENT
+          http.request request, &
+        end
+      end
+
       def fetch_version_number
-        # Retrieve last org version from git repository tags page.
-        tag_rx = Regexp.new(
-          '<a href=\'/cgit/emacs/org-mode.git/tag/\?h=' \
-          '(?<tag>release_(?<number>[^\']+))\'>\k<tag></a>'
-        )
-        versions = URI(
-          'https://git.savannah.gnu.org/cgit/emacs/org-mode.git/refs/'
-        ).open.readlines.map do |line|
-          line.match(tag_rx) { |matchdata| matchdata[:number] }
+        # Retrieve last org version from GNU ELPA page.
+        uri = URI("#{GNU_ELPA_URL}.html")
+        response = http_get_client(uri).body
+        version_line = response.each_line(chomp: true).find do |line|
+          line.start_with? '<dt>Latest</dt> <dd><a href='
         end
-        versions.compact.first
+        return unless version_line
+
+        version_match = version_line.match(/org-(?<version>[0-9.]+)\.tar/)
+        return version_match[:version] if version_match
+
+        nil
       end
 
       # Download latest org-mode tarball.
@@ -56,49 +70,29 @@ module Fronde
       # @return [String] the downloaded org-mode version
       def download(destination = 'var/tmp')
         org_last_version = last_version(force: false, cookie_dir: destination)
-        tarball = "org-mode-release_#{org_last_version}.tar.gz"
-        uri = URI("https://git.savannah.gnu.org/cgit/emacs/org-mode.git/snapshot/#{tarball}")
+        uri = URI("#{GNU_ELPA_URL}-#{org_last_version}.tar")
         # Will crash on purpose if anything goes wrong
-        Net::HTTP.start(uri.host) do |http|
-          fetch_org_tarball http, Net::HTTP::Get.new(uri), destination
+        http_get_client(uri) do |response|
+          fetch_org_tarball response, destination
         end
         org_last_version
       end
 
-      def fetch_org_tarball(http, request, destination)
+      def fetch_org_tarball(response, destination)
         # Remove version number in dest file to allow easy rake file
         # task naming
-        dest_file = ::File.expand_path('org.tar.gz', destination)
-        http.request request do |response|
-          ::File.open(dest_file, 'w') do |io|
-            response.read_body { |chunk| io.write chunk }
-          end
+        dest_file = ::File.expand_path('org.tar', destination)
+        ::File.open(dest_file, 'w') do |io|
+          response.read_body { |chunk| io.write chunk }
         end
       end
 
-      def make_org_cmd(org_dir, target, verbose: false)
-        make = ['make', '-C', org_dir, target]
-        return make.join(' ') if verbose
-
-        make.insert(3, '-s')
-        make << 'EMACSQ="emacs -Q --eval \'(setq inhibit-message t)\'"'
-        make.join(' ')
-      end
-
-      # Compile downloaded Org package
+      # Extract downloaded Org tarball
       #
       # @param source [String] path to the org-mode tarball to install
-      # @param version [String] version of the org package to install
       # @param target [String] path to the final install directory
-      # @param verbose [Boolean] whether the process should be verbose
-      def compile(source, version, target, verbose: false)
-        untar_cmd = ['tar', '-xzf', source]
-        system(*untar_cmd)
-        FileUtils.mv "org-mode-release_#{version}", target
-        # Fix a weird unknown package version
-        ::File.write("#{target}/mk/version.mk", "ORGVERSION ?= #{version}")
-        system(*make_org_cmd(target, 'compile', verbose:))
-        system(*make_org_cmd(target, 'autoloads', verbose:))
+      def extract(source, target)
+        system 'tar', '-C', target, '-xf', source
       end
     end
   end

data/lib/fronde/source.rb

@@ -17,29 +17,19 @@ module Fronde
       render_heading
     end
 
-    def [](key)
-      @config[key]
-    end
+    def [](key) = @config[key]
 
     def []=(key, value)
       @config[key] = value
     end
 
-    def type
-      @config['type']
-    end
+    def type = @config['type']
 
-    def recursive?
-      !!@config['recursive']
-    end
+    def recursive? = !!@config['recursive']
 
-    def blog?
-      !!@config['is_blog']
-    end
+    def blog? = !!@config['is_blog']
 
-    def to_h
-      @config
-    end
+    def to_h = @config
 
     def source_for?(file_name)
       relative_file_path = file_name.delete_prefix "#{@config['path']}/"
@@ -76,10 +66,9 @@ module Fronde
     end
 
     def target_for(file_name)
-      target = File.expand_path file_name
-      target.delete_prefix! "#{Dir.pwd}/"
+      target = File.expand_path(file_name).delete_prefix "#{Dir.pwd}/"
       target.sub!(/\.org\z/, @config['ext'])
-      project_relative_path = @config['path'].delete_prefix("#{Dir.pwd}/")
+      project_relative_path = @config['path'].delete_prefix "#{Dir.pwd}/"
       target.delete_prefix! "#{project_relative_path}/"
       public_absolute_path + target
     end

data/lib/fronde/sync/neocities.rb

@@ -85,8 +85,8 @@ module Fronde
       end
 
       def select_orphans(to_apply, current_list, &)
-        paths_to_apply = to_apply.map { _1['path'] }
-        current_paths = current_list.map { _1['path'] }
+        paths_to_apply = to_apply.map { it['path'] }
+        current_paths = current_list.map { it['path'] }
         (current_paths - paths_to_apply).filter_map(&)
       end
 

data/lib/fronde/templater.rb

@@ -58,14 +58,14 @@ module Fronde
 
       def apply_templates(source)
         public_file = source.pub_file absolute: true
-        dom = File.open(public_file, 'r') { Nokogiri::HTML _1 }
+        dom = File.open(public_file, 'r') { Nokogiri::HTML it }
         changes = Fronde::CONFIG.get('templates', []).map do |config|
           template = Fronde::Templater.new(source, dom, config)
           next if !template.valid? || template.applied?
 
           template.apply
         end
-        File.open(public_file, 'w') { dom.write_to _1 } if changes.any?
+        File.open(public_file, 'w') { dom.write_to it } if changes.any?
       end
     end
 

data/lib/fronde/version.rb

@@ -2,5 +2,9 @@
 
 module Fronde
   # @return [String] the version number of the current Fronde release.
-  VERSION = '0.6.2'
+  VERSION = '0.6.4'
+
+  USER_AGENT = ["Fronde/#{Fronde::VERSION}",
+                "(#{RUBY_ENGINE} #{RUBY_VERSION} #{RUBY_PLATFORM})",
+                '(+https://etienne.pflieger.bzh/fronde/)'].join(' ').freeze
 end

data/lib/tasks/cli.rake

@@ -28,7 +28,7 @@ namespace :cli do
     data['commands'] = all_commands.filter_map do |command, options|
       next if options[:alias] || command == 'basic'
 
-      opts = (options[:opts] || []).map { comp_opt_to_liquid(_1, command) }
+      opts = (options[:opts] || []).map { comp_opt_to_liquid(it, command) }
       { 'name' => command,
         'translation' => I18n.t("fronde.bin.commands.#{command}"),
         'options' => opts }

data/lib/tasks/org.rake

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'open-uri'
-
 require_relative '../fronde/config'
 require_relative '../fronde/cli/throbber'
 
@@ -12,15 +10,16 @@ CLOBBER.push(
 )
 
 HTMLIZE_TAG = 'release/1.58'
-OX_GMI_TAG = 'v0.2'
+TMP_ORG_TARBALL = 'var/tmp/org.tar'
 
 namespace :org do
+  directory 'lib'
   directory 'var/tmp'
 
   desc 'Download last version of Org'
-  file 'var/tmp/org.tar.gz' => 'var/tmp' do
+  file TMP_ORG_TARBALL => 'var/tmp' do
     # Weird Rake issue, still executing the task even if the file exists
-    next if File.exist? 'var/tmp/org.tar.gz'
+    next if File.exist? TMP_ORG_TARBALL
 
     download = Thread.new do
       version = Fronde::Org.download
@@ -33,18 +32,19 @@ namespace :org do
     warn I18n.t('fronde.tasks.org.no_download') if verbose
   end
 
-  desc 'Compile Org'
-  multitask compile: ['var/tmp/org.tar.gz', 'lib'] do |task|
+  desc 'Extract Org tarball'
+  multitask extract: [TMP_ORG_TARBALL, 'lib'] do |task|
     # No need to force fetch last version as it is only interesting as
     # part of the upgrade task
     version = Fronde::Org.last_version
 
     org_dir = "lib/org-#{version}"
-    next if Dir.exist?("#{org_dir}/lisp")
+    next if File.exist?("#{org_dir}/org-version.el")
 
     build = Thread.new do
-      Fronde::Org.compile(task.prerequisites[0], version, org_dir, verbose:)
-      Dir.glob('lib/org-[0-9.]*').each { rm_r _1 unless _1 == org_dir }
+      Fronde::Org.extract task.prerequisites[0], 'lib'
+      # Remove old versions
+      Dir.glob('lib/org-[0-9.]*').each { rm_r it unless it == org_dir }
       puts I18n.t('fronde.tasks.org.installed', version:) if verbose
     end
     Fronde::CLI::Throbber.run(
@@ -54,23 +54,19 @@ namespace :org do
     next
   end
 
-  directory 'lib'
-
   file 'lib/htmlize.el' => 'lib' do
-    htmlize = URI(
+    uri = URI(
       "https://raw.githubusercontent.com/hniksic/emacs-htmlize/refs/tags/#{HTMLIZE_TAG}/htmlize.el"
-    ).open.read
-    File.write 'lib/htmlize.el', htmlize
-  end
-
-  file 'lib/ox-gmi.el' => 'lib' do
-    ox_gmi = URI(
-      "https://git.umaneti.net/ox-gmi/plain/ox-gmi.el?h=#{OX_GMI_TAG}"
-    ).open.read
-    File.write 'lib/ox-gmi.el', ox_gmi
+    )
+    response = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+      request = Net::HTTP::Get.new(uri)
+      request['User-Agent'] = Fronde::USER_AGENT
+      http.request request
+    end
+    File.write 'lib/htmlize.el', response.body
   end
 
-  file 'var/lib/org-config.el' => ['lib/htmlize.el', 'lib/ox-gmi.el'] do
+  file 'var/lib/org-config.el' => ['lib/htmlize.el'] do
     Fronde::CONFIG.write_org_lisp_config
   end
 
@@ -84,15 +80,15 @@ namespace :org do
   end
 
   desc 'Install Org'
-  multitask install: ['org:compile', '.gitignore'] do
-    # lib/htmlize.el and lib/ox-gmi.el cannot be generated in parallel
-    # of org:compilation, as it will leads to a weird SSL error. Thus
-    # finishing file generation "manually" here.
+  multitask install: ['org:extract', '.gitignore'] do
+    # lib/htmlize.el cannot be generated in parallel of org:compilation,
+    # as it will leads to a weird SSL error. Thus finishing file generation
+    # "manually" here.
     Rake::Task['var/lib/org-config.el'].invoke
     sources = Fronde::CONFIG.sources
-    sources.each { mkdir_p _1['path'] }
+    sources.each { mkdir_p it['path'] }
 
-    outputs = sources.map { _1['type'] }.uniq
+    outputs = sources.map { it['type'] }.uniq
     if outputs.include?('html')
       mkdir_p "#{Fronde::CONFIG.get('html_public_folder')}/assets"
     end
@@ -104,7 +100,7 @@ namespace :org do
   desc 'Upgrade Org'
   task :upgrade do
     Rake::Task['clobber'].execute
-    if File.exist? 'var/tmp/org.tar.gz'
+    if File.exist? TMP_ORG_TARBALL
       # Cleanup cached tarball only if a new version is available.
       # Also cached the new remote org version in the same time.
       org_version = Fronde::Org.current_version
@@ -113,7 +109,7 @@ namespace :org do
       rescue RuntimeError
         last_version = org_version
       end
-      File.unlink 'var/tmp/org.tar.gz' unless org_version == last_version
+      File.unlink TMP_ORG_TARBALL unless org_version == last_version
     end
     Rake::Task['org:install'].invoke
   end