servel 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2763001e5065c946d727b67fdf97e42a888d6794159528c72b2f15c7492c3409
-  data.tar.gz: d44b73a268aa7e69ea9b431ade3700a311b37906614fd8601effafc09473b2f4
+  metadata.gz: 2fa8d88495eaaf272edc23d6f8ee35358cdbf85e11339fc46f786cbead036ff9
+  data.tar.gz: dc9d48be2ce10ec35ebe1918f96985cef584bb2871ffaffebbb61ef2ea80a659
 SHA512:
-  metadata.gz: ea0615e5c1661f40afd3ebf639e6d751db50989506fec1434c81f72ca3aaa3107c0eb5a8aa5f40e899e7d94ca62c99332e0998389c4a23296c910f8dd2c43750
-  data.tar.gz: 0071e811b8c7c5a401b5a060c297a686616e311a9bd6726a4e4bd5d6ed6626ebf25cd193ea2202dbeaff9a9ca851bfc4f19de73ad819a5245e33c196cb0c3ede
+  metadata.gz: c06b97acc7830e90bda35051313097cf3c414f1f3f4b15e6c2ec1af4be0cc6e665ce9480ace68a20827ad8d140396f9b34630061daa929f289d0c4027f3d2997
+  data.tar.gz: 8d0d2d034cf124464ceb421c110e01750341b9e5aa2bd009963e0bb1ec6262fe8bd24edc97b7bcb4bafaf6b0466879f65caadade8feee8b7a9663f400cb01352

data/{lib/servel/templates → app}/css/common.css

@@ -23,18 +23,3 @@ a {
 a:hover, a:focus, a:active {
   text-decoration: underline;
 }
-
-#loading {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 2;
-  background-color: rgba(255, 255, 255, 0.6);
-  font-size: 24px;
-  font-weight: bold;
-}

data/{lib/servel/templates → app}/css/listing.css

@@ -1,5 +1,4 @@
 #listing {
-  display: none;
   padding: 10px;
   position: relative;
   z-index: 1;

data/{lib/servel/templates → app}/index.haml

@@ -4,6 +4,12 @@
     %meta{charset: 'utf-8'}
     %title Listing of #{url_root}#{url_path}
     %meta{name: 'viewport', content: 'width=device-width, height=device-height, user-scalable=no'}
+
+    :javascript
+      window.specialEntries = #{special_entries};
+      window.directoryEntries = #{directory_entries};
+      window.fileEntries = #{file_entries};
+
     :css
       #{include('css/normalize.css')}
       #{include('css/common.css')}
@@ -12,11 +18,11 @@
       #{include('css/gallery-text.css')}
 
     :javascript
+      #{include('js/natural-orderby.min.js')}
+      #{include('js/entries.js')}
       #{include('js/listing.js')}
       #{include('js/ume.js')}
       #{include('js/gallery.js')}
-      #{include('js/index.js')}
   %body
     #gallery!= partial('gallery')
-    #listing!= partial('listing', { url_root: url_root, url_path: url_path })
-    #loading Loading...
+    #listing!= partial('listing', { url_root: url_root, url_path: url_path })

data/app/js/entries.js

