-
-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- https://github.com/zinc-collective/convene/issues/1566 This refactor allows us to do post-processing of the markdown at the Component level, which has access to the rails URL builders; which should allow us to link to the `Keyword` within the `Entry#body`...
- Loading branch information
Showing
7 changed files
with
45 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
<%- breadcrumb :journal_entry, entry %> | ||
<%= render entry %> | ||
<%= render Journal::EntryComponent.new(entry: entry) %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
class Journal | ||
class EntryComponent < ApplicationComponent | ||
include RendersMarkdown | ||
attr_accessor :entry | ||
|
||
def initialize(*args, entry:, **kwargs) | ||
self.entry = entry | ||
super(*args, **kwargs) | ||
end | ||
|
||
def body_html | ||
render_markdown(entry.body) | ||
end | ||
|
||
def published_at | ||
entry.published_at.to_fs(:long_ordinal) | ||
end | ||
|
||
def self.renderer | ||
@_renderer ||= Redcarpet::Markdown.new( | ||
Renderer.new(filter_html: true, with_toc_data: true), | ||
autolink: true, strikethrough: true, | ||
no_intra_emphasis: true, | ||
lax_spacing: true, | ||
fenced_code_blocks: true, disable_indented_code_blocks: true, | ||
tables: true, footnotes: true, superscript: true, quote: true | ||
) | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
require "rails_helper" | ||
|
||
RSpec.describe Journal::EntryComponent, type: :component do | ||
subject(:output) { render_inline(component) } | ||
|
||
let(:component) { described_class.new(entry: entry) } | ||
let(:entry) { create(:journal_entry, body: "https://www.google.com @[email protected] #GoodTimes") } | ||
|
||
it { is_expected.to have_link("https://www.google.com", href: "https://www.google.com") } | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,16 +10,6 @@ | |
it { is_expected.to have_one(:room).through(:journal) } | ||
it { is_expected.to have_one(:space).through(:journal) } | ||
|
||
describe "#to_html" do | ||
subject(:to_html) { entry.to_html } | ||
|
||
context "when #body is 'https://www.google.com @[email protected]'" do | ||
let(:entry) { build(:journal_entry, body: "https://www.google.com @[email protected]") } | ||
|
||
it { is_expected.to include('<a href="https://www.google.com">https://www.google.com</a>') } | ||
end | ||
end | ||
|
||
describe "#save" do | ||
let(:entry) { create(:journal_entry, body: "#GoodTimes") } | ||
let(:journal) { entry.journal } | ||
|