Merge pull request #193 from joyofrails/feat/atom-app-file-code-blocks

Render basic code block from app file within atom

Author: rossta

app/controllers/feed_controller.rb

@@ -3,8 +3,7 @@ def index
     @articles = ArticlePage.published
     respond_to do |format|
       format.html { redirect_to feed_path(format: :atom), status: :moved_permanently }
-      # format.xml { headers["Content-Type"] = 'application/rss+xml; charset=utf-8'}
-      format.atom { headers["Content-Type"] = "application/atom+xml; charset=utf-8" }
+      format.atom
     end
   end
 end

app/models/examples/app_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Examples
   class AppFile
     class << self

app/views/components/atom/entry_content.rb

@@ -50,7 +50,7 @@ def render_template_html
       inline: article.body,
       type: :"mdrb-atom",
       layout: false,
-      content_type: article.mime_type.to_s,
+      content_type: "application/atom+xml",
       assigns: {
         format: :atom
       }

app/views/components/code_block/app_file.rb

@@ -10,6 +10,11 @@ def initialize(filename, lines: nil, revision: "HEAD", **attributes)
   end
 
   def view_template
+    # When an AppFile code block renders within an Atom feed, we want to render the basic code block
+    if content_type?("application/atom+xml")
+      return render ::CodeBlock::Basic.new(source, **attributes)
+    end
+
     render ::CodeBlock::Article.new(**attributes) do |code_block|
       code_block.title do
         link(app_file.repo_url, "Source code on Github", class: "nc") {
@@ -31,4 +36,8 @@ def view_template
   def source
     app_file.source(lines: lines)
   end
+
+  def content_type?(type)
+    helpers.headers["Content-Type"].to_s =~ %r{#{Regexp.escape(type)}}
+  end
 end

app/views/components/markdown/allows_erb.rb

@@ -1,3 +1,6 @@
+# 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.
+
 module Markdown::AllowsErb
   ERB_TAGS = %r{s*<%.*?%>}
   ERB_TAGS_START = %r{\A<%.*?%>}

app/views/components/markdown/atom.rb

@@ -1,6 +1,3 @@
-# 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 Markdown::Atom < Markdown::Application
   prepend Markdown::AllowsErb
 end

app/views/feed/index.atom.builder

@@ -9,7 +9,7 @@ atom_feed do |feed|
       url: request.base_url + article.request_path
     ) do |entry|
       entry.title(article.title)
-      entry.content(Atom::EntryContent.new(article).render, type: "html")
+      entry.content(Atom::EntryContent.new(article, request: request).render, type: "html")
 
       entry.author do |author|
         author.name(article.author)

spec/views/components/code_block/app_file_spec.rb

@@ -5,12 +5,17 @@ def render_page(*, **)
     Capybara.string(render(*, **))
   end
 
+  before do
+    allow(view).to receive(:headers).and_return({"Content-Type" => "text/html"})
+  end
+
   it "renders contents of file" do
     page = render_page(CodeBlock::AppFile.new("config/database.yml"))
     expect(page).to have_content(<<~YAML)
       default: &default
         adapter: sqlite3
     YAML
+    expect(page).to have_content("config/database.yml")
   end
 
   it "renders contents of file by line number" do
@@ -42,4 +47,16 @@ def render_page(*, **)
     expect(page).to have_content("database: storage/production/data.sqlite3")
     expect(page).not_to have_content("database: storage/development/data.sqlite3")
   end
+
+  it "renders basic code block when content type is atom" do
+    allow(view).to receive(:headers).and_return({"Content-Type" => "application/atom+xml"})
+
+    page = render_page(CodeBlock::AppFile.new("config/database.yml"))
+    expect(page).to have_content(<<~YAML)
+      default: &default
+        adapter: sqlite3
+    YAML
+
+    expect(page).not_to have_content("config/database.yml")
+  end
 end