servel 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90781daa208037a411ff728a5b24119dd2680e83
-  data.tar.gz: 5fda6f639a3b61fe93054b69075f552070b68ab8
+  metadata.gz: f6492d021105b80fbde26cbc28be8ae3e94e3363
+  data.tar.gz: eef6c59037a02a8773e757f590a1e421dcd227cc
 SHA512:
-  metadata.gz: 44b15921dd110dc9d6dd139f0f748f94bacc7d16ec37b8a398f48a6e643b11a7222fb148b9fa4955576aadda38d7376d8afca775fefdd8b05291ce061bb8ffd8
-  data.tar.gz: beb51c3c7ff7f278119d6430482e3d506984ffec030dd7bdbfe61872275b8b3bfdcfdbc7ec4e4fe39c8e15122ed037754c129da5ad9de6df994c8e0167d187e7
+  metadata.gz: 4d9562a78fc9bde9928591f32301b20a0b3e63bd74cb8c41c4f90cfb4610d5c31a2cc065906e94393b40836c2ca2a8c92c3e2a34bcfeb41672e9806fa162e6f6
+  data.tar.gz: 891d91db9bef20c5b34fbf34dc2e8abf93aca9a09e400795c561c0dfa3d539cd7a06f2170b5ddb16bd55eb642ed81b301d07262914a9b39756b207dea565f41b

data/bin/servel

@@ -2,5 +2,4 @@
 
 require "servel"
 
-servel = Servel::Servel.new(Pathname.new(ARGV.first).realpath)
-servel.start
+Servel::CLI.new(ARGV).start

data/lib/servel.rb

@@ -9,12 +9,18 @@ require 'pathname'
 require 'delegate'
 
 module Servel
+  def self.build_app(path_map)
+    url_map = path_map.map { |root, url_root| [url_root, Servel::App.new(root)] }.to_h
+    url_map["/"] = Servel::HomeApp.new(path_map.values) unless url_map.keys.include?("/")
+
+    Rack::URLMap.new(url_map)
+  end
 end
 
 require "servel/version"
-require "servel/core_ext/pathname"
 require "servel/pathname_decorator"
 require "servel/haml_context"
 require "servel/locals"
-require "servel/middleware"
-require "servel/servel"
+require "servel/app"
+require "servel/home_app"
+require "servel/cli"

data/lib/servel/app.rb

@@ -0,0 +1,38 @@
+class Servel::App
+  def initialize(root)
+    @root = Pathname.new(root)
+    @file_server = Rack::File.new(root.to_s)
+  end
+
+  def call(env)
+    url_root = env["SCRIPT_NAME"]
+    url_path = clean_url_path(env["PATH_INFO"])
+
+    return redirect("#{url_root}/") if env["PATH_INFO"] == ""
+
+    fs_path = @root + url_path[1..-1]
+
+    return @file_server.call(env) if fs_path.file?
+
+    return redirect("#{url_root}#{url_path}/") unless env["PATH_INFO"].end_with?("/")
+
+    index(Servel::Locals.new(url_root: url_root, url_path: url_path, fs_path: fs_path))
+  end
+
+  def redirect(location)
+    [302, { "Location" => location }, []]
+  end
+
+  def clean_url_path(path)
+    url_path = Rack::Utils.unescape_path(path)
+    raise unless Rack::Utils.valid_path?(url_path)
+    Rack::Utils.clean_path_info(url_path)
+  end
+
+  def index(locals)
+    @haml_context ||= Servel::HamlContext.new
+    body = @haml_context.render('index.haml', locals.resolve)
+
+    [200, {}, [body]]
+  end
+end

data/lib/servel/cli.rb

@@ -0,0 +1,18 @@
+class Servel::CLI
+  def initialize(argv)
+    @argv = argv
+  end
+
+  def start
+    Rack::Handler::Puma.run(Servel.build_app(path_map))
+  end
+
+  def path_map
+    @argv.map do |arg|
+      root, url_root = arg.split(":" , 2)
+      root = Pathname.new(root).realpath
+
+      [root, url_root || "/"]
+    end.to_h
+  end
+end

data/lib/servel/haml_context.rb

@@ -20,6 +20,10 @@ 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/home_app.rb

