impression 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5a7e55ef9ff6c795a485a4b1e50456949932d923425ad447ada836ef2e69b0c
-  data.tar.gz: 669f0781d30986542fb09aad0af058107a658281136ace716edfdefc18fefabb
+  metadata.gz: aaea11fcf3fcaab1902290a620d9cdb0fa5dfb11ae38c90335f80471629d652f
+  data.tar.gz: 9eaebd5c2a28856a568e583399c3ea6db8332e6c2aae6d570639505788203dc1
 SHA512:
-  metadata.gz: 1cdbfd6167b1e1717e5a3fda6089c84bb0ed7c6d810b1dac9376a1cd81a38a473c097ba6dd6ecbd07c61145b86b5e10f13c8be02ac69c14c556ba6991f87e4f4
-  data.tar.gz: cf2e071b60b5ed0aa0ab826d2721c55d15cabb7fa0f63e84d068f76eef9a39db68159d6a651ddf5371976c4703a72a910883e50becdd64ff365d4b955cb93192
+  metadata.gz: 145722a3828e039ed1a021c002cc0a551e66f78a300d869203f15d8c3df8c2d532d71d37674a7c11b1d995c39cb138a06040665a785e22581473843d28581a49
+  data.tar.gz: 9d179f895f2d819f1c63762099137dda5511614176c9e25df4aef7d735975fbda25167b5f3c3a94788f96c8b37ece7c2f42acc7b54dcaa38054863976f039ccf

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: ciconia

data/.github/workflows/test.yml

@@ -0,0 +1,32 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        ruby: ['2.7', '3.0', '3.1', 'head']
+
+    name: >-
+      ${{matrix.os}}, ${{matrix.ruby}}
+
+    runs-on: ${{matrix.os}}
+
+    env:
+      POLYPHONY_USE_LIBEV: "1"
+
+    steps:
+    - name: Setup machine
+      uses: actions/checkout@v1
+    - name: Setup Ruby and install deps
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true # 'bundle install' and cache
+        cache-version: 1
+        
+    - name: Run tests
+      run:  bundle exec rake test

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 0.2 2022-01-13
+
+- Implement `FileTree` (#2)
+- Rename `Resource#render` to `Resource#respond`
+- Rewrite resource routing (#1)
+- Implement `Resource`
+
+## 0.1 2021-02-24

data/Gemfile

@@ -1,3 +1,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+# %w{polyphony tipi qeweney rubyoshka}.each do |dep|
+#   dir = "../#{dep}"
+#   gem(dep, path: dir) if File.directory?(dir)
+# end

data/Gemfile.lock

@@ -1,53 +1,86 @@
 PATH
   remote: .
   specs:
-    impression (0.1)
+    impression (0.2)
       kramdown (~> 2.3.0)
       kramdown-parser-gfm (~> 1.1.0)
-      polyphony (~> 0.51.0)
+      papercraft (~> 0.12)
+      polyphony (~> 0.73.1)
+      qeweney (~> 0.15)
       rouge (~> 3.26.0)
-      tipi (~> 0.37)
+      tipi (~> 0.45)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ansi (1.5.0)
-    builder (3.2.4)
-    docile (1.3.5)
+    acme-client (2.0.9)
+      faraday (>= 0.17, < 2.0.0)
+    docile (1.4.0)
     escape_utils (1.2.1)
-    http-2 (0.10.2)
-    http_parser.rb (0.6.0)
-    json (2.5.1)
-    kramdown (2.3.0)
+    ever (0.1)
+    extralite (1.11)
+    faraday (1.9.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    h1p (0.2)
+    http-2 (0.11.0)
+    json (2.6.1)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    localhost (1.1.9)
     minitest (5.11.3)
-    minitest-reporters (1.4.3)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
     msgpack (1.4.2)
-    polyphony (0.51.0)
-    qeweney (0.5)
+    multipart-post (2.1.1)
+    papercraft (0.12)
+      escape_utils (= 1.2.1)
+      kramdown (~> 2.3.0)
+      kramdown-parser-gfm (~> 1.1.0)
+      rouge (~> 3.26.0)
+    polyphony (0.73.1)
+    qeweney (0.15)
       escape_utils (~> 1.2.1)
     rack (2.2.3)
     rake (12.3.3)
-    rexml (3.2.4)
-    rouge (3.26.0)
-    ruby-progressbar (1.11.0)
+    rexml (3.2.5)
+    rouge (3.26.1)
+    ruby2_keywords (0.0.5)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    tipi (0.37)
-      http-2 (~> 0.10.0)
-      http_parser.rb (~> 0.6.0)
+    tipi (0.45)
+      acme-client (~> 2.0.8)
+      ever (~> 0.1)
+      extralite (~> 1.2)
+      h1p (~> 0.2)
+      http-2 (~> 0.11)
+      localhost (~> 1.1.4)
       msgpack (~> 1.4.2)
-      polyphony (~> 0.51.0)
-      qeweney (~> 0.5)
+      polyphony (~> 0.71)
+      qeweney (~> 0.14)
       rack (>= 2.0.8, < 2.3.0)
       websocket (~> 1.2.8)
     websocket (1.2.9)
@@ -58,9 +91,8 @@ PLATFORMS
 DEPENDENCIES
   impression!
   minitest (~> 5.11.3)
-  minitest-reporters (~> 1.4.2)
   rake (~> 12.3.3)
   simplecov (~> 0.17.1)
 
 BUNDLED WITH
-   2.1.4
+   2.3.3

data/Rakefile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rake/clean"
+
+task :default => [:test]
+
+task :test do
+  exec 'ruby test/run.rb'
+end

data/examples/markdown/_assets/style.css

@@ -0,0 +1,98 @@
+* {
+  border: 0;
+  font: inherit;
+  font-size: 100%;
+  vertical-align: baseline;
+  margin: 0;
+  padding: 0;
+  color: black;
+}
+
+body {
+  font: normal 14px monospace;
+}
+
+h1, h2 {
+  font-weight: bold;
+}
+
+header {
+  margin-bottom: 20px;
+}
+
+a {
+  color: -webkit-link;
+}
+
+li {
+  margin-left: 40px;
+}
+
+em {
+  font-style: italic;
+}
+
+strong {
+  font-weight: bold;
+}
+
+p, ul, ol {
+  margin: 20px;
+}
+
+pre {
+  margin-bottom: 20px;
+  padding: 20px 5px;
+  overflow-x: visible;
+}
+
+pre code {
+  word-wrap: no;
+}
+
+hr {
+  display: block;
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+  margin-left: auto;
+  margin-right: auto;
+  border-style: inset;
+  border-width: 1px;
+}
+
+#nav {
+  padding: 20px 5px;
+}
+
+#nav, #content, footer {
+  margin: 0 20px;
+  max-width: 580px;
+}
+
+#nav h1 {
+  margin-bottom: 20px;
+}
+
+iframe {
+  margin: 20px;
+  max-width: 530px;
+}
+
+#content img {
+  max-width: 100%;
+}
+
+#title {
+  margin-top: 40px;
+  font-weight: bold;
+  text-align: center;
+}
+
+#date {
+  display: block;
+  text-align: right;
+}
+
+#webring {
+  padding-bottom: 10px;
+}

data/examples/markdown/app.rb

@@ -11,13 +11,19 @@ opts = {
 }
 
 puts "pid: #{Process.pid}"
-puts 'Listening on port 4411...'
 
-Tipi.serve('0.0.0.0', 4411, opts) do |req|
-  app.call(req)
+Tipi.full_service do |req|
+  req.route do
+    if req.host != 'noteflakes.com'
+      req.respond(nil, ':status' => Qeweney::Status::SERVICE_UNAVAILABLE)
+      stop_routing
+    end
+    req.on('assets') { req.serve_file(req.route_relative_path, base_path: File.join(__dir__, '_assets')) }
+    req.default { app.call(req) }
+  end
 rescue Exception => e
-  p e
-  puts e.backtrace.join("\n")
+  p [req.path, e]
+  # puts e.backtrace.join("\n")
   status = e.respond_to?(:http_status) ? e.http_status : 500
   req.respond(e.inspect, ':status' => status)
 end

data/examples/markdown/docs/tutorial.md

@@ -0,0 +1,15 @@
+# This is a tutorial
+
+## I'm an h2
+
+```ruby
+"here's some code"
+
+class A
+  def b
+    [:c, 42, /foo/]
+  end
+end
+
+p A.new.b
+```

data/impression.gemspec

@@ -19,15 +19,19 @@ Gem::Specification.new do |s|
 
   # s.executables   = ['impression']
 
-  s.add_runtime_dependency      'polyphony',            '~>0.51.0'
-  s.add_runtime_dependency      'tipi',                 '~>0.37'
+  s.add_runtime_dependency      'polyphony',            '~>0.73.1'
+  s.add_runtime_dependency      'tipi',                 '~>0.45'
+  s.add_runtime_dependency      'qeweney',              '~>0.15'
+  
   s.add_runtime_dependency      'kramdown',             '~>2.3.0'
   s.add_runtime_dependency      'rouge',                '~>3.26.0'
   s.add_runtime_dependency      'kramdown-parser-gfm',  '~>1.1.0'
 
+  # s.add_runtime_dependency      'rb-inotify',           '~>0.10.1'
+  s.add_runtime_dependency      'papercraft',            '~>0.12'
+
   
   s.add_development_dependency  'rake',                 '~>12.3.3'
   s.add_development_dependency  'minitest',             '~>5.11.3'
-  s.add_development_dependency  'minitest-reporters',   '~>1.4.2'
   s.add_development_dependency  'simplecov',            '~>0.17.1'
 end

data/lib/impression/app.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Impression
+  class App < Resource
+    def initialize(path: '/', **opts)
+      super(path: path, **opts)
+    end
+  end
+end

data/lib/impression/file_tree.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require_relative './resource'
+
+module Impression
+
+  # `FileTree` implements a resource that maps to a static file hierarchy.
+  class FileTree < Resource
+
+    # Initializes a `FileTree` resource.
+    #
+    # @param directory [String] static directory path
+    # @return [void]
+    def initialize(directory:, **props)
+      super(**props)
+      @directory = directory
+      @path_info_cache = {}
+    end
+
+    # Responds to a request.
+    #
+    # @param req [Qeweney::Request] request
+    # @return [void]
+    def respond(req)
+      path_info = get_path_info(req.resource_relative_path)
+      render_from_path_info(req, *path_info)
+    end
+
+    private
+
+    # Renders a response from the given response kind and path.
+    #
+    # @param req [Qeweney::Request] request
+    # @param kind [Symbol] path kind (`:not_found` or `:file`)
+    # @param path [String, nil] file path
+    def render_from_path_info(req, kind, path = nil)
+      case kind
+      when :not_found
+        req.respond(nil, ':status' => Qeweney::Status::NOT_FOUND)
+      when :file
+        req.serve_file(path)
+      else
+        raise "Invalid path info kind #{kind.inspect}"
+      end
+    end
+
+    # Returns the path info for the given relative path.
+    #
+    # @param path [String] relative path
+    # @return [Array] path info (a tuple comprising kind and file path)
+    def get_path_info(path)
+      @path_info_cache[path] || calculate_path_info(path)
+    end
+
+    # Calculates the path info for the given relative path.
+    #
+    # @param path [String] relative path
+    # @param add_html_ext [bool] whether to add .html extension if not found
+    # @return [Array] path info
+    def calculate_path_info(path, add_html_ext = true)
+      full_path = File.join(@directory, path)
+
+      stat = File.stat(full_path) rescue nil
+      if !stat
+        return add_html_ext ?
+          calculate_path_info("#{path}.html", false) : [:not_found]
+      elsif stat.directory?
+        return calculate_directory_path_info(full_path)
+      else
+        return [:file, full_path]
+      end
+    end
+
+    # Calculates the path info for a directory. If an `index.html` file exists,
+    # its path info is returned, otherwise a `:not_found` path info is returned.
+    #
+    # @param path [String] directory path
+    # @return [Array] path info
+    def calculate_directory_path_info(path)
+      index_path = File.join(path, 'index.html')
+      if File.file?(index_path)
+        [:file, index_path]
+      else
+        [:not_found]
+      end
+    end
+  end
+end

data/lib/impression/file_watcher.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'rb-inotify'
+
+module Impression
+  class FileWatcher
+    def initialize(spec)
+      @notifier = INotify::Notifier.new
+      @buffer = []
+      setup(spec)
+    end
+
+    def setup(spec)
+      if File.file?(spec)
+        setup_single_file(spec)
+      elsif File.directory?(spec)
+        setup_directory(spec)
+      else
+        dir = File.dir_name(spec)
+        filename = File.basename(spec)
+        if dir =~ /\/\*\*$/
+          dir = File.dir_name(dir)
+          filename = "**/#{filename}"
+        end
+        setup_directory(dir, filename)
+      end
+    end
+
+    def setup_directory(dir)
+      @notifier.watch(dir, :moved_to, :create, :move, :attrib, :modify, :delete) do |event|
+        kind = event.flags.first
+
+        @buffer << [kind, event.absolute_name]
+      end
+    end
+
+    def each(&block)
+      @receiver = Fiber.current
+      io = @notifier.to_io
+      loop do
+        io.wait_readable
+        @notifier.process
+        next if @buffer.empty?
+
+        @buffer.each(&block)
+        @buffer.clear
+      end
+    end
+  end
+end