madness 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 476c5a098ba603805e53fa355f545eb3daaa7d692fc63a1793abb6f89fea7946
-  data.tar.gz: 0552adeb738418cc51ae4cd67caa12d3f577238bc95ac9f599945892df1c92ce
+  metadata.gz: 17e42d618e170958cf8b556c2271ddb7efeeae6e15144c5e5f4252cdb4708808
+  data.tar.gz: b4fc80231d2cdbc2834dab2a428a501371abbb3b7426984f20833b411314df6e
 SHA512:
-  metadata.gz: 98410335fb59c3795fe8a009c171a7099c06b7bdda6f54699e31e386bc264a74aa8d30bd8cc7a98902698d271d40bcb2b00a5228b3830d1b0e0ffcad5931e65b
-  data.tar.gz: 05aec5e799377845efdef6a70e3563ab1f47e1c702b15d177c63af781b0b397705d2526067f6eed7518d9d732bd075dfd360f4ea0aabff06b19b6fd4a5260e88
+  metadata.gz: 547e6b50b089cac0e4c01bc4938ea14a0cee3985c7dbdcf6bf01a7aa375a4f18f31d720c368918e595c4d03a2ef5f03b6ece929d260c90b523f90d2886b54af5
+  data.tar.gz: 5c72050811de28e4bf8174b1897f847a770f6eeb12844b741c81ca810ba1c345b353e7aac00194f7ca0c01493d5ba664539ae00bdbedb552b81bffec4c07d4f9

data/lib/madness/breadcrumbs.rb

@@ -15,7 +15,7 @@ module Madness
       path == "" ? [] : get_breadcrumbs
     end
 
-    private
+  private
 
     def get_breadcrumbs
       home = OpenStruct.new({ label: "Home", href: '/' })

data/lib/madness/command_line.rb

@@ -22,7 +22,7 @@ module Madness
       end
     end
 
-    private
+  private
 
     # Separate between the two main modes: Create something, or launch
     # the server.

data/lib/madness/directory.rb

@@ -14,7 +14,7 @@ module Madness
       @list ||= (dirs + files)
     end
 
-    private
+  private
 
     def files
       result = Dir["#{dir}/*.md"]

data/lib/madness/document.rb

@@ -47,19 +47,20 @@ module Madness
 
     # Return the HTML for that document, force re-read.
     def content!
-      type == :empty ? "<h1>#{title}</h1>" : markdown_to_html
+      [:empty, :missing].include?(type) ? "<h1>#{title}</h1>" : markdown_to_html
     end
 
-    private
+  private
 
     # Identify file, dir and type.
-    # :readme - in case the path is a directory, and it contains index.md
-    #           or README.md
-    # :file   - in case the path is a *.md file
-    # :empty  - in any other case, we don't know.
+    # :readme  - in case the path is a directory, and it contains index.md
+    #            or README.md
+    # :file    - in case the path is a *.md file
+    # :empty   - in case it is a folder without README.md or index.md
+    # :missing - in any other case, we don't know (will trigger 404)
     def set_base_attributes
       @dir  = docroot
-      @type = :empty
+      @type = :missing
       @file = ''
       @title = 'Index'
 

data/lib/madness/item.rb

@@ -14,7 +14,7 @@ module Madness
     end
 
     def href
-      URI.escape(path_without_extension.sub(/^#{docroot}/, ''))
+      path_without_extension.sub(/^#{docroot}/, '').to_href
     end
 
     def dir?
@@ -25,7 +25,7 @@ module Madness
       type == :file
     end
 
-    private
+  private
 
     def label!
       File.basename(path_without_extension).to_label

data/lib/madness/navigation.rb

@@ -22,7 +22,7 @@ module Madness
       @with_search ||= Search.new.has_index?
     end
 
-    private
+  private
 
     def directory
       @directory ||= Directory.new(dir)

data/lib/madness/refinements/string_refinements.rb

@@ -5,6 +5,10 @@ module Madness
         gsub regex, ''
       end
 
+      def to_href
+        URI.escape self
+      end
+
       def to_slug
         downcase.strip.gsub(' ', '-').remove(/[^\w-]/)
       end

data/lib/madness/search.rb

@@ -60,7 +60,7 @@ module Madness
       "#{@path}/_index"
     end
 
-    private
+  private
 
     # We are going to avoid indexing of README.md when there is also an
     # index.md in the same directory, to keep behavior consistent with the 

data/lib/madness/server.rb

@@ -4,6 +4,8 @@ module Madness
 
   # The Sinatra server
   class Server < ServerBase
+    using StringRefinements
+
     get '/_search' do
       query = params[:q]
       results = query ? Search.new.search(query) : false
@@ -33,7 +35,7 @@ module Madness
       content = doc.content
 
       if doc.type == :readme and !path.empty? and path[-1] != '/'
-        redirect "#{path}/"
+        redirect "#{path.to_href}/"
       end
 
       nav = Navigation.new dir
@@ -43,6 +45,8 @@ module Madness
         redirect to(nav.links.first.href)
       end
 
+      status 404 if doc.type == :missing
+
       slim :document, locals: { 
         content: content, 
         type: doc.type,

data/lib/madness/settings.rb

@@ -39,7 +39,7 @@ module Madness
       '.madness.yml'
     end
 
-    private
+  private
 
     def defaults
       {

data/lib/madness/table_of_contents.rb

@@ -18,7 +18,7 @@ module Madness
       @toc ||= toc!.join("\n")
     end
 
-    private
+  private
 
     def toc!(path=dir, indent=0)
       list = Directory.new(path).list

data/lib/madness/version.rb

@@ -1,3 +1,3 @@
 module Madness
-  VERSION = "0.7.6"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: madness
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-08 00:00:00.000000000 Z
+date: 2019-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay