madness 1.1.2 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 374e643da9e1c6fe4f6f0166bddd4f590b974e83bd0e8771ce6825171ed5c90b
-  data.tar.gz: 5c37a04d04cc735c5b67ced49505193e75d735312fd91e7a31e6064e92f72f48
+  metadata.gz: 76896d82203c749d37aa6bb4a321deee5e544f9763ff9ab9544bd28ae90c613d
+  data.tar.gz: a1a8c4093bc5dbef67489096658f057860945125c6de6e5376f362287b207be2
 SHA512:
-  metadata.gz: 553ec42ee241e5272e789e3dcd18be0e896c52c97419d28b7c419a769cb7c4934cbc426ded181f550473acb4b84f459ab80235046424ab9f834b7da4d6b37290
-  data.tar.gz: 197c7d750d44ef8e9bdefca0842cc63d30a43fae815a8f56ac53fbcb89fbb8f9f178a1b4cf4173fabee0883e625ee5002d5bd27d1138c1b24ff7451a2d621062
+  metadata.gz: 7a0e267fcdd6e0568f348e03d2b67b99e3bbc7ca6cbc7eefef3d8f00f1661b5193c281800520fa7b4ad266083eb174dc62d65314d1a6883e91d986e5e6719203
+  data.tar.gz: 55db2eb7681263246b3fbae1881c811e62c5d39974439ad7279ecf6ba48c43c6e69d18866c09e9d110aa3e26674ec127e251343f88ccdc8d9da3a5926359b182

data/README.md

@@ -78,9 +78,6 @@ Madness expects to be executed in a documentation directory.
 A documentation directory contains only markdown files (`*.md`) and sub
 directories that contain more markdown files.
 
-The server will consider the file `index.md` or `README.md` in any directory as
-the main file describing this directory, where `index.md` has priority.
-
 The navigation sidebar will show all the sub directories and files in the same
 directory as the viewed file.
 
@@ -129,6 +126,11 @@ bind: 0.0.0.0
 # base_uri: /docs
 base_uri: ~
 
+# choose navigation sort order:
+# sort_order: dirs_first     # alphabetic directories then alphabetic files
+# sort_order: mixed          # alphabetic regardless of type
+sort_order: dirs_first
+
 # enable sidebar
 sidebar: true
 
@@ -195,6 +197,23 @@ exclude: ['^[a-z_\-0-9]+$']
 
 ## Features
 
+### Cover Pages
+
+Cover pages are specially named markdown files that serve as the introduction
+to the contents of a specific directory.
+
+The server will consider any of the following files as cover pages (prioritized):
+
+- A markdown file with the same name as the directory (adjacent to it).
+- `index.md`
+- `README.md`
+
+For example, for a directory named "API Documentation":
+
+- `/API Documentation.md`
+- `/API Documentation/index.md`
+- `/API Documentation/README.md`
+
 ### Search
 
 Madness comes with a full text search page.
@@ -286,6 +305,9 @@ will be omitted when they are displayed.
 └── 2. Another file or folder
 ```
 
+Note that by default, directories will appear above files. If you wish to
+change this, set `sort_order: mixed` in your configuration file.
+
 ### Displaying Additional File Types
 
 If you wish the navigation and search features to also show other documents
@@ -384,14 +406,26 @@ $ alias madness='docker run --rm -it -v $PWD:/docs -p 3000:3000 dannyben/madness
 $ madness --help
 ```
 
+or use docker compose:
+
+```yaml
+# docker-compose.yml
+services:
+  web:
+    image: dannyben/madness
+    volumes: [".:/docs"]
+    ports: ["3000:3000"]
+    command: server
+```
+
 For more information about the docker image, see:
 
 - [Madness image on Docker Hub][dockerhub]
-- [Madness Dockerfile and Docker Compose][dockerfile]
+- [Madness Dockerfile][dockerfile]
 
 
 [dockerhub]: https://hub.docker.com/r/dannyben/madness/
-[dockerfile]: https://github.com/DannyBen/docker-madness
+[dockerfile]: https://github.com/DannyBen/madness/blob/master/Dockerfile
 [css]: https://github.com/DannyBen/madness/blob/master/app/public/css/main.css
 [sasstool]: https://github.com/DannyBen/sasstool
 

data/lib/madness/directory.rb

@@ -3,6 +3,7 @@ module Madness
   class Directory
     include ServerHelper
     using ArrayRefinements
+    using StringRefinements
 
     attr_reader :dir
 
@@ -17,17 +18,22 @@ module Madness
   private
 
     def files
-      result = Dir["#{dir}/#{config.dir_glob}"]
-      result.reject! do |f|
-        ['README.md', 'index.md'].include? File.basename(f)
+      @files ||= begin
+        result = Dir["#{dir}/#{config.dir_glob}"]
+        result.reject! do |f|
+          ['README.md', 'index.md'].include? File.basename(f)
+        end
+        result.reject! { |f| is_cover_page? f }
+        result.nat_sort.map { |path| Item.new path, :file }
       end
-      result.nat_sort.map { |path| Item.new path, :file }
     end
 
     def dirs
