Merge branch 'release/1.9.3'

Author: apoorv1316

.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile:1
-ARG VARIANT=3.2.4
+ARG VARIANT=3.3.10
 FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT} AS base
 
 # Update args in docker-compose.yaml to set the UID/GID of the "vscode" user.

.env.example

@@ -62,9 +62,20 @@ SOLID_QUEUE_PASSWORD: <some_password>
 MISSION_CONTROL_ENABLED=true
 POSTMARK_API_TOKEN= "<Replace with postmark API Token>"
 
+# Zerobounce Email Validation (Optional - disabled by default)
+# To enable: Set ENABLE_EMAIL_VALIDATION=true and add your API key
+ENABLE_EMAIL_VALIDATION=false
+ZERO_BOUNCE_API_KEY="<Replace with Zerobounce API_KEY>"
+# ADMIN_EMAIL= "<Optional: Email for circuit breaker alerts>"
+
 #Cloudfare R2 credentials
 CLOUDFLARE_R2_ACCESS_KEY_ID= "<Replace with cloudfare access key id>"
 CLOUDFLARE_R2_SECRET_ACCESS_KEY= "<Replace with cloudfare R2 secret access key key>"
 CLOUDFLARE_R2_BUCKET_NAME= "<Replace with R2 bucket name key id>"
 CLOUDFLARE_R2_REGION= "auto"
 CLOUDFLARE_R2_ENDPOINT= "<Replace with cloudfare R2 endpoint url>"
+
+# Open Exchange Rates API Configuration
+# Sign up at: https://openexchangerates.org/signup/free
+# Free tier: 1,000 requests/month
+OPEN_EXCHANGE_RATES_APP_ID=your_app_id_here

.ruby-version

@@ -1 +1 @@
-3.2.4
+3.3.10

Dockerfile.local

@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile:1
-FROM ruby:3.2.4-slim AS base
+FROM ruby:3.3.10-slim AS base
 
 ARG NODE_VERSION=20.18.2
 
@@ -11,17 +11,19 @@ RUN mkdir /app
 WORKDIR /app
 RUN mkdir -p tmp/pids
 
-RUN apt-get update && apt-get install -y --no-install-recommends curl gnupg2 && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list && \
-    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    curl -sL https://deb.nodesource.com/setup_lts.x | bash - && \
+RUN apt-get update && apt-get install -y --no-install-recommends curl gnupg2 ca-certificates && \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/yarn-keyring.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/yarn-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" > /etc/apt/sources.list.d/nodesource.list && \
+    apt-get update && \
     apt-get install -y --no-install-recommends nodejs yarn && \
     npm --version && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
 
 
-RUN curl --location --silent https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-    && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
+RUN curl --location --silent https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /usr/share/keyrings/google-chrome-keyring.gpg \
+    && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome-keyring.gpg] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list \
     && apt-get update && apt-get install google-chrome-stable -y --no-install-recommends postgresql-client && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
 

Dockerfile.test

@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile:1
-FROM ruby:3.2.4-slim AS base
+FROM ruby:3.3.10-slim AS base
 
 ARG NODE_VERSION=20.18.2
 

Gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.2.4"
+ruby "3.3.10"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
 gem "rails", "~> 7.1.5.1"
@@ -72,6 +72,9 @@ gem "countries"
 # Letter opener can be configured to avoid sending sending actual emails whenever required.
 gem "letter_opener_web"
 
+# Premailer for inlining CSS in emails
+gem "premailer-rails", "~> 1.12"
+
 # currency list and conversion
 gem "money"
 
@@ -141,7 +144,7 @@ gem "google-api-client", require: "google/apis/calendar_v3"
 
 group :development, :test, :ci do
   # See https://edgeguides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
-  gem "debug", ">= 1.0.0", platforms: %i[mri mingw x64_mingw]
+  gem "debug", ">= 1.9.0", platforms: %i[mri mingw x64_mingw]
 
   # Add Rubocop to lint and format Ruby code
   gem "rubocop", require: false
@@ -233,3 +236,6 @@ gem "administrate"
 gem "psych", "~> 4"
 
 gem "postmark-rails"
+
+# Zerobounce email validation
+gem "zerobounce-sdk"

Gemfile.lock

@@ -171,6 +171,8 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
+    css_parser (1.21.1)
+      addressable
     data_migrate (9.3.0)
       activerecord (>= 6.1)
       railties (>= 6.1)
@@ -181,9 +183,9 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
-    debug (1.7.1)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
+    debug (1.11.0)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     declarative (0.0.20)
     device_detector (1.1.0)
     devise (4.8.1)
@@ -198,6 +200,7 @@ GEM
     docile (1.4.0)
     dockerfile-rails (1.2.5)
       rails
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
@@ -293,6 +296,10 @@ GEM
     hash_dot (2.5.0)
     hashdiff (1.0.1)
     hashie (5.0.0)
+    htmlentities (4.3.4)
+    http-accept (1.7.0)
+    http-cookie (1.1.0)
+      domain_name (~> 0.5)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
@@ -354,6 +361,10 @@ GEM
     marcel (1.1.0)
     matrix (0.4.2)
     memoist (0.16.2)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0924)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
@@ -379,6 +390,7 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
+    netrc (0.11.0)
     newrelic_rpm (9.8.0)
     nio4r (2.7.4)
     nokogiri (1.18.10)
@@ -429,6 +441,14 @@ GEM
       postmark (>= 1.21.3, < 2.0)
     pp (0.6.3)
       prettyprint
+    premailer (1.27.0)
+      addressable
+      css_parser (>= 1.19.0)
+      htmlentities (>= 4.0.0)
+    premailer-rails (1.12.0)
+      actionmailer (>= 3)
+      net-smtp
+      premailer (~> 1.7, >= 1.7.9)
     prettyprint (0.2.0)
     psych (4.0.6)
       stringio
@@ -514,6 +534,11 @@ GEM
     responders (3.1.0)
       actionpack (>= 5.2)
       railties (>= 5.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     retriable (3.1.2)
     rexml (3.4.4)
     rolify (6.0.1)
@@ -566,7 +591,7 @@ GEM
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
-    ruby_audit (2.2.0)
+    ruby_audit (3.0.0)
       bundler-audit (~> 0.9.0)
     rubyzip (2.3.2)
     safely_block (0.4.0)
@@ -677,6 +702,9 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.7.3)
+    zerobounce-sdk (1.2.0)
+      dotenv
+      rest-client (~> 2.1)
 
 PLATFORMS
   arm64-darwin-21
@@ -702,7 +730,7 @@ DEPENDENCIES
   countries
   data_migrate
   database_cleaner (~> 2.0)
-  debug (>= 1.0.0)
+  debug (>= 1.9.0)
   devise
   discard (~> 1.2)
   dockerfile-rails
@@ -730,6 +758,7 @@ DEPENDENCIES
   parallel_tests
   pg
   postmark-rails
+  premailer-rails (~> 1.12)
   psych (~> 4)
   puma (~> 6.4.3)
   pundit (~> 2.2)
@@ -766,9 +795,10 @@ DEPENDENCIES
   vcr (~> 6.1)
   web-console (>= 4.1.0)
   webmock (~> 3.14.0)
+  zerobounce-sdk
 
 RUBY VERSION
-   ruby 3.2.4p170
+   ruby 3.3.10p183
 
 BUNDLED WITH
    2.4.10