servel 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6492d021105b80fbde26cbc28be8ae3e94e3363
-  data.tar.gz: eef6c59037a02a8773e757f590a1e421dcd227cc
+  metadata.gz: a9415e93e4c4259efd8b7547c1d8a67c8bb71c54
+  data.tar.gz: 87744e0b049184c5b2138fd34ab3e34c292016dd
 SHA512:
-  metadata.gz: 4d9562a78fc9bde9928591f32301b20a0b3e63bd74cb8c41c4f90cfb4610d5c31a2cc065906e94393b40836c2ca2a8c92c3e2a34bcfeb41672e9806fa162e6f6
-  data.tar.gz: 891d91db9bef20c5b34fbf34dc2e8abf93aca9a09e400795c561c0dfa3d539cd7a06f2170b5ddb16bd55eb642ed81b301d07262914a9b39756b207dea565f41b
+  metadata.gz: 30c5075efb1b5fab6b79ee68b55a18e75fddfe681bd7c03d159a83f2321b97f7442b7cd9430d8c3aadf5117db6a9fd244c48ed1d23200ba8c8f4302f5c915821
+  data.tar.gz: 5e2e42e1b6caf5857a3d16a6d44d8207343401a4188a82af8bbbee4a7cca5bfc599b25755a1c3edba805c247276cadd160444fbc5f1b42509ea4b7dc984d007a

data/lib/servel.rb

@@ -18,7 +18,8 @@ module Servel
 end
 
 require "servel/version"
-require "servel/pathname_decorator"
+require "servel/path"
+require "servel/path_builder"
 require "servel/haml_context"
 require "servel/locals"
 require "servel/app"

data/lib/servel/haml_context.rb

@@ -20,10 +20,6 @@ class Servel::HamlContext
     (@build_path + path).read
   end
 
-  def decorate(path)
-    Servel::PathnameDecorator.new(pathname: path)
-  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))

data/lib/servel/locals.rb

@@ -16,19 +16,23 @@ class Servel::Locals
 
   def directories
     list = @fs_path.children.select { |child| child.directory? }
-    list = sort_paths(list)
+    list = sort_paths(list).map { |path| build(path) }
 
     unless @url_path == "/"
