servel 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bbb0f367b145394675e204c7a80df6418b6bbb2
-  data.tar.gz: 6070307eafbfe804dd06539c736a95c0991c93b3
+  metadata.gz: 6b04f7ed035910d2308b11a3ca5cde78e3e5464f
+  data.tar.gz: aa266ba4e42980678226a9aad763ef23fef31f67
 SHA512:
-  metadata.gz: 865cdba7e39632c9b242d6d7961f2a17940a9b509a158e9d120f9f15fe26c1a0986cd9bce0e6f3e40880d528aa96a50e36de67ae7f6d2619a4f1f20145809caf
-  data.tar.gz: 07d88d0349d4e20e2eb42cad1003b91679a276c37b9105015c6b792b76b01688b8b75842c8626921d3a717465ba5bdb7451d49749b7e3a6243c38c505fc67f3d
+  metadata.gz: 61c466680fffedef13a2a2e9d996379a7c1d98d356b0d8eb044e358e89100bcce1baa1105a2d0c2acd5f463fa087e5b85a29e091552c26f0342ad365bda404e9
+  data.tar.gz: 4fa87e8bcdd2b192517f32d21272da99002e242b29a2e01fcb7f6b05aa59b333b44ba5d3940786722156d03a4e47f82f5652617b7f202c08b808bd99332f35f3

data/lib/servel.rb

@@ -1,27 +1,26 @@
-require 'rack'
-require 'rack/handler/puma'
-require 'haml'
-require 'naturalsorter'
-require 'active_support/all'
-
-require 'json'
-require 'pathname'
-require 'delegate'
-
-module Servel
-  def self.build_app(path_map)
-    url_map = path_map.map { |root, url_root| [url_root, Servel::App.new(root)] }.to_h
-    url_map["/"] = Servel::HomeApp.new(path_map.values) unless url_map.keys.include?("/")
-
-    Rack::URLMap.new(url_map)
-  end
-end
-
-require "servel/version"
-require "servel/path"
-require "servel/path_builder"
-require "servel/haml_context"
-require "servel/locals"
-require "servel/app"
-require "servel/home_app"
-require "servel/cli"
+require 'rack'
+require 'rack/handler/puma'
+require 'haml'
+require 'naturalsorter'
+require 'active_support/all'
+
+require 'thread'
+require 'pathname'
+
+module Servel
+  def self.build_app(path_map)
+    url_map = path_map.map { |root, url_root| [url_root, Servel::App.new(root)] }.to_h
+    url_map["/"] = Servel::HomeApp.new(path_map.values) unless url_map.keys.include?("/")
+
+    Rack::URLMap.new(url_map)
+  end
+end
+
+require "servel/version"
+require "servel/entry"
+require "servel/entry_factory"
+require "servel/haml_context"
+require "servel/index"
+require "servel/app"
+require "servel/home_app"
+require "servel/cli"

data/lib/servel/app.rb

@@ -18,7 +18,7 @@ class Servel::App
 
     return [404, {}, []] unless fs_path.exist?
 
-    index(Servel::Locals.new(url_root: url_root, url_path: url_path, fs_path: fs_path))
+    Servel::Index.new(url_root: url_root, url_path: url_path, fs_path: fs_path).render
   end
 
   def redirect(location)
@@ -30,11 +30,4 @@ class Servel::App
     raise unless Rack::Utils.valid_path?(url_path)
     Rack::Utils.clean_path_info(url_path)
   end
-
-  def index(locals)
-    @haml_context ||= Servel::HamlContext.new
-    body = @haml_context.render('index.haml', locals.resolve)
-
-    [200, {}, [body]]
-  end
 end

data/lib/servel/entry.rb

@@ -0,0 +1,18 @@
+class Servel::Entry
+  attr_reader :type, :media_type, :listing_classes, :icon, :href, :name, :size, :mtime
+
+  def initialize(type:, media_type: nil, listing_classes:, icon:, href:, name:, size: nil, mtime: nil)
+    @type = type
+    @media_type = media_type
+    @listing_classes = listing_classes
+    @icon = icon
+    @href = href
+    @name = name
+    @size = size
+    @mtime = mtime
+  end
+
+  def media?
+    !@media_type.nil?
+  end
+end

