Staging release: Rust widget renderer

.cfignore

@@ -38,6 +38,10 @@
 /public/packs-test
 /node_modules
 
-# Ignore Rust build artifacts
+# Ignore Rust build artifacts, but keep the prebuilt widget library
 target/
 ext/widget_renderer/target/
+!ext/widget_renderer/target/
+!ext/widget_renderer/target/release/
+!ext/widget_renderer/target/release/libwidget_renderer.so
+!ext/widget_renderer/libwidget_renderer.so

.github/workflows/build-widget.yml

@@ -23,18 +23,25 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
-          target: x86_64-unknown-linux-gnu
           override: true
 
       - name: Build widget (Linux .so)
         working-directory: ext/widget_renderer
-        run: cargo build --release --target x86_64-unknown-linux-gnu
+        run: cargo build --release
 
       - name: Prepare artifact for CF
         run: |
-          mkdir -p ext/widget_renderer/target/release
-          cp ext/widget_renderer/target/x86_64-unknown-linux-gnu/release/libwidget_renderer.so ext/widget_renderer/
-          cp ext/widget_renderer/target/x86_64-unknown-linux-gnu/release/libwidget_renderer.so ext/widget_renderer/target/release/
+          set -euo pipefail
+          mkdir -p ext/widget_renderer/target/release target/release
+          artifact=$(find target ext/widget_renderer/target -maxdepth 4 -name 'libwidget_renderer*.so' 2>/dev/null | head -n 1 || true)
+          if [ -z "${artifact}" ]; then
+            echo "No built libwidget_renderer.so found. Current target tree:"
+            find target ext/widget_renderer/target -maxdepth 4 -type f | sed 's/^/  /'
+            exit 1
+          fi
+          echo "Using artifact: ${artifact}"
+          cp "${artifact}" ext/widget_renderer/libwidget_renderer.so
+          cp "${artifact}" ext/widget_renderer/target/release/libwidget_renderer.so
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

.gitignore

@@ -27,9 +27,11 @@
 # Don't check in these things
 .env
 .env.development
+.env.*
 .manifest.yml
 .csv
 vars.yml
+vars*.yml
 
 # For Macs
 .DS_Store

.profile.d/build_widget_renderer.sh

@@ -1,16 +1,47 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-APP_ROOT="${HOME}/app"
-EXT_DIR="${APP_ROOT}/ext/widget_renderer"
+if [ -d "${HOME}/ext/widget_renderer" ]; then
+  EXT_DIR="${HOME}/ext/widget_renderer"
+elif [ -d "${HOME}/app/ext/widget_renderer" ]; then
+  EXT_DIR="${HOME}/app/ext/widget_renderer"
+else
+  echo "===> widget_renderer: extension directory not found under HOME: ${HOME}"
+  exit 1
+fi
 LIB_SO="${EXT_DIR}/libwidget_renderer.so"
 LIB_DYLIB="${EXT_DIR}/libwidget_renderer.dylib"
 
 echo "===> widget_renderer: checking for native library"
 
+# Ensure target/release has the library if it's already present at the root.
+if [ -f "$LIB_SO" ]; then
+  mkdir -p "${EXT_DIR}/target/release"
+  cp "$LIB_SO" "${EXT_DIR}/target/release/libwidget_renderer.so"
+fi
+
 # Build the Rust extension at runtime if the shared library is missing.
 if [ ! -f "$LIB_SO" ] && [ ! -f "$LIB_DYLIB" ]; then
   echo "===> widget_renderer: building native extension"
