Merge pull request #420 from OpenHistoricalMap/upstream-merge

Upstream merge

Author: erictheise

.database_consistency.yml

@@ -0,0 +1,20 @@
+# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
+ARG RUBY_VERSION=3.4.7
+FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION
+
+USER root
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Required on Windows
+RUN mkdir -p /workspaces/openstreetmap-website \
+    && chown -R vscode:vscode /workspaces/openstreetmap-website
+
+# Install system packages then clean up to minimize image size
+RUN apt-get update \
+  && apt-get install --no-install-recommends -y \
+    file \
+    libarchive-dev \
+    libgd-dev \
+    osmosis \
+  && apt-get clean \
+  && apt-get distclean

.devcontainer/Dockerfile

@@ -0,0 +1,8 @@
+# Would use postgis:15-3.5, but it doesn't work with Apple Silicon
+# (https://github.com/postgis/docker-postgis/issues/216).
+# Therefore we use postgres:15 and apt-install Postgis ourselves.
+FROM postgres:15
+
+RUN apt-get update \
+  && apt-get install --no-install-recommends -y \
+    postgresql-15-postgis-3

.devcontainer/Dockerfile.postgres

@@ -0,0 +1,53 @@
+name: "open_street_map"
+
+services:
+  rails-app:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+
+    volumes:
+    - ../..:/workspaces:cached
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: sleep infinity
+
+    # Uncomment the next line to use a non-root user for all processes.
+    # user: vscode
+
+    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+    depends_on:
+    - selenium-default
+    - selenium-de
+    - selenium-nolang
+    - postgres
+
+  selenium-default:
+    image: selenium/standalone-firefox
+    restart: unless-stopped
+
+  selenium-de:
+    image: selenium/standalone-firefox
+    restart: unless-stopped
+
+  selenium-nolang:
+    image: selenium/standalone-firefox
+    restart: unless-stopped
+
+  postgres:
+    build:
+      context: .
+      dockerfile: ./Dockerfile.postgres
+    restart: unless-stopped
+    networks:
+    - default
+    volumes:
+    - postgres-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: openstreetmap
+      POSTGRES_USER: openstreetmap
+      POSTGRES_PASSWORD: openstreetmap
+
+volumes:
+  postgres-data:

.devcontainer/compose.yaml

@@ -0,0 +1,34 @@
+// For format details, see https://containers.dev/implementors/json_reference/.
+// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/ruby
+{
+  "name": "open_street_map",
+  "dockerComposeFile": "compose.yaml",
+  "service": "rails-app",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/node:1": {},
+    "ghcr.io/rails/devcontainer/features/activestorage": {},
+    "ghcr.io/rails/devcontainer/features/postgres-client": {}
+  },
+
+  "containerEnv": {
+    "CAPYBARA_SERVER_PORT": "45678",
+    "DB_HOST": "postgres"
+  },
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  "forwardPorts": [3000, 5432],
+
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://containers.dev/implementors/json_reference/#remoteUser.
+  // "remoteUser": "root",
+
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": ".devcontainer/start"
+}

.devcontainer/devcontainer.json

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This setup uses https://mise.jdx.dev to manage language versions.
+# Mark the config file as trusted to avoid an interactive prompt.
+mise trust /workspaces/mise.local.toml
+
+cp config/devcontainer.database.yml config/database.yml
+cp config/example.storage.yml config/storage.yml
+touch config/settings.local.yml
+
+bin/setup --skip-server

.devcontainer/start

@@ -3,7 +3,6 @@
 /Dockerfile*
 /docker-compose*
 /.dockerignore
-/.travis.yml
 /.git
 /.gitignore
 /.github

.dockerignore

@@ -2,7 +2,14 @@
 linters:
   AllowedScriptType:
     enabled: true
-#    disallow_inline_scripts: true  // @todo: fix this.
+    disallow_inline_scripts: true
+  HardCodedString:
+    enabled: false # We're using a custom version of this, see below
+  # Add our own linter, refs https://github.com/Shopify/erb_lint/pull/397
+  CustomHardCodedString:
+    enabled: true
+    exclude:
+     - 'app/views/shared/_markdown_help.html.erb'
   Rubocop:
     enabled: true
     rubocop_config:
@@ -26,5 +33,7 @@ linters:
     enabled: false
   SpaceInHtmlTag:
     enabled: true
+  NoUnusedDisable:
+    enabled: true
 exclude:
   - '**/vendor/**'

.erb_lint.yml

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "better_html/tree/tag"
+require "active_support/core_ext/string/inflections"
+
+module ERBLint
+  module Linters
+    # A customised version of the HardCodedString linter, adding `·` as not needing translation
+    # Checks for hardcoded strings. Useful if you want to ensure a string can be translated using i18n.
+    class CustomHardCodedString < HardCodedString
+      include LinterRegistry
+
+      NO_TRANSLATION_NEEDED = Set.new([
+                                        "&nbsp;",
+                                        "&amp;",
+                                        "&lt;",
+                                        "&gt;",
+                                        "&quot;",
+                                        "&copy;",
+                                        "&reg;",
+                                        "&trade;",
+                                        "&hellip;",
+                                        "&mdash;",
+                                        "&bull;",
+                                        "&ldquo;",
+                                        "&rdquo;",
+                                        "&lsquo;",
+                                        "&rsquo;",
+                                        "&larr;",
+                                        "&rarr;",
+                                        "&darr;",
+                                        "&uarr;",
+                                        "&ensp;",
+                                        "&emsp;",
+                                        "&thinsp;",
+                                        "&times;",
+                                        "&laquo;",
+                                        "&raquo;",
+                                        "&middot;"
+                                      ])
+
+      private
+
+      def check_string?(str)
+        string = str.gsub(/\s*/, "")
+        string.length > 1 && !NO_TRANSLATION_NEEDED.include?(string)
+      end
+    end
+  end
+end

.erb_linters/custom_hard_coded_string.rb

@@ -4,7 +4,7 @@ contact_links:
     url: https://wiki.openstreetmap.org/wiki/Website_internationalization#How_to_translate
     about: Please read about how to use Translatewiki to correct translations
   - name: There is an issue with the default map layer shown on the front page
-    url: https://github.com/gravitystorm/openstreetmap-carto
+    url: https://github.com/openstreetmap-carto/openstreetmap-carto
     about: Please share your feedback with the OpenStreetMap-Carto team
   - name: There is an issue with the iD editor used on the Edit tab
     url: https://github.com/openstreetmap/iD