-      result = Dir["#{dir}/*"].select { |f| File.directory? f }
-      result.reject! { |f| exclude? f }
-      result.nat_sort.map { |path| Item.new path, :dir }
+      @dirs ||= begin
+        result = Dir["#{dir}/*"].select { |f| File.directory? f }
+        result.reject! { |f| exclude? f }
+        result.nat_sort.map { |path| Item.new path, :dir }
+      end
     end
 
     def exclude?(path)
@@ -40,6 +46,14 @@ module Madness
       false
     end
 
+    def is_cover_page?(path)
+      dir_paths.include? path.remove(/\.md$/)
+    end
+
+    def dir_paths
+      @dir_paths ||= dirs.map(&:path)
+    end
+
     def config
       @config ||= Settings.instance
     end

data/lib/madness/document.rb

@@ -55,10 +55,8 @@ module Madness
       @dir  = base
       @type = :readme
 
-      if File.exist? "#{base}/index.md"
-        @file = "#{base}/index.md"
-      elsif File.exist? "#{base}/README.md"
-        @file = "#{base}/README.md"
+      if cover_page
+        @file = cover_page
       else
         @type = :empty
       end
@@ -79,5 +77,25 @@ module Madness
     def md_filename
       File.extname(base) == '.md' ? base : "#{base}.md"
     end
+
+    def cover_page
+      @cover_page ||= cover_page!
+    end
+
+    def cover_page!
+      cover_page_candidates.each do |candidate|
+        return candidate if File.exist? candidate
+      end
+
+      nil
+    end
+
+    def cover_page_candidates
+      @cover_page_candidates ||= [
+        File.expand_path("../#{File.basename(base)}.md", base),
+        File.expand_path('index.md', base),
+        File.expand_path('README.md', base),
+      ]
+    end
   end
 end

data/lib/madness/navigation.rb

@@ -2,6 +2,7 @@ module Madness
   # Handle the navigation links for a given directory
   class Navigation
     include ServerHelper
+    using ArrayRefinements
     using StringRefinements
 
     attr_reader :dir
@@ -11,7 +12,11 @@ module Madness
     end
 
     def links
-      @links ||= directory.list
+      @links ||= if config.sort_order == 'mixed'
+        directory.list.nat_sort(by: :href)
+      else
+        directory.list
+      end
     end
 
     def caption
@@ -27,5 +32,9 @@ module Madness
     def directory
       @directory ||= Directory.new(dir)
     end
+
+    def config
+      Settings.instance
+    end
   end
 end

data/lib/madness/refinements/array_refinements.rb

@@ -3,8 +3,8 @@ require 'naturally'
 module Madness
   module ArrayRefinements
     refine Array do
-      def nat_sort
-        Naturally.sort self
+      def nat_sort(by: nil)
+        Naturally.sort self, by: by
       end
     end
   end

data/lib/madness/server_base.rb

@@ -16,7 +16,7 @@ module Madness
     set :static, false
 
     # Since we cannot use any config values in the main body of the class,
-    # since they will be updated later, we need to set anything that relys
+    # since they will be updated later, we need to set anything that relies
     # on the config values just before running the server.
     # The CommandLine class and the test suite should both call
     # `Server.prepare` before calling Server.run!

data/lib/madness/settings.rb

@@ -15,7 +15,7 @@ module Madness
       reset
     end
 
-    def method_missing(name, *args, &_blk)
+    def method_missing(name, *args, &_block)
       name_string = name.to_s
 
       if name_string.end_with? '='
@@ -57,6 +57,7 @@ module Madness
         port:              3000,
         bind:              '0.0.0.0',
         base_uri:          nil,
+        sort_order:        'dirs_first',
         sidebar:           true,
         auto_h1:           true,
         auto_nav:          true,

data/lib/madness/templates/madness.yml

@@ -15,6 +15,11 @@ bind: 0.0.0.0
 # base_uri: /docs
 base_uri: ~
 
+# choose navigation sort order:
+# sort_order: dirs_first     # alphabetic directories then alphabetic files
+# sort_order: mixed          # alphabetic regardless of type
+sort_order: dirs_first
+
 # enable sidebar
 sidebar: true
 

data/lib/madness/version.rb

@@ -1,3 +1,3 @@
 module Madness
-  VERSION = '1.1.2'
+  VERSION = '1.1.5'
 end

data/lib/madness.rb

@@ -1,11 +1,8 @@
-if ENV['BYEBUG']
-  require 'byebug'
-  require 'lp'
-end
-
 require 'requires'
 
 requires 'madness/refinements'
 requires 'madness/settings'
 requires 'madness/server_helper'
 requires 'madness'
+
+require 'debug' rescue nil if ENV['DEBUGGER']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: madness
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.5
 platform: ruby
 authors:
 - Danny Ben Shitrit
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -28,22 +28,16 @@ dependencies:
   name: colsole
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: extended_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +114,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -166,16 +174,22 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -280,7 +294,7 @@ metadata:
   homepage_uri: https://madness.dannyb.co/
   source_code_uri: https://github.com/DannyBen/madness
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -295,8 +309,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
 summary: Instant Markdown Server
 test_files: []