impression 0.12 → 0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9b79a3bb3823fad2c5c7ad2ed7f187c2c398dea84c62d9d0fdbd481238f499a
-  data.tar.gz: 6cd1d41db73b992ee6f2027220440871d6512811f23b810ba064733a0538e7d4
+  metadata.gz: 76c18adee5b69fe0e3d02d2eeb8530142899f9de803ee7eed1f3c131884022f6
+  data.tar.gz: 29914f3e6cc48f4205422f6e50ecd36f6114b9a731fdec8a58998eaf73319cfb
 SHA512:
-  metadata.gz: 734ab33bb5056e06076403fc774a13851953edec042b915826577aaa810c8e9d39c1a242b95836b5b6dcb61404d0fd1e8ab3afaf0cd095105a14d5ccd1bab9ea
-  data.tar.gz: df49438b49021b4d42de855f72b2342ecfe9416a2ea118feb8d09580d8ac4c0bb3f10b87d25edc020cdf37be8a91a5d0d4f85119b3a7bf3e3d3186b917477594
+  metadata.gz: 86d4bd1c95d1de78ebb38b76ad7c8d2aa3227cd0229c3874bac78704f2d3407efb8eecf301d982305dd8e74169a3d20299770b624b5a76aea79dda42fdbddceb
+  data.tar.gz: 486af13f289f550d8fe5c4c48805697d32c50ed3f813f4517335718eb0c754337e125ea9a552e1fc0f954adb4e2fca4efbfed58982cc309c175521bc840357b6

data/.github/FUNDING.yml

@@ -1 +1 @@
-github: ciconia
+github: noteflakes

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,11 @@
+## 0.14 2024-12-11
+
+- Remove Polyphony, Tipi deps
+
+## 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,88 +1,38 @@
 PATH
   remote: .
   specs:
-    impression (0.12)
+    impression (0.14)
       modulation (~> 1.1)
       papercraft (~> 0.23)
-      polyphony (~> 0.77)
       qeweney (~> 0.18)
-      tipi (~> 0.50)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    acme-client (2.0.9)
-      faraday (>= 0.17, < 2.0.0)
-    docile (1.4.0)
-    escape_utils (1.2.1)
-    ever (0.1)
-    extralite (1.12)
-    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.3)
-    http-2 (0.11.0)
-    json (2.6.1)
-    kramdown (2.3.1)
+    docile (1.4.1)
+    escape_utils (1.2.2)
+    json (2.8.2)
+    kramdown (2.3.2)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    localhost (1.1.9)
     minitest (5.11.3)
-    modulation (1.1)
-    msgpack (1.4.5)
-    multipart-post (2.1.1)
-    papercraft (0.23)
+    modulation (1.2)
+    papercraft (0.29)
       escape_utils (~> 1.2.1)
       kramdown (~> 2.3.1)
       kramdown-parser-gfm (~> 1.1.0)
       rouge (~> 3.27.0)
-    polyphony (0.77)
     qeweney (0.18)
       escape_utils (~> 1.2.1)
-    rack (2.2.3)
     rake (12.3.3)
-    rexml (3.2.5)
+    rexml (3.3.9)
     rouge (3.27.0)
-    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.50)
-      acme-client (~> 2.0.9)
-      ever (~> 0.1)
-      extralite (~> 1.2)
-      h1p (~> 0.3)
-      http-2 (~> 0.11)
-      localhost (~> 1.1.4)
-      msgpack (~> 1.4.2)
-      polyphony (~> 0.77)
-      qeweney (~> 0.17)
-      rack (>= 2.0.8, < 2.3.0)
-      websocket (~> 1.2.8)
-    websocket (1.2.9)
 
 PLATFORMS
   ruby

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,66 @@ 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
+      calculate_path_info(path)
+    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 +115,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
@@ -238,10 +292,10 @@ module Impression
       layout ||= 'default'
       path = File.join(@directory, "_layouts/#{layout}.rb")
       raise "Layout not found #{path}" unless File.file?(path)
-      
+
       import path
     end
-  
+
     # Parses the markdown file at the given path.
     #
     # @param path [String] file path
@@ -258,11 +312,11 @@ module Impression
       if (m = content.match(FRONT_MATTER_REGEXP))
         front_matter = m[1]
         content = m.post_match
-        
+
         yaml = YAML.safe_load(front_matter, **YAML_OPTS)
         atts = atts.merge(yaml)
       end
-        
+
       [atts, content]
     end
 

data/lib/impression/rack_app.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'fileutils'
-require 'tipi'
+# require 'tipi'
 require_relative './resource'
 
 module Impression

data/lib/impression/request_extensions/responses.rb

@@ -3,7 +3,7 @@
 require 'json'
 
 module Impression
-  
+
   module RequestExtensions
 
     # Response extensions for `Qeweney::Request`

data/lib/impression/request_extensions/routing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Impression
-  
+
   # Extensions for `Qeweney::Request`
   module RequestExtensions
 

data/lib/impression/request_extensions.rb

@@ -8,7 +8,7 @@ require_relative './request_extensions/responses'
 
 # Extensions to `Qeweney::Request`
 class Qeweney::Request
-  
+
   # include Impression::Pages::RequestMethods
   include Impression::RequestExtensions::Routing
   include Impression::RequestExtensions::Responses

data/lib/impression/version.rb

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

data/lib/impression.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'polyphony'
+# require 'polyphony'
 
 require_relative './impression/request_extensions'
 require_relative './impression/resource'

data/test/test_app.rb

@@ -260,7 +260,7 @@ class AppTest < MiniTest::Test
   def test_template_resource_and_request
     req = mock_req(':method' => 'GET', ':path' => '/foobar?q=42')
     @app.route_and_call(req)
-  
+
     foo = Papercraft.html {
       html5 {
         head {
@@ -360,14 +360,14 @@ class AbstractAppTest < MiniTest::Test
 
   def test_abstract_app_each
     app = Impression::App.new(path: '/')
-    
+
     buffer = []
     app.each { |r| buffer << r }
     assert_equal [app], buffer
 
     foo = PathRenderingResource.new(parent: app, path: 'foo')
     bar = PathRenderingResource.new(parent: app, path: 'bar')
-    
+
     buffer = []
     app.each { |r| buffer << r }
     assert_equal [app, foo, bar], buffer

data/test/test_resource.rb

@@ -55,7 +55,7 @@ class ResourceTest < MiniTest::Test
     req = mock_req(':method' => 'GET', ':path' => '/foo/bar/littlebar')
     assert_equal r4, r1.route(req)
     assert_equal '/', req.resource_relative_path
-  
+
     req = mock_req(':method' => 'GET', ':path' => '/foo/bar/littlebar/littlebaz')
     assert_equal r4, r1.route(req)
     assert_equal '/littlebaz', req.resource_relative_path

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: impression
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.14'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2024-12-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: polyphony
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.77'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.77'
-- !ruby/object:Gem::Dependency
-  name: tipi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.50'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.50'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Impression - a modern web framework for Ruby