From c852c36879d112e46c4179356a7b98c5a3fc5803 Mon Sep 17 00:00:00 2001 From: pvincent Date: Wed, 3 Apr 2024 10:55:36 +0400 Subject: [PATCH] inlineFold AlpineJs --- .vscode/settings.json | 3 +- config/database.yml | 82 +++---------------------------- lib/formatters/basic_formatter.rb | 4 +- 3 files changed, 12 insertions(+), 77 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 491eb9a..629bd0c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -20,5 +20,6 @@ "*.html.erb": "erb" }, - "vscode-erb-beautify.keepBlankLines": 1 + "vscode-erb-beautify.keepBlankLines": 1, + "inlineFold.regex": "(class=|className=|class:\\s*)(({(`|))|(['\"`]))(.*?)(\\2|(\\4)})" // inline AlpineJs `class: ` } \ No newline at end of file diff --git a/config/database.yml b/config/database.yml index 85c1f34..6687bed 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,87 +1,19 @@ -# PostgreSQL. Versions 9.3 and up are supported. -# -# Install the pg driver: -# gem install pg -# On macOS with Homebrew: -# gem install pg -- --with-pg-config=/usr/local/bin/pg_config -# On Windows: -# gem install pg -# Choose the win32 build. -# Install PostgreSQL and put its /bin directory on your path. -# -# Configure Using Gemfile -# gem "pg" -# +--- + default: &default adapter: postgresql encoding: unicode # For details on connection pooling, see Rails configuration guide # https://guides.rubyonrails.org/configuring.html#database-pooling pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + host: localhost development: <<: *default - database: ruby-debug - user: ruby-debug - password: ruby-debug - host: localhost - - # The specified database role being used to connect to PostgreSQL. - # To create additional roles in PostgreSQL see `$ createuser --help`. - # When left blank, PostgreSQL will use the default role. This is - # the same name as the operating system user running Rails. - #username: debug - - # The password associated with the PostgreSQL role (username). - #password: - - # Connect on a TCP socket. Omitted by default since the client uses a - # domain socket that doesn't need configuration. Windows does not have - # domain sockets, so uncomment these lines. - #host: localhost + database: &db-name easy-going-rails + user: *db-name + password: *db-name - # The TCP port the server listens on. Defaults to 5432. - # If your server runs on a different port number, change accordingly. - #port: 5432 - - # Schema search path. The server defaults to $user,public - #schema_search_path: myapp,sharedapp,public - - # Minimum log levels, in increasing order: - # debug5, debug4, debug3, debug2, debug1, - # log, notice, warning, error, fatal, and panic - # Defaults to warning. - #min_messages: notice - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. test: <<: *default - database: debug_test - -# As with config/credentials.yml, you never want to store sensitive information, -# like your database password, in your source code. If your source code is -# ever seen by anyone, they now have access to your database. -# -# Instead, provide the password or a full connection URL as an environment -# variable when you boot the app. For example: -# -# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" -# -# If the connection URL is provided in the special DATABASE_URL environment -# variable, Rails will automatically merge its configuration values on top of -# the values provided in this file. Alternatively, you can specify a connection -# URL environment variable explicitly: -# -# production: -# url: <%= ENV["MY_APP_DATABASE_URL"] %> -# -# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database -# for a full overview on how database connection configuration can be specified. -# -production: - <<: *default - database: debug_production - username: debug - password: <%= ENV["DEBUG_DATABASE_PASSWORD"] %> + database: easy-going-rails_test \ No newline at end of file diff --git a/lib/formatters/basic_formatter.rb b/lib/formatters/basic_formatter.rb index 35048d9..08f4b35 100644 --- a/lib/formatters/basic_formatter.rb +++ b/lib/formatters/basic_formatter.rb @@ -197,8 +197,10 @@ class BasicFormatter < SemanticLogger::Formatters::Color # rubocop:disable Metri def transform_rendered_message_with_filename(message) md = message.match(/^Rendered( layout| collection of|) (.*?\.erb)/) + return message unless md + filename = "app/views/#{md.match(2)}" - log.message = "Rendered#{md.match(1)} #{filename}#{md.post_match}" + "Rendered#{md.match(1)} #{filename}#{md.post_match}" end def transform_log_debug_lstrip(log)