servel 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68aa3fcde45ef2b5d719a46cdbf40a626791d71f
-  data.tar.gz: 682e23bda6b0a4488f27fcf8f9c93606c6aa1665
+  metadata.gz: 368f3a82244101749c5bd21dda7e82d229d093c4
+  data.tar.gz: 66955c76c3cc09c6d38ea396da93ff3df65036b6
 SHA512:
-  metadata.gz: 19a8a5e7b912be06b0cc9aa2dbce64272b717656b4fff91f4fe964efcf73dbbe4db48c5edb323e70278e044f7084a0ff7bf1af3fcdb27e8ecef89b29a9212cd8
-  data.tar.gz: 3564b088e3b9153d50e7efd73448da11141e0b55049475542900c3ab051c13a2288a1e3792654e19ed7f9453a7288b4621be1a27f90ef195d18ee6d8a9f112ad
+  metadata.gz: 5d278f493f55dcff11d89d97c958e01564bb8bda9a80b82d4b13fc055726a53c771179803b32dcc913c7eb9c3a750a9d7b5cad5059b4f97c0e7cb1d45b6ad5f8
+  data.tar.gz: 8865989fd4ed41d1629753967e92bc4ef7a4b124aa456eaa129aa804c92a2900454d434ed6e28bd3d92135dc311c56f6a1700e2398c880e1415f82ebe9ffda15

data/bin/servel

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-puts "ARGV: #{ARGV.inspect}"
-
-require "servel"
-
+#!/usr/bin/env ruby
+
+require "servel"
+
 Servel::CLI.new(ARGV).start

data/lib/servel.rb

@@ -1,8 +1,9 @@
 require 'rack'
 require 'rack/handler/puma'
-require 'haml'
+require 'hamlit'
 require 'naturalsorter'
 require 'active_support/all'
+require 'lru_redux'
 
 require 'thread'
 require 'pathname'
@@ -17,6 +18,7 @@ module Servel
 end
 
 require "servel/version"
+require "servel/instrumentation"
 require "servel/entry"
 require "servel/entry_factory"
 require "servel/haml_context"

data/lib/servel/app.rb

@@ -18,7 +18,8 @@ class Servel::App
 
     return [404, {}, []] unless fs_path.exist?
 
-    Servel::Index.new(url_root: url_root, url_path: url_path, fs_path: fs_path).render
+    request = Rack::Request.new(env)
+    Servel::Index.new(url_root: url_root, url_path: url_path, fs_path: fs_path, params: request.params).render
   end
 
   def redirect(location)

data/lib/servel/entry.rb

@@ -1,7 +1,8 @@
 class Servel::Entry
-  attr_reader :type, :media_type, :listing_classes, :icon, :href, :name, :size, :mtime
+  attr_reader :ftype, :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)
+  def initialize(ftype:, type:, media_type: nil, listing_classes:, icon:, href:, name:, size: nil, mtime: nil)
+    @ftype = ftype
     @type = type
     @media_type = media_type
     @listing_classes = listing_classes
@@ -12,6 +13,14 @@ class Servel::Entry
     @mtime = mtime
   end
 
+  def directory?
+    @ftype == :directory
+  end
+
+  def file?
+    @ftype == :file
+  end
+
   def media?
     !@media_type.nil?
   end

data/lib/servel/entry_factory.rb

@@ -1,4 +1,6 @@
 class Servel::EntryFactory
+  extend Servel::Instrumentation
+
   IMAGE_EXTS = %w(.jpg .jpeg .png .gif)
   VIDEO_EXTS = %w(.webm .mp4 .mkv)
   AUDIO_EXTS = %w(.mp3 .m4a .wav)
@@ -6,6 +8,7 @@ class Servel::EntryFactory
 
   def self.home(href)
     Servel::Entry.new(
+      ftype: :directory,
       type: "Dir",
       listing_classes: "home directory",
       icon: "🏠",
@@ -16,6 +19,7 @@ class Servel::EntryFactory
 
   def self.top(href)
     Servel::Entry.new(
+      ftype: :directory,
       type: "Dir",
       listing_classes: "top directory",
       icon: "🔝",
@@ -26,6 +30,7 @@ class Servel::EntryFactory
 
   def self.parent(href)
     Servel::Entry.new(
+      ftype: :directory,
       type: "Dir",
       listing_classes: "parent directory",
       icon: "⬆️",
@@ -39,36 +44,46 @@ class Servel::EntryFactory
   end
 
   def initialize(path)
-    @path = Pathname.new(path)
+    @path_basename = path.basename.to_s
+    @path_extname = path.extname.to_s
+    stat = path.stat
+    @path_mtime = stat.mtime
+    @path_size = stat.size
+    @path_ftype = stat.ftype.intern
+    @path_directory = @path_ftype == :directory
+    @path_file = @path_ftype == :file
   end
 
+  instrument :initialize
+
   def entry
     Servel::Entry.new(
+      ftype: @path_ftype,
       type: type,
       media_type: media_type,
       listing_classes: listing_classes,
       icon: icon,
-      href: @path.basename,
-      name: @path.basename,
+      href: @path_basename,
+      name: @path_basename,
       size: size,
-      mtime: @path.mtime
+      mtime: @path_mtime
     )
   end
 
   def type
-    if @path.directory?
+    if @path_directory
       "Dir"
-    elsif @path.file?
-      @path.extname.sub(/^\./, "")
+    elsif @path_file
+      @path_extname.sub(/^\./, "")
     else
       ""
     end
   end
 
   def media_type
-    return nil unless @path.file? && @path.extname
+    return nil unless @path_file && @path_extname
 
-    case @path.extname.downcase
+    case @path_extname.downcase
     when *IMAGE_EXTS
       :image
     when *VIDEO_EXTS
@@ -84,15 +99,15 @@ class Servel::EntryFactory
 
   def listing_classes
     klasses = []
-    klasses << "file" if @path.file?
-    klasses << "directory" if @path.directory?
+    klasses << "file" if @path_file
+    klasses << "directory" if @path_directory
     klasses << "media" if media_type
     klasses << media_type if media_type
     klasses.join(" ")
   end
 
   def icon
-    return "📁" if @path.directory?
+    return "📁" if @path_directory
     case media_type
     when :video
       "🎞️"
@@ -106,6 +121,6 @@ class Servel::EntryFactory
   end
 
   def size
-    @path.directory? ? nil : @path.size
+    @path_directory ? nil : @path_size
   end
 end

data/lib/servel/haml_context.rb

@@ -1,7 +1,7 @@
 class Servel::HamlContext
+  extend Servel::Instrumentation
   include ActiveSupport::NumberHelper
 
-  ENGINE_OPTIONS = { remove_whitespace: true, escape_html: true, ugly: true }
   LOCK = Mutex.new
 
   def self.render(template, locals)
@@ -24,13 +24,31 @@ class Servel::HamlContext
     (@build_path + path).read
   end
 
+  def sort_attrs(sort, current_method)
+    data = { sort_method: current_method, sort_direction: "asc" }
+    classes = ["sortable"]
+    if sort[:method] == current_method
+      data[:sort_active] = true
+      data[:sort_direction] = sort[:direction]
+      classes << "sort-active"
+      classes << "sort-#{sort[:direction]}"
+    end
+
+    {
+      data: data,
+      class: classes
+    }
+  end
+
   def haml_engine(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))
+        @@haml_engine_cache[path] = Hamlit::Template.new(filename: path) { include(path) }
       end
       @@haml_engine_cache[path]
     end
   end
+
+  instrument :render, :partial, :include
 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)
-    return [404, {}, []] if env["PATH_INFO"] == FAVICON_PATH
-    Servel::HamlContext.render('home.haml', { roots: @roots })
-  end
+class Servel::HomeApp
+  FAVICON_PATH = "/favicon.ico"
+
+  def initialize(roots)
+    @roots = roots
+  end
+
+  def call(env)
+    return [404, {}, []] if env["PATH_INFO"] == FAVICON_PATH
+    Servel::HamlContext.render('home.haml', { roots: @roots })
+  end
 end

data/lib/servel/index.rb

@@ -1,43 +1,91 @@
-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.unshift(Servel::EntryFactory.home("/")) if @url_root != ""
-
-    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
+class Servel::Index
+  extend Servel::Instrumentation
+  LOCALS_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
+    Servel::HamlContext.render('index.haml', locals)
+  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 locals_cache_key
+    @locals_cache_key ||= [@fs_path.to_s, @fs_path.mtime.to_i, sort_method, sort_direction].join("-")
+  end
+
+  def locals
+    LOCALS_CACHE.getset(locals_cache_key) { build_locals }
+  end
+
+  def build_locals
+    entries = @fs_path.children.map { |path| Servel::EntryFactory.for(path) }
+
+    {
+      url_root: @url_root,
+      url_path: @url_path,
+      directories: directories(entries),
+      files: files(entries),
+      sort: {
+        method: sort_method,
+        direction: sort_direction
+      }
+    }
+  end
+
+  def directories(entries)
+    list = apply_sort(entries.select { |entry| entry.directory? })
+
+    unless @url_path == "/"
+      list.unshift(Servel::EntryFactory.parent("../"))
+      list.unshift(Servel::EntryFactory.top(@url_root == "" ? "/" : @url_root))
+    end
+
+    list.unshift(Servel::EntryFactory.home("/")) if @url_root != ""
+
+    list
+  end
+
+  def files(entries)
+    apply_sort(entries.select { |entry| entry.file? })
+  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
+
+  def sort_entries(entries)
+    Naturalsorter::Sorter.sort_by_method(entries, :name, true)
+  end
+
+  instrument :locals, :directories, :files, :sort_entries
 end

data/lib/servel/instrumentation.rb

@@ -0,0 +1,26 @@
+module Servel::Instrumentation
+  def instrument(*method_names)
+    return unless ENV["DEBUG"] == "1"
+
+    Array(method_names).each do |method_name|
+      original_method_name = "#{method_name}_without_instrumentation"
+
+      alias_method original_method_name, method_name
+
+      cumulative_time_spent = 0
+
+      define_method(method_name) do |*args|
+        start = Time.now
+
+        return_value = __send__(original_method_name, *args)
+
+        finish = Time.now
+        time_spent = ((finish - start) * 1000.0)
+        cumulative_time_spent += time_spent
+        puts "Running #{self.class.name}<#{object_id}>##{method_name}: #{time_spent.round(3)}ms (cumulative: #{cumulative_time_spent.round(3)}ms)"
+
+        return_value
+      end
+    end
+  end
+end

data/lib/servel/templates/_gallery.haml

@@ -1,11 +1,11 @@
-%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 ◀◀
-#page-next-10.paginator ▶▶
+%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 ◀◀
+#page-next-10.paginator ▶▶
 #page-toggle-size.paginator ⤡

data/lib/servel/templates/_listing.haml

@@ -3,11 +3,15 @@
   %table
     %thead
       %tr
-        %th Name
+        %th{sort_attrs(sort, "name")}
+          %a{href: "#"} Name
         %th.new-tab
-        %th.type Type
-        %th.size Size
-        %th.modified Modified
+        %th.type{sort_attrs(sort, "type")}
+          %a{href: "#"} Type
+        %th.size{sort_attrs(sort, "size")}
+          %a{href: "#"} Size
+        %th.modified{sort_attrs(sort, "mtime")}
+          %a{href: "#"} Modified
     %tbody
       - (directories + files).each do |file|
         %tr