From b52b71b4a807aade2b01c8de63913347ecfeb325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Mon, 24 Oct 2022 00:11:08 +0900 Subject: [PATCH 01/25] Add Grammarly to Devcontainer --- .devcontainer/devcontainer.json | 11 +++++++++-- README.md | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0f5ac42..94f4329 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -23,8 +23,15 @@ "extensions": [ "GitHub.copilot", "rebornix.ruby", - "castwide.solargraph" - ] + "castwide.solargraph", + "znck.grammarly" + ], + "settings": { + "grammarly.files.include": [ + "**/*.txt", + "**/*.md" + ] + } } } diff --git a/README.md b/README.md index c542efb..af7b296 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,8 @@ This file is not required for Git management, so you can add it to `.gitignore` mermaid_erd ``` -`/mermaid_erd/index.html` is single HTML file. -If you share this file, it can be used by those who do not have Ruby on Rails environment. Or, you can upload the file to a web server and share it with the same URL. +`/mermaid_erd/index.html` is a single HTML file. +If you share this file, it can be used by those who do not have a Ruby on Rails environment. Or, you can upload the file to a web server and share it with the same URL. It would be very smart to generate it automatically using CI. From 477fbd5c4c4e4cd173062f77db5f048b60ef2ebe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 05:11:10 +0000 Subject: [PATCH 02/25] Bump tzinfo-data from 1.2022.5 to 1.2022.7 Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2022.5 to 1.2022.7. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2022.5...v1.2022.7) --- updated-dependencies: - dependency-name: tzinfo-data dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7c5b31c..2c7042c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -217,7 +217,7 @@ GEM timeout (0.3.0) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - tzinfo-data (1.2022.5) + tzinfo-data (1.2022.7) tzinfo (>= 1.0.0) unicode-display_width (2.3.0) webrick (1.7.0) From 66714047c7d0560d719b430ddeb365b3f05f5f70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 19:15:17 +0000 Subject: [PATCH 03/25] Bump actionpack from 7.0.4 to 7.0.4.1 Bumps [actionpack](https://github.com/rails/rails) from 7.0.4 to 7.0.4.1. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v7.0.4.1/actionpack/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v7.0.4...v7.0.4.1) --- updated-dependencies: - dependency-name: actionpack dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 142 +++++++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7c5b31c..d0d5860 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,67 +7,67 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + actioncable (7.0.4.1) + actionpack (= 7.0.4.1) + activesupport (= 7.0.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actionmailbox (7.0.4.1) + actionpack (= 7.0.4.1) + activejob (= 7.0.4.1) + activerecord (= 7.0.4.1) + activestorage (= 7.0.4.1) + activesupport (= 7.0.4.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4) - actionpack (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activesupport (= 7.0.4) + actionmailer (7.0.4.1) + actionpack (= 7.0.4.1) + actionview (= 7.0.4.1) + activejob (= 7.0.4.1) + activesupport (= 7.0.4.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4) - actionview (= 7.0.4) - activesupport (= 7.0.4) + actionpack (7.0.4.1) + actionview (= 7.0.4.1) + activesupport (= 7.0.4.1) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4) - actionpack (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actiontext (7.0.4.1) + actionpack (= 7.0.4.1) + activerecord (= 7.0.4.1) + activestorage (= 7.0.4.1) + activesupport (= 7.0.4.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4) - activesupport (= 7.0.4) + actionview (7.0.4.1) + activesupport (= 7.0.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.4) - activesupport (= 7.0.4) + activejob (7.0.4.1) + activesupport (= 7.0.4.1) globalid (>= 0.3.6) - activemodel (7.0.4) - activesupport (= 7.0.4) - activerecord (7.0.4) - activemodel (= 7.0.4) - activesupport (= 7.0.4) - activestorage (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activesupport (= 7.0.4) + activemodel (7.0.4.1) + activesupport (= 7.0.4.1) + activerecord (7.0.4.1) + activemodel (= 7.0.4.1) + activesupport (= 7.0.4.1) + activestorage (7.0.4.1) + actionpack (= 7.0.4.1) + activejob (= 7.0.4.1) + activerecord (= 7.0.4.1) + activesupport (= 7.0.4.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4) + activesupport (7.0.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -82,7 +82,7 @@ GEM diff-lcs (1.5.0) docile (1.4.0) e2mmap (0.1.0) - erubi (1.11.0) + erubi (1.12.0) globalid (1.0.0) activesupport (>= 5.0) i18n (1.12.0) @@ -93,7 +93,7 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -101,7 +101,7 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.16.3) + minitest (5.17.0) net-imap (0.3.1) net-protocol net-pop (0.1.2) @@ -111,40 +111,40 @@ GEM net-smtp (0.3.2) net-protocol nio4r (2.5.8) - nokogiri (1.13.9-x86_64-darwin) + nokogiri (1.14.0-x86_64-darwin) racc (~> 1.4) - nokogiri (1.13.9-x86_64-linux) + nokogiri (1.14.0-x86_64-linux) racc (~> 1.4) parallel (1.22.1) parser (3.1.2.1) ast (~> 2.4.1) pg (1.4.4) - racc (1.6.0) - rack (2.2.4) + racc (1.6.2) + rack (2.2.6.2) rack-test (2.0.2) rack (>= 1.3) - rails (7.0.4) - actioncable (= 7.0.4) - actionmailbox (= 7.0.4) - actionmailer (= 7.0.4) - actionpack (= 7.0.4) - actiontext (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activemodel (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + rails (7.0.4.1) + actioncable (= 7.0.4.1) + actionmailbox (= 7.0.4.1) + actionmailer (= 7.0.4.1) + actionpack (= 7.0.4.1) + actiontext (= 7.0.4.1) + actionview (= 7.0.4.1) + activejob (= 7.0.4.1) + activemodel (= 7.0.4.1) + activerecord (= 7.0.4.1) + activestorage (= 7.0.4.1) + activesupport (= 7.0.4.1) bundler (>= 1.15.0) - railties (= 7.0.4) + railties (= 7.0.4.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.1) + actionpack (= 7.0.4.1) + activesupport (= 7.0.4.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -155,15 +155,15 @@ GEM reverse_markdown (2.1.1) nokogiri rexml (3.2.5) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.1) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (6.0.0) + rspec-support (~> 3.12.0) + rspec-rails (6.0.1) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -171,7 +171,7 @@ GEM rspec-expectations (~> 3.11) rspec-mocks (~> 3.11) rspec-support (~> 3.11) - rspec-support (3.11.1) + rspec-support (3.12.0) rubocop (1.35.1) json (~> 2.3) parallel (~> 1.10) @@ -194,7 +194,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - solargraph (0.47.2) + solargraph (0.48.0) backport (~> 1.2) benchmark bundler (>= 1.17.2) From bf0353c9b77af175d25a4d2916ed56f09c2d807e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:10:37 +0000 Subject: [PATCH 04/25] Bump nokogiri from 1.14.0 to 1.15.4 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.0 to 1.15.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.14.0...v1.15.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d0d5860..9d0955b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -111,15 +111,15 @@ GEM net-smtp (0.3.2) net-protocol nio4r (2.5.8) - nokogiri (1.14.0-x86_64-darwin) + nokogiri (1.15.4-x86_64-darwin) racc (~> 1.4) - nokogiri (1.14.0-x86_64-linux) + nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) parallel (1.22.1) parser (3.1.2.1) ast (~> 2.4.1) pg (1.4.4) - racc (1.6.2) + racc (1.7.1) rack (2.2.6.2) rack-test (2.0.2) rack (>= 1.3) From 79d74f30157bd197a305ab77b4ef83cf680228c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:10:42 +0000 Subject: [PATCH 05/25] Bump activesupport from 7.0.4.1 to 7.0.8 Bumps [activesupport](https://github.com/rails/rails) from 7.0.4.1 to 7.0.8. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v7.0.8/activesupport/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v7.0.4.1...v7.0.8) --- updated-dependencies: - dependency-name: activesupport dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 116 +++++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d0d5860..b4675a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,67 +7,67 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4.1) - actionpack (= 7.0.4.1) - activesupport (= 7.0.4.1) + actioncable (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4.1) - actionpack (= 7.0.4.1) - activejob (= 7.0.4.1) - activerecord (= 7.0.4.1) - activestorage (= 7.0.4.1) - activesupport (= 7.0.4.1) + actionmailbox (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4.1) - actionpack (= 7.0.4.1) - actionview (= 7.0.4.1) - activejob (= 7.0.4.1) - activesupport (= 7.0.4.1) + actionmailer (7.0.8) + actionpack (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activesupport (= 7.0.8) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4.1) - actionview (= 7.0.4.1) - activesupport (= 7.0.4.1) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4.1) - actionpack (= 7.0.4.1) - activerecord (= 7.0.4.1) - activestorage (= 7.0.4.1) - activesupport (= 7.0.4.1) + actiontext (7.0.8) + actionpack (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4.1) - activesupport (= 7.0.4.1) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.4.1) - activesupport (= 7.0.4.1) + activejob (7.0.8) + activesupport (= 7.0.8) globalid (>= 0.3.6) - activemodel (7.0.4.1) - activesupport (= 7.0.4.1) - activerecord (7.0.4.1) - activemodel (= 7.0.4.1) - activesupport (= 7.0.4.1) - activestorage (7.0.4.1) - actionpack (= 7.0.4.1) - activejob (= 7.0.4.1) - activerecord (= 7.0.4.1) - activesupport (= 7.0.4.1) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activestorage (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activesupport (= 7.0.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4.1) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -77,7 +77,7 @@ GEM benchmark (0.2.0) builder (3.2.4) bump (0.10.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) diff-lcs (1.5.0) docile (1.4.0) @@ -85,7 +85,7 @@ GEM erubi (1.12.0) globalid (1.0.0) activesupport (>= 5.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) jaro_winkler (1.5.4) json (2.6.2) @@ -101,7 +101,7 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.17.0) + minitest (5.20.0) net-imap (0.3.1) net-protocol net-pop (0.1.2) @@ -123,28 +123,28 @@ GEM rack (2.2.6.2) rack-test (2.0.2) rack (>= 1.3) - rails (7.0.4.1) - actioncable (= 7.0.4.1) - actionmailbox (= 7.0.4.1) - actionmailer (= 7.0.4.1) - actionpack (= 7.0.4.1) - actiontext (= 7.0.4.1) - actionview (= 7.0.4.1) - activejob (= 7.0.4.1) - activemodel (= 7.0.4.1) - activerecord (= 7.0.4.1) - activestorage (= 7.0.4.1) - activesupport (= 7.0.4.1) + rails (7.0.8) + actioncable (= 7.0.8) + actionmailbox (= 7.0.8) + actionmailer (= 7.0.8) + actionpack (= 7.0.8) + actiontext (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activemodel (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) bundler (>= 1.15.0) - railties (= 7.0.4.1) + railties (= 7.0.8) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.4) loofah (~> 2.19, >= 2.19.1) - railties (7.0.4.1) - actionpack (= 7.0.4.1) - activesupport (= 7.0.4.1) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) @@ -215,7 +215,7 @@ GEM thor (1.2.1) tilt (2.0.11) timeout (0.3.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2022.5) tzinfo (>= 1.0.0) From 2d79692a279302acd8c75b4a28b4bc62976da24a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:13:41 +0000 Subject: [PATCH 06/25] Bump standard from 1.16.1 to 1.31.1 Bumps [standard](https://github.com/standardrb/standard) from 1.16.1 to 1.31.1. - [Release notes](https://github.com/standardrb/standard/releases) - [Changelog](https://github.com/standardrb/standard/blob/main/CHANGELOG.md) - [Commits](https://github.com/standardrb/standard/compare/v1.16.1...v1.31.1) --- updated-dependencies: - dependency-name: standard dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8b4953c..f932d7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,6 +74,7 @@ GEM tzinfo (~> 2.0) ast (2.4.2) backport (1.2.0) + base64 (0.1.1) benchmark (0.2.0) builder (3.2.4) bump (0.10.0) @@ -88,11 +89,13 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) jaro_winkler (1.5.4) - json (2.6.2) + json (2.6.3) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -115,9 +118,10 @@ GEM racc (~> 1.4) nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) - parallel (1.22.1) - parser (3.1.2.1) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) + racc pg (1.4.4) racc (1.7.1) rack (2.2.6.2) @@ -151,10 +155,10 @@ GEM zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.6.0) + regexp_parser (2.8.1) reverse_markdown (2.1.1) nokogiri - rexml (3.2.5) + rexml (3.2.6) rspec-core (3.12.0) rspec-support (~> 3.12.0) rspec-expectations (3.12.2) @@ -172,22 +176,24 @@ GEM rspec-mocks (~> 3.11) rspec-support (~> 3.11) rspec-support (3.12.0) - rubocop (1.35.1) + rubocop (1.56.3) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-performance (1.14.3) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-performance (1.19.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) @@ -209,9 +215,18 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - standard (1.16.1) - rubocop (= 1.35.1) - rubocop-performance (= 1.14.3) + standard (1.31.1) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.56.2) + standard-custom (~> 1.0.0) + standard-performance (~> 1.2) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.2.0) + lint_roller (~> 1.1) + rubocop-performance (~> 1.19.0) thor (1.2.1) tilt (2.0.11) timeout (0.3.0) @@ -219,7 +234,7 @@ GEM concurrent-ruby (~> 1.0) tzinfo-data (1.2022.5) tzinfo (>= 1.0.0) - unicode-display_width (2.3.0) + unicode-display_width (2.4.2) webrick (1.7.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) From aff5295f4ef42573dbb94e462ea1ee647feca9aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:13:44 +0000 Subject: [PATCH 07/25] Bump rack from 2.2.6.2 to 2.2.8 Bumps [rack](https://github.com/rack/rack) from 2.2.6.2 to 2.2.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.6.2...v2.2.8) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8b4953c..b6595f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,7 +120,7 @@ GEM ast (~> 2.4.1) pg (1.4.4) racc (1.7.1) - rack (2.2.6.2) + rack (2.2.8) rack-test (2.0.2) rack (>= 1.3) rails (7.0.8) From 6ba8b995da1dfceea7b3f9cfa9d3e784506305eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:15:11 +0000 Subject: [PATCH 08/25] Bump globalid from 1.0.0 to 1.2.1 Bumps [globalid](https://github.com/rails/globalid) from 1.0.0 to 1.2.1. - [Release notes](https://github.com/rails/globalid/releases) - [Commits](https://github.com/rails/globalid/compare/v1.0.0...v1.2.1) --- updated-dependencies: - dependency-name: globalid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c1a77ef..8459500 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,8 +83,8 @@ GEM docile (1.4.0) e2mmap (0.1.0) erubi (1.12.0) - globalid (1.0.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) i18n (1.14.1) concurrent-ruby (~> 1.0) jaro_winkler (1.5.4) From 3d0bd03b6ac2f3bffc3fd1ca4728880d73b96108 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:16:54 +0000 Subject: [PATCH 09/25] Bump pg from 1.4.4 to 1.5.4 Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.4 to 1.5.4. - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md) - [Commits](https://github.com/ged/ruby-pg/compare/v1.4.4...v1.5.4) --- updated-dependencies: - dependency-name: pg dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 715fff9..bc9ddc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,7 @@ GEM parser (3.2.2.3) ast (~> 2.4.1) racc - pg (1.4.4) + pg (1.5.4) racc (1.7.1) rack (2.2.8) rack-test (2.0.2) From 31cd59c90b3b5caecf38d9df5beb897b4ba4d442 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:17:45 +0000 Subject: [PATCH 10/25] Bump rspec-rails from 6.0.1 to 6.0.3 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.0.1 to 6.0.3. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v6.0.1...v6.0.3) --- updated-dependencies: - dependency-name: rspec-rails dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8f2038d..df11f46 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,9 +96,9 @@ GEM kramdown (~> 2.0) language_server-protocol (3.17.0.3) lint_roller (1.1.0) - loofah (2.19.1) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.2) @@ -125,7 +125,7 @@ GEM pg (1.4.4) racc (1.7.1) rack (2.2.8) - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) rails (7.0.8) actioncable (= 7.0.8) @@ -141,11 +141,13 @@ GEM activesupport (= 7.0.8) bundler (>= 1.15.0) railties (= 7.0.8) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) railties (7.0.8) actionpack (= 7.0.8) activesupport (= 7.0.8) @@ -159,23 +161,23 @@ GEM reverse_markdown (2.1.1) nokogiri rexml (3.2.6) - rspec-core (3.12.0) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.3) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.1) + rspec-rails (6.0.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) - rspec-support (3.12.0) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.1) rubocop (1.56.3) base64 (~> 0.1.1) json (~> 2.3) @@ -227,7 +229,7 @@ GEM standard-performance (1.2.0) lint_roller (~> 1.1) rubocop-performance (~> 1.19.0) - thor (1.2.1) + thor (1.2.2) tilt (2.0.11) timeout (0.3.0) tzinfo (2.0.6) @@ -241,7 +243,7 @@ GEM websocket-extensions (0.1.5) yard (0.9.28) webrick (~> 1.7.0) - zeitwerk (2.6.1) + zeitwerk (2.6.11) PLATFORMS x86_64-darwin-21 From 183067304962da03972309618972cb07798a8292 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 05:08:11 +0000 Subject: [PATCH 11/25] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/coding-style-check.yml | 2 +- .github/workflows/run-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a4d2655..5e81e94 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/coding-style-check.yml b/.github/workflows/coding-style-check.yml index 118ba70..e4c76ae 100644 --- a/.github/workflows/coding-style-check.yml +++ b/.github/workflows/coding-style-check.yml @@ -12,7 +12,7 @@ jobs: timeout-minutes: 30 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Restore Cache uses: actions/cache@v3 diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml index c1b3337..95d05d4 100644 --- a/.github/workflows/run-test.yml +++ b/.github/workflows/run-test.yml @@ -12,7 +12,7 @@ jobs: timeout-minutes: 30 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Restore Cache uses: actions/cache@v3 From 7f42560072f32f9fd7dae80790370cc15484a8a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 05:29:16 +0000 Subject: [PATCH 12/25] Bump simplecov from 0.21.2 to 0.22.0 Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.21.2 to 0.22.0. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.21.2...v0.22.0) --- updated-dependencies: - dependency-name: simplecov dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb394fc..410da1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,7 +196,7 @@ GEM rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) ruby-progressbar (1.13.0) - simplecov (0.21.2) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) From e68c6a61bb556d324491d22af7361096f13e1c03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 05:29:26 +0000 Subject: [PATCH 13/25] Bump tzinfo-data from 1.2022.7 to 1.2023.3 Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2022.7 to 1.2023.3. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2022.7...v1.2023.3) --- updated-dependencies: - dependency-name: tzinfo-data dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb394fc..64567a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -234,7 +234,7 @@ GEM timeout (0.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2022.7) + tzinfo-data (1.2023.3) tzinfo (>= 1.0.0) unicode-display_width (2.4.2) webrick (1.7.0) From 29a0780611c3a3630591002a22880b0cb141e461 Mon Sep 17 00:00:00 2001 From: ydah Date: Thu, 4 Apr 2024 20:42:57 +0900 Subject: [PATCH 14/25] Fix a typo requried ==> required --- lib/rails-mermaid_erd/builder.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rails-mermaid_erd/builder.rb b/lib/rails-mermaid_erd/builder.rb index 4320c01..8d89a65 100644 --- a/lib/rails-mermaid_erd/builder.rb +++ b/lib/rails-mermaid_erd/builder.rb @@ -91,12 +91,12 @@ def model_data reverse_relation = result[:Relations].find { |r| r[:RightModelName] == model[:ModelName] && r[:LeftModelName] == reflection_model_name } if reverse_relation - if (::Rails.application.config.active_record.belongs_to_required_by_default && reflection.options[:optional]) || (!::Rails.application.config.active_record.belongs_to_required_by_default && !reflection.options[:requried]) + if (::Rails.application.config.active_record.belongs_to_required_by_default && reflection.options[:optional]) || (!::Rails.application.config.active_record.belongs_to_required_by_default && !reflection.options[:required]) reverse_relation[:LeftValue] = "|o" end reverse_relation[:Comment] = "#{reverse_relation[:Comment]}, BT:#{reflection.name}" else - right_value = if (::Rails.application.config.active_record.belongs_to_required_by_default && reflection.options[:optional]) || (!::Rails.application.config.active_record.belongs_to_required_by_default && !reflection.options[:requried]) + right_value = if (::Rails.application.config.active_record.belongs_to_required_by_default && reflection.options[:optional]) || (!::Rails.application.config.active_record.belongs_to_required_by_default && !reflection.options[:required]) "o|" else "||" From a44225e5c51701f8edf4eb695533835b492f0538 Mon Sep 17 00:00:00 2001 From: masatoshi_moritsuka Date: Sun, 7 Apr 2024 19:29:14 +0900 Subject: [PATCH 15/25] Add table comments to SCHEMA_DATA.Models ### Motivation / Background ActiveRecord allows comments on tables as well as columns. cf. https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html#method-i-table_comment However, `rails-mermaid_erd` currently does not support table comments. I want comments on tables along with ER diagrams in the following cases. - Discussion of model design - Explanation to non-engineers - Explanation to new team members during on-boarding ### Detail We can now output table comments to SCHEMA_DATA. We can get a table comment by using `::ActiveRecord::Base.connection.table_comment`. cf. https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html#method-i-table_comment It was difficult to output them as ER diagram, so I implemented that they are output as mermaid code, it's similar to table names. --- docs/example.html | 2 +- lib/rails-mermaid_erd/builder.rb | 4 +++- lib/templates/index.html.erb | 1 + .../20240406203417_add_table_comment_to_user_images.rb | 5 +++++ spec/dummy/db/schema.rb | 4 ++-- spec/rails-mermaid_erd/builder/model_data_spec.rb | 7 +++++++ 6 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 spec/dummy/db/migrate/20240406203417_add_table_comment_to_user_images.rb diff --git a/docs/example.html b/docs/example.html index 3f128d5..697b3b7 100644 --- a/docs/example.html +++ b/docs/example.html @@ -293,7 +293,7 @@

{{i18n[language]["models"]["title"]}} - +