servel 0.28.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f15c64ad7143343fa43beea82a7c09813ffda5d38c64cf3933fe5033bb78270
-  data.tar.gz: 4a37029622423e52a260f26b3dd71a2ac0943e605370364a85e206fd644f6951
+  metadata.gz: 36dac91c1fba1bbaa2ab70a7dc39404996216867968c93438f503ccc8dd15631
+  data.tar.gz: fedf2fb5c899e69de6715c40b64c4d7c652f6f01c6bec40c99cea1780ce6c16a
 SHA512:
-  metadata.gz: bea3930d3199941d249401dfae0f25a27dc03cf43dd39af5914d2ae7ef9af64ce49c73b47099758611e076f96396f30564404451b9f8f58a78fbfaf34b2f2622
-  data.tar.gz: 0d3f892f937a3046e75a8a61fad8678252a88e7f657ef84da82ee7f46d852492368cc42aa17cda7ac869236a4ae3ae12200f6b48dd8a35c8648afd9460b02b52
+  metadata.gz: 6b52f97da999645b081ad452866fb032e841f073dbb9e3be5c28b4501062cca015d131872c237fc14cf5920421a0671ef8114d984c7bc320c4183f407da66cb3
+  data.tar.gz: 3d621057dd5499b01a69251a08e3d18c3dab29435fde99313f43484d0ae53ba443ca9aec6c16b71369a8e0a25dd5319bf029104cf7c385bf32913cc4d928cc92

data/app/_gallery.haml

@@ -6,9 +6,10 @@
   #page-back.paginator ◀
   #page-next.paginator ▶
 #content
-  %img#image
-  %video#video{controls: false, loop: true}
-  %audio#audio{controls: true}
-  #text
-    %a#text-anchor{href: '#'}
-    #text-content
+  #scroller
+    %img#image
+    %video#video{controls: false, loop: true}
+    %audio#audio{controls: true}
+    #text
+      %a#text-anchor{href: '#'}
+      #text-content

data/app/css/common.css

@@ -16,6 +16,14 @@ body {
   user-select: none;
 }
 
+.text-selectable {
+  -webkit-user-select: text;
+  -moz-user-select: text;
+  -khtml-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
+}
+
 a {
   text-decoration: none;
 }

data/app/css/gallery.css

@@ -1,25 +1,85 @@
 #gallery {
   background: #333;
   display: none;
-  flex-direction: column;
 }
 
 body.has-gallery.gallery #gallery {
   display: flex;
 }
 
+#controls {
+  display: flex;
+}
+
+#page-jump-listing {
+  flex-grow: 1;
+}
+
+.paginator {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 75px;
+
+  font-size: 2em;
+  font-weight: bold;
+  text-align: center;
+  background-color: #1f1f1f;
+  color: #858585;
+
+  cursor: pointer;
+}
+
+.paginator:hover {
+  background-color: #0f0f0f;
+  color: #c1c1c1;
+}
+
 #content {
   display: flex;
   align-items: center;
   justify-content: center;
   flex-grow: 1;
+  min-width: 0;
+  min-height: 0;
+}
+
+#scroller {
+  width: 100%;
+  max-height: 100%;
+  overflow: auto;
+}
+
+body.portrait #gallery {
+  flex-direction: column;
+}
+
+body.portrait .paginator {
+  width: 100px;
+}
+
+body.portrait #page-jump-listing {
+  width: auto;
+}
+
+body.landscape #gallery {
+  flex-direction: row;
+}
+
+body.landscape #controls {
+  flex-direction: column;
+  flex-shrink: 0;
+  width: 100px;
+}
+
+body.landscape #page-jump-listing {
+  writing-mode: vertical-rl;
+  transform: rotate(180deg);
 }
 
 #image, #video, #audio, #text {
   display: none;
-  max-width: 100%;
   margin: 0 auto 0 auto;
-  padding-top: 75px;
 }
 
 #video:focus, #audio:focus {
@@ -51,36 +111,6 @@ body.has-gallery.gallery #gallery {
   display: block;
 }
 
-#controls {
-  position: fixed;
-  left: 0;
-  right: 0;
-  display: flex;
-  z-index: 10;
-}
-
-.paginator {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100px;
-  height: 75px;
-
-  font-size: 2em;
-  font-weight: bold;
-  text-align: center;
-  background-color: #000000;
-  color: #ffffff;
-
-  opacity: 0.4;
-  cursor: pointer;
-}
-
-#page-jump-listing {
-  flex-grow: 1;
-  width: auto;
-}
-
 @media screen and (max-width: 767px) {
   #gallery.video, #gallery.audio, #gallery.text {
     padding: 0;
@@ -101,9 +131,3 @@ body.has-gallery.gallery #gallery {
     display: none;
   }
 }
