impression 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5644ebb122c166a8a5579a950b3e64fde5d3d332eea8299aa4c4023af8b85cb6
-  data.tar.gz: b89065d1cd8c14d5ddad28f1fc3ff90cc48d43354698e339715f3b6d172af671
+  metadata.gz: f310190c6415f14cdc24e4ab871dee51122a148292b778d6fc4679dafa03b10c
+  data.tar.gz: 302dd60dea184497508d7200354bf230835e0e84768ef6f5e5f5ee1e8ee27416
 SHA512:
-  metadata.gz: 45ab7c1f4e3c9f920175acc8bce2417932571ceca8946cf1fd0b784a6280413514587bc998d467808023c56e054a0edc2c821e6dc700289a4a02f4e2372dfe05
-  data.tar.gz: d3b57e4089e0473e508f5a67c52db12be7a62850897bc79a27871b4ea7a3d2b3b3062f214980a98d5e842033b62496ae9024416c37b00ca05b527b01c088b53e
+  metadata.gz: dc1469936dd52810143d48ce608335a96b2fcfac8187d481c6df031bc4b3bc9d22ef41a3532660fb0826973dd356ef7ba7f181fdd1ac8ea8be31bc080b99013c
+  data.tar.gz: 89294842887b2da78309bb2c5cb3472123f363a315e2b22d9dcac67753e6008926374222895a40f373738c6dbdb964752873d459fac942cd99a68eafb4e1fd11

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4 2022-01-19
+
+- Remove deprecated Pages code (#6)
+
 # 0.3 2022-01-19
 
 - Implement basic Jamstack resource (#5)

data/Gemfile.lock

@@ -1,14 +1,11 @@
 PATH
   remote: .
   specs:
-    impression (0.3)
-      kramdown (~> 2.3.0)
-      kramdown-parser-gfm (~> 1.1.0)
+    impression (0.4)
       modulation (~> 1.1)
       papercraft (~> 0.14)
       polyphony (~> 0.73.1)
       qeweney (~> 0.15)
-      rouge (~> 3.26.0)
       tipi (~> 0.45)
 
 GEM

data/impression.gemspec

@@ -10,7 +10,10 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split
   s.homepage    = 'http://github.com/digital-fabric/impression'
   s.metadata    = {
-    "source_code_uri" => "https://github.com/digital-fabric/impression"
+    "source_code_uri" => "https://github.com/digital-fabric/impression",
+    "documentation_uri" => "https://www.rubydoc.info/gems/impression",
+    "homepage_uri" => "https://github.com/digital-fabric/impression",
+    "changelog_uri" => "https://github.com/digital-fabric/impression/blob/master/CHANGELOG.md"
   }
   s.rdoc_options = ["--title", "impression", "--main", "README.md"]
   s.extra_rdoc_files = ["README.md"]
@@ -23,10 +26,6 @@ Gem::Specification.new do |s|
   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.14'
   s.add_runtime_dependency      'modulation',           '~>1.1'

data/lib/impression/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: impression
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -52,48 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: rouge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.26.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.26.0
-- !ruby/object:Gem::Dependency
-  name: kramdown-parser-gfm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: papercraft
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +150,6 @@ files:
 - lib/impression/file_tree.rb
 - lib/impression/file_watcher.rb
 - lib/impression/jamstack.rb
-- lib/impression/pages.rb
 - lib/impression/request_extensions.rb
 - lib/impression/request_extensions/responses.rb
 - lib/impression/request_extensions/routing.rb
@@ -222,6 +179,9 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/digital-fabric/impression
+  documentation_uri: https://www.rubydoc.info/gems/impression
+  homepage_uri: https://github.com/digital-fabric/impression
+  changelog_uri: https://github.com/digital-fabric/impression/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options:
 - "--title"

data/lib/impression/pages.rb

@@ -1,239 +0,0 @@
-# frozen_string_literal: true
-
-require 'kramdown'
-require 'rouge'
-require 'kramdown-parser-gfm'
-require 'yaml'
-require 'rb-inotify'
-require 'papercraft'
-
-require_relative './errors'
-
-module Impression
-  class Pages
-    module RequestMethods
-      def serve_page(pages)
-        pages.serve(self)
-      end
-    end
-
-    def initialize(base_path, opts = {})
-      @base_path = base_path
-      @opts = opts
-      @opts[:pages] = self
-
-      load
-
-      if opts[:auto_reload]
-        start_automatic_reloader
-      end
-    end
-
-    def start_automatic_reloader
-      notifier = INotify::Notifier.new
-      watched = {}
-      @map.each_value do |entry|
-        path = entry[:full_path]
-        next if watched[path]
-
-        notifier.watch(path, :modify, :delete_self) { |e| handle_changed_file(path) }
-        watched[path] = true
-      end
-      notifier.watch(@base_path, :moved_to, :create) do |event|
-        path = event.absolute_name
-        if File.file?(path)
-          notifier.watch(path, :modify, :delete_self) { |e| handle_changed_file(path) }
-        end
-        handle_changed_file(path)
-      end
-      @reloader = spin do
-        notify_io = notifier.to_io
-        loop do
-          notify_io.wait_readable
-          notifier.process
-        end
-      end
-    end
-
-    def handle_changed_file(full_path)
-      p handle_changed_file: full_path
-      if !File.file?(full_path)
-        @map.reject! { |k, v| v[:full_path] == full_path }
-        return
-      end
-
-      path = File.basename(full_path)
-      page = Page.new(path, full_path, @opts)
-      permalink = page.permalink
-      @map[permalink] = { page: page, full_path: full_path }
-      @map['/'] = @map[permalink] if permalink == '/index'
-    end
-
-    def load
-      @map = {}
-      Dir['**/*', base: @base_path].each do |path|
-        next if path =~ /\/_.+/
-
-        full_path = File.join(@base_path, path)
-        next unless File.file?(full_path)
-
-        page = Page.new(path, full_path, @opts)
-        @map[page.permalink] = { page: page, full_path: full_path }
-      end
-      @map['/'] = @map['/index']
-    end
-    alias_method :reload, :load
-
-    def prev_page(page)
-      keys = @map.keys
-      case idx = keys.index(page.permalink)
-      when 0, nil
-        nil
-      else
-        @map[keys[idx - 1]][:page]
-      end
-    end
-
-    def next_page(page)
-      keys = @map.keys
-      case idx = keys.index(page.permalink)
-      when keys.size - 1, nil
-        nil
-      else
-        @map[keys[idx + 1]][:page]
-      end
-    end
-
-    def load_file(path)
-      content = IO.read(path)
-    end
-
-    def serve(req)
-      entry = @map[req.route_relative_path]
-      raise NotFoundError unless entry
-
-      body = render_page(entry[:page])
-      req.respond(body, 'Content-Type' => 'text/html')
-    rescue NotFoundError => e
-      req.respond('Not found.', ':status' => e.http_status)
-    end
-    alias_method :call, :serve
-
-    def render_page(page)
-      layout_proc(page.layout).().render(pages: self, page: page)
-    end
-
-    def layout_proc(layout)
-      full_path = File.expand_path("../_layouts/#{layout}.rb", @base_path)
-      instance_eval("->(&block) do; #{IO.read(full_path)}; end", full_path)
-    end
-
-    def select(selector)
-      @map.inject([]) do |array, (permalink, entry)|
-        array << entry[:page] if permalink =~ selector
-        array
-      end
-    end
-  end
-
-  class Page
-    attr_reader :attributes
-
-    def initialize(path, full_path, opts = {})
-      @path = path
-      @full_path = full_path
-      @opts = opts
-      @kind = detect_page_kind(full_path)
-      read_page
-    end
-
-    EXTNAME_REGEXP = /^\.(.+)$/.freeze
-
-    def detect_page_kind(path)
-      File.extname(path).match(EXTNAME_REGEXP)[1].to_sym
-    end
-  
-    PAGE_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m.freeze
-  
-    def read_page
-      data = IO.read(@full_path) || ''
-      if data =~ PAGE_REGEXP
-        front_matter = Regexp.last_match(1)
-        @content_start_line = front_matter.lines.size + 2
-        @attributes = YAML.load(front_matter)
-        @content = Regexp.last_match.post_match
-      else
-        @attributes = {}
-        @content_start_line = 1
-        @content = data
-      end
-    end
-
-    def permalink
-      @permalink = @attributes[:permalink] || path_without_extension
-    end
-
-    def path_without_extension
-      "/#{@path.delete_suffix(File.extname(@path))}"
-    end
-  
-    def title
-      @attributes['title'] || title_from_content
-    end
-
-    def prev_page
-      @opts[:pages].prev_page(self)
-    end
-
-    def next_page
-      @opts[:pages].next_page(self)
-    end
-  
-    TITLE_REGEXP = /^#\s+([^\n]+)/.freeze
-  
-    def title_from_content
-      (@content =~ TITLE_REGEXP) && Regexp.last_match(1)
-    end
-  
-    def status
-      @attributes['status'] || Qeweney::Status::OK
-    end
-
-    def layout
-      layout = @attributes['layout'] || 'default'
-    end
-  
-    def render
-      case @kind
-      when :md
-        render_markdown
-      when :rb
-        render_papercraft
-      else
-        raise "Invalid page kind #{kind.inspect}"
-      end
-    end
-
-    def render_markdown
-      Kramdown::Document.new(@content, **kramdown_options).to_html
-    end
-
-    def kramdown_options
-      {
-        entity_output: :numeric,
-        syntax_highlighter: :rouge,
-        input: 'GFM',
-        hard_wrap: false
-      }
-    end
-
-    def render_papercraft
-      proc = instance_eval("->(&block) do; #{@content}; end", @full_path, @content_start_line)
-      proc.().render(page: self, pages: @opts[:pages])
-    end
-  end
-end
-
-class Qeweney::Request
-  include Impression::Pages::RequestMethods
-end