diff --git a/app/controllers/scores_controller.rb b/app/controllers/scores_controller.rb index 1e62852..cf6b7db 100644 --- a/app/controllers/scores_controller.rb +++ b/app/controllers/scores_controller.rb @@ -8,6 +8,9 @@ class ScoresController < ApplicationController def index @pagy, @scores = pagy(Score.all) # logger.info("#{HotConstants.boolean}") + logger.info('start', dimensions: AnsiDimensions.start) + logger.info('end', dimensions: AnsiDimensions.end) + logger.info('around', dimensions: AnsiDimensions.around) end # GET /scores/1 diff --git a/app/views/scores/_score.html.erb b/app/views/scores/_score.html.erb index 6acc730..e5d472b 100644 --- a/app/views/scores/_score.html.erb +++ b/app/views/scores/_score.html.erb @@ -1,4 +1,4 @@ - + <%= score.name %> @@ -7,7 +7,7 @@ <%= score.grade %> - + <% if action_name != "show" %> <%= link_to score, 'data-tooltip': 'show',class: 'mr-1 border rounded-lg border-purple-800 p-2 bg-white' do %><%=fa_icon :eye %><% end %> <%= link_to edit_score_path(score), 'data-tooltip': 'edit', class: 'mr-1 border rounded-lg border-purple-800 p-2 bg-white' do %><%=fa_icon :edit %><% end %> diff --git a/app/views/scores/index.html.erb b/app/views/scores/index.html.erb index 96f33de..10bd4c0 100644 --- a/app/views/scores/index.html.erb +++ b/app/views/scores/index.html.erb @@ -5,12 +5,12 @@ <%= link_to "New score", new_score_path, class: "rounded-lg py-3 px-5 bg-blue-600 text-white block font-medium" %> - +
- - - - + + + + <%= render @scores %> diff --git a/lib/formatters/ansi_dimensions.rb b/lib/formatters/ansi_dimensions.rb index 2d49c65..da660c7 100644 --- a/lib/formatters/ansi_dimensions.rb +++ b/lib/formatters/ansi_dimensions.rb @@ -5,4 +5,16 @@ module AnsiDimensions def self.new(rails: '╣x╠', before: 0, after: 0, terminus: false) OpenStruct.new(rails:, before:, after:, terminus:) # rubocop:disable Style/OpenStructUse end + + def self.start + OpenStruct.new(rails: '╓─╖') # rubocop:disable Style/OpenStructUse + end + + def self.end + OpenStruct.new(rails: '╣ ╠') # rubocop:disable Style/OpenStructUse + end + + def self.around + OpenStruct.new(rails: '╣ ╠') # rubocop:disable Style/OpenStructUse + end end diff --git a/test/formatters/wrapper2_test.rb b/test/formatters/wrapper2_test.rb index c9d67c4..edcaa46 100644 --- a/test/formatters/wrapper2_test.rb +++ b/test/formatters/wrapper2_test.rb @@ -1,24 +1,30 @@ -require_relative '../../lib/formatters/wrapper' +require_relative '../../lib/formatters/ansi_wrapper' require 'minitest/autorun' class Wrapper2Test < Minitest::Test def test_wrap_score assert_wrap("\ -********************\n\ -********************\n\ -**********", +********************\e[0m\n\ +********************\e[0m\n\ +**********\e[0m", ('*' * 50), 20) assert_wrap("\ -> ******************\n\ -> ******************\n\ -> **************", +> ******************\e[0m\n\ +> ******************\e[0m\n\ +> **************\e[0m", ('*' * 50), 20, '> ') end def test_wrap_sql assert_wrap("\ +\e[0m\e[0;36mELECT \"scores\".* FRO\e[0m ++\e[0m\e[0;36mM \"scores\" WHERE \"sc\e[0m ++\e[0m\e[0;36mores\".\"id\" = $1 LIMI\e[0m ++\e[0m\e[0;36mT $2\e[0m [[\"id\", 2], [\"L + IMIT\", 1]] + \e[0;35mScore Load (0.6ms)\e[0m \e[0;36mS\e[0m\n\ \e[0;36mELECT \"scores\".* FRO\e[0m\n\ \e[0;36mM \"scores\" WHERE \"sc\e[0m\n\ @@ -43,11 +49,11 @@ IMIT\", 1]]", "\ def assert_wrap(expectation, text, length, prefix = '') show_with_style(text, length, prefix) - assert_equal(expectation, prefix + Wrapper.wrap(text, prefix, length - prefix.length)) + assert_equal(expectation, prefix + AnsiWrapper.wrap(text, length - prefix.length, prefix)) end def show_with_style(text, length, prefix = '') - expectation = Wrapper.wrap(text, prefix, length - prefix.length) + expectation = AnsiWrapper.wrap(text, length - prefix.length, prefix) puts "original_o is:\n#{prefix}[#{text}]\e[0m" puts "original_i is:\n#{prefix}[#{text.inspect}]\e[0m" puts
NameGradeActions
NameGradeActions