Skip to content

Commit e64deae

Browse files
committed
Update code block article api
1 parent efb6d5d commit e64deae

File tree

3 files changed

+31
-9
lines changed

3 files changed

+31
-9
lines changed

app/views/components/code_block/app_file.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def view_template
1818
}
1919
end
2020

21-
code_block.source_code do
21+
code_block.body do
2222
source
2323
end
2424
end

app/views/components/code_block/article.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ def initialize(source = "", language: nil, filename: nil, run: false, show_heade
1010
@show_header = show_header
1111
end
1212

13-
def view_template(&block)
14-
# Capture the block content as the source if no source was provided
15-
# The capture call appears to add a leading space, so we strip it.
16-
@source ||= capture(&block)&.strip if block.present?
17-
13+
def view_template
1814
div(
1915
class: "code-wrapper highlight language-#{language}",
2016
data: code_example_data.keep_if { enable_run }.merge(data)
@@ -54,7 +50,7 @@ def title(&block)
5450
end
5551

5652
# Overwite the source code with a block
57-
def source_code(&)
53+
def body(&)
5854
@source = capture(&)
5955
end
6056

app/views/settings/syntax_highlights/form.rb

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,35 @@ def view_template
3737

3838
h2 { %(Preview) }
3939
h3 { %(Ruby) }
40-
render CodeBlock::AppFile.new("app/controllers/application_controller.rb", language: "ruby")
40+
41+
render CodeBlock::Article.new(language: "ruby") do |code|
42+
code.body do
43+
<<~RUBY.html_safe
44+
class Family < Group
45+
include Enumerable
46+
47+
def initialize(*members)
48+
@members = members
49+
end
50+
51+
def each(&)
52+
@members.each(&)
53+
end
54+
end
55+
RUBY
56+
end
57+
end
4158
h3 { %(CSS) }
42-
render CodeBlock::AppFile.new("app/javascript/css/components/page-header.css", language: "css")
59+
render CodeBlock::Article.new(language: "css") do |code|
60+
code.body do
61+
<<~CSS
62+
body {
63+
font-size: 12pt;
64+
background: #fff url(temp.png) top left no-repeat;
65+
}
66+
CSS
67+
end
68+
end
4369
h3 { %(HTML with ERB) }
4470
render CodeBlock::AppFile.new("app/views/layouts/application.html.erb", language: "erb")
4571
end

0 commit comments

Comments
 (0)