data/lib/servel/{path_builder.rb → entry_factory.rb}

@@ -1,14 +1,39 @@
-class Servel::PathBuilder
+class Servel::EntryFactory
   IMAGE_EXTS = %w(.jpg .jpeg .png .gif)
   VIDEO_EXTS = %w(.webm .mp4 .mkv)
   AUDIO_EXTS = %w(.mp3 .m4a .wav)
+  TEXT_EXTS = %w(.txt)
+
+  def self.top(href)
+    Servel::Entry.new(
+      type: "Dir",
+      listing_classes: "top directory",
+      icon: "🔝",
+      href: href,
+      name: "Top Directory"
+    )
+  end
+
+  def self.parent(href)
+    Servel::Entry.new(
+      type: "Dir",
+      listing_classes: "parent directory",
+      icon: "⬆️",
+      href: href,
+      name: "Parent Directory"
+    )
+  end
+
+  def self.for(path)
+    new(path).entry
+  end
 
   def initialize(path)
     @path = Pathname.new(path)
   end
 
-  def build
-    Servel::Path.new(
+  def entry
+    Servel::Entry.new(
       type: type,
       media_type: media_type,
       listing_classes: listing_classes,
@@ -40,6 +65,8 @@ class Servel::PathBuilder
       :video
     when *AUDIO_EXTS
       :audio
+    when *TEXT_EXTS
+      :text
     else
       nil
     end

data/lib/servel/haml_context.rb

@@ -2,10 +2,14 @@ class Servel::HamlContext
   include ActiveSupport::NumberHelper
 
   ENGINE_OPTIONS = { remove_whitespace: true, escape_html: true, ugly: true }
+  LOCK = Mutex.new
 
-  def initialize()
+  def self.render(template, locals)
+    [200, {}, [new.render(template, locals)]]
+  end
+
+  def initialize
     @build_path = Pathname.new(__FILE__).dirname.realpath + 'templates'
-    @haml_engine_cache = {}
   end
 
   def render(template, locals = {})
@@ -21,9 +25,12 @@ class Servel::HamlContext
   end
 
   def haml_engine(path)
-    unless @haml_engine_cache.key?(path)
-      @haml_engine_cache[path] = Haml::Engine.new(include(path), ENGINE_OPTIONS.merge(filename: path))
+    LOCK.synchronize do
+      @@haml_engine_cache ||= {}
+      unless @@haml_engine_cache.key?(path)
+        @@haml_engine_cache[path] = Haml::Engine.new(include(path), ENGINE_OPTIONS.merge(filename: path))
+      end
+      @@haml_engine_cache[path]
     end
-    @haml_engine_cache[path]
   end
 end

data/lib/servel/home_app.rb

@@ -1,12 +1,12 @@
 class Servel::HomeApp
+  FAVICON_PATH = "/favicon.ico"
+
   def initialize(roots)
     @roots = roots
   end
 
   def call(env)
-    @haml_context ||= Servel::HamlContext.new
-    body = @haml_context.render('home.haml', { roots: @roots })
-
-    [200, {}, [body]]
+    return [404, {}, []] if env["PATH_INFO"] == FAVICON_PATH
+    Servel::HamlContext.render('home.haml', { roots: @roots })
   end
 end

data/lib/servel/{locals.rb → index.rb}

@@ -1,41 +1,41 @@
-class Servel::Locals
-  def initialize(url_root:, url_path:, fs_path:)
-    @url_root = url_root
-    @url_path = url_path
-    @fs_path = fs_path
-  end
-
-  def resolve
-    {
-      url_root: @url_root,
-      url_path: @url_path,
-      directories: directories,
-      files: files
-    }
-  end
-
-  def directories
-    list = @fs_path.children.select { |child| child.directory? }
-    list = sort_paths(list).map { |path| build(path) }
-
-    unless @url_path == "/"
-      list.unshift(Servel::Path.parent("../"))
-      list.unshift(Servel::Path.top(@url_root == "" ? "/" : @url_root))
-    end
-
-    list
-  end
-
-  def build(path)
-    Servel::PathBuilder.new(path).build
-  end
-
-  def files
-    list = @fs_path.children.select { |child| child.file? }
-    sort_paths(list).map { |path| build(path) }
-  end
-
-  def sort_paths(paths)
-    Naturalsorter::Sorter.sort(paths.map(&:to_s), true).map { |path| Pathname.new(path) }
-  end
+class Servel::Index
+  def initialize(url_root:, url_path:, fs_path:)
+    @url_root = url_root
+    @url_path = url_path
+    @fs_path = fs_path
+  end
+
+  def render
+    Servel::HamlContext.render('index.haml', locals)
+  end
+
+  def locals
+    {
+      url_root: @url_root,
+      url_path: @url_path,
+      directories: directories,
+      files: files
+    }
+  end
+
+  def directories
+    list = @fs_path.children.select { |child| child.directory? }
+    list = sort_paths(list).map { |path| Servel::EntryFactory.for(path) }
+
+    unless @url_path == "/"
+      list.unshift(Servel::EntryFactory.parent("../"))
+      list.unshift(Servel::EntryFactory.top(@url_root == "" ? "/" : @url_root))
+    end
+
+    list
+  end
+
+  def files
+    list = @fs_path.children.select { |child| child.file? }
+    sort_paths(list).map { |path| Servel::EntryFactory.for(path) }
+  end
+
+  def sort_paths(paths)
+    Naturalsorter::Sorter.sort(paths.map(&:to_s), true).map { |path| Pathname.new(path) }
+  end
 end

data/lib/servel/templates/_gallery.haml

@@ -1,6 +1,9 @@
 %img#image
 %video#video{autoplay: true, controls: true}
 %audio#audio{autoplay: true, controls: true}
+#text
+  %a#text-anchor{href: '#'}
+  #text-content
 #page-back.paginator ◀
 #page-next.paginator ▶
 #page-back-10.paginator ◀◀

data/lib/servel/templates/css/gallery-text.css

@@ -0,0 +1,39 @@
+#text-content {
+  max-width: 1000px;
+  margin: 0 auto 0 auto;
+  padding: 30px;
+}
+
+#text-content p {
+  margin-top: 0;
+  margin-bottom: 1.2em;
+}
+
+#text-content h1, #text-content h2, #text-content h3, #text-content h4, #text-content h5, #text-content h6 {
+  margin-top: 0;
+  margin-bottom: 0.6em;
+}
+
+#text-content h1 {
+  font-size: 36px;
+}
+
+#text-content h2 {
+  font-size: 26px;
+}
+
+#text-content h3 {
+  font-size: 22px;
+}
+
+#text-content h4 {
+  font-size: 18px;
+}
+
+#text-content h5 {
+  font-size: 16px;
+}
+
+#text-content h6 {
+  font-size: 16px;
+}

