make_pdf-jekyll 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ca4768cc346d06fd2b534d43a33232e50ba7054da2974ca89bf53d87eb052f
-  data.tar.gz: e5fa0a4c6aa2affb970cbd9e950d0af1b359ed60caadad94874924e3c716f88f
+  metadata.gz: 68f4407fd68b80e7a2f87419480396c0eb7b543ddf86e5bcd8a8b4c60f9d71a6
+  data.tar.gz: 85e8793030dc76e217a4f1882d3befd3fc4a7d49ed01efe888a6789198d6730f
 SHA512:
-  metadata.gz: 80ef0cd96743d8ec50fd55de00716963e80bf1c9842d4c1578131c9a685758dcc235280555f218d8022780c090768201623fdcc3aa743a7b1d68eeb4941de6c6
-  data.tar.gz: a0a030c29b3fb29fbf6a42b8c63067eb8af4d5540518431fd41097726d23ffa6d7acbf530eb2a2c11d3c7356b239efcb5385e16511f8557f0c2d8782c459f173
+  metadata.gz: 0f38ee9054a2ae250228ebac98ef1a97fe7e13fadeee5dba66aa1b9afb302e0f4e9cc4a9a9d35e21e28dded6af688c66362793add3fd488b877fa27a316f3a52
+  data.tar.gz: fc8c51cd0bb88aacf8ba5dfce138eeca83e71fed79ea80c60ea02e37eac7f71d1393d7c4cbd5ebece01dcc1bb8990983761c2da391ed3b932fe07f7fa9dcac14

data/lib/make_pdf/firefox.rb

@@ -12,14 +12,14 @@ module MakePDF
     end
 
     def initialize(options)
-      Jekyll.logger.info('MakePDF firefox:', options)
+      Processor.logger.info('MakePDF firefox:', options)
       @args = make_arguments(**options)
       @driver_opts = Selenium::WebDriver::Firefox::Options.new(args: @opts)
       setup
     end
 
     def setup
-      Jekyll.logger.info('MakePDF firefox: start driver')
+      Processor.logger.info('MakePDF firefox: start driver')
       @driver = Selenium::WebDriver.for :firefox, capabilities: @driver_opts
     end
 

data/lib/make_pdf/jekyll.rb

@@ -6,8 +6,8 @@ module MakePDF
   LOG_NAME = "make_pdf:"
 
   # MakePDF Jekyll plugin
-  class Jekyll
-    attr_reader :reason
+  class Processor
+    attr_reader :reason, :doc, :name
 
     def valid?
       @reason.nil?
@@ -30,35 +30,42 @@ module MakePDF
             "no" => false
           }
 
-          [ key, possible[value.downcase] ]
+          [ key, possible[value.to_s.downcase] ]
         else
           [ key.sub("make-pdf-", "").to_sym, value ] if key.start_with?("make-pdf-")
         end
       end.to_h.merge(options)
     end
 
-    def initialize(current_doc, **options)
-      @file     = current_doc.destination(@base_source)
+    def initialize(site, current_doc, **options)
+      @site    = site
+      @file    = current_doc.destination(@base_source)
       @options = filter_options(current_doc, **options)
-      splited_url = site.config["url"].match(Regexp.new("^\(.*\)://\([^/]+\)/?.*$")).to_a
-      @options[:input_base_url] ||= site.baseurl
-      @options[:input_host] ||= splited_url[2]
+      @name    = current_doc.name
+
       logger.debug("base_paths: input → #{@options[:input_base_url]} output → #{@options[:output_base_path]} host → #{@options[:input_host]}")
 
-      current_options = make_options(@options, site_options, filter_options(current_doc))
-      output_dir = @options[:output_dir] || path_of(site.dest).dirname
+      current_options = make_options(@options, options, filter_options(current_doc))
 
       logger.debug("options : #{current_options}")
 
+      return if check_failure(current_options[:disabled], "MakePDF disabled")
+
       return if check_failure(File.extname(@file) != '.html', "#{@file} is not an html")
+
       return if check_failure(current_options[:make_pdf].nil? && !@opt_in, "#{current_doc.name} has not opted in")
+
       return if check_failure(current_options[:make_pdf] == false, "#{current_doc.name} has opted out")
 
-      writer = current_options[:writer]
+      writer = current_options[:writer] || site.options[:writer]
       return if check_failure(writer.nil?, "No writer defined for #{current_doc.name} (#{writer})")
 
-      logger.info(" processing #{current_doc.name}")
       @writer = MakePDF.const_get(writer.capitalize).new(logger:, **current_options)
+      @doc = current_doc
+    end
+
+    def output_dir
+      @writer.output_dir
     end
 
     def targets