+
+  # Ensure Cargo toolchain from the Rust buildpack is used (avoid reinstall).
+  if [ -z "${CARGO_HOME:-}" ] && [ -d "/home/vcap/deps/0/rust/cargo" ]; then
+    export CARGO_HOME="/home/vcap/deps/0/rust/cargo"
+  fi
+  if [ -z "${RUSTUP_HOME:-}" ] && [ -d "/home/vcap/deps/0/rust/rustup" ]; then
+    export RUSTUP_HOME="/home/vcap/deps/0/rust/rustup"
+  fi
+  echo "===> widget_renderer: CARGO_HOME=${CARGO_HOME:-unset}"
+  echo "===> widget_renderer: RUSTUP_HOME=${RUSTUP_HOME:-unset}"
+
+  # Tell rutie to link against the shared Ruby library provided by the Ruby buildpack.
+  RUBY_LIB_PATH=$(ruby -e 'require "rbconfig"; print RbConfig::CONFIG["libdir"]')
+  RUBY_SO_NAME=$(ruby -e 'require "rbconfig"; print RbConfig::CONFIG["RUBY_SO_NAME"]')
+  export RUTIE_RUBY_LIB_PATH="$RUBY_LIB_PATH"
+  export RUTIE_RUBY_LIB_NAME="$RUBY_SO_NAME"
+  unset RUBY_STATIC
+  export NO_LINK_RUTIE=1
+
   cd "$EXT_DIR"
   ruby extconf.rb
   make

app/models/form.rb

@@ -332,7 +332,7 @@ def touchpoints_js_string
                           'form-header-logo-square'
                         end
                       end,
-          questions: ordered_questions.map { |q| { answer_field: q.answer_field, question_type: q.question_type, question_text: q.question_text, is_required: q.is_required } },
+          questions: ordered_questions.map { |q| { answer_field: q.answer_field, question_type: q.question_type, question_text: q.text, is_required: q.is_required } },
         }
         json = form_hash.to_json
         puts "DEBUG: JSON class: #{json.class}"

app/models/service.rb

@@ -162,14 +162,14 @@ def self.to_csv
                    organization_name organization_abbreviation service_provider_id service_provider_name service_provider_slug
                  ] - %w[
                    channels
-        budget_code
-        uii_code
-        non_digital_explanation
-        homepage_url
-        digital_service
-        estimated_annual_volume_of_customers
-        fully_digital_service
-        barriers_to_fully_digital_service
+                   budget_code
+                   uii_code
+                   non_digital_explanation
+                   homepage_url
+                   digital_service
+                   estimated_annual_volume_of_customers
+                   fully_digital_service
+                   barriers_to_fully_digital_service
         multi_agency_service
         multi_agency_explanation
         other_service_type

config/environments/staging.rb

@@ -107,7 +107,8 @@
 
   # Prevent host header injection
   # Reference: https://github.com/ankane/secure_rails
-  config.action_controller.asset_host = ENV.fetch('TOUCHPOINTS_WEB_DOMAIN')
+  asset_host = ENV.fetch('ASSET_HOST', nil)
+  config.action_controller.asset_host = asset_host.presence || ENV.fetch('TOUCHPOINTS_WEB_DOMAIN')
 
   config.action_mailer.delivery_method = :ses_v2
   config.action_mailer.ses_v2_settings = {

config/initializers/session_store.rb

@@ -1,3 +1,8 @@
 # frozen_string_literal: true
 
-Rails.application.config.session_store :cookie_store, key: '_touchpoints_session', domain: ENV.fetch('TOUCHPOINTS_WEB_DOMAIN'), same_site: :lax, expire_after: 30.minutes
+cookie_domain = ENV['SESSION_COOKIE_DOMAIN'].presence
+Rails.application.config.session_store :cookie_store,
+  key: '_touchpoints_session',
+  domain: cookie_domain,
+  same_site: :lax,
+  expire_after: 30.minutes

config/initializers/widget_renderer.rb

@@ -1,7 +1,7 @@
 # Load the Rust widget renderer extension
 begin
   # Try loading from the extension directory
-  require_relative '../../ext/widget_renderer/widget_renderer'
+  require_relative '../../ext/widget_renderer/lib/widget_renderer'
 rescue LoadError => e
   Rails.logger.warn "Widget renderer extension not available: #{e.message}"
   # Attempt to build the Rust extension on the fly (installs Rust via extconf if needed)
@@ -11,7 +11,7 @@
     Dir.chdir(ext_dir) do
       system('ruby extconf.rb') && system('make')
     end
-    require_relative '../../ext/widget_renderer/widget_renderer'
+    require_relative '../../ext/widget_renderer/lib/widget_renderer'
     Rails.logger.info 'Successfully compiled widget_renderer extension at runtime.'
   rescue StandardError => build_error
     Rails.logger.warn "Widget renderer build failed: #{build_error.class}: #{build_error.message}"

ext/widget_renderer/lib/widget_renderer.rb

@@ -2,85 +2,90 @@
 
 require 'rutie'
 
-module WidgetRenderer
-  root = File.expand_path('..', __dir__)
+root = File.expand_path('..', __dir__)
 
-  # Debugging: Print root and directory contents
-  puts "WidgetRenderer: root=#{root}"
-  puts "WidgetRenderer: __dir__=#{__dir__}"
+# Debugging: Print root and directory contents
+puts "WidgetRenderer: root=#{root}"
+puts "WidgetRenderer: __dir__=#{__dir__}"
 
-  # Define potential paths where the shared object might be located
-  paths = [
-    File.join(root, 'target', 'release'),
-    File.expand_path('../../target/release', root), # Workspace target directory
-    File.join(root, 'widget_renderer', 'target', 'release'),
-    File.join(root, 'target', 'debug'),
-    File.expand_path('../../target/debug', root), # Workspace debug directory
-    File.join(root, 'widget_renderer', 'target', 'debug'),
-    root,
-  ]
+# If a stale module exists, remove it so Rutie can define or reopen the class.
+if defined?(WidgetRenderer) && WidgetRenderer.is_a?(Module) && !WidgetRenderer.is_a?(Class)
+  Object.send(:remove_const, :WidgetRenderer)
+end
+# Ensure the constant exists as a Class so rb_define_class will reopen it instead of erroring on Module.
+WidgetRenderer = Class.new unless defined?(WidgetRenderer) && WidgetRenderer.is_a?(Class)
 
-  # Find the first path that contains the library file
-  found_path = paths.find do |p|
-    exists = File.exist?(File.join(p, 'libwidget_renderer.so')) ||
-             File.exist?(File.join(p, 'libwidget_renderer.bundle')) ||
-             File.exist?(File.join(p, 'libwidget_renderer.dylib'))
-    puts "WidgetRenderer: Checking #{p} -> #{exists}"
-    exists
-  end
+# Define potential paths where the shared object might be located
+paths = [
+  File.join(root, 'target', 'release'),
+  File.expand_path('../../target/release', root), # Workspace target directory
+  File.join(root, 'widget_renderer', 'target', 'release'),
+  File.join(root, 'target', 'debug'),
+  File.expand_path('../../target/debug', root), # Workspace debug directory
+  File.join(root, 'widget_renderer', 'target', 'debug'),
+  root,
+]
+
+# Find the first path that contains the library file
+found_path = paths.find do |p|
+  exists = File.exist?(File.join(p, 'libwidget_renderer.so')) ||
+           File.exist?(File.join(p, 'libwidget_renderer.bundle')) ||
+           File.exist?(File.join(p, 'libwidget_renderer.dylib'))
+  puts "WidgetRenderer: Checking #{p} -> #{exists}"
+  exists
+end
 
-  if found_path
-    puts "WidgetRenderer: Found library in #{found_path}"
-
-    # Debug: Check dependencies
-    lib_file = File.join(found_path, 'libwidget_renderer.so')
-    if File.exist?(lib_file)
-      puts "WidgetRenderer: File details for #{lib_file}"
-      puts `ls -l #{lib_file}`
-      puts `file #{lib_file}`
-      puts "WidgetRenderer: Running ldd on #{lib_file}"
-      puts `ldd #{lib_file} 2>&1`
-    end
+if found_path
+  puts "WidgetRenderer: Found library in #{found_path}"
+
+  # Debug: Check dependencies
+  lib_file = File.join(found_path, 'libwidget_renderer.so')
+  if File.exist?(lib_file)
+    puts "WidgetRenderer: File details for #{lib_file}"
+    puts `ls -l #{lib_file}`
+    puts `file #{lib_file}`
+    puts "WidgetRenderer: Running ldd on #{lib_file}"
+    puts `ldd #{lib_file} 2>&1`
+  end
+else
+  puts 'WidgetRenderer: Library not found in any checked path. Listing root contents:'
+  # List files in root to help debug
+  Dir.glob(File.join(root, '*')).each { |f| puts f }
+
+  puts 'WidgetRenderer: Listing target contents:'
+  target_dir = File.join(root, 'target')
+  if Dir.exist?(target_dir)
+    Dir.glob(File.join(target_dir, '*')).each { |f| puts f }
   else
-    puts 'WidgetRenderer: Library not found in any checked path. Listing root contents:'
-    # List files in root to help debug
-    Dir.glob(File.join(root, '*')).each { |f| puts f }
-
-    puts 'WidgetRenderer: Listing target contents:'
-    target_dir = File.join(root, 'target')
-    if Dir.exist?(target_dir)
-      Dir.glob(File.join(target_dir, '*')).each { |f| puts f }
-    else
-      puts "WidgetRenderer: target directory does not exist at #{target_dir}"
-    end
+    puts "WidgetRenderer: target directory does not exist at #{target_dir}"
+  end
 
-    puts 'WidgetRenderer: Listing target/release contents:'
-    release_dir = File.join(root, 'target', 'release')
-    if Dir.exist?(release_dir)
-      Dir.glob(File.join(release_dir, '*')).each { |f| puts f }
-    else
-      puts "WidgetRenderer: target/release directory does not exist at #{release_dir}"
-    end
+  puts 'WidgetRenderer: Listing target/release contents:'
+  release_dir = File.join(root, 'target', 'release')
+  if Dir.exist?(release_dir)
+    Dir.glob(File.join(release_dir, '*')).each { |f| puts f }
+  else
+    puts "WidgetRenderer: target/release directory does not exist at #{release_dir}"
   end
+end
 
-  # Default to root if not found (Rutie might have its own lookup)
-  path = found_path || root
+# Default to root if not found (Rutie might have its own lookup)
+path = found_path || root
 
-  # Rutie expects the project root, not the directory containing the library.
-  # It appends /target/release/lib<name>.so to the path.
-  # So if we found it in .../target/release, we need to strip that part.
-  if path.end_with?('target/release')
-    path = path.sub(%r{/target/release$}, '')
-  elsif path.end_with?('target/debug')
-    path = path.sub(%r{/target/debug$}, '')
-  end
+# Rutie expects the project root, not the directory containing the library.
+# It appends /target/release/lib<name>.so to the path.
+# So if we found it in .../target/release, we need to strip that part.
+if path.end_with?('target/release')
+  path = path.sub(%r{/target/release$}, '')
+elsif path.end_with?('target/debug')
+  path = path.sub(%r{/target/debug$}, '')
+end
 
-  # Rutie assumes the passed path is a subdirectory (like lib/) and goes up one level
-  # before appending target/release.
-  # So we append a 'lib' directory so that when it goes up, it lands on the root.
-  path = File.join(path, 'lib')
+# Rutie assumes the passed path is a subdirectory (like lib/) and goes up one level
+# before appending target/release.
+# So we append a 'lib' directory so that when it goes up, it lands on the root.
+path = File.join(path, 'lib')
 
-  puts "WidgetRenderer: Initializing Rutie with path: #{path}"
+puts "WidgetRenderer: Initializing Rutie with path: #{path}"
 
-  Rutie.new(:widget_renderer).init 'Init_widget_renderer', path
-end
+Rutie.new(:widget_renderer).init 'Init_widget_renderer', path