-
-@media screen and (min-width: 768px) {
-  .paginator:hover {
-    opacity: 0.7;
-  }
-}

data/app/js/gallery.js

@@ -1,9 +1,11 @@
 "use strict";
 
 var Gallery = (function() {
-  var LAYOUT_MODES = ["fit-both", "fit-width", "clamp-width"];
+  var LAYOUT_MODES = ["fit-both", "fit-width", "clamp-width", "full-size"];
 
+  var $body;
   var $gallery;
+  var $image;
   var $video;
   var $audio;
   var currentIndex;
@@ -155,15 +157,38 @@ var Gallery = (function() {
   }
 
   function layout() {
-    var viewportHeight = document.documentElement.clientHeight + "px";
-    $gallery.style.minHeight = viewportHeight;
+    var vw = document.documentElement.clientWidth;
+    var vh = document.documentElement.clientHeight;
+
+    var viewportOrientation = vw > vh ? "landscape" : "portrait";
+    $body.classList.remove("landscape", "portrait");
+    $body.classList.add(viewportOrientation);
+
+    $gallery.style.height = vh + "px";
+
+    var scrollerMaxHeight = viewportOrientation == "landscape" ? vh : vh - 75;
 
     var layoutMode = LAYOUT_MODES[layoutModeIndex];
-    var maxHeight = layoutMode == "fit-both" ? viewportHeight : "none";
-    var maxWidth = layoutMode == "clamp-width" ? "1000px" : "100%";
 
-    $("#image").style.maxWidth = maxWidth;
-    $("#image").style.maxHeight = maxHeight;
+    if(layoutMode == "fit-both") {
+      var maxWidth = "100%";
+      var maxHeight = (scrollerMaxHeight + "px");
+    }
+    else if(layoutMode == "fit-width") {
+      var maxWidth = "100%";
+      var maxHeight = "none";
+    }
+    else if(layoutMode == "clamp-width") {
+      var maxWidth = "1000px";
+      var maxHeight = "none";
+    }
+    else if(layoutMode == "full-size") {
+      var maxWidth = "none";
+      var maxHeight = "none";
+    }
+
+    $image.style.maxWidth = maxWidth;
+    $image.style.maxHeight = maxHeight;
     $video.style.maxWidth = maxWidth;
     $video.style.maxHeight = maxHeight;
     $audio.style.maxWidth = maxWidth;
@@ -181,7 +206,9 @@ var Gallery = (function() {
   }
 
   function init() {
+    $body = $("body");
     $gallery = $("#gallery");
+    $image = $("#image");
     $video = $("#video");
     $audio = $("#audio");
 

data/app/js/index.js

@@ -19,52 +19,8 @@ var Index = (function() {
     document.body.classList.add("gallery");
   }
 
-  function jumpScroll() {
-    if(galleryVisible()) {
-      jumpListing();
-      window.scrollTo(0, 0);
-    }
-    else {
-      jumpGallery();
-      window.scrollTo(0, document.body.scrollHeight);
-    }
-  }
-
-  function atTop() {
-    return window.scrollY == 0;
-  }
-
-  function bottomScrollDown(event) {
-    return galleryVisible() && atBottom() && event.deltaY > 0;
-  }
-
-  function topScrollUp(event) {
-    return listingVisible() && atTop() && event.deltaY < 0;
-  }
-
-  function initEvents() {
-    var scrollSize = 0;
-
-    window.addEventListener("wheel", function(event) {
-      if(bottomScrollDown(event) || topScrollUp(event)) {
-        scrollSize += Math.abs(event.deltaY);
-
-        if(scrollSize >= 1500) {
-          scrollSize = 0;
-          jumpScroll();
-        }
-      }
-      else {
-        scrollSize = 0;
-      }
-    });
-  }
-
   function init() {
-    if((Entries.media().length / Entries.all().length) >= 0.5) jumpGallery();
-    else jumpListing();
-
-    initEvents();
+    jumpListing();
   }
 
   return {

data/app/js/listing.js

@@ -27,7 +27,7 @@ var Listing = (function() {
   function renderRow(file) {
     return HTMLSafe`
       <tr>
-        <td class="name">
+        <td class="name text-selectable">
           <span class="icon">${file.icon}</span>
           <a href="${file.href}" class="default ${file.class}" data-url="${file.href}" data-type="${file.mediaType}">${file.name}</a>
         </td>

data/bin/servel

@@ -2,4 +2,4 @@
 
 require "servel"
 
-Servel::CLI.new(ARGV).start
+Servel::CLI.new.start

data/lib/servel.rb

@@ -1,20 +1,59 @@
 require 'rack'
 require 'rack/handler/puma'
+require 'puma/configuration'
 require 'hamlit'
 require 'active_support/all'
 require 'lru_redux'
+require 'tty-config'
 
 require 'thread'
 require 'pathname'
 require 'json'
+require 'digest'
 
 module Servel
-  def self.build_app(path_map)
+  def self.build_app(listings:, username: nil, password: nil)
+    app = build_listings_app(build_path_map(listings))
+
+    if username && username != ""
+      build_authentication_app(app: app, username: username, password: password)
+    else
+      app
+    end
+  end
+
+  def self.build_authentication_app(app:, username:, password:)
+    hashed_username = Digest::SHA512.digest(username)
+    hashed_password = Digest::SHA512.digest(password)
+
+    Rack::Auth::Basic.new(app) do |submitted_username, submitted_password|
+      hashed_submitted_username = Digest::SHA512.digest(submitted_username)
+      hashed_submitted_password = Digest::SHA512.digest(submitted_password)
+
+      Rack::Utils.secure_compare(
+        "#{hashed_username}#{hashed_password}",
+        "#{hashed_submitted_username}#{hashed_submitted_password}"
+      )
+    end
+  end
+
+  def self.build_path_map(listings)
+    listings.map do |listing|
+      listing = { listing => nil } if listing.is_a?(String)
+
+      root, url_root = listing.keys.first, listing.values.first || "/"
+      [Pathname.new(root).realpath, url_root]
+    end.to_h
+  end
+
+  def self.build_listings_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"
@@ -25,4 +64,5 @@ require "servel/haml_context"
 require "servel/index"
 require "servel/app"
 require "servel/home_app"
+require "servel/config_parser"
 require "servel/cli"

data/lib/servel/cli.rb

@@ -1,18 +1,16 @@
-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
+class Servel::CLI
+  ALLOWED_PUMA_OPTIONS = [
+    :Host,
+    :Port,
+    :binds
+  ]
+
+  def initialize
+    @config = Servel::ConfigParser.new.config
+  end
+
+  def start
+    app = Servel.build_app(**@config.slice(:listings, :username, :password))
+    Rack::Handler::Puma.run(app, **@config.slice(*ALLOWED_PUMA_OPTIONS))
+  end
+end

data/lib/servel/config_parser.rb

@@ -0,0 +1,45 @@
+class Servel::ConfigParser
+  attr_reader :config
+
+  def initialize
+    @tty_config = TTY::Config.new
+    @tty_config.filename = "servel"
+    @tty_config.append_path(Dir.pwd)
+    @tty_config.append_path((Pathname.new(Dir.home) + ".servel").to_s)
+    @tty_config.append_path(Dir.home)
+    @tty_config.env_prefix = "servel"
+    @tty_config.autoload_env
+    @tty_config.read if @tty_config.exist?
+
+    @tty_config.append(*parse_argv, to: :listings)
+    parse_binds
+
+    @config = @tty_config.to_h.transform_keys(&:to_sym)
+  end
+
+  def parse_argv
+    ARGV.map do |arg|
+      root, url_root = arg.split(":" , 2)
+      { root => url_root }
+    end
+  end
+
+  def parse_binds
+    return parse_ssl_bind if @tty_config.fetch(:cert) && @tty_config.fetch(:key)
+
+    host = @tty_config.fetch(:host)
+    port = @tty_config.fetch(:port)
+    @tty_config.set(:Host, value: host) if host
+    @tty_config.set(:Port, value: port) if port
+  end
+
+  def parse_ssl_bind
+    host = @tty_config.fetch(:host, default: ::Puma::ConfigDefault::DefaultTCPHost)
+    port = @tty_config.fetch(:port, default: ::Puma::ConfigDefault::DefaultTCPPort)
+    key = Pathname.new(@tty_config.fetch(:key)).expand_path
+    cert = Pathname.new(@tty_config.fetch(:cert)).expand_path
+
+    query = URI.encode_www_form(key: key, cert: cert)
+    @tty_config.append("ssl://#{host}:#{port}?#{query}", to: :binds)
+  end
+end

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.28.0"
+  VERSION = "0.33.0"
 end

data/servel.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hamlit"
   spec.add_dependency "activesupport"
   spec.add_dependency "lru_redux"
+  spec.add_dependency "tty-config"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Serves files and directories over HTTP.
 email:
 - i@bloople.net
@@ -143,6 +157,7 @@ files:
 - lib/servel.rb
 - lib/servel/app.rb
 - lib/servel/cli.rb
+- lib/servel/config_parser.rb
 - lib/servel/entry.rb
 - lib/servel/entry_factory.rb
 - lib/servel/haml_context.rb
@@ -170,8 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Serves files and directories over HTTP.