paperwork 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ca73b108fa2e53bfc6882abb4e1dfd84c34e58d4306bc29a4ec54ae0b55a28
-  data.tar.gz: 75c019845942a4b8596fc04e7c7b8cdc22198dd8fad7b94918e2c4a93cbac3f0
+  metadata.gz: 1955714ea9b28ec4ec30953e9bb6d9fdde843dc6b07b1e845250272e06d231ce
+  data.tar.gz: f173804ede9bd1280bd724867b34aac75cae1d48e9ef13735e0ca5957185dcf3
 SHA512:
-  metadata.gz: bc72644eaa74956c6360083a90450f127df96ebcd15742ca5e63f50a16c4c7cbf43bdd105264610df53ca6362b682af52c217e65cfd717a67a0acf4d82c97c29
-  data.tar.gz: 5aeecba6354e787619122d7fbb977e4025bc902ee28b5f1d6cdd4d32e4c1cc218b4d85f1c13c856d461c1862219e7cbe2cab0bb0f83654d28d50429942a6a1be
+  metadata.gz: 2a5f3811fbbe9c7f8a48e120f83e4dad99a5e48ea15489d183a64d627f1ecdf210734e08f764c559298df7f832affc1e232e17f65cded172f59d9111a4ffc90f
+  data.tar.gz: 0fbb45795dcfa953c0e9479e0a8c135e799a6fbb41f26cd59471d7e0a5a6fb083832bb6082d8881fc2f1368e302425209b7d6170b4ee98c537825f37cd28326f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paperwork (0.2.0)
+    paperwork (0.2.5)
       rake (~> 12.3)
       redcarpet (~> 3.5.0)
 

data/Rakefile

@@ -13,4 +13,4 @@ task rebuild: [:clean, :build]
 task default: :spec
 CLEAN.include(".work/coverage")
 
-paperwork :doc, sources: ["README.md", "navdemo.md", "site.yml", "custom.js", "custom.css"]
+paperwork :doc, sources: ["README.md", "nested_example/navdemo.md", "site.yml", "custom.js", "custom.css"]

data/lib/paperwork/tasks.rb

@@ -17,7 +17,7 @@ module Paperwork
         dependencies = []
         if task.nil?
             task = options.keys.first
-            dependencies = options.delete(ntaskame)
+            dependencies = options.delete(task)
         end
         doc = Paperwork::Tasks::Document.new(task, sources, *dependencies)
         doc.create_tasks

data/lib/paperwork/tasks/document.rb

@@ -35,18 +35,25 @@ module Paperwork
             private
 
             def get_destination(dst_base, src) # rubocop:disable Metrics/AbcSize
+                nested_base = File.dirname(src)
+                if nested_base == "."
+                    nested_base = dst_base
+                else
+                    nested_base = File.join(dst_base, nested_base)
+                end
+
                 ext = File.extname(src)
                 case ext
                 when ".md"
-                    File.join(dst_base, File.basename(src)).gsub(".md", ".html.md")
+                    File.join(nested_base, File.basename(src)).gsub(".md", ".html.md")
                 when ".scss"
-                    Paperwork::Config[:custom_css] << File.basename(src)
+                    Paperwork::Config[:custom_css] << File.basename(src, ext)
                     File.join(dst_base, "stylesheets", File.basename(src)).gsub(".scss", ".css.scss")
                 when ".css"
-                    Paperwork::Config[:custom_css] << File.basename(src)
+                    Paperwork::Config[:custom_css] << File.basename(src, ext)
                     File.join(dst_base, "stylesheets", File.basename(src))
                 when ".js"
-                    Paperwork::Config[:custom_js] << File.basename(src)
+                    Paperwork::Config[:custom_js] << File.basename(src, ext)
                     File.join(dst_base, "javascripts", File.basename(src))
                 when ".yml"
                     File.join(dst_base, "..", "data", File.basename(src))

data/lib/paperwork/tasks/middleman_template/config.rb

