make_pdf-jekyll 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a21bc7883012692bab3b448615f5a40c58a37566c23d678e67f7f4cad520de
-  data.tar.gz: 905cf312025602478eebabd00a45477603f40e2785261297e5312321bf3c1d90
+  metadata.gz: b5ca4768cc346d06fd2b534d43a33232e50ba7054da2974ca89bf53d87eb052f
+  data.tar.gz: e5fa0a4c6aa2affb970cbd9e950d0af1b359ed60caadad94874924e3c716f88f
 SHA512:
-  metadata.gz: 80b67fdfb51e5b34d3eebac122a4d6793d543c80c27ff9b416d63cee957928c229605a4ec4f81dd71099f0c403bfa74c4a5112ba93c1ded4cb0e4f7a1549e4a0
-  data.tar.gz: b30b0279151ba01a329c5f0e1d99c3ddc5e2677ba85704065c0fe187c080ad327cc5661bbd3014c6a94970b97df34aa527ce2525043fb87af009033c119a64d8
+  metadata.gz: 80ef0cd96743d8ec50fd55de00716963e80bf1c9842d4c1578131c9a685758dcc235280555f218d8022780c090768201623fdcc3aa743a7b1d68eeb4941de6c6
+  data.tar.gz: a0a030c29b3fb29fbf6a42b8c63067eb8af4d5540518431fd41097726d23ffa6d7acbf530eb2a2c11d3c7356b239efcb5385e16511f8557f0c2d8782c459f173

data/lib/make_pdf/jekyll.rb

@@ -1,5 +1,6 @@
 require 'jekyll'
 require 'make_pdf'
+require 'path_of'
 
 module MakePDF
   LOG_NAME = "make_pdf:"
@@ -39,7 +40,10 @@ module MakePDF
     def initialize(current_doc, **options)
       @file     = current_doc.destination(@base_source)
       @options = filter_options(current_doc, **options)
-      logger.debug("base_paths: input → #{@options[:input_base_path]} output → #{@options[:output_base_path]}")
+      splited_url = site.config["url"].match(Regexp.new("^\(.*\)://\([^/]+\)/?.*$")).to_a
+      @options[:input_base_url] ||= site.baseurl
+      @options[:input_host] ||= splited_url[2]
+      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
@@ -123,9 +127,12 @@ module MakePDF
         config = site.config["make-pdf"]||{}
         logger(logger: ::Jekyll.logger, level: (config["log-map-level"] || :debug).to_sym, verbose: config['log-verbose'])
         @site         = site
+        input_location  = path_of(site.dest)
+        input_base_url = relative_path_of(site.baseurl)
         @site_options = { 
           :output_base_path => site.source, 
-          :input_base_path => site.dest,
+          input_location:,
+          input_base_url:,
           :input_scheme => "file"
         }.merge(make_options(@site.config["make-pdf"], options))
         logger.debug("Initialized with #{self.site_options}.")

data/lib/make_pdf.rb

@@ -1,20 +1,10 @@
 # frozen_string_literal: true
 
 require 'fileutils'
+require 'path_of'
 
 module MakePDF
   module PathManip
-    def path_of(base, *path_components)
-      other = unless path_components.empty?
-                path_components
-                  .map { |component| path_of(component) }
-                  .sum Pathname.new(".")
-              else
-                Pathname.new("")
-              end
-      base = Pathname.new(".") if base.nil?
-      if base.instance_of?(Pathname) then base else Pathname.new(base) end + other
-    end
 
     def relative_path(file, base_path)
       path_of(file).relative_path_from(path_of(base_path))
@@ -77,40 +67,41 @@ module MakePDF
     include PathManip
     attr_reader :output_dir, :source_url, :logger
 
-    def initialize(input_base_path:, output_base_path:, input_scheme: "file", logger: Logger.new() ,**options)
+    def initialize(input_base_url:, output_base_path:, input_scheme: "file", input_host: nil, logger: Logger.new() ,**options)
       @logger = logger
-      @options = options.merge({ input_base_path:, output_base_path:, input_scheme: })
+      raise ArgumentError.new("Scheme `#{input_scheme}` requires an `input_host`.") if input_scheme != "file" && input_host.nil?
+      @options = options.merge({ input_base_url:, output_base_path:, input_scheme:, input_host: })
+
     end
     
-    def make_source_url(file, input_base_path:, output_base_path:, input_scheme: , **options)
-      target_file = relative_path(file, input_base_path:, **options)
+    def make_relative_file(file, input_location:, **options)
+      path_of(file).relative_path_from(path_of(input_location))
+    end
+
+    def make_source_url(file, input_base_url:, output_base_path:, input_scheme: , input_host: , input_location:, **options)
+      target_file = make_relative_file(file, input_location:, **options)
+      input_location = path_of(input_location)
+      input_base_url = relative_path_of(input_base_url)
       if (input_scheme != "file")
-        return input_scheme + "://" + output_base_path + target_file.to_s
+        return input_scheme + "://" + input_host + "/" + (input_base_url / target_file).to_path
       else
-        return input_base_path + target_file.to_s
+        return (input_location / input_location / target_file).to_path
       end
     end
 
-    def relative_path(file, input_base_path:, **options)
-      base_path = Pathname.new(input_base_path)
-      result = Pathname.new(file).relative_path_from(base_path).dirname
-      @logger.verbose("relative_path(#{file}, #{input_base_path}) → base_path: #{base_path} ⇒ #{result}")
-      result
-    end
-
-    def make_pdf_filename(file, input_base_path:, **options)
-      base_path = relative_path(file, input_base_path:, **options)
-      filename = Pathname.new(file).basename.sub_ext(".pdf")
-      result = base_path / filename
-      @logger.verbose("make_pdf_filename(#{file}, #{input_base_path}) → base_path: #{base_path}, filename: #{filename} ⇒ #{result}")
+    def make_pdf_filename(file, output_base_path:, input_location:, output_dir:, **options)
+      base_path = path_of(output_base_path) 
+      filepath = make_relative_file(file, input_location:).sub_ext(".pdf")
+      result = base_path / relative_path_of(output_dir) / filepath
+      @logger.verbose("make_pdf_filename(#{file}, #{output_base_path}) → base_path: #{base_path}, filepath: #{filepath} ⇒ #{result}")
       result
     end
 
-    def make_output_filename(file, input_base_path:, output_base_path:, output_dir: ".", **options)
-      @logger.verbose("make_output_filename(#{file}, #{input_base_path}, #{output_base_path})")
-      filename = make_pdf_filename(file, input_base_path:, **options) 
-      output_base_path = Pathname.new(output_base_path)
-      output = output_base_path / Pathname.new(output_dir) / filename
+    def make_output_filename(file, input_location:, output_base_path:, output_dir: ".", **options)
+      @logger.verbose("make_output_filename(#{file}, #{input_location}, #{output_base_path})")
+      filename = make_pdf_filename(file, output_base_path:, output_dir:, input_location:,  **options) 
+      output_base_path = path_of(output_base_path)
+      output = output_base_path / relative_path_of(output_dir) / filename
       FileUtils::mkdir_p(output.dirname)
       @logger.debug("filename: #{filename} ⇒ #{output}")
       output

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_pdf-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Victor Bogado da Silva Lins