Merge pull request #66 from trileuco/master

Allow request md files with or without the .md extension

lib/madness/document.rb

@@ -66,9 +66,9 @@ def set_base_attributes
       if File.directory? base
         @title = File.basename(path).to_label unless path.empty?
         set_base_attributes_for_directory
-      elsif File.exist? "#{base}.md"
+      elsif md_file?
+        @file = md_filename
         @title = File.basename(base).to_label
-        @file = "#{base}.md"
         @dir  = File.dirname file
         @type = :file
       end
@@ -138,6 +138,14 @@ def syntax_highlight(html)
         CodeRay.scan(code, lang).html opts
       end
     end
+
+    def md_file?
+      File.exist?("#{base}.md") || (File.exist?(base) && File.extname(base) == '.md')
+    end
+
+    def md_filename
+      File.extname(base) == '.md' ? base : "#{base}.md"
+    end
   end
 end
 

lib/madness/refinements/string_refinements.rb

@@ -12,7 +12,7 @@ def to_slug
       # just removes any numbers followed by a dot at the beginning of the 
       # string, in order to allow "The Invisible Sorting Hand".
       def to_label
-        gsub(/^\d+\.\s+/, '')
+        gsub(/^\d+\.\s+/, '').gsub(/\.md$/, '')
       end
     end
   end

lib/madness/server_base.rb

@@ -29,7 +29,7 @@ class ServerBase < Sinatra::Application
     # The CommandLine class and the test suite should both call
     # `Server.prepare` before calling Server.run!
     def self.prepare
-      use Rack::TryStatic, root: "#{config.path}/", :urls => %w[/]
+      use Madness::Static, root: "#{config.path}/", :urls => %w[/]
       set :bind, config.bind
       set :port, config.port
 

lib/madness/static.rb

@@ -0,0 +1,22 @@
+module Madness
+
+  # The Madness::Static middleware delegates requests to Rack::TryStatic middleware
+  # trying to match a static file when the request doesn't finish with ".md"
+
+  class Static
+
+    def initialize(app, options)
+      @app = app
+      @static = ::Rack::TryStatic.new(app, options)
+    end
+
+    def call(env)
+      orig_path = env['PATH_INFO']
+      if orig_path.end_with? ".md"
+        @app.call(env)
+      else
+        @static.call(env)
+      end
+    end
+  end
+end

spec/madness/document_spec.rb

@@ -119,7 +119,35 @@
       describe '#title' do
         it 'returns proper title' do
           expect(subject.title).to eq 'File'
-        end        
+        end
+      end
+    end
+
+    context "with a file.md" do
+      subject { described_class.new "Folder/File.md" }
+
+      describe '#type' do
+        it 'returns :file' do
+          expect(subject.type).to eq :file
+        end
+      end
+
+      describe '#file' do
+        it 'returns full path to file' do
+          expect(subject.file).to end_with 'Folder/File.md'
+        end
+      end
+
+      describe '#dir' do
+        it 'returns full path to directory' do
+          expect(subject.dir).to end_with "#{config.path}/Folder"
+        end
+      end
+
+      describe '#title' do
+        it 'returns proper title' do
+          expect(subject.title).to eq 'File'
+        end
       end
     end
 

spec/madness/server_spec.rb

@@ -95,6 +95,23 @@
       end
     end
 
+    context "with a nested file with .md extension" do
+      it "works" do
+        get '/Folder/File.md'
+        expect(last_response).to be_ok
+        expect(last_response.body).to have_tag 'h1', text: "Nested File #1"
+      end
+
+      it "shows breadcrumbs" do
+        get '/Folder/File.md'
+        expect(last_response.body).to have_tag '.breadcrumbs' do
+          with_tag 'a', text: 'Home'
+          with_tag 'a', text: 'Folder'
+          with_tag 'span', text: 'File'
+        end
+      end
+    end
+
     context "in an empty folder" do
       it "shows index" do
         get '/Empty%20Folder'