-      list.unshift(Servel::PathnameDecorator.new(pathname: "../", parent: true))
-      list.unshift(Servel::PathnameDecorator.new(pathname: @url_root, top: true))
+      list.unshift(Servel::Path.parent("../"))
+      list.unshift(Servel::Path.top(@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)
+    sort_paths(list).map { |path| build(path) }
   end
 
   def sort_paths(paths)

data/lib/servel/path.rb

@@ -0,0 +1,49 @@
+class Servel::Path
+  attr_reader :type, :media_type, :listing_classes, :icon, :href, :name, :size, :mtime
+
+  def initialize(type:, media_type:, 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 listing_attrs
+    {
+      class: @listing_classes,
+      data: {
+        type: @media_type
+      }
+    }
+  end
+
+  def media?
+    @media_type != "unknown"
+  end
+
+  def self.top(href)
+    Servel::Path.new(
+      type: "Dir",
+      media_type: "unknown",
+      listing_classes: "top directory",
+      icon: "🔝",
+      href: href,
+      name: "Top Directory"
+    )
+  end
+  
+  def self.parent(href)
+    Servel::Path.new(
+      type: "Dir",
+      media_type: "unknown",
+      listing_classes: "parent directory",
+      icon: "⬆️",
+      href: href,
+      name: "Parent Directory"
+    )
+  end
+end

data/lib/servel/path_builder.rb

@@ -0,0 +1,80 @@
+class Servel::PathBuilder
+  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 image?
+    @path.file? && @path.extname && %w(.jpg .jpeg .png .gif).include?(@path.extname.downcase)
+  end
+
+  def video?
+    @path.file? && @path.extname && %w(.webm .mp4).include?(@path.extname.downcase)
+  end
+
+  def audio?
+    @path.file? && @path.extname && %w(.mp3 .m4a .wav).include?(@path.extname.downcase)
+  end
+
+  def media?
+    image? || video? || audio?
+  end
+
+  def type
+    if @path.directory?
+      "Dir"
+    elsif @path.file?
+      @path.extname.sub(/^\./, "")
+    else
+      ""
+    end
+  end
+
+  def media_type
+    return "video" if video?
+    return "image" if image?
+    return "audio" if audio?
+    "unknown"
+  end
+
+  def listing_classes
+    klasses = []
+    klasses << "media" if media?
+    klasses << "image" if image?
+    klasses << "video" if video?
+    klasses << "audio" if audio?
+    klasses << "file" if @path.file?
+    klasses << "directory" if @path.directory?
+    klasses.join(" ")
+  end
+
+  def icon
+    if @path.directory?
+      "📁"
+    elsif video?
+      "🎞️"
+    elsif image?
+      "🖼️"
+    elsif audio?
+      "🔊"
+    else
+      "📝"
+    end
+  end
+
+  def size
+    @path.directory? ? nil : @path.size
+  end
+end

data/lib/servel/templates/_listing.haml

@@ -10,7 +10,6 @@
         %th.modified Modified
     %tbody
       - (directories + files).each do |file|
-        - file = decorate(file)
         %tr
           %td
             %span.icon= file.icon
@@ -18,5 +17,5 @@
           %td
             %a.new-tab{href: file.href, target: "_blank", **file.listing_attrs} (New tab)
           %td= file.type
-          %td= file.directory? || file.virtual? ? "-" : number_to_human_size(file.size)
-          %td= file.virtual? ? "-" : file.mtime.strftime("%e %b %Y %l:%M %p")
+          %td= file.size.nil? ? "-" : number_to_human_size(file.size)
+          %td= file.mtime.nil? ? "-" : file.mtime.strftime("%e %b %Y %l:%M %p")

data/lib/servel/templates/index.haml

@@ -14,6 +14,6 @@
     :javascript
       #{include('gallery.js')}
   %body
-    - if files.any? { |f| decorate(f).media? }
+    - if files.any? { |f| f.media? }
       #gallery!= partial('gallery')
     #listing!= partial('listing', { url_root: url_root, url_path: url_path, directories: directories, files: files })

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
@@ -130,7 +130,8 @@ files:
 - lib/servel/haml_context.rb
 - lib/servel/home_app.rb
 - lib/servel/locals.rb
-- lib/servel/pathname_decorator.rb
+- lib/servel/path.rb
+- lib/servel/path_builder.rb
 - lib/servel/templates/_gallery.haml
 - lib/servel/templates/_listing.haml
 - lib/servel/templates/common.css

data/lib/servel/pathname_decorator.rb

@@ -1,110 +0,0 @@
-class Servel::PathnameDecorator < SimpleDelegator
-  def initialize(pathname:, parent: false, top: false)
-    super(pathname)
-    @parent = parent
-    @top = top
-  end
-
-  def image?
-    file? && extname && %w(.jpg .jpeg .png .gif).include?(extname.downcase)
-  end
-
-  def video?
-    file? && extname && %w(.webm .mp4).include?(extname.downcase)
-  end
-
-  def audio?
-    file? && extname && %w(.mp3 .m4a .wav).include?(extname.downcase)
-  end
-
-  def media?
-    image? || video? || audio?
-  end
-
-  def type
-    if directory?
-      "Dir"
-    elsif file?
-      extname.sub(/^\./, "")
-    else
-      ""
-    end
-  end
-
-  def media_type
-    return "video" if video?
-    return "image" if image?
-    return "audio" if audio?
-    "unknown"
-  end
-
-  def listing_classes
-    klasses = []
-    klasses << "media" if media?
-    klasses << "image" if image?
-    klasses << "video" if video?
-    klasses << "audio" if audio?
-    klasses << "top" if top?
-    klasses << "parent" if parent?
-    klasses << "file" if file?
-    klasses << "directory" if directory?
-    klasses.join(" ")
-  end
-
-  def listing_attrs
-    {
-      class: listing_classes,
-      data: {
-        type: media_type
-      }
-    }
-  end
-
-  def top?
-    @top
-  end
-
-  def parent?
-    @parent
-  end
-
-  def virtual?
-    top? || parent?
-  end
-
-  def icon
-    if @top
-      "🔝"
-    elsif @parent
-      "⬆️"
-    elsif directory?
-      "📁"
-    elsif video?
-      "🎞️"
-    elsif image?
-      "🖼️"
-    elsif audio?
-      "🔊"
-    else
-      "📝"
-    end
-  end
-
-  def href
-    if @top || @parent
-      to_s
-    else
-      basename
-    end
-  end
-
-  def name
-    if @top
-      "Top Directory"
-    elsif @parent
-      "Parent Directory"
-    else
-      basename
-    end
-  end
-end