@@ -50,7 +50,6 @@ set :relative_links, true
 activate :relative_assets
 activate :livereload
 activate :syntax, line_numbers: true
-# activate :directory_indexes
 
 
 require "lib/doc_renderer"

data/lib/paperwork/tasks/middleman_template/lib/doc_renderer.rb

@@ -6,10 +6,12 @@
 #
 module DocRenderer
     require "middleman-core/renderers/redcarpet"
+    require_relative "info_helpers"
 
     # This is a basic renderer for transforming markdown to HTML
     # inherit from this renderer to create more specific variants
     class Base < Middleman::Renderers::MiddlemanRedcarpetHTML
+        include InfoHelpers
 
         # block level calls
         def block_code(code, language)
@@ -79,11 +81,12 @@ module DocRenderer
         # def emphasis(text)
         # end
 
-        # def image(link, title, alt_text, default_class: "img-fluid")
-        #     <<~IMG
-        #         <img src="#{link}" alt="#{alt_text}" class="#{default_class}">
-        #     IMG
-        # end
+        def image(link, title, alt_text)
+            <<~IMG
+                <img src="#{relative_link link, scope.current_path}" alt="#{alt_text}" class="img-fluid">#{title}</img>
+            IMG
+            #super(relative_link(link, scope.current_path), title, alt_text)
+        end
 
         # def linebreak()
         # end
@@ -119,7 +122,7 @@ module DocRenderer
         private
 
         def definition_list(text)
-            str = ""
+            str = String.new
             re = /^[^:].*?(?:\R: .*)+/
             text.scan(re) do |match|
                 list = match.split(":")

data/lib/paperwork/tasks/middleman_template/lib/info_helpers.rb

@@ -20,6 +20,21 @@ module InfoHelpers
         end
     end
 
+    def relative_link(stringifyable, current_path=current_page.path)
+        relative = String.new
+        dots = current_path.split(/[\/\\]/).size - 1
+        dots.times{ relative += "../" }
+        # This has been some nasty part to debug...
+        # keep these comments for debugging session yet to come
+        # puts "##################################"
+        # puts "current_page.path: #{current_page.path}"
+        # puts "stringifyable: #{stringifyable.to_s}"
+        # puts "dots: #{dots}"
+        # puts "relative link: #{relative + stringifyable.to_s}"
+        # puts "##################################"
+        relative + stringifyable.to_s
+    end
+
     def site?
         data.respond_to?(:site)
     end
@@ -30,7 +45,12 @@ module InfoHelpers
 
     def navbar_links
         nav = data.site.navbar.links if navbar?
-        nav || {}
+        nav ||= {}
+        mapped = {}
+        nav.each do |name, link|
+            mapped[name] = relative_link(link)
+        end
+        mapped
     end
 
     def navbar_brand

data/lib/paperwork/tasks/root_helpers.rb

@@ -33,7 +33,7 @@ module Paperwork
                         <<~ROOT_HELPERS
                             module RootHelpers
                                 def root_path
-                                    "#{self.root}"
+                                    relative_link "#{self.root}"
                                 end
 
                                 def custom_css

data/lib/paperwork/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Paperwork
-    VERSION = "0.2.0"
+    VERSION = "0.2.5"
 end

data/{navdemo.md → nested_example/navdemo.md}

@@ -3,3 +3,6 @@ title: Linked
 ---
 
 # just a linked page for demonstrating navbar links
+
+
+[Back...](../README.md)

data/site.yml

@@ -4,4 +4,4 @@ navbar:
   brand: paperwork
   links:
     Home: README.md
-    Navbar Demo: navdemo.md
+    Navbar Demo: nested_example/navdemo.md

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperwork
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Tobias Schmid
@@ -161,7 +161,7 @@ files:
 - lib/paperwork/tasks/root_helpers.rb
 - lib/paperwork/tasks/template.rb
 - lib/paperwork/version.rb
-- navdemo.md
+- nested_example/navdemo.md
 - paperwork.gemspec
 - site.yml
 homepage: https://gitlab.com/couchbelag/paperwork