data/lib/servel/templates/{gallery.css → css/gallery.css}

@@ -3,7 +3,7 @@
   transform: translateZ(0px);
 }
 
-#image, #video, #audio {
+#image, #video, #audio, #text {
   display: none;
   max-width: 100%;
   margin: 0 auto 0 auto;
@@ -13,8 +13,14 @@
   width: 100%;
 }
 
+#text {
+  overflow: auto;
+  color: #000000;
+  background-color: #ffffff;
+}
+
 @media (min-width: 992px) {
-  #image, #video, #audio {
+  #image, #video, #audio, #text {
     max-height: 100%;
   }
 }
@@ -39,6 +45,14 @@
   display: block;
 }
 
+#gallery.text {
+  padding: 0 100px;
+}
+
+#gallery.text #text {
+  display: block;
+}
+
 .paginator {
   position: fixed;
   width: 100px;

data/lib/servel/templates/home.haml

@@ -5,9 +5,9 @@
     %title Browse Listings
     %meta{name: 'viewport', content: 'width=device-width, height=device-height, user-scalable=no'}
     :css
-      #{include('normalize.css')}
-      #{include('common.css')}
-      #{include('home.css')}
+      #{include('css/normalize.css')}
+      #{include('css/common.css')}
+      #{include('css/home.css')}
   %body
     #home
       %h1 Browse Listings

data/lib/servel/templates/index.haml

@@ -5,14 +5,16 @@
     %title Listing of #{url_root}#{url_path}
     %meta{name: 'viewport', content: 'width=device-width, height=device-height, user-scalable=no'}
     :css
-      #{include('normalize.css')}
-      #{include('common.css')}
-      #{include('index.css')}
-      #{include('listing.css')}
-      #{include('gallery.css')}
+      #{include('css/normalize.css')}
+      #{include('css/common.css')}
+      #{include('css/index.css')}
+      #{include('css/listing.css')}
+      #{include('css/gallery.css')}
+      #{include('css/gallery-text.css')}
 
     :javascript
-      #{include('gallery.js')}
+      #{include('js/ume.js')}
+      #{include('js/gallery.js')}
   %body
     - if files.any? { |f| f.media? }
       #gallery!= partial('gallery')

data/lib/servel/templates/{gallery.js → js/gallery.js}

@@ -1,3 +1,5 @@
+var $;
+
 var Gallery = (function() {
   var urls = [];
   var types = [];
@@ -13,15 +15,33 @@ var Gallery = (function() {
     }
   }
 
+  function renderText(url) {
+    var http = new XMLHttpRequest();
+    http.open("GET", url, true);
+    http.onload = function() {
+      $("#text-content").innerHTML = ume(http.responseText);
+      $("#text").scrollTop = 0;
+      $("#text-anchor").focus();
+    }
+    http.send();
+  }
+
   function render() {
     var url = urls[currentIndex];
     var type = types[currentIndex];
 
-    var galleryElement = document.querySelector("#gallery");
-    galleryElement.classList.remove("image", "video", "audio");
-    galleryElement.classList.add(type);
+    var $gallery = $("#gallery");
+    $gallery.classList.remove("image", "video", "audio", "text");
+    $gallery.classList.add(type);
 
-    document.getElementById(type).src = url;
+    if(type == "text") {
+      renderText(url);
+    }
+    else {
+      var $element = $("#" + type);
+      $element.src = url;
+      $element.focus();
+    }
 
     window.scrollTo(0, 0);
 
@@ -128,7 +148,8 @@ var Gallery = (function() {
 })();
 
 function initGallery() {
-  if(!document.querySelector("#gallery")) return;
+  $ = document.querySelector.bind(document);
+  if(!$("#gallery")) return;
   Gallery.init();
 }
 

data/lib/servel/templates/js/ume.js

@@ -0,0 +1,63 @@
+var ume = (function() {
+  function normalise(text) {
+    return text.replace(/\s+/g, " ").trim();
+  }
+
+  function escapeEntities(text) {
+    return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+  }
+
+  const BOLD_ITALIC_REGEX = /(?:(\W|^)(\*)|(\*)(\W|$)|(\W|^)(_)|(_)(\W|$))/;
+
+  function parseInlines(text) {
+    const parts = text.split(BOLD_ITALIC_REGEX);
+
+    if(parts.filter(function(part) { return part == "*"; }).length % 2 != 0) return text;
+    if(parts.filter(function(part) { return part == "_"; }).length % 2 != 0) return text;
+
+    var inBold = false;
+    var inItalic = false;
+    var html = [];
+
+    for(const part of parts) {
+      if(part == "*") {
+        inBold = !inBold;
+        html.push(inBold ? "<b>" : "</b>"); //Note that in_bold has been inverted, so this is inverted as well
+      }
+      else if(part == "_") {
+        inItalic = !inItalic;
+        html.push(inItalic ? "<i>" : "</i>"); //Note that in_italic has been inverted, so this is inverted as well
+      }
+      else {
+        html.push(part);
+      }
+    }
+
+    return html.join("");
+  }
+
+  function parseHeading(text) {
+    const parts = text.match(/^(#+) (.*)$/);
+    return "<h" + parts[1].length + ">" + parseInlines(parts[2]) + "</h" + parts[1].length + ">";
+  }
+
+  function parseParagraph(text) {
+    return "<p>" + parseInlines(text) + "</p>";
+  }
+
+  return function(text) {
+    const nodes = text.split(/(\r?\n){2,}/g);
+    var html = [];
+
+    for(const node of nodes) {
+      const cleanedNode = escapeEntities(normalise(node));
+
+      if(cleanedNode.startsWith("#")) html.push(parseHeading(cleanedNode));
+      else html.push(parseParagraph(cleanedNode));
+    }
+
+    return html.join("");
+  }
+})();
+
+if(typeof module === "object" && typeof module.exports === "object") module.exports = ume;

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/servel.gemspec

@@ -1,31 +1,31 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "servel/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "servel"
-  spec.version       = Servel::VERSION
-  spec.authors       = ["Brenton \"B-Train\" Fletcher"]
-  spec.email         = ["i@bloople.net"]
-
-  spec.summary       = %q{Serves files and directories over HTTP.}
-  spec.description   = %q{Serves files and directories over HTTP.}
-  spec.homepage      = "http://bloople.net/"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "bin"
-  spec.executables   = "servel"
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_dependency "rack", "~> 2.0"
-  spec.add_dependency "puma"
-  spec.add_dependency "naturalsorter"
-  spec.add_dependency "haml", "~> 4"
-  spec.add_dependency "activesupport"
-end
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "servel/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "servel"
+  spec.version       = Servel::VERSION
+  spec.authors       = ["Brenton \"B-Train\" Fletcher"]
+  spec.email         = ["i@bloople.net"]
+
+  spec.summary       = %q{Serves files and directories over HTTP.}
+  spec.description   = %q{Serves files and directories over HTTP.}
+  spec.homepage      = "http://bloople.net/"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "bin"
+  spec.executables   = "servel"
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_dependency "rack", "~> 2.0"
+  spec.add_dependency "puma"
+  spec.add_dependency "naturalsorter"
+  spec.add_dependency "haml", "~> 4"
+  spec.add_dependency "activesupport"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,22 +127,24 @@ files:
 - lib/servel.rb
 - lib/servel/app.rb
 - lib/servel/cli.rb
+- lib/servel/entry.rb
+- lib/servel/entry_factory.rb
 - lib/servel/haml_context.rb
 - lib/servel/home_app.rb
-- lib/servel/locals.rb
-- lib/servel/path.rb
-- lib/servel/path_builder.rb
+- lib/servel/index.rb
 - lib/servel/templates/_gallery.haml
 - lib/servel/templates/_listing.haml
-- lib/servel/templates/common.css
-- lib/servel/templates/gallery.css
-- lib/servel/templates/gallery.js
-- lib/servel/templates/home.css
+- lib/servel/templates/css/common.css
+- lib/servel/templates/css/gallery-text.css
+- lib/servel/templates/css/gallery.css
+- lib/servel/templates/css/home.css
+- lib/servel/templates/css/index.css
+- lib/servel/templates/css/listing.css
+- lib/servel/templates/css/normalize.css
 - lib/servel/templates/home.haml
-- lib/servel/templates/index.css
 - lib/servel/templates/index.haml
-- lib/servel/templates/listing.css
-- lib/servel/templates/normalize.css
+- lib/servel/templates/js/gallery.js
+- lib/servel/templates/js/ume.js
 - lib/servel/version.rb
 - servel.gemspec
 homepage: http://bloople.net/

data/lib/servel/path.rb

@@ -1,38 +0,0 @@
-class Servel::Path
-  attr_reader :type, :media_type, :listing_classes, :icon, :href, :name, :size, :mtime
-
-  def initialize(type:, media_type: nil, listing_classes:, icon:, href:, name:, size: nil, mtime: nil)
-    @type = type
-    @media_type = media_type
-    @listing_classes = listing_classes
-    @icon = icon
-    @href = href
-    @name = name
-    @size = size
-    @mtime = mtime
-  end
-
-  def media?
-    !@media_type.nil?
-  end
-
-  def self.top(href)
-    Servel::Path.new(
-      type: "Dir",
-      listing_classes: "top directory",
-      icon: "🔝",
-      href: href,
-      name: "Top Directory"
-    )
-  end
-
-  def self.parent(href)
-    Servel::Path.new(
-      type: "Dir",
-      listing_classes: "parent directory",
-      icon: "⬆️",
-      href: href,
-      name: "Parent Directory"
-    )
-  end
-end