@@ -0,0 +1,12 @@
+class Servel::HomeApp
+  def initialize(roots)
+    @roots = roots
+  end
+
+  def call(env)
+    @haml_context ||= Servel::HamlContext.new
+    body = @haml_context.render('home.haml', { roots: @roots })
+
+    [200, {}, [body]]
+  end
+end

data/lib/servel/locals.rb

@@ -1,12 +1,13 @@
 class Servel::Locals
-  def initialize(url_path:, fs_path:, root:)
+  def initialize(url_root:, url_path:, fs_path:)
+    @url_root = url_root
     @url_path = url_path
     @fs_path = fs_path
-    @root = root
   end
 
-  def locals
+  def resolve
     {
+      url_root: @url_root,
       url_path: @url_path,
       directories: directories,
       files: files
@@ -16,7 +17,12 @@ class Servel::Locals
   def directories
     list = @fs_path.children.select { |child| child.directory? }
     list = sort_paths(list)
-    list.unshift(@fs_path.decorate(true)) unless @fs_path == @root
+
+    unless @url_path == "/"
+      list.unshift(Servel::PathnameDecorator.new(pathname: "../", parent: true))
+      list.unshift(Servel::PathnameDecorator.new(pathname: @url_root, top: true))
+    end
+
     list
   end
 

data/lib/servel/pathname_decorator.rb

@@ -1,91 +1,110 @@
-class Servel::PathnameDecorator < SimpleDelegator
-  def initialize(pathname, parent)
-    super(pathname)
-    @parent = parent
-  end
-
-  def decorate
-    self
-  end
-
-  def image?
-    file? && extname && %w(.jpg .jpeg .png .gif).include?(extname.downcase)
-  end
-
-  def video?
-    file? && extname && %w(.webm).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.join(" ")
-  end
-
-  def listing_attrs
-    {
-      class: listing_classes,
-      data: {
-        type: media_type
-      }
-    }
-  end
-
-  def parent?
-    @parent
-  end
-
-  def icon
-    if @parent
-      "🔝"
-    elsif directory?
-      "📁"
-    else
-      ""
-    end
-  end
-
-  def href
-    if @parent
-      "../"
-    else
-      basename
-    end
-  end
-
-  def name
-    if @parent
-      "(Parent Directory)"
-    else
-      basename
-    end
-  end
+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

data/lib/servel/templates/_gallery.haml

@@ -1,8 +1,8 @@
-%img#image
-%video#video{autoplay: true, controls: true}
-%audio#audio{autoplay: true, controls: true}
-#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}
+#page-back.paginator ◀
+#page-next.paginator ▶
+#page-back-10.paginator ◀◀
+#page-next-10.paginator ▶▶
 #page-toggle-size.paginator ⤡

data/lib/servel/templates/_listing.haml

@@ -1,21 +1,22 @@
-%h1 Listing of #{url_path}
-%table
-  %thead
-    %tr
-      %th Name
-      %th.new-tab
-      %th.type Type
-      %th.size Size
-      %th.modified Modified
-  %tbody
-    - (directories + files).each do |file|
-      - file = file.decorate
-      %tr
-        %td
-          %span.icon= file.icon
-          %a.default{href: file.href, **file.listing_attrs}= file.name
-        %td
-          %a.new-tab{href: file.href, target: "_blank", **file.listing_attrs} (New tab)
-        %td= file.type
-        %td= file.directory? ? "-" : number_to_human_size(file.size)
-        %td= file.mtime.strftime("%e %b %Y %l:%M %p")
+%h1 Listing of #{url_root}#{url_path}
+.table-wrapper
+  %table
+    %thead
+      %tr
+        %th Name
+        %th.new-tab
+        %th.type Type
+        %th.size Size
+        %th.modified Modified
+    %tbody
+      - (directories + files).each do |file|
+        - file = decorate(file)
+        %tr
+          %td
+            %span.icon= file.icon
+            %a.default{href: file.href, **file.listing_attrs}= file.name
+          %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")

data/lib/servel/templates/common.css

@@ -1,4 +1,5 @@
 * {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   box-sizing: border-box;
 }
 
@@ -13,4 +14,12 @@ body {
   -khtml-user-select: none;
   -ms-user-select: none;
   user-select: none;
+}
+
+a {
+  text-decoration: none;
+}
+
+a:hover, a:focus, a:active {
+  text-decoration: underline;
 }

data/lib/servel/templates/gallery.css

@@ -1,5 +1,5 @@
 #gallery {
-  padding: 0 20px;
+  padding: 0 100px;
   background: #333;
   transform: translateZ(0px);
 }