@@ -66,10 +73,12 @@ module MakePDF
     end
 
     def method_missing(method_name, *args, **options)
-      if not Jekyll.site_options.nil? and Jekyll.site_options.include?(method_name)
-        return Jekyll.site_options[method_name]
-      elsif Jekyll.respond_to?(method_name, false)
-        return Jekyll.send(method_name, *args, **options)
+      if @options.include?(method_name)
+        return @options[method_name]
+      elsif not @site.options.nil? and @site.options.include?(method_name)
+        return @site.options[method_name]
+      elsif @site.respond_to?(method_name, false)
+        return @site.send(method_name, *args, **options)
       else
         super
       end
@@ -80,6 +89,7 @@ module MakePDF
 
       attempted = 0
       begin
+        logger.info("processing #{@file}")
         @writer.process(@file, **options.merge(@options))
       rescue => error
         attempted += 1
@@ -103,9 +113,19 @@ module MakePDF
       end
     end
 
-    class << self
+    class Site
       include PathManip
-      attr_reader :site_options, :site
+      attr_reader :options, :site, :logger
+
+      def default_options
+        return { 
+          output_base_path: site.source, 
+          input_location: path_of(site.dest),
+          input_base_url: relative_path_of(site.baseurl[1..]),
+          input_host: site.config["url"].match(Regexp.new("^[^:]*://\([^/]+\)/?.*$"))[1],
+          input_scheme: "file"
+        }.freeze
+      end
 
       def make_options(options, *more_options)
         return {} if options.nil?
@@ -117,44 +137,49 @@ module MakePDF
           end
       end
 
-      def logger(**options)
-        @logger ||= MakePDF::Logger.new(**options)
-      end
-
-      def setup(site, **options)
-        return unless @site.nil?
-
+      def initialize(site, **options)
         config = site.config["make-pdf"]||{}
-        logger(logger: ::Jekyll.logger, level: (config["log-map-level"] || :debug).to_sym, verbose: config['log-verbose'])
+        @logger = MakePDF::Logger.new(logger: ::Jekyll.logger, level: (config["log-map-level"] || :debug))
         @site         = site
-        input_location  = path_of(site.dest)
-        input_base_url = relative_path_of(site.baseurl)
-        @site_options = { 
-          :output_base_path => site.source, 
-          input_location:,
-          input_base_url:,
-          :input_scheme => "file"
-        }.merge(make_options(@site.config["make-pdf"], options))
-        logger.debug("Initialized with #{self.site_options}.")
+        @options = default_options.merge(make_options(@site.config["make-pdf"], options))
+        @queue        = []
+        logger.debug("Initialized with #{self.options}.")
       end
 
-      def process(current_doc, **options)
-        setup(current_doc.site, **options) if @site.nil?
-
-        processor = self.new(current_doc)
+      def queue(processor)
+        logger.info("Adding #{processor.name} to queue")
+        @queue.push(processor)
+      end
 
-        unless processor.valid?
-          logger.debug "Ignoring #{current_doc.name} ⇒ #{processor.reason}"
-          return false
+      def <<(doc)
+        processor = Processor.new(self, doc, **@options)
+        if processor.valid?
+          queue(processor)
+        else
+          logger.info("Skip #{doc.name} => #{processor.reason}")
         end
+      end
 
-        processor.process(**@site_options)
+      def process
+        @queue.each do |processor|
+          processor.process(**@options)
+        end
       end
     end
   end
-end
 
-::Jekyll.logger.info("Loaded #{MakePDF::LOG_NAME} plugin")
-::Jekyll::Hooks.register [:pages, :documents, :posts], :post_write do |doc|
-  MakePDF::Jekyll.process(doc)
+  ::Jekyll.logger.info("Loaded #{MakePDF::LOG_NAME} plugin")
+
+  ::Jekyll::Hooks.register [:site], :after_init do |site|
+    @@site = MakePDF::Processor::Site.new(site)
+    @@site.logger.info("site :after_init #{@@site}")
+  end
+
+  ::Jekyll::Hooks.register [:pages, :documents, :posts], :post_write do |doc|
+    @@site << doc
+  end
+
+  ::Jekyll::Hooks.register [:site], :post_write do |site|
+    @@site.process
+  end
 end

data/lib/make_pdf.rb

@@ -121,6 +121,5 @@ module MakePDF
 end
 
 Dir[File.join(__dir__, 'make_pdf/', '**', '*.rb')].each do |file| 
-  print "#{file}\n"
   require file
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: make_pdf-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Victor Bogado da Silva Lins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-27 00:00:00.000000000 Z
+date: 2025-09-03 00:00:00.000000000 Z
 dependencies: []
 description: Allows that some documents, or pages to have a pdf version pre generated.
 email: 'victor@bogado.net  '