diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-02-05 23:17:38 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-02-05 23:17:38 +0900 |
| commit | 2ca3abe9f7650d72221ffeb8a9cd069891501b09 (patch) | |
| tree | a696f286b825abac5d758429ed65b14436534780 | |
| parent | 84071d2e698115a95dba330f3b51c5dee30c9b6f (diff) | |
| download | nsfisis.dev-2ca3abe9f7650d72221ffeb8a9cd069891501b09.tar.gz nsfisis.dev-2ca3abe9f7650d72221ffeb8a9cd069891501b09.tar.zst nsfisis.dev-2ca3abe9f7650d72221ffeb8a9cd069891501b09.zip | |
refactor(nuldoc): remove unnecessary parentheses
19 files changed, 83 insertions, 83 deletions
diff --git a/services/nuldoc/lib/nuldoc/components/global_headers.rb b/services/nuldoc/lib/nuldoc/components/global_headers.rb index ab62a5f0..8111ce1b 100644 --- a/services/nuldoc/lib/nuldoc/components/global_headers.rb +++ b/services/nuldoc/lib/nuldoc/components/global_headers.rb @@ -7,8 +7,8 @@ module Nuldoc end def build - header(class: 'header') do - div(class: 'site-logo') do + header class: 'header' do + div class: 'site-logo' do a(href: "https://#{@config.sites.default.fqdn}/") { text 'nsfisis.dev' } end end @@ -22,8 +22,8 @@ module Nuldoc end def build - header(class: 'header') do - div(class: 'site-logo') do + header class: 'header' do + div class: 'site-logo' do a(href: "https://#{@config.sites.default.fqdn}/") { text 'nsfisis.dev' } end end @@ -37,12 +37,12 @@ module Nuldoc end def build - header(class: 'header') do - div(class: 'site-logo') do + header class: 'header' do + div class: 'site-logo' do a(href: "https://#{@config.sites.default.fqdn}/") { text 'nsfisis.dev' } end div(class: 'site-name') { text @config.sites.blog.site_name } - nav(class: 'nav') do + nav class: 'nav' do ul do li { a(href: "https://#{@config.sites.about.fqdn}/") { text 'About' } } li { a(href: '/posts/') { text 'Posts' } } @@ -60,11 +60,11 @@ module Nuldoc end def build - header(class: 'header') do - div(class: 'site-logo') do + header class: 'header' do + div class: 'site-logo' do a(href: "https://#{@config.sites.default.fqdn}/") { text 'nsfisis.dev' } end - nav(class: 'nav') do + nav class: 'nav' do ul do li { a(href: "https://#{@config.sites.about.fqdn}/") { text 'About' } } li { a(href: '/slides/') { text 'Slides' } } diff --git a/services/nuldoc/lib/nuldoc/components/page_layout.rb b/services/nuldoc/lib/nuldoc/components/page_layout.rb index d1b31744..5e8eb002 100644 --- a/services/nuldoc/lib/nuldoc/components/page_layout.rb +++ b/services/nuldoc/lib/nuldoc/components/page_layout.rb @@ -17,27 +17,27 @@ module Nuldoc def build site_entry = @config.site_entry(@site) - html(lang: 'ja-JP') do + html lang: 'ja-JP' do head do - meta(charset: 'UTF-8') - meta(name: 'viewport', content: 'width=device-width, initial-scale=1.0') - meta(name: 'author', content: @config.site.author) - meta(name: 'copyright', content: "© #{@meta_copyright_year} #{@config.site.author}") - meta(name: 'description', content: @meta_description) + meta charset: 'UTF-8' + meta name: 'viewport', content: 'width=device-width, initial-scale=1.0' + meta name: 'author', content: @config.site.author + meta name: 'copyright', content: "© #{@meta_copyright_year} #{@config.site.author}" + meta name: 'description', content: @meta_description if @meta_keywords && !@meta_keywords.empty? - meta(name: 'keywords', - content: @meta_keywords.join(',')) + meta name: 'keywords', + content: @meta_keywords.join(',') end - meta(property: 'og:type', content: 'article') - meta(property: 'og:title', content: @meta_title) - meta(property: 'og:description', content: @meta_description) - meta(property: 'og:site_name', content: site_entry.site_name) - meta(property: 'og:locale', content: 'ja_JP') - meta(name: 'Hatena::Bookmark', content: 'nocomment') - link(rel: 'alternate', href: @meta_atom_feed_href, type: 'application/atom+xml') if @meta_atom_feed_href - link(rel: 'icon', href: '/favicon.svg', type: 'image/svg+xml') + meta property: 'og:type', content: 'article' + meta property: 'og:title', content: @meta_title + meta property: 'og:description', content: @meta_description + meta property: 'og:site_name', content: site_entry.site_name + meta property: 'og:locale', content: 'ja_JP' + meta name: 'Hatena::Bookmark', content: 'nocomment' + link rel: 'alternate', href: @meta_atom_feed_href, type: 'application/atom+xml' if @meta_atom_feed_href + link rel: 'icon', href: '/favicon.svg', type: 'image/svg+xml' title { text @meta_title } - render(StaticStylesheet, file_name: '/style.css', config: @config) + render StaticStylesheet, file_name: '/style.css', config: @config end child @children end diff --git a/services/nuldoc/lib/nuldoc/components/pagination.rb b/services/nuldoc/lib/nuldoc/components/pagination.rb index 3a6a5dc6..471c5fae 100644 --- a/services/nuldoc/lib/nuldoc/components/pagination.rb +++ b/services/nuldoc/lib/nuldoc/components/pagination.rb @@ -14,24 +14,24 @@ module Nuldoc else pages = generate_page_numbers(@current_page, @total_pages) - nav(class: 'pagination') do - div(class: 'pagination-prev') do + nav class: 'pagination' do + div class: 'pagination-prev' do a(href: page_url_at(@base_path, @current_page - 1)) { text '前へ' } if @current_page > 1 end pages.each do |page| if page == '...' div(class: 'pagination-elipsis') { text "\u2026" } elsif page == @current_page - div(class: 'pagination-page pagination-page-current') do + div class: 'pagination-page pagination-page-current' do span { text page.to_s } end else - div(class: 'pagination-page') do + div class: 'pagination-page' do a(href: page_url_at(@base_path, page)) { text page.to_s } end end end - div(class: 'pagination-next') do + div class: 'pagination-next' do a(href: page_url_at(@base_path, @current_page + 1)) { text '次へ' } if @current_page < @total_pages end end diff --git a/services/nuldoc/lib/nuldoc/components/post_page_entry.rb b/services/nuldoc/lib/nuldoc/components/post_page_entry.rb index 4a9ab6c6..0f80b77d 100644 --- a/services/nuldoc/lib/nuldoc/components/post_page_entry.rb +++ b/services/nuldoc/lib/nuldoc/components/post_page_entry.rb @@ -12,11 +12,11 @@ module Nuldoc updated = Revision.date_to_string(GeneratorUtils.updated_date(@post)) has_updates = GeneratorUtils.any_updates?(@post) - article(class: 'post-entry') do - a(href: @post.href) do + article class: 'post-entry' do + a href: @post.href do header(class: 'entry-header') { h2 { text @post.title } } section(class: 'entry-content') { p { text @post.description } } - footer(class: 'entry-footer') do + footer class: 'entry-footer' do time(datetime: published) { text published } text ' 投稿' if has_updates @@ -24,7 +24,7 @@ module Nuldoc time(datetime: updated) { text updated } text ' 更新' end - render(TagList, tags: @post.tags, config: @config) if @post.tags.length.positive? + render TagList, tags: @post.tags, config: @config if @post.tags.length.positive? end end end diff --git a/services/nuldoc/lib/nuldoc/components/slide_page_entry.rb b/services/nuldoc/lib/nuldoc/components/slide_page_entry.rb index 4aabc425..5b5ff55f 100644 --- a/services/nuldoc/lib/nuldoc/components/slide_page_entry.rb +++ b/services/nuldoc/lib/nuldoc/components/slide_page_entry.rb @@ -12,11 +12,11 @@ module Nuldoc updated = Revision.date_to_string(GeneratorUtils.updated_date(@slide)) has_updates = GeneratorUtils.any_updates?(@slide) - article(class: 'post-entry') do - a(href: @slide.href) do + article class: 'post-entry' do + a href: @slide.href do header(class: 'entry-header') { h2 { text @slide.title } } section(class: 'entry-content') { p { text @slide.description } } - footer(class: 'entry-footer') do + footer class: 'entry-footer' do time(datetime: published) { text published } text ' 登壇' if has_updates @@ -24,7 +24,7 @@ module Nuldoc time(datetime: updated) { text updated } text ' 更新' end - render(TagList, tags: @slide.tags, config: @config) if @slide.tags.length.positive? + render TagList, tags: @slide.tags, config: @config if @slide.tags.length.positive? end end end diff --git a/services/nuldoc/lib/nuldoc/components/static_stylesheet.rb b/services/nuldoc/lib/nuldoc/components/static_stylesheet.rb index f0925e18..c1f87bca 100644 --- a/services/nuldoc/lib/nuldoc/components/static_stylesheet.rb +++ b/services/nuldoc/lib/nuldoc/components/static_stylesheet.rb @@ -11,7 +11,7 @@ module Nuldoc def build file_path = File.join(Dir.pwd, @config.locations.static_dir, @site || '_all', @file_name) hash = ComponentUtils.calculate_file_hash(file_path) - link(rel: 'stylesheet', href: "#{@file_name}?h=#{hash}") + link rel: 'stylesheet', href: "#{@file_name}?h=#{hash}" end end end diff --git a/services/nuldoc/lib/nuldoc/components/table_of_contents.rb b/services/nuldoc/lib/nuldoc/components/table_of_contents.rb index 499ca681..b77e7442 100644 --- a/services/nuldoc/lib/nuldoc/components/table_of_contents.rb +++ b/services/nuldoc/lib/nuldoc/components/table_of_contents.rb @@ -7,7 +7,7 @@ module Nuldoc end def build - nav(class: 'toc') do + nav class: 'toc' do h2 { text '目次' } ul { @toc.items.each { |entry| toc_entry_component(entry) } } end diff --git a/services/nuldoc/lib/nuldoc/components/tag_list.rb b/services/nuldoc/lib/nuldoc/components/tag_list.rb index acbcaaf3..92348ca6 100644 --- a/services/nuldoc/lib/nuldoc/components/tag_list.rb +++ b/services/nuldoc/lib/nuldoc/components/tag_list.rb @@ -8,9 +8,9 @@ module Nuldoc end def build - ul(class: 'entry-tags') do + ul class: 'entry-tags' do @tags.each do |slug| - li(class: 'tag') do + li class: 'tag' do span(class: 'tag-inner') { text @config.tag_label(slug) } end end diff --git a/services/nuldoc/lib/nuldoc/markdown/transform.rb b/services/nuldoc/lib/nuldoc/markdown/transform.rb index 0e20493e..c11eb541 100644 --- a/services/nuldoc/lib/nuldoc/markdown/transform.rb +++ b/services/nuldoc/lib/nuldoc/markdown/transform.rb @@ -184,7 +184,7 @@ module Nuldoc operation_attr = n.attributes['operation'] is_edit_block = editat_attr && operation_attr - label_element = div(class: 'admonition-label') do + label_element = div class: 'admonition-label' do text(is_edit_block ? "#{editat_attr} #{operation_attr}" : 'NOTE') end content_element = div(class: 'admonition-content') { child(*n.children.dup) } diff --git a/services/nuldoc/lib/nuldoc/pages/about_page.rb b/services/nuldoc/lib/nuldoc/pages/about_page.rb index 07391f9a..d2d3dfba 100644 --- a/services/nuldoc/lib/nuldoc/pages/about_page.rb +++ b/services/nuldoc/lib/nuldoc/pages/about_page.rb @@ -18,18 +18,18 @@ module Nuldoc config: config, children: DOM::HTMLBuilder.new.build do body class: 'single' do - render(Components::AboutGlobalHeader, config: config) + render Components::AboutGlobalHeader, config: config main class: 'main' do article class: 'post-single' do header class: 'post-header' do h1(class: 'post-title') { text 'nsfisis' } div class: 'my-icon' do - div(id: 'myIcon') { img(src: '/favicon.svg') } - render(Components::StaticScript, + div(id: 'myIcon') { img src: '/favicon.svg' } + render Components::StaticScript, site: 'about', file_name: '/my-icon.js', defer: 'true', - config: config) + config: config end end div class: 'post-content' do @@ -80,7 +80,7 @@ module Nuldoc end end end - render(Components::GlobalFooter, config: config) + render Components::GlobalFooter, config: config end end ).build diff --git a/services/nuldoc/lib/nuldoc/pages/atom_page.rb b/services/nuldoc/lib/nuldoc/pages/atom_page.rb index bf49f548..2c1967e5 100644 --- a/services/nuldoc/lib/nuldoc/pages/atom_page.rb +++ b/services/nuldoc/lib/nuldoc/pages/atom_page.rb @@ -11,14 +11,14 @@ module Nuldoc feed xmlns: 'http://www.w3.org/2005/Atom' do id { text feed.id } title { text feed.title } - link(rel: 'alternate', href: feed.link_to_alternate) - link(rel: 'self', href: feed.link_to_self) + link rel: 'alternate', href: feed.link_to_alternate + link rel: 'self', href: feed.link_to_self author { name { text feed.author } } updated { text feed.updated } feed.entries.each do |entry| entry do id { text entry.id } - link(rel: 'alternate', href: entry.link_to_alternate) + link rel: 'alternate', href: entry.link_to_alternate title { text entry.title } summary { text entry.summary } published { text entry.published } diff --git a/services/nuldoc/lib/nuldoc/pages/home_page.rb b/services/nuldoc/lib/nuldoc/pages/home_page.rb index 22c33c08..dc6588d6 100644 --- a/services/nuldoc/lib/nuldoc/pages/home_page.rb +++ b/services/nuldoc/lib/nuldoc/pages/home_page.rb @@ -16,7 +16,7 @@ module Nuldoc config: config, children: DOM::HTMLBuilder.new.build do body class: 'single' do - render(Components::DefaultGlobalHeader, config: config) + render Components::DefaultGlobalHeader, config: config main class: 'main' do article class: 'post-single' do article class: 'post-entry' do @@ -41,7 +41,7 @@ module Nuldoc end end end - render(Components::GlobalFooter, config: config) + render Components::GlobalFooter, config: config end end ).build diff --git a/services/nuldoc/lib/nuldoc/pages/not_found_page.rb b/services/nuldoc/lib/nuldoc/pages/not_found_page.rb index b7b80285..820d1849 100644 --- a/services/nuldoc/lib/nuldoc/pages/not_found_page.rb +++ b/services/nuldoc/lib/nuldoc/pages/not_found_page.rb @@ -26,11 +26,11 @@ module Nuldoc config: config, children: DOM::HTMLBuilder.new.build do body class: 'single' do - render(global_header, config: config) + render global_header, config: config main class: 'main' do article { div(class: 'not-found') { text '404' } } end - render(Components::GlobalFooter, config: config) + render Components::GlobalFooter, config: config end end ).build diff --git a/services/nuldoc/lib/nuldoc/pages/post_list_page.rb b/services/nuldoc/lib/nuldoc/pages/post_list_page.rb index a7de1f31..7c43a41b 100644 --- a/services/nuldoc/lib/nuldoc/pages/post_list_page.rb +++ b/services/nuldoc/lib/nuldoc/pages/post_list_page.rb @@ -27,16 +27,16 @@ module Nuldoc config: config, children: DOM::HTMLBuilder.new.build do body class: 'list' do - render(Components::BlogGlobalHeader, config: config) + render Components::BlogGlobalHeader, config: config main class: 'main' do header(class: 'page-header') { h1 { text "#{page_title}#{page_info_suffix}" } } - render(Components::Pagination, current_page: current_page, total_pages: total_pages, - base_path: '/posts/') + render Components::Pagination, current_page: current_page, total_pages: total_pages, + base_path: '/posts/' posts.each { |post| render(Components::PostPageEntry, post: post, config: config) } - render(Components::Pagination, current_page: current_page, total_pages: total_pages, - base_path: '/posts/') + render Components::Pagination, current_page: current_page, total_pages: total_pages, + base_path: '/posts/' end - render(Components::GlobalFooter, config: config) + render Components::GlobalFooter, config: config end end ).build diff --git a/services/nuldoc/lib/nuldoc/pages/post_page.rb b/services/nuldoc/lib/nuldoc/pages/post_page.rb index bcd5a644..fee976c3 100644 --- a/services/nuldoc/lib/nuldoc/pages/post_page.rb +++ b/services/nuldoc/lib/nuldoc/pages/post_page.rb @@ -18,7 +18,7 @@ module Nuldoc config: config, children: DOM::HTMLBuilder.new.build do body class: 'single' do - render(Components::BlogGlobalHeader, config: config) + render Components::BlogGlobalHeader, config: config main class: 'main' do article class: 'post-single' do header class: 'post-header' do @@ -33,7 +33,7 @@ module Nuldoc end end end - render(Components::TableOfContents, toc: doc.toc) if doc.toc && doc.toc.items.length.positive? + render Components::TableOfContents, toc: doc.toc if doc.toc && doc.toc.items.length.positive? div class: 'post-content' do section id: 'changelog' do h2 { a(href: '#changelog') { text '更新履歴' } } @@ -51,7 +51,7 @@ module Nuldoc end end end - render(Components::GlobalFooter, config: config) + render Components::GlobalFooter, config: config end end ).build diff --git a/services/nuldoc/lib/nuldoc/pages/slide_list_page.rb b/services/nuldoc/lib/nuldoc/pages/slide_list_page.rb index 62ca6552..f6cc89f7 100644 --- a/services/nuldoc/lib/nuldoc/pages/slide_list_page.rb +++ b/services/nuldoc/lib/nuldoc/pages/slide_list_page.rb @@ -20,14 +20,14 @@ module Nuldoc config: config, children: DOM::HTMLBuilder.new.build do body class: 'list' do - render(Components::SlidesGlobalHeader, config: config) + render Components::SlidesGlobalHeader, config: config main class: 'main' do header(class: 'page-header') { h1 { text page_title } } sorted.each do |slide| - render(Components::SlidePageEntry, slide: slide, config: config) + render Components::SlidePageEntry, slide: slide, config: config end end - render(Components::GlobalFooter, config: config) + render Components::GlobalFooter, config: config end end ).build diff --git a/services/nuldoc/lib/nuldoc/pages/slide_page.rb b/services/nuldoc/lib/nuldoc/pages/slide_page.rb index 0e76599d..07dd80aa 100644 --- a/services/nuldoc/lib/nuldoc/pages/slide_page.rb +++ b/services/nuldoc/lib/nuldoc/pages/slide_page.rb @@ -18,8 +18,8 @@ module Nuldoc config: config, children: DOM::HTMLBuilder.new.build do body class: 'single' do - render(Components::StaticStylesheet, site: 'slides', file_name: '/slides.css', config: config) - render(Components::SlidesGlobalHeader, config: config) + render Components::StaticStylesheet, site: 'slides', file_name: '/slides.css', config: config + render Components::SlidesGlobalHeader, config: config main class: 'main' do article class: 'post-single' do header class: 'post-header' do @@ -47,32 +47,32 @@ module Nuldoc end end end - canvas(id: 'slide', 'data-slide-link': slide.slide_link) + canvas id: 'slide', 'data-slide-link': slide.slide_link div class: 'controllers' do div class: 'controllers-buttons' do button id: 'prev', type: 'button' do elem 'svg', width: '20', height: '20', viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor', 'stroke-width': '2' do - elem('path', d: 'M15 18l-6-6 6-6') + elem 'path', d: 'M15 18l-6-6 6-6' end end button id: 'next', type: 'button' do elem 'svg', width: '20', height: '20', viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor', 'stroke-width': '2' do - elem('path', d: 'M9 18l6-6-6-6') + elem 'path', d: 'M9 18l6-6-6-6' end end end end - render(Components::StaticScript, + render Components::StaticScript, site: 'slides', file_name: '/slide.js', type: 'module', - config: config) + config: config end end end - render(Components::GlobalFooter, config: config) + render Components::GlobalFooter, config: config end end ).build diff --git a/services/nuldoc/lib/nuldoc/pages/tag_list_page.rb b/services/nuldoc/lib/nuldoc/pages/tag_list_page.rb index 0d8dab2a..bd7e0782 100644 --- a/services/nuldoc/lib/nuldoc/pages/tag_list_page.rb +++ b/services/nuldoc/lib/nuldoc/pages/tag_list_page.rb @@ -24,7 +24,7 @@ module Nuldoc config: config, children: DOM::HTMLBuilder.new.build do body class: 'list' do - render(global_header, config: config) + render global_header, config: config main class: 'main' do header(class: 'page-header') { h1 { text page_title } } sorted_tags.each do |tag| @@ -41,7 +41,7 @@ module Nuldoc end end end - render(Components::GlobalFooter, config: config) + render Components::GlobalFooter, config: config end end ).build diff --git a/services/nuldoc/lib/nuldoc/pages/tag_page.rb b/services/nuldoc/lib/nuldoc/pages/tag_page.rb index f0946abd..f4695926 100644 --- a/services/nuldoc/lib/nuldoc/pages/tag_page.rb +++ b/services/nuldoc/lib/nuldoc/pages/tag_page.rb @@ -28,18 +28,18 @@ module Nuldoc config: config, children: DOM::HTMLBuilder.new.build do body class: 'list' do - render(global_header, config: config) + render global_header, config: config main class: 'main' do header(class: 'page-header') { h1 { text page_title } } pages.each do |page| if page.respond_to?(:event) - render(Components::SlidePageEntry, slide: page, config: config) + render Components::SlidePageEntry, slide: page, config: config else - render(Components::PostPageEntry, post: page, config: config) + render Components::PostPageEntry, post: page, config: config end end end - render(Components::GlobalFooter, config: config) + render Components::GlobalFooter, config: config end end ).build |
