impression 0.12 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9b79a3bb3823fad2c5c7ad2ed7f187c2c398dea84c62d9d0fdbd481238f499a
-  data.tar.gz: 6cd1d41db73b992ee6f2027220440871d6512811f23b810ba064733a0538e7d4
+  metadata.gz: 7dff68cd22a426ae305742591ca09a3aa737cf453af1f186a54170671170f250
+  data.tar.gz: 920c5ca0698212f318dcc967cc09405e0b2f25e8d8521580c2fce331a4bfe982
 SHA512:
-  metadata.gz: 734ab33bb5056e06076403fc774a13851953edec042b915826577aaa810c8e9d39c1a242b95836b5b6dcb61404d0fd1e8ab3afaf0cd095105a14d5ccd1bab9ea
-  data.tar.gz: df49438b49021b4d42de855f72b2342ecfe9416a2ea118feb8d09580d8ac4c0bb3f10b87d25edc020cdf37be8a91a5d0d4f85119b3a7bf3e3d3186b917477594
+  metadata.gz: 98d8b4da9955eb4ac433cb74c45b9edeae759850e3a2b28cb4933f4445d554c25a360f968323f1a7a6db0bd9e748a2570048efc698a88803ac86920d77452757
+  data.tar.gz: e9e91a9fb0e9754fef82946f6a26368e53eb6c131d1e5d2ac0fe6e46274b75787cd2c47ee352a4dd015fd402ee2895fbfef2be1b7b01d84b8e3327ff91d18010

data/.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     env:
-      POLYPHONY_USE_LIBEV: "1"
+      POLYPHONY_LIBEV: "1"
 
     steps:
     - name: Setup machine

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.13 2022-04-05
+
+- Prevent race condiution on loading Ruby modules
+
 ## 0.12 2022-02-16
 
 - Implement `RackApp` resource class (#16)

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    impression (0.12)
+    impression (0.13)
       modulation (~> 1.1)
       papercraft (~> 0.23)
-      polyphony (~> 0.77)
+      polyphony (~> 0.93)
       qeweney (~> 0.18)
-      tipi (~> 0.50)
+      tipi (~> 0.52)
 
 GEM
   remote: https://rubygems.org/
@@ -16,8 +16,8 @@ GEM
     docile (1.4.0)
     escape_utils (1.2.1)
     ever (0.1)
-    extralite (1.12)
-    faraday (1.9.3)
+    extralite (1.14)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -40,10 +40,10 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    h1p (0.3)
+    h1p (0.5)
     http-2 (0.11.0)
     json (2.6.1)
-    kramdown (2.3.1)
+    kramdown (2.3.2)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
@@ -52,12 +52,12 @@ GEM
     modulation (1.1)
     msgpack (1.4.5)
     multipart-post (2.1.1)
-    papercraft (0.23)
+    papercraft (0.24)
       escape_utils (~> 1.2.1)
       kramdown (~> 2.3.1)
       kramdown-parser-gfm (~> 1.1.0)
       rouge (~> 3.27.0)
-    polyphony (0.77)
+    polyphony (0.93)
     qeweney (0.18)
       escape_utils (~> 1.2.1)
     rack (2.2.3)
@@ -70,16 +70,16 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    tipi (0.50)
+    tipi (0.52)
       acme-client (~> 2.0.9)
       ever (~> 0.1)
-      extralite (~> 1.2)
-      h1p (~> 0.3)
+      extralite (~> 1.14)
+      h1p (~> 0.4)
       http-2 (~> 0.11)
       localhost (~> 1.1.4)
       msgpack (~> 1.4.2)
-      polyphony (~> 0.77)
-      qeweney (~> 0.17)
+      polyphony (~> 0.80)
+      qeweney (~> 0.18)
       rack (>= 2.0.8, < 2.3.0)
       websocket (~> 1.2.8)
     websocket (1.2.9)

data/impression.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.6'
 
-  s.add_runtime_dependency      'polyphony',            '~>0.77'
-  s.add_runtime_dependency      'tipi',                 '~>0.50'
+  s.add_runtime_dependency      'polyphony',            '~>0.93'
+  s.add_runtime_dependency      'tipi',                 '~>0.52'
   s.add_runtime_dependency      'qeweney',              '~>0.18'
   
   s.add_runtime_dependency      'papercraft',           '~>0.23'

data/lib/impression/app.rb

@@ -16,6 +16,7 @@ module Impression
     def initialize(**props)
       super
       @layouts = {}
+      @file_info_loader = spin { run_file_info_loader }
     end
 
     # Returns a list of pages found in the given directory (relative to the base
@@ -46,6 +47,65 @@ module Impression
       symbolize_names: true
     }.freeze
 
+    # Runs a file info loader handling incoming requests for file info. This
+    # method is run in a fiber setup in #initialize.
+    #
+    # @return [void]
+    def run_file_info_loader
+      loop do
+        peer, path = receive
+        begin
+          info = calculate_path_info(path)
+          peer << info
+        rescue Polyphony::BaseException
+          raise
+        rescue => e
+          peer.raise(e)
+        end
+      end
+    end
+
+    def safe_calculate_path_info(path)
+      @file_info_loader << [Fiber.current, path]
+      receive
+    end
+
+    # Returns the path info for the given relative path.
+    #
+    # @param path [String] relative path
+    # @return [Hash] path info
+    def get_path_info(path)
+      @path_info_cache[path] ||= safe_calculate_path_info(path)
+    end
+
+    # Returns complete file info for Markdown files
+    #
+    # @param info [Hash] file info
+    # @param path [String] file path
+    # @return [Hash] file info
+    def file_info_md(info, path)
+      atts, content = parse_markdown_file(path)
+      info = info.merge(atts)
+      info[:html_content] = Papercraft.markdown(content)
+      info[:kind] = :markdown
+      if !info[:date] && (m = path.match(DATE_REGEXP))
+        info[:date] = Date.parse(m[1])
+      end
+      info
+    end
+
+    # Returns complete file info for Ruby files
+    #
+    # @param info [Hash] file info
+    # @param path [String] file path
+    # @return [Hash] file info
+    def file_info_rb(info, path)
+      info.merge(
+        kind: :module,
+        module: import(path)
+      )
+    end
+
     # Returns the path info for the given file path.
     #
     # @param path [String] file path
@@ -54,19 +114,12 @@ module Impression
       info = super
       case info[:ext]
       when '.md'
-        atts, content = parse_markdown_file(path)
-        info = info.merge(atts)
-        info[:html_content] = Papercraft.markdown(content)
-        info[:kind] = :markdown
+        file_info_md(info, path)
       when '.rb'
-        info[:module] = import(path)
-        info[:kind] = :module
-      end
-      if (m = path.match(DATE_REGEXP))
-        info[:date] ||= Date.parse(m[1])
+        file_info_rb(info, path)
+      else
+        info
       end
-  
-      info
     end
 
     # Returns the pretty URL for the given relative path. For pages, the

data/lib/impression/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Impression
-  VERSION = '0.12'
+  VERSION = '0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: impression
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.93'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.93'
 - !ruby/object:Gem::Dependency
   name: tipi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '0.52'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '0.52'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement