markdown-rails 2.0.0.alpha8 → 2.0.0.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc5654ddf4c2621a0f1f25c9de3cc177b1ca02d6a47c3c23550b426eb5c1f0f
-  data.tar.gz: 672879f00b880bdc35f9bb79fad4ac0fdacfcf85fea5abb96ded0e773a77c90f
+  metadata.gz: 322bc825210d3a2bfc37e22665366325be25e77e438adb4b81fd3fb671151433
+  data.tar.gz: bd95381cdc14695bd1dbde902ad85d3b1724c91c4f04b41932f45bfcba0ea227
 SHA512:
-  metadata.gz: 2de8d3c2ed3febe65b4fe72ce05e52eb98005f32cf319e6bf8b33e68e5ad27725325c0cdb400d70ae69e28db0242b137a9f76d061fb519a0acd746b5dd6af737
-  data.tar.gz: 7fbd9f25952aeba219bce5726c0e37de27bec2d77f3187363abdc06e840a57f237b5ba9f00b916f40530e3fafafd076642c7cb8e9630cf92382b95e5fe68bccb
+  metadata.gz: 9c4c978ffdd52d865fc73c9636f51eef60ce84d902eaa9727100d52bfa4f831b67b842cbc05489e43c424dee36a6ff8efc8bdda6642fc72bf29313bbe1a54e67
+  data.tar.gz: ed00ba127ec4e455c7c492be6ffe50d1a87bdcc3a60fba6378fd85e821bce9d6a9ab79733177ccfd06186050825fc491bdfee91b357d311672681571ab9e766e

data/README.md

@@ -58,45 +58,29 @@ Applications commonly need various markdown variants within one application. For
 # Restart the server to see changes made to this file.
 
 # Setup markdown stacks to work with different template handler in Rails.
-MarkdownRails.handle :md do
-  ApplicationMarkdown.new
-end
-
-MarkdownRails.handle :crazymd do
-  MyCrazyMarkdown.new
-end
+MarkdownRails.handle :md, :markdown, with: :ApplicationMarkdown
+MarkdownRails.handle :smd, with: :SafeMarkdown
 ```
 
 ### Enable Erb in Markdown
 
 Only enable Erb in Markdown if you trust the source of the file. Do not enable it for markdown provided by users or they will be able to execute arbitrary Ruby code.
 
-To enable Erb, you can tell Rails to render all view files ending with `.markerb` using the `MarkdownRails::Handler::Erb` handler.
-
-```ruby
-# ./config/initializers/markdown.rb
-MarkdownRails.handle :markerb, with: MarkdownRails::Handler::Erb do
-  ApplicationMarkdown.new
-end
-```
-
-You *could* change `:markerb` to `:md`, but I don't recommend it for all Markdown files or you'll run into problems if you have content like `<%= Time.current %>` inside of an `erb` codefence. You're better off having two configurations: one that handles Erb and another that doesn't, like this:
+To enable Erb, you can tell Rails to render all view files ending with `.markerb` using the `ErbMarkdown` handler.
 
 ```ruby
 # ./config/initializers/markdown.rb
 # Restart the server to see changes made to this file.
 
 # Setup markdown stacks to work with different template handler in Rails.