@@ -0,0 +1,111 @@
+"use strict";
+
+var Entries = (function() {
+  //Lists
+  var all;
+  var media;
+  var hasMedia;
+
+  var sortMethod = "name";
+  var sortDirection = "asc";
+  var filterText = "";
+
+  function runFilter(entries) {
+    if(filterText == "") return entries;
+
+    var filteredEntries = [];
+
+    for(var i = 0; i < entries.length; i++) {
+      var entry = entries[i];
+      if(entry.name.toLowerCase().includes(filterText.toLowerCase())) filteredEntries.push(entry);
+    }
+
+    return filteredEntries;
+  }
+
+  function sortByName(entries) {
+    return naturalOrderBy.orderBy(entries, function(entry) {
+      return entry.name.toLowerCase();
+    }, sortDirection);
+  }
+
+  function sortByMtime(a, b) {
+    return b.mtime - a.mtime;
+  }
+
+  function sortBySize(a, b) {
+    return b.size - a.size;
+  }
+
+  function sortByType(a, b) {
+    var aType = a.type.toLowerCase();
+    var bType = b.type.toLowerCase();
+
+    if(aType < bType) return -1;
+    if(aType > bType) return 1;
+
+    return 0;
+  }
+
+  function runSort(entries) {
+    if(sortMethod == "name") return sortByName(entries);
+
+    var sortFunction;
+    if(sortMethod == "mtime") sortFunction = sortByMtime;
+    else if(sortMethod == "size") sortFunction = sortBySize;
+    else if(sortMethod == "type") sortFunction = sortByType;
+
+    entries.sort(sortFunction);
+    if(sortDirection == "desc") entries.reverse();
+
+    return entries;
+  }
+
+  function updateLists() {
+    specialEntries = window.specialEntries.slice();
+    directoryEntries = runSort(runFilter(window.directoryEntries.slice()));
+    fileEntries = runSort(runFilter(window.fileEntries.slice()));
+
+    all = [].concat(specialEntries, directoryEntries, fileEntries);
+
+    media = [];
+    for(var i = 0; i < fileEntries.length; i++) {
+      if(fileEntries[i].media) media.push(fileEntries[i]);
+    }
+
+    hasMedia = media.length > 0;
+  }
+
+  function update() {
+    updateLists();
+    Gallery.onEntriesUpdate();
+    Listing.onEntriesUpdate();
+  }
+
+  function sort(newSortMethod, newSortDirection) {
+    sortMethod = newSortMethod;
+    sortDirection = newSortDirection;
+    update();
+  }
+
+  function filter(newFilterText) {
+    filterText = newFilterText;
+    update();
+  }
+
+  updateLists();
+
+  return {
+    all: function() {
+      return all;
+    },
+    media: function() {
+      return media;
+    },
+    hasMedia: function() {
+      return hasMedia;
+    },
+    filter: filter,
+    sort: sort
+  };
+})();

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

@@ -3,8 +3,7 @@
 var Gallery = (function() {
   var $;
   var $gallery;
-  var mediaEntries = [];
-  var currentIndex = 0;
+  var currentIndex;
   var layoutItemMax = false;
 
   function renderText(url) {
@@ -29,10 +28,10 @@ var Gallery = (function() {
   function render() {
     clearContent();
 
-    var entry = mediaEntries[currentIndex];
+    var entry = Entries.media()[currentIndex];
 
     var url = entry.href;
-    var type = entry.media_type;
+    var type = entry.mediaType;
 
     $gallery.classList.add(type);
 
@@ -52,7 +51,7 @@ var Gallery = (function() {
 
   function clamp(index) {
     if(index == null || isNaN(index) || index < 0) return 0;
-    if(index >= mediaEntries.length) return mediaEntries.length - 1;
+    if(index >= Entries.media().length) return Entries.media().length - 1;
     return index;
   }
 
@@ -81,7 +80,7 @@ var Gallery = (function() {
   }
 
   function jump(url) {
-    var index = mediaEntries.findIndex(function(entry) {
+    var index = Entries.media().findIndex(function(entry) {
       return entry.href == url;
     });
     go(index);
@@ -156,10 +155,18 @@ var Gallery = (function() {
     layout();
   }
 
-  function onEntriesInit() {
+  function onEntriesUpdate() {
+    currentIndex = 0;
+    if(Entries.hasMedia()) render();
+  }
+
+  function init() {
+    $ = document.querySelector.bind(document);
+    $gallery = $("#gallery");
+
     onEntriesUpdate();
 
-    if(mediaEntries.length > 0) {
+    if(Entries.hasMedia()) {
       $gallery.style.display = "flex";
 
       initEvents();
@@ -167,23 +174,8 @@ var Gallery = (function() {
     }
   }
 
-  function onEntriesUpdate() {
-    currentIndex = 0;
-    mediaEntries = [];
-    for(var i = 0; i < window.entries.length; i++) {
-      if(window.entries[i].media) mediaEntries.push(window.entries[i]);
-    }
-
-    if(mediaEntries.length > 0) render();
-  }
-
-  window.addEventListener("DOMContentLoaded", function() {
-    $ = document.querySelector.bind(document);
-    $gallery = $("#gallery");
-  });
-
   return {
-    onEntriesInit: onEntriesInit,
+    init: init,
     onEntriesUpdate: onEntriesUpdate,
     go: go,
     prev: prev,
@@ -193,3 +185,5 @@ var Gallery = (function() {
     jump: jump
   };
 })();
+
+window.addEventListener("DOMContentLoaded", Gallery.init);

data/{lib/servel/templates → app}/js/listing.js

@@ -3,10 +3,9 @@
 var Listing = (function() {
   var $;
   var $container;
-  var filteredEntries = [];
   var perPage = 99;
-  var currentIndex = 0;
-  var moreContent = true;
+  var currentIndex;
+  var moreContent;
   var scrollDebounce = false;
 
   function escapeHTML(unsafe) {
@@ -31,14 +30,14 @@ var Listing = (function() {
       <tr>
         <td class="name">
           <span class="icon">${file.icon}</span>
-          <a href="${file.href}" class="default ${file.class}" data-url="${file.href}" data-type="${file.media_type}">${file.name}</a>
+          <a href="${file.href}" class="default ${file.class}" data-url="${file.href}" data-type="${file.mediaType}">${file.name}</a>
         </td>
         <td class="new-tab">
           <a href="${file.href}" class="new-tab ${file.class}" target="_blank">(New tab)</a>
         </td>
         <td class="type">${file.type}</td>
-        <td class="size">${file.size}</td>
-        <td class="modified">${file.mtime}</td>
+        <td class="size">${file.sizeText}</td>
+        <td class="modified">${file.mtimeText}</td>
       </tr>
     `;
   }
@@ -58,7 +57,7 @@ var Listing = (function() {
   }
 
   function render() {
-    var currentEntries = filteredEntries.slice(currentIndex, currentIndex + perPage);
+    var currentEntries = Entries.all().slice(currentIndex, currentIndex + perPage);
     $container.insertAdjacentHTML("beforeend", renderTable(currentEntries));
   }
 
@@ -69,7 +68,7 @@ var Listing = (function() {
   function onScrolled() {
     if(atBottom() && moreContent) {
       currentIndex += perPage;
-      if(currentIndex >= filteredEntries.length) moreContent = false;
+      if(currentIndex >= Entries.all().length) moreContent = false;
       render();
     }
     scrollDebounce = false;
@@ -85,32 +84,8 @@ var Listing = (function() {
 
     sortable.classList.add("sort-active", "sort-" + sortable.dataset.sortDirection);
 
-    Index.loadEntries(function() {
-      sortable.scrollIntoView();
-    });
-  }
-
-  function updateFilteredEntries(needle) {
-    if(needle == "") {
-      filteredEntries = window.entries;
-    }
-    else {
-      filteredEntries = [];
-
-      for(var i = 0; i < window.entries.length; i++) {
-        var entry = window.entries[i];
-        if(entry.name.toLowerCase().includes(needle.toLowerCase())) filteredEntries.push(entry);
-      }
-    }
-  }
-
-  function applyFilter(needle) {
-    updateFilteredEntries(needle);
-
-    $container.innerHTML = "";
-    currentIndex = 0;
-    moreContent = true;
-    render();
+    Entries.sort(sortable.dataset.sortMethod, sortable.dataset.sortDirection);
+    sortable.scrollIntoView();
   }
 
   function initEvents() {
@@ -134,28 +109,31 @@ var Listing = (function() {
       e.stopPropagation();
 
       if(e.keyCode == 13) {
-        applyFilter($("#search").value);
+        Entries.filter($("#search").value);
       }
     });
   }
 
-  function onEntriesInit() {
-    onEntriesUpdate();
-    $("#listing").style.display = "block";
-    initEvents();
-  }
-
   function onEntriesUpdate() {
-    applyFilter($("#search").value);
+    $container.innerHTML = "";
+    currentIndex = 0;
+    moreContent = true;
+    render();
   }
 
-  window.addEventListener("DOMContentLoaded", function() {
+  function init() {
     $ = document.querySelector.bind(document);
     $container = $("#listing-container");
-  });
+
+    onEntriesUpdate();
+
+    initEvents();
+  }
 
   return {
-    onEntriesInit: onEntriesInit,
+    init: init,
     onEntriesUpdate: onEntriesUpdate
   };
 })();
+
+window.addEventListener("DOMContentLoaded", Listing.init);

data/app/js/natural-orderby.min.js

@@ -0,0 +1,2 @@
+var naturalOrderBy=function(e){"use strict";var d=function(e,n){return e<n?-1:n<e?1:0},r=/(^0x[\da-fA-F]+$|^([+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?(?!\.\d+)(?=\D|\s|$))|\d+)/g,l=/^\s+|\s+$/g,o=/\s+/g,u=/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/,t=/(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[/-]\d{1,4}[/-]\d{1,4}|^\w+, \w+ \d+, \d{4})/,a=/^0+[1-9]{1}[0-9]*$/,y=/[^\x00-\x80]/,m=function(e,n){return e.value===n.value?0:void 0!==e.parsedNumber&&void 0!==n.parsedNumber?d(e.parsedNumber,n.parsedNumber):e.chunks&&n.chunks?function(e,n){for(var r,t,i,o,u=e.length,a=n.length,s=Math.min(u,a),c=0;c<s;c++){var f=e[c],l=n[c];if(f!==l)return""===f!=(""===l)?""===f?-1:1:"number"==typeof f&&"number"==typeof l?d(f,l):"number"==typeof f||"number"==typeof l?"number"==typeof f?-1:1:y.test(f+l)&&f.localeCompare?(i=l,(o=f.localeCompare(i))?o/Math.abs(o):0):(r=f)<(t=l)?-1:t<r?1:0}return s<u||s<a?u<=s?-1:1:0}(e.chunks,n.chunks):(t=n,((r=e).chunks?!t.chunks:t.chunks)?r.chunks?-1:1:(r.isNaN?!t.isNaN:t.isNaN)?r.isNaN?-1:1:(r.isSymbol?!t.isSymbol:t.isSymbol)?r.isSymbol?-1:1:(r.isObject?!t.isObject:t.isObject)?r.isObject?-1:1:(r.isArray?!t.isArray:t.isArray)?r.isArray?-1:1:(r.isFunction?!t.isFunction:t.isFunction)?r.isFunction?-1:1:(r.isNull?!t.isNull:t.isNull)?r.isNull?-1:1:0);var r,t},v="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},s=function(r){return"function"==typeof r?r:function(e){if(Array.isArray(e)){var n=Number(r);if(Number.isInteger(n))return e[n]}else if(e&&"object"===(void 0===e?"undefined":v(e))&&"function"!=typeof r)return e[r];return e}},c=function(e){if(0!==e.length){var n=Number(e);if(!Number.isNaN(n))return n}},b=function(e){var n=c(e);return void 0!==n?n:function(e){if(t.test(e)){var n=Date.parse(e);if(!Number.isNaN(n))return n}}(e)},p=function(e){var n;return(n=e,n.replace(r,"\0$1\0").replace(/\0$/,"").replace(/^\0/,"").split("\0")).map(function(e,n,r){return t=e,i=r.length,!u.test(t)||a.test(t)&&1!==i?t.replace(o," ").replace(l,""):c(t)||0;var t,i})},N=function(e){return Number.isNaN(e)||e instanceof Number&&Number.isNaN(e.valueOf())},f=function(){var f=!(0<arguments.length&&void 0!==arguments[0])||arguments[0];return function(e){if("string"==typeof e||e instanceof String||("number"==typeof e||e instanceof Number)&&!N(e)||"boolean"==typeof e||e instanceof Boolean||e instanceof Date){var n=(i=f,"boolean"==typeof(t=e)||t instanceof Boolean?Number(t).toString():"number"==typeof t||t instanceof Number?t.toString():t instanceof Date?t.getTime().toString():"string"==typeof t||t instanceof String?(i?t:t.toLowerCase()).replace(l,""):""),r=b(n);return{parsedNumber:r,chunks:p(r?""+r:n),value:e}}var t,i,o,u,a,s,c;return{isArray:Array.isArray(e),isFunction:(c=e,"function"==typeof c),isNaN:N(e),isNull:(s=e,null===s),isObject:(a=e,!(null===a||"object"!==(void 0===a?"undefined":v(a))||Array.isArray(a)||a instanceof Number||a instanceof String||a instanceof Boolean||a instanceof Date)),isSymbol:(u=e,"symbol"===(void 0===u?"undefined":v(u))),isUndefined:(o=e,void 0===o),value:e}}},g=function(t,e,r){var i=e.length?e.map(s):[function(e){return e}],n=t.map(function(n,e){return{index:e,values:i.map(function(e){return e(n)}).map(f())}});return n.sort(function(e,n){return function(e,n,r){for(var t=e.values,i=n.values,o=t.length,u=r.length,a=0;a<o;a++){var s=a<u?r[a]:null;if(s&&"function"==typeof s){var c=s(t[a].value,i[a].value);if(c)return c}else{var f=m(t[a],i[a]);if(f)return f*("desc"===s?-1:1)}}return 0}(e,n,r)}),n.map(function(e){return n=t,r=e.index,n[r];var n,r})};var i={caseSensitive:!0,order:"asc"};return e.orderBy=function(e,n,r){if(!e||!Array.isArray(e))return[];var t=function(e){if(!e)return[];var n=Array.isArray(e)?[].concat(e):[e];return n.some(function(e){return"string"!=typeof e&&"number"!=typeof e&&"function"!=typeof e})?[]:n}(n),i=function(e){if(!e)return[];var n=Array.isArray(e)?[].concat(e):[e];return n.some(function(e){return"asc"!==e&&"desc"!==e&&"function"!=typeof e})?[]:n}(r);return g(e,t,i)},e.compare=function(e){var n,o,r=(n=e)&&"object"===(void 0===n?"undefined":v(n))?{caseSensitive:"boolean"==typeof n.caseSensitive?n.caseSensitive:i.caseSensitive,order:"asc"===n.order||"desc"===n.order?n.order:i.order}:i;return o=r,function(e,n){var r=f(o.caseSensitive),t=r(e),i=r(n);return m(t,i)*("desc"===o.order?-1:1)}},e}({});
+//# sourceMappingURL=natural-orderby.min.js.map

data/lib/servel.rb

@@ -1,7 +1,6 @@
 require 'rack'
 require 'rack/handler/puma'
 require 'hamlit'
-require 'naturalsorter'
 require 'active_support/all'
 require 'lru_redux'
 
@@ -23,7 +22,6 @@ require "servel/instrumentation"
 require "servel/entry"
 require "servel/entry_factory"
 require "servel/haml_context"
-require "servel/entries"
 require "servel/index"
 require "servel/app"
 require "servel/home_app"

data/lib/servel/app.rb

@@ -25,13 +25,7 @@ class Servel::App
 
     return [404, {}, []] unless fs_path.exist?
 
-    request = Rack::Request.new(env)
-
-    if json_request?(request)
-      Servel::Entries.new(url_root: url_root, url_path: url_path, fs_path: fs_path, params: request.params).render
-    else
-      Servel::Index.new(url_root: url_root, url_path: url_path).render
-    end
+    Servel::Index.new(url_root: url_root, url_path: url_path, fs_path: fs_path).render
   end
 
   def redirect(location)
@@ -44,10 +38,6 @@ class Servel::App
     Rack::Utils.clean_path_info(url_path)
   end
 
-  def json_request?(request)
-    Rack::Utils.best_q_match(request.get_header("HTTP_ACCEPT"), ['text/html', 'application/json']) == 'application/json'
-  end
-
   def try_encode(string)
     return string if string.encoding == UTF_8
     string.encode(UTF_8)

data/lib/servel/entry.rb

@@ -32,11 +32,13 @@ class Servel::Entry
       icon: @icon,
       href: Rack::Utils.escape_path(@href),
       class: @listing_classes,
-      media_type: @media_type,
+      mediaType: @media_type,
       name: @name,
       type: @type,
-      size: @size.nil? ? "-" : @size,
-      mtime: @mtime.nil? ? "-" : @mtime.strftime("%e %b %Y %l:%M %p"),
+      size: @size.to_i,
+      sizeText: @size.nil? ? "-" : @size,
+      mtime: @mtime.to_i,
+      mtimeText: @mtime.nil? ? "-" : @mtime.strftime("%e %b %Y %l:%M %p"),
       media: media?
     }
   end

data/lib/servel/haml_context.rb

@@ -9,7 +9,7 @@ class Servel::HamlContext
   end
 
   def initialize
-    @build_path = Pathname.new(__FILE__).dirname.realpath + 'templates'
+    @build_path = Pathname.new(__FILE__).dirname.realpath + "../../app"
   end
 
   def render(template, locals = {})

data/lib/servel/index.rb

@@ -1,21 +1,44 @@
 class Servel::Index
   extend Servel::Instrumentation
+  RENDER_CACHE = LruRedux::ThreadSafeCache.new(100)
 
-  def initialize(url_root:, url_path:)
+  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)
+    RENDER_CACHE.getset(render_cache_key) { Servel::HamlContext.render('index.haml', locals) }
+  end
+
+  def render_cache_key
+    @render_cache_key ||= [@fs_path.to_s, @fs_path.mtime.to_i].join("-")
   end
 
   def locals
+    children = @fs_path.children.map { |path| Servel::EntryFactory.for(path) }.compact
+
     {
       url_root: @url_root,
-      url_path: @url_path
+      url_path: @url_path,
+      special_entries: special_entries.to_json,
+      directory_entries: children.select(&:directory?).to_json,
+      file_entries: children.select(&:file?).to_json
     }
   end
 
+  def special_entries
+    list = []
+    list << Servel::EntryFactory.home("/") if @url_root != ""
+
+    unless @url_path == "/"
+      list << Servel::EntryFactory.top(@url_root == "" ? "/" : @url_root)
+      list << Servel::EntryFactory.parent("../")
+    end
+
+    list
+  end
+
   instrument :render, :locals
 end

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.20.0"
+  VERSION = "0.21.0"
 end

data/servel.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_dependency "rack", "~> 2.0"
   spec.add_dependency "puma"
-  spec.add_dependency "naturalsorter"
   spec.add_dependency "hamlit"
   spec.add_dependency "activesupport"
   spec.add_dependency "lru_redux"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: naturalsorter
-  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'
 - !ruby/object:Gem::Dependency
   name: hamlit
   requirement: !ruby/object:Gem::Requirement
@@ -135,33 +121,33 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/_gallery.haml
+- app/_listing.haml
+- app/css/common.css
+- app/css/gallery-text.css
+- app/css/gallery.css
+- app/css/home.css
+- app/css/listing.css
+- app/css/normalize.css
+- app/home.haml
+- app/index.haml
+- app/js/entries.js
+- app/js/gallery.js
+- app/js/listing.js
+- app/js/natural-orderby.min.js
+- app/js/ume.js
 - bin/console
 - bin/servel
 - bin/setup
 - lib/servel.rb
 - lib/servel/app.rb
 - lib/servel/cli.rb
-- lib/servel/entries.rb
 - lib/servel/entry.rb
 - lib/servel/entry_factory.rb
 - 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
-- lib/servel/templates/css/gallery-text.css
-- lib/servel/templates/css/gallery.css
-- lib/servel/templates/css/home.css
-- lib/servel/templates/css/listing.css
-- lib/servel/templates/css/normalize.css
-- lib/servel/templates/home.haml
-- lib/servel/templates/index.haml
-- lib/servel/templates/js/gallery.js
-- lib/servel/templates/js/index.js
-- lib/servel/templates/js/listing.js
-- lib/servel/templates/js/ume.js
 - lib/servel/version.rb
 - servel.gemspec
 homepage: http://bloople.net/

data/lib/servel/entries.rb

@@ -1,68 +0,0 @@
-class Servel::Entries
-  extend Servel::Instrumentation
-  RENDER_CACHE = LruRedux::ThreadSafeCache.new(100)
-  SORT_METHODS = ["name", "mtime", "size", "type"]
-  SORT_DIRECTIONS = ["asc", "desc"]
-
-  def initialize(url_root:, url_path:, fs_path:, params:)
-    @url_root = url_root
-    @url_path = url_path
-    @fs_path = fs_path
-    @params = params
-  end
-
-  def render
-    RENDER_CACHE.getset(render_cache_key) { [200, {}, [entries.to_json]] }
-  end
-
-  def render_cache_key
-    @render_cache_key ||= [@fs_path.to_s, @fs_path.mtime.to_i, sort_method, sort_direction].join("-")
-  end
-
-  def entries
-    children = @fs_path.children.map { |path| Servel::EntryFactory.for(path) }.compact
-    special_entries + apply_sort(children.select(&:directory?)) + apply_sort(children.select(&:file?))
-  end
-
-  def sort_method
-    param = @params["_servel_sort_method"]
-    param = "name" unless SORT_METHODS.include?(param)
-    param
-  end
-
-  def sort_direction
-    param = @params["_servel_sort_direction"]
-    param = "asc" unless SORT_DIRECTIONS.include?(param)
-    param
-  end
-
-  def special_entries
-    list = []
-    list << Servel::EntryFactory.home("/") if @url_root != ""
-
-    unless @url_path == "/"
-      list << Servel::EntryFactory.top(@url_root == "" ? "/" : @url_root)
-      list << Servel::EntryFactory.parent("../")
-    end
-
-    list
-  end
-
-  def apply_sort(entries)
-    entries = case sort_method
-    when "name"
-      Naturalsorter::Sorter.sort_by_method(entries, :name, true)
-    when "mtime"
-      entries.sort_by { |entry| entry.mtime }
-    when "size"
-      entries.sort_by { |entry| entry.size || 0 }
-    when "type"
-      entries.sort_by { |entry| entry.type }
-    end
-
-    entries.reverse! if sort_direction == "desc"
-    entries
-  end
-
-  instrument :render, :entries, :apply_sort
-end

data/lib/servel/templates/js/index.js

@@ -1,54 +0,0 @@
-"use strict";
-
-var Index = (function() {
-  var $;
-  var inited = false;
-
-  function entriesURL() {
-    var sortable = $("th.sortable.sort-active");
-    return `${location.pathname}?_servel_sort_method=${sortable.dataset.sortMethod}&_servel_sort_direction=${sortable.dataset.sortDirection}`;
-  }
-
-  function onEntriesLoad(callback) {
-    if(inited) {
-      Gallery.onEntriesUpdate();
-      Listing.onEntriesUpdate();
-    }
-    else {
-      inited = true;
-      Gallery.onEntriesInit();
-      Listing.onEntriesInit();
-    }
-
-    $("#loading").style.display = "none";
-    if(callback) callback();
-  }
-
-  function loadEntries(callback) {
-    $("#loading").style.display = "flex";
-
-    var http = new XMLHttpRequest();
-    http.open("GET", entriesURL());
-
-    http.onreadystatechange = function() {
-      if(http.readyState === 4 && http.status === 200) {
-        window.entries = JSON.parse(http.responseText);
-        setTimeout(function() {
-          onEntriesLoad(callback);
-        }, 0);
-      }
-    };
-
-    http.setRequestHeader("Accept", "application/json");
-    http.send();
-  }
-
-  window.addEventListener("DOMContentLoaded", function() {
-    $ = document.querySelector.bind(document);
-    loadEntries();
-  });
-
-  return {
-    loadEntries: loadEntries
-  };
-})();