servel 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9415e93e4c4259efd8b7547c1d8a67c8bb71c54
-  data.tar.gz: 87744e0b049184c5b2138fd34ab3e34c292016dd
+  metadata.gz: d4a27247e6a018f755e9ace67a1135b4a324702a
+  data.tar.gz: d812976aaa161dc23b9fea1d661db77b7b81d5af
 SHA512:
-  metadata.gz: 30c5075efb1b5fab6b79ee68b55a18e75fddfe681bd7c03d159a83f2321b97f7442b7cd9430d8c3aadf5117db6a9fd244c48ed1d23200ba8c8f4302f5c915821
-  data.tar.gz: 5e2e42e1b6caf5857a3d16a6d44d8207343401a4188a82af8bbbee4a7cca5bfc599b25755a1c3edba805c247276cadd160444fbc5f1b42509ea4b7dc984d007a
+  metadata.gz: 37bd1b9749d58c39d15c97165f07ee3bc49795d68cc7bdaf89aaccbbfa70baa71295b92faa5f23f53fe120515d2abde5bf020618651b8a179fca845bf30a0635
+  data.tar.gz: 96af2ce748d56880f872f12e1af2841010d9aa959553883480de01ffdbc19af6f8ef4e3a62ad71b75fef24115b28fa538b27a4fec12c4bdd5a2af8a8053cdc07

data/lib/servel/path.rb

@@ -1,7 +1,7 @@
 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)
+  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
@@ -12,34 +12,23 @@ class Servel::Path
     @mtime = mtime
   end
 
-  def listing_attrs
-    {
-      class: @listing_classes,
-      data: {
-        type: @media_type
-      }
-    }
-  end
-
   def media?
-    @media_type != "unknown"
+    !@media_type.nil?
   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,

data/lib/servel/path_builder.rb

@@ -1,8 +1,12 @@
 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,
@@ -15,22 +19,6 @@ class Servel::PathBuilder
       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?
@@ -43,31 +31,37 @@ class Servel::PathBuilder
   end
 
   def media_type
-    return "video" if video?
-    return "image" if image?
-    return "audio" if audio?
-    "unknown"
+    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 << "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 << "media" if media_type
+    klasses << media_type if media_type
     klasses.join(" ")
   end
 
   def icon
-    if @path.directory?
-      "📁"
-    elsif video?
+    return "📁" if @path.directory?
+    case media_type
+    when :video
       "🎞️"
-    elsif image?
+    when :image
       "🖼️"
-    elsif audio?
+    when :audio
       "🔊"
     else
       "📝"

data/lib/servel/templates/_listing.haml

@@ -13,9 +13,9 @@
         %tr
           %td
             %span.icon= file.icon
-            %a.default{href: file.href, **file.listing_attrs}= file.name
+            %a.default{href: file.href, class: file.listing_classes, data: { type: file.media_type }}= file.name
           %td
-            %a.new-tab{href: file.href, target: "_blank", **file.listing_attrs} (New tab)
+            %a.new-tab{href: file.href, class: file.listing_classes, target: "_blank"} (New tab)
           %td= file.type
           %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/version.rb

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

metadata

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