servel 0.11.0 → 0.12.0

data/lib/servel/templates/home.haml

@@ -1,18 +1,18 @@
-!!!
-%html
-  %head
-    %meta{charset: 'utf-8'}
-    %title Browse Listings
-    %meta{name: 'viewport', content: 'width=device-width, height=device-height, user-scalable=no'}
-    :css
-      #{include('css/normalize.css')}
-      #{include('css/common.css')}
-      #{include('css/home.css')}
-  %body
-    #home
-      %h1 Browse Listings
-      %ul#roots
-        - roots.each do |root|
-          %li
-            %a{href: root}= root
-            %a.new-tab{href: root, target: "_blank"} (New Tab)
+!!!
+%html
+  %head
+    %meta{charset: 'utf-8'}
+    %title Browse Listings
+    %meta{name: 'viewport', content: 'width=device-width, height=device-height, user-scalable=no'}
+    :css
+      #{include('css/normalize.css')}
+      #{include('css/common.css')}
+      #{include('css/home.css')}
+  %body
+    #home
+      %h1 Browse Listings
+      %ul#roots
+        - roots.each do |root|
+          %li
+            %a{href: root}= root
+            %a.new-tab{href: root, target: "_blank"} (New Tab)

data/lib/servel/templates/index.haml

@@ -1,21 +1,23 @@
-!!!
-%html
-  %head
-    %meta{charset: 'utf-8'}
-    %title Listing of #{url_root}#{url_path}
-    %meta{name: 'viewport', content: 'width=device-width, height=device-height, user-scalable=no'}
-    :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('js/ume.js')}
-      #{include('js/gallery.js')}
-  %body
-    - if files.any? { |f| f.media? }
-      #gallery!= partial('gallery')
-    #listing!= partial('listing', { url_root: url_root, url_path: url_path, directories: directories, files: files })
+!!!
+%html
+  %head
+    %meta{charset: 'utf-8'}
+    %title Listing of #{url_root}#{url_path}
+    %meta{name: 'viewport', content: 'width=device-width, height=device-height, user-scalable=no'}
+    :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('js/url-search-params.js')}
+      #{include('js/listing.js')}
+      #{include('js/ume.js')}
+      #{include('js/gallery.js')}
+  %body
+    - if files.any? { |f| f.media? }
+      #gallery!= partial('gallery')
+    #listing!= partial('listing', { url_root: url_root, url_path: url_path, directories: directories, files: files, sort: sort })

data/lib/servel/templates/js/gallery.js

@@ -1,9 +1,11 @@
 var $;
 
 var Gallery = (function() {
+  var TYPES = ["image", "video", "audio", "text"];
   var urls = [];
   var types = [];
   var currentIndex = 0;
+  var $gallery;
 
   function initItems() {
     var links = document.querySelectorAll("#listing a.default.media");
@@ -26,12 +28,27 @@ var Gallery = (function() {
     http.send();
   }
 
+  function clearContent() {
+    for(var i = 0; i < TYPES.length; i++) {
+      var type = TYPES[i];
+
+      $gallery.classList.remove(type);
+
+      if(type == "text") {
+        $("#text-content").innerHTML = "";
+      }
+      else {
+        $("#" + type).src = "about:none";
+      }
+    }
+  }
+
   function render() {
+    clearContent();
+
     var url = urls[currentIndex];
     var type = types[currentIndex];
 
-    var $gallery = $("#gallery");
-    $gallery.classList.remove("image", "video", "audio", "text");
     $gallery.classList.add(type);
 
     if(type == "text") {
@@ -129,6 +146,8 @@ var Gallery = (function() {
   }
 
   function init() {
+    $gallery = $("#gallery");
+
     initItems();
     initEvents();
     render();

data/lib/servel/templates/js/listing.js

@@ -0,0 +1,26 @@
+function initListing() {
+  $ = document.querySelector.bind(document);
+
+  function applySort(sortable) {
+    var params = new URLSearchParams(location.search.slice(1));
+    params.set("_servel_sort_method", sortable.dataset.sortMethod);
+    params.set("_servel_sort_direction", sortable.dataset.sortDirection);
+
+    if('sortActive' in sortable.dataset) {
+      params.set("_servel_sort_direction", sortable.dataset.sortDirection == "asc" ? "desc" : "asc");
+    }
+
+    location.href = location.pathname + "?" + params.toString();
+  }
+
+  document.body.addEventListener("click", function(e) {
+    if(!e.target) return;
+
+    if(e.target.closest("th.sortable")) {
+      e.preventDefault();
+      applySort(e.target.closest("th.sortable"));
+    }
+  });
+}
+
+window.addEventListener("DOMContentLoaded", initListing);

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

@@ -1,63 +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;
+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/templates/js/url-search-params.js

@@ -0,0 +1,2 @@
+/*! (C) Andrea Giammarchi - Mit Style License */
+var URLSearchParams=URLSearchParams||function(){"use strict";function URLSearchParams(query){var index,key,value,pairs,i,length,dict=Object.create(null);this[secret]=dict;if(!query)return;if(typeof query==="string"){if(query.charAt(0)==="?"){query=query.slice(1)}for(pairs=query.split("&"),i=0,length=pairs.length;i<length;i++){value=pairs[i];index=value.indexOf("=");if(-1<index){appendTo(dict,decode(value.slice(0,index)),decode(value.slice(index+1)))}else if(value.length){appendTo(dict,decode(value),"")}}}else{if(isArray(query)){for(i=0,length=query.length;i<length;i++){value=query[i];appendTo(dict,value[0],value[1])}}else{for(key in query){appendTo(dict,key,query[key])}}}}var isArray=Array.isArray,URLSearchParamsProto=URLSearchParams.prototype,find=/[!'\(\)~]|%20|%00/g,plus=/\+/g,replace={"!":"%21","'":"%27","(":"%28",")":"%29","~":"%7E","%20":"+","%00":"\0"},replacer=function(match){return replace[match]},secret="__URLSearchParams__:"+Math.random();function appendTo(dict,name,value){if(name in dict){dict[name].push(""+value)}else{dict[name]=isArray(value)?value:[""+value]}}function decode(str){return decodeURIComponent(str.replace(plus," "))}function encode(str){return encodeURIComponent(str).replace(find,replacer)}URLSearchParamsProto.append=function append(name,value){appendTo(this[secret],name,value)};URLSearchParamsProto["delete"]=function del(name){delete this[secret][name]};URLSearchParamsProto.get=function get(name){var dict=this[secret];return name in dict?dict[name][0]:null};URLSearchParamsProto.getAll=function getAll(name){var dict=this[secret];return name in dict?dict[name].slice(0):[]};URLSearchParamsProto.has=function has(name){return name in this[secret]};URLSearchParamsProto.set=function set(name,value){this[secret][name]=[""+value]};URLSearchParamsProto.forEach=function forEach(callback,thisArg){var dict=this[secret];Object.getOwnPropertyNames(dict).forEach(function(name){dict[name].forEach(function(value){callback.call(thisArg,value,name,this)},this)},this)};URLSearchParamsProto.toJSON=function toJSON(){return{}};URLSearchParamsProto.toString=function toString(){var dict=this[secret],query=[],i,key,name,value;for(key in dict){name=encode(key);for(i=0,value=dict[key];i<value.length;i++){query.push(name+"="+encode(value[i]))}}return query.join("&")};var dP=Object.defineProperty,gOPD=Object.getOwnPropertyDescriptor,createSearchParamsPollute=function(search){function append(name,value){URLSearchParamsProto.append.call(this,name,value);name=this.toString();search.set.call(this._usp,name?"?"+name:"")}function del(name){URLSearchParamsProto["delete"].call(this,name);name=this.toString();search.set.call(this._usp,name?"?"+name:"")}function set(name,value){URLSearchParamsProto.set.call(this,name,value);name=this.toString();search.set.call(this._usp,name?"?"+name:"")}return function(sp,value){sp.append=append;sp["delete"]=del;sp.set=set;return dP(sp,"_usp",{configurable:true,writable:true,value:value})}},createSearchParamsCreate=function(polluteSearchParams){return function(obj,sp){dP(obj,"_searchParams",{configurable:true,writable:true,value:polluteSearchParams(sp,obj)});return sp}},updateSearchParams=function(sp){var append=sp.append;sp.append=URLSearchParamsProto.append;URLSearchParams.call(sp,sp._usp.search.slice(1));sp.append=append},verifySearchParams=function(obj,Class){if(!(obj instanceof Class))throw new TypeError("'searchParams' accessed on an object that "+"does not implement interface "+Class.name)},upgradeClass=function(Class){var ClassProto=Class.prototype,searchParams=gOPD(ClassProto,"searchParams"),href=gOPD(ClassProto,"href"),search=gOPD(ClassProto,"search"),createSearchParams;if(!searchParams&&search&&search.set){createSearchParams=createSearchParamsCreate(createSearchParamsPollute(search));Object.defineProperties(ClassProto,{href:{get:function(){return href.get.call(this)},set:function(value){var sp=this._searchParams;href.set.call(this,value);if(sp)updateSearchParams(sp)}},search:{get:function(){return search.get.call(this)},set:function(value){var sp=this._searchParams;search.set.call(this,value);if(sp)updateSearchParams(sp)}},searchParams:{get:function(){verifySearchParams(this,Class);return this._searchParams||createSearchParams(this,new URLSearchParams(this.search.slice(1)))},set:function(sp){verifySearchParams(this,Class);createSearchParams(this,sp)}}})}};upgradeClass(HTMLAnchorElement);if(/^function|object$/.test(typeof URL)&&URL.prototype)upgradeClass(URL);return URLSearchParams}();(function(URLSearchParamsProto){var iterable=function(){try{return!!Symbol.iterator}catch(error){return false}}();if(!("forEach"in URLSearchParamsProto)){URLSearchParamsProto.forEach=function forEach(callback,thisArg){var names=Object.create(null);this.toString().replace(/=[\s\S]*?(?:&|$)/g,"=").split("=").forEach(function(name){if(!name.length||name in names)return;(names[name]=this.getAll(name)).forEach(function(value){callback.call(thisArg,value,name,this)},this)},this)}}if(!("keys"in URLSearchParamsProto)){URLSearchParamsProto.keys=function keys(){var items=[];this.forEach(function(value,name){items.push(name)});var iterator={next:function(){var value=items.shift();return{done:value===undefined,value:value}}};if(iterable){iterator[Symbol.iterator]=function(){return iterator}}return iterator}}if(!("values"in URLSearchParamsProto)){URLSearchParamsProto.values=function values(){var items=[];this.forEach(function(value){items.push(value)});var iterator={next:function(){var value=items.shift();return{done:value===undefined,value:value}}};if(iterable){iterator[Symbol.iterator]=function(){return iterator}}return iterator}}if(!("entries"in URLSearchParamsProto)){URLSearchParamsProto.entries=function entries(){var items=[];this.forEach(function(value,name){items.push([name,value])});var iterator={next:function(){var value=items.shift();return{done:value===undefined,value:value}}};if(iterable){iterator[Symbol.iterator]=function(){return iterator}}return iterator}}if(iterable&&!(Symbol.iterator in URLSearchParamsProto)){URLSearchParamsProto[Symbol.iterator]=URLSearchParamsProto.entries}if(!("sort"in URLSearchParamsProto)){URLSearchParamsProto.sort=function sort(){var entries=this.entries(),entry=entries.next(),done=entry.done,keys=[],values=Object.create(null),i,key,value;while(!done){value=entry.value;key=value[0];keys.push(key);if(!(key in values)){values[key]=[]}values[key].push(value[1]);entry=entries.next();done=entry.done}keys.sort();for(i=0;i<keys.length;i++){this["delete"](keys[i])}for(i=0;i<keys.length;i++){key=keys[i];this.append(key,values[key].shift())}}}})(URLSearchParams.prototype);

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/servel.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rack", "~> 2.0"
   spec.add_dependency "puma"
   spec.add_dependency "naturalsorter"
-  spec.add_dependency "haml", "~> 4"
+  spec.add_dependency "hamlit"
   spec.add_dependency "activesupport"
+  spec.add_dependency "lru_redux"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: hamlit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lru_redux
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Serves files and directories over HTTP.
 email:
 - i@bloople.net
@@ -132,6 +146,7 @@ files:
 - lib/servel/haml_context.rb
 - lib/servel/home_app.rb
 - lib/servel/index.rb
+- lib/servel/instrumentation.rb
 - lib/servel/templates/_gallery.haml
 - lib/servel/templates/_listing.haml
 - lib/servel/templates/css/common.css
@@ -144,7 +159,9 @@ files:
 - lib/servel/templates/home.haml
 - lib/servel/templates/index.haml
 - lib/servel/templates/js/gallery.js
+- lib/servel/templates/js/listing.js
 - lib/servel/templates/js/ume.js
+- lib/servel/templates/js/url-search-params.js
 - lib/servel/version.rb
 - servel.gemspec
 homepage: http://bloople.net/