-MarkdownRails.handle :md do
-  ApplicationMarkdown.new
-end
-
-MarkdownRails.handle :markerb, with: MarkdownRails::Handler::Erb do
-  ApplicationMarkdown.new
-end
+MarkdownRails.handle :md, :markdown, with: :ApplicationMarkdown
+# This is a bad idea for a few reasons, but sometimes its needed
+MarkdownRails.handle :markerb, with: :ErbMarkdown
 ```
 
-## Customizing renderer
+You *could* change `:markerb` to `:md`, but I don't recommend it for all Markdown files or you'll run into problems if you have content like `<%= Time.current %>` inside of an `erb` codefence. You're better off having two configurations: one that handles Erb and another that doesn't.
+
+## Customizing Markdown
 
 You might want to customize your Markdown handler to do things like syntax code highlighting, etc.
 

data/lib/generators/markdown_rails/install/templates/app/markdown/application_markdown.rb

@@ -9,7 +9,7 @@ class ApplicationMarkdown < MarkdownRails::Renderer::Rails
   # Uncomment and run `bundle add rouge` for syntax highlighting
   # include MarkdownRails::Helper::Rouge
 
-  # If you need access to ActionController::Base.helpers, you can delegate by uncommenting
+  # If you need access to methods from the view context, you can delegate by uncommenting
   # and adding to the list below. Several are already included for you in the `MarkdownRails::Renderer::Rails`,
   # but you can add more here.
   #
@@ -19,7 +19,7 @@ class ApplicationMarkdown < MarkdownRails::Renderer::Rails
   #   :request,
   #   :cache,
   #   :turbo_frame_tag,
-  # to: :helpers
+  # to: :view
 
   # These flags control features in the Redcarpet renderer, which you can read
   # about at https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use

data/lib/generators/markdown_rails/install/templates/app/markdown/erb_markdown.rb

@@ -0,0 +1,10 @@
+# DANGER! This parses Erb, which means arbitrary Ruby can be run. Make sure
+# you trust the source of your markdown and that its not user input.
+
+class ErbMarkdown < ApplicationMarkdown
+  # Enables Erb to render for the entire doc before the markdown is rendered.
+  # This works great, except when you have an `erb` code fence.
+  def preprocess(html)
+    view.render inline: html, handler: :erb
+  end
+end

data/lib/generators/markdown_rails/install/templates/config/initializers/markdown.rb

@@ -1,13 +1,12 @@
 # Restart the server to see changes made to this file.
 
 # Setup markdown stacks to work with different template handler in Rails.
-MarkdownRails.handle :md, :markdown do
-  ApplicationMarkdown.new
-end
+MarkdownRails.handle :md, :markdown,
+  with: :ApplicationMarkdown
 
-# Don't use Erb for untrusted markdown content created by users; otherwise they
-# can execute arbitrary code on your server. This should only be used for input you
-# trust, like content files from your code repo.
-MarkdownRails.handle :markerb, with: MarkdownRails::Handler::Erb do
-  ApplicationMarkdown.new
-end
+# Ideally you can modify `ApplicationMarkdown` to suit your needs without
+# needing ERB, but for some reason enabling ERB with markdown is insanely
+# popular, so here it is if that's your jam.
+
+# MarkdownRails.handle :markerb,
+#   with: :ErbMarkdown

data/lib/markdown-rails/renderer/base.rb

@@ -15,8 +15,8 @@ module MarkdownRails
         ]
       end
 
-      def renderer
-        ::Redcarpet::Markdown.new(self.class, **features)
+      def markdown_renderer
+        @markdown_renderer ||= ::Redcarpet::Markdown.new(self, **features)
       end
 
       private

data/lib/markdown-rails/renderer/rails.rb

@@ -3,6 +3,18 @@ module MarkdownRails
     class Rails < Base
       include ::Rails.application.routes.url_helpers
 
+      def initialize(view:, **extensions)
+        super(extensions)
+        @view = view
+      end
+
+      # The Rails render sets the view, which we can use to delegate everything
+      # to from the renderer.
+      attr_reader :view
+
+      # Rendering from Markdown is actually outside of the view
+      # context, so we need to delegate render to the ApplicationController
+      # render method that can render outside of the view context.
       delegate \
         :asset_digest_path,
         :asset_path,
@@ -20,21 +32,17 @@ module MarkdownRails
         :video_url,
         :tag,
         :content_tag,
-        :render,
         :request,
         :turbo_frame_tag,
         :controller,
         :raw,
-      to: :helpers
+        :request,
+        :controller,
+      to: :view
 
       def image(link, title, alt)
         image_tag link, title: title, alt: alt
       end
-
-      protected
-        def helpers
-          ::ActionController::Base.helpers
-        end
     end
   end
 end

data/lib/markdown-rails/template_handler.rb

@@ -0,0 +1,15 @@
+module MarkdownRails
+  # We cannot use MarkdownRails because it conflicts with RDiscount's Markdown class
+  class TemplateHandler
+    def initialize(klass)
+      @markdown = klass
+    end
+
+    def call(template, source = template.source)
+      %[
+        markdown = #{@markdown.name}.new(view: self);
+        markdown.markdown_renderer.render(#{source.inspect}).html_safe;
+      ]
+    end
+  end
+end

data/lib/markdown-rails/version.rb

@@ -1,3 +1,3 @@
 module MarkdownRails
-  VERSION = "2.0.0.alpha8"
+  VERSION = "2.0.0.alpha10"
 end

data/lib/markdown-rails.rb

@@ -2,21 +2,22 @@ require "markdown-rails/version"
 require "markdown-rails/engine"
 
 module MarkdownRails
-  def self.handle(*extensions, with: Handler::Markdown, &block)
-    with.handle *extensions, &block
-  end
+  def self.handle(*extensions, with:)
+    handler = TemplateHandler.new(with)
 
-  module Handler
-    autoload :Markdown,   "markdown-rails/handler/markdown"
-    autoload :Erb,        "markdown-rails/handler/erb"
+    extensions.each do |extension|
+      ActionView::Template.register_template_handler extension, handler
+    end
   end
 
+  autoload :TemplateHandler,  "markdown-rails/template_handler"
+
   module Renderer
-    autoload :Base,       "markdown-rails/renderer/base"
-    autoload :Rails,      "markdown-rails/renderer/rails"
+    autoload :Base,           "markdown-rails/renderer/base"
+    autoload :Rails,          "markdown-rails/renderer/rails"
   end
 
   module Helper
-    autoload :Rouge,      "markdown-rails/helper/rouge"
+    autoload :Rouge,          "markdown-rails/helper/rouge"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha8
+  version: 2.0.0.alpha10
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,15 +53,15 @@ files:
 - lib/generators/markdown_rails/install/USAGE
 - lib/generators/markdown_rails/install/install_generator.rb
 - lib/generators/markdown_rails/install/templates/app/markdown/application_markdown.rb
+- lib/generators/markdown_rails/install/templates/app/markdown/erb_markdown.rb
 - lib/generators/markdown_rails/install/templates/config/initializers/markdown.rb
 - lib/markdown-rails.rb
 - lib/markdown-rails/engine.rb
-- lib/markdown-rails/handler/erb.rb
-- lib/markdown-rails/handler/markdown.rb
 - lib/markdown-rails/helper/rouge.rb
 - lib/markdown-rails/railtie.rb
 - lib/markdown-rails/renderer/base.rb
 - lib/markdown-rails/renderer/rails.rb
+- lib/markdown-rails/template_handler.rb
 - lib/markdown-rails/version.rb
 - lib/tasks/markdown/rails_tasks.rake
 homepage: https://github.com/sitepress/markdown-rails
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Markdown templates and partials in Rails.

data/lib/markdown-rails/handler/erb.rb

@@ -1,22 +0,0 @@
-module MarkdownRails
-  module Handler
-    class Erb < Markdown
-      def call(template, source = template.source)
-        compiled_source = compile_erb template, source
-        # TODO: This won't properly handle initializer blocks. Somehow
-        # I need to pass a reference to the block that's passed in.
-        "#{markdown.class.name}.new.renderer.render(begin;#{compiled_source};end).html_safe"
-      end
-
-      private
-
-      def compile_erb(template, source)
-        erb.call(template, source)
-      end
-
-      def erb
-        ActionView::Template.registered_template_handler(:erb)
-      end
-    end
-  end
-end

data/lib/markdown-rails/handler/markdown.rb

@@ -1,37 +0,0 @@
-module MarkdownRails
-  module Handler
-    # We cannot use MarkdownRails because it conflicts with RDiscount's Markdown class
-    class Markdown
-      def initialize(&block)
-        @markdown = block
-      end
-
-      def call(template, source = template.source)
-        renderer.render(source).inspect + '.html_safe'
-      end
-
-      def self.handle(*extensions, &block)
-        Array(extensions).each do |extension|
-          handler = new &block
-          ActionView::Template.register_template_handler extension, handler
-        end
-      end
-
-      private
-
-      def markdown
-        @cache = nil unless cache_enabled?
-        @cache ||= @markdown.call
-      end
-
-      def renderer
-        @renderer = nil unless cache_enabled?
-        @renderer ||= markdown.renderer
-      end
-
-      def cache_enabled?
-        ::Rails.configuration.cache_classes
-      end
-    end
-  end
-end