@@ -12,7 +12,6 @@
 
 #audio {
   width: 100%;
-  padding: 0 100px;
 }
 
 @media (min-width: 992px) {
@@ -25,6 +24,10 @@
   display: block;
 }
 
+#gallery.image {
+  padding: 0 20px;
+}
+
 #gallery.image #image {
   display: block;
 }

data/lib/servel/templates/home.css

@@ -0,0 +1,16 @@
+#home {
+  padding: 20px;
+}
+
+#home h1 {
+  margin-top: 0;
+}
+
+#roots li {
+  font-size: 24px;
+}
+
+#roots a.new-tab {
+  display: inline-block;
+  margin-left: 20px;
+}

data/lib/servel/templates/home.haml

@@ -0,0 +1,18 @@
+!!!
+%html
+  %head
+    %meta{charset: 'utf-8'}
+    %title Browse Listings
+    %meta{name: 'viewport', content: 'width=device-width, height=device-height, user-scalable=no'}
+    :css
+      #{include('normalize.css')}
+      #{include('common.css')}
+      #{include('home.css')}
+  %body
+    #home
+      %h1 Browse Listings
+      %ul#roots
+        - roots.each do |root|
+          %li
+            %a{href: root}= root
+            %a.new-tab{href: root, target: "_blank"} (New Tab)

data/lib/servel/templates/index.css

@@ -12,25 +12,4 @@ body.split-screen #listing {
 body.split-screen #gallery {
   width: 50%;
   float: right;
-}
-/*
-@media screen and (min-width: 1800px) {
-  #listing {
-    float: left;
-    width: 800px;
-    height: 100%;
-    overflow: auto;
-  }
-
-  #gallery {
-    margin-left: 800px;
-  }
-
-  body.gallery-expanded #listing {
-    display: none;
-  }
-
-  body.gallery-expanded #gallery {
-    margin-left: 0;
-  }
-}*/
+}

data/lib/servel/templates/index.haml

@@ -1,19 +1,19 @@
-!!!
-%html
-  %head
-    %meta{charset: 'utf-8'}
-    %title Listing of #{url_path}
-    %meta{name: 'viewport', content: 'width=device-width, height=device-height, user-scalable=no'}
-    :css
-      #{include('normalize.css')}
-      #{include('common.css')}
-      #{include('index.css')}
-      #{include('listing.css')}
-      #{include('gallery.css')}
-
-    :javascript
-      #{include('gallery.js')}
-  %body
-    - if files.any? { |f| f.decorate.media? }
-      #gallery!= partial('gallery')
-    #listing!= partial('listing', { url_path: url_path, directories: directories, files: files })
+!!!
+%html
+  %head
+    %meta{charset: 'utf-8'}
+    %title Listing of #{url_root}#{url_path}
+    %meta{name: 'viewport', content: 'width=device-width, height=device-height, user-scalable=no'}
+    :css
+      #{include('normalize.css')}
+      #{include('common.css')}
+      #{include('index.css')}
+      #{include('listing.css')}
+      #{include('gallery.css')}
+
+    :javascript
+      #{include('gallery.js')}
+  %body
+    - if files.any? { |f| decorate(f).media? }
+      #gallery!= partial('gallery')
+    #listing!= partial('listing', { url_root: url_root, url_path: url_path, directories: directories, files: files })

data/lib/servel/templates/listing.css

@@ -1,43 +1,55 @@
-#listing {
-  padding: 20px;
-}
-
-#listing h1 {
-  margin-top: 0;
-}
-
-table {
-  width: 100%;
-  border-collapse: collapse;
-  border: 1px solid #ddd;
-  table-layout: fixed;
-}
-
-th, td {
-  padding: 5px;
-  border: 1px solid #ddd;
-}
-
-tbody > tr:nth-of-type(odd) {
-  background-color: #f9f9f9;
-}
-
-th.new-tab {
-  width: 6em;
-}
-
-th.type {
-  width: 4em;
-}
-
-th.size {
-  width: 6em;
-}
-
-th.modified {
-  width: 12em;
-}
-
-span.icon {
-  margin-right: 0.2em;
-}
+#listing {
+  padding: 20px;
+}
+
+#listing h1 {
+  margin-top: 0;
+}
+
+.table-wrapper {
+  overflow: auto;
+}
+
+table {
+  width: 100%;
+  min-width: 800px;
+  border-collapse: collapse;
+  border: 1px solid #ddd;
+  table-layout: fixed;
+}
+
+th, td {
+  padding: 5px;
+  border: 1px solid #ddd;
+}
+
+tbody > tr:nth-of-type(odd) {
+  background-color: #f9f9f9;
+}
+
+th.new-tab {
+  width: 6em;
+}
+
+th.type {
+  width: 4em;
+}
+
+th.size {
+  width: 6em;
+}
+
+th.modified {
+  width: 12em;
+}
+
+span.icon {
+  display: inline-block;
+  margin-right: 0.2em;
+  width: 1.4em;
+  text-align: center;
+}
+
+a.default.top, a.default.parent {
+  font-style: oblique;
+}

data/lib/servel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,17 +125,19 @@ files:
 - bin/servel
 - bin/setup
 - lib/servel.rb
-- lib/servel/core_ext/pathname.rb
+- lib/servel/app.rb
+- lib/servel/cli.rb
 - lib/servel/haml_context.rb
+- lib/servel/home_app.rb
 - lib/servel/locals.rb
-- lib/servel/middleware.rb
 - lib/servel/pathname_decorator.rb
-- lib/servel/servel.rb
 - lib/servel/templates/_gallery.haml
 - lib/servel/templates/_listing.haml
 - lib/servel/templates/common.css
 - lib/servel/templates/gallery.css
 - lib/servel/templates/gallery.js
+- lib/servel/templates/home.css
+- lib/servel/templates/home.haml
 - lib/servel/templates/index.css
 - lib/servel/templates/index.haml
 - lib/servel/templates/listing.css

data/lib/servel/core_ext/pathname.rb

@@ -1,5 +0,0 @@
-class Pathname
-  def decorate(parent = false)
-    Servel::PathnameDecorator.new(self, parent)
-  end
-end

data/lib/servel/middleware.rb

@@ -1,36 +0,0 @@
-class Servel::Middleware
-  def initialize(app, options = {})
-    @app = app
-    @root = Pathname.new(options[:root])
-    @file_server = Rack::File.new(@root.to_s)
-  end
-
-  def call(env)
-    path = env["PATH_INFO"]
-    url_path = url_path_for(path)
-    fs_path = @root + url_path[1..-1]
-
-    return @file_server.call(env) unless fs_path.directory?
-
-    url_path << "/" unless url_path.end_with?("/")
-
-    return [302, { "Location" => url_path }, []] unless path == "" || path.end_with?("/")
-
-    index(url_path, fs_path)
-  end
-
-  def url_path_for(url_path)
-    url_path = Rack::Utils.unescape_path(url_path)
-    raise unless Rack::Utils.valid_path?(url_path)
-
-    Rack::Utils.clean_path_info(url_path)
-  end
-
-  def index(url_path, fs_path)
-    @haml_context ||= Servel::HamlContext.new
-    locals = Servel::Locals.new(url_path: url_path, fs_path: fs_path, root: @root).locals
-    body = @haml_context.render('index.haml', locals)
-
-    [200, {}, [body]]
-  end
-end

data/lib/servel/servel.rb

@@ -1,21 +0,0 @@
-class Servel::Servel
-  def initialize(root)
-    @root = root
-  end
-
-  def start
-    Rack::Handler::Puma.run(build_app)
-  end
-
-  def build_app
-    root = @root
-
-    Rack::Builder.new do
-      use(Servel::Middleware, root: root)
-
-      run ->(env) do
-        [404, {}, []]
-      end
-    end
-  end
-end