servel 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4a27247e6a018f755e9ace67a1135b4a324702a
-  data.tar.gz: d812976aaa161dc23b9fea1d661db77b7b81d5af
+  metadata.gz: 110f9b74c9c900dfe2febfde8eb58d671831b549
+  data.tar.gz: 0e2acd5f66b547f9ccfb53d52896ba3c3ce4184b
 SHA512:
-  metadata.gz: 37bd1b9749d58c39d15c97165f07ee3bc49795d68cc7bdaf89aaccbbfa70baa71295b92faa5f23f53fe120515d2abde5bf020618651b8a179fca845bf30a0635
-  data.tar.gz: 96af2ce748d56880f872f12e1af2841010d9aa959553883480de01ffdbc19af6f8ef4e3a62ad71b75fef24115b28fa538b27a4fec12c4bdd5a2af8a8053cdc07
+  metadata.gz: f1d8a384505b7b707e484adbb3e5238ebce1eca1c0e451839a6ad99751521799216e4b65e8ba5bfbf5a12c883a8e9b30e6c66366251eacfe39ae1f3fbe2ac554
+  data.tar.gz: 95a5fb8d8ae8e43642a70291bba5b2c2c9e231c81c1cc4e044857efb8333fafabbb59e5b84e7e47d4417452c27770938f749e9c2d408a6723b572d143d1a8cc6

data/lib/servel/app.rb

@@ -16,6 +16,8 @@ class Servel::App
 
     return redirect("#{url_root}#{url_path}/") unless env["PATH_INFO"].end_with?("/")
 
+    return [404, {}, []] unless fs_path.exist?
+
     index(Servel::Locals.new(url_root: url_root, url_path: url_path, fs_path: fs_path))
   end
 

data/lib/servel/locals.rb

@@ -20,7 +20,7 @@ class Servel::Locals
 
     unless @url_path == "/"
       list.unshift(Servel::Path.parent("../"))
-      list.unshift(Servel::Path.top(@url_root))
+      list.unshift(Servel::Path.top(@url_root == "" ? "/" : @url_root))
     end
 
     list

data/lib/servel/path.rb

@@ -1,38 +1,38 @@
-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
+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

data/lib/servel/path_builder.rb

@@ -1,74 +1,74 @@
-class Servel::PathBuilder
-  IMAGE_EXTS = %w(.jpg .jpeg .png .gif)
-  VIDEO_EXTS = %w(.webm .mp4)
-  AUDIO_EXTS = %w(.mp3 .m4a .wav)
-
-  def initialize(path)
-    @path = Pathname.new(path)
-  end
-
-  def build
-    Servel::Path.new(
-      type: type,
-      media_type: media_type,
-      listing_classes: listing_classes,
-      icon: icon,
-      href: @path.basename,
-      name: @path.basename,
-      size: size,
-      mtime: @path.mtime
-    )
-  end
-
-  def type
-    if @path.directory?
-      "Dir"
-    elsif @path.file?
-      @path.extname.sub(/^\./, "")
-    else
-      ""
-    end
-  end
-
-  def media_type
-    return nil unless @path.file? && @path.extname
-
-    case @path.extname.downcase
-    when *IMAGE_EXTS
-      :image
-    when *VIDEO_EXTS
-      :video
-    when *AUDIO_EXTS
-      :audio
-    else
-      nil
-    end
-  end
-
-  def listing_classes
-    klasses = []
-    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?
-    case media_type
-    when :video
-      "🎞️"
-    when :image
-      "🖼️"
-    when :audio
-      "🔊"
-    else
-      "📝"
-    end
-  end
-
-  def size
-    @path.directory? ? nil : @path.size
-  end
+class Servel::PathBuilder
+  IMAGE_EXTS = %w(.jpg .jpeg .png .gif)
+  VIDEO_EXTS = %w(.webm .mp4)
+  AUDIO_EXTS = %w(.mp3 .m4a .wav)
+
+  def initialize(path)
+    @path = Pathname.new(path)
+  end
+
+  def build
+    Servel::Path.new(
+      type: type,
+      media_type: media_type,
+      listing_classes: listing_classes,
+      icon: icon,
+      href: @path.basename,
+      name: @path.basename,
+      size: size,
+      mtime: @path.mtime
+    )
+  end
+
+  def type
+    if @path.directory?
+      "Dir"
+    elsif @path.file?
+      @path.extname.sub(/^\./, "")
+    else
+      ""
+    end
+  end
+
+  def media_type
+    return nil unless @path.file? && @path.extname
+
+    case @path.extname.downcase
+    when *IMAGE_EXTS
+      :image
+    when *VIDEO_EXTS
+      :video
+    when *AUDIO_EXTS
+      :audio
+    else
+      nil
+    end
+  end
+
+  def listing_classes
+    klasses = []
+    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?
+    case media_type
+    when :video
+      "🎞️"
+    when :image
+      "🖼️"
+    when :audio
+      "🔊"
+    else
+      "📝"
+    end
+  end
+
+  def size
+    @path.directory? ? nil : @path.size
+  end
 end

data/lib/servel/templates/gallery.js

@@ -67,7 +67,7 @@ var Gallery = (function() {
     document.body.addEventListener("click", function(e) {
       if(!e.target) return;
 
-      if(e.target.matches("a.media")) {
+      if(e.target.matches("a.media:not(.new-tab)")) {
         e.preventDefault();
         jump(e.target.href);
       }

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler