madman 0.1.1 → 0.1.2

data/lib/madman/server.rb

@@ -1,30 +1,40 @@
 module Madman
-  class Server < Sinatra::Base
-    @@options = {}
-
-    def self.options(opts)
-      @@options = opts
-      set :bind, @@options[:bind]
-      set :port, @@options[:port]
-      set :public_folder, File.expand_path(File.dirname(@@options[:file]))
+  class Server < ServerBase
+    set :public_folder, -> { File.expand_path(settings.dir) }
+
+    before do
+      @renderer = settings.respond_to?(:renderer) ? settings.renderer : :default
     end
 
-    get '/' do
-      template.render doc.render
+    get '/favicon.ico' do
+      
     end
 
-    get '/github' do
-      template.render doc.render(:github)
+    get '/*' do
+      path = params[:splat].first
+
+      type, file = find_file(path)
+      redirect "#{path}/" if type == :dir and path[-1] != '/'
+
+      @doc = Document.from_file file 
+      slim :template
     end
 
     private
 
-    def doc
-      Madman::Document.from_file @@options[:file]
-    end
+    def find_file(path)
+      type = :file
+      file = File.expand_path path, settings.dir
+
+      if File.directory? file
+        type = path.empty? ? :root : :dir
+        file ="#{file}/README.md"
+      else
+        file ="#{file}.md"
+      end
 
-    def template
-      Madman::Template.new :default, rtl: @@options[:rtl]
+      [type, file]
     end
+
   end
 end

data/lib/madman/server_base.rb

@@ -0,0 +1,12 @@
+module Madman
+  class ServerBase < Sinatra::Base
+    set :views, File.expand_path('../views', __dir__)
+    
+    Slim::Engine.set_options pretty: true
+    
+    configure :development do
+      register Sinatra::Reloader
+      also_reload "#{__dir__}/*.rb"
+    end
+  end
+end

data/lib/madman/version.rb

@@ -1,3 +1,3 @@
 module Madman
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/madman.rb

@@ -1,10 +1,20 @@
 require 'commonmarker'
 require 'octokit'
 require 'sinatra/base'
+require 'sinatra/reloader'
+require 'slim'
+require 'string-direction'
 
+require 'madman/injector'
+
+require 'madman/directory'
 require 'madman/document'
+require 'madman/item'
 require 'madman/renderers'
+require 'madman/navigation'
+
+require 'madman/server_base'
+require 'madman/preview_server'
 require 'madman/server'
-require 'madman/template'
 
 require 'byebug' if ENV['BYEBUG']

data/lib/views/template.slim

@@ -0,0 +1,25 @@
+doctype html
+html
+  head
+    meta name="viewport" content="width=device-width, initial-scale=1"
+
+  body
+    link href='https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/2.10.0/github-markdown.min.css' rel='stylesheet' type='text/css'
+
+    css:
+      .markdown-body {
+        box-sizing: border-box;
+        min-width: 200px;
+        max-width: 980px;
+        margin: 0 auto;
+        padding: 45px;
+      }
+
+      @media (max-width: 767px) {
+        .markdown-body {
+          padding: 15px;
+        }
+      }
+
+    article class="markdown-body" dir=('rtl' if @doc.rtl?)
+      == @doc.render @renderer

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: madman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-19 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: commonmarker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: mister_bin
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: commonmarker
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: string-direction
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: lp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +294,8 @@ description: A command line utility for markdown fun
 email: db@dannyben.com
 executables:
 - madman
+- madman-nav.rb
+- madman-preview.rb
 - madman-render.rb
 - madman-serve.rb
 extensions: []
@@ -245,18 +303,24 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/madman
+- bin/madman-nav.rb
+- bin/madman-preview.rb
 - bin/madman-render.rb
 - bin/madman-serve.rb
 - lib/madman.rb
+- lib/madman/directory.rb
 - lib/madman/document.rb
+- lib/madman/injector.rb
+- lib/madman/item.rb
+- lib/madman/navigation.rb
+- lib/madman/preview_server.rb
 - lib/madman/renderers.rb
 - lib/madman/renderers/default.rb
 - lib/madman/renderers/github.rb
 - lib/madman/server.rb
-- lib/madman/template.rb
+- lib/madman/server_base.rb
 - lib/madman/version.rb
-- lib/templates/css.css
-- lib/templates/template.html
+- lib/views/template.slim
 homepage: https://github.com/dannyben/madman
 licenses:
 - MIT

data/lib/madman/template.rb

@@ -1,45 +0,0 @@
-module Madman
-  class Template
-    attr_reader :file, :options, :content
-
-    def initialize(file, options=nil)
-      @file = file.is_a?(Symbol) ? presets[file] : file
-      @options = options || {}
-    end
-
-    def render(content)
-      @content = content
-      template % replacements
-    end
-
-    private
-
-    def replacements
-      result = {
-        content: content,
-        inline_css: css,
-        body_attributes: ''
-      }
-      result[:body_attributes] = "dir='rtl'" if options[:rtl]
-      result
-    end
-
-    def template
-      @template ||= File.read file
-    end
-
-    def css
-      @css ||= File.read css_file
-    end
-
-    def presets
-      {
-        default: File.expand_path('../templates/template.html', __dir__)
-      }
-    end
-
-    def css_file 
-      @css_file ||= File.expand_path('../templates/css.css', __dir__)
-    end
-  end
-end