-
-
Notifications
You must be signed in to change notification settings - Fork 20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
🧹 Journal
: Move Entry
rendering to EntryComponent
#1650
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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) %> |
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 |
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") } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any reason you're just testing the link existence and not other strings? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Well, I could have done some tests to ensure headings have the appropriate ids and such; but this was the thrust of the work I was doing so it's what I focused on. |
||
end |
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 } | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about
content_html
not to confuse with the<body>
tag. This might be more consistent with other components that define header/content/footer slots?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I like that! I will do a follow up PR to rename
Entry#body
toEntry#content