Merge branch 'main' into simpler-item-previews

Oh right, I did a dev-side version of this, and forgot prod needs it
too! (Maybe a bit silly to bother for a patch-level but whatever!)

.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.4

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '3.3.0'
+ruby '3.3.4'
 
 gem 'rails', '~> 7.1', '>= 7.1.3.4'
 
@@ -57,7 +57,7 @@ gem 'letter_opener', '~> 1.8', '>= 1.8.1', group: :development
 gem 'parallel', '~> 1.23'
 
 # For miscellaneous HTTP requests.
-gem "httparty", "~> 0.21.0"
+gem "httparty", "~> 0.22.0"
 gem "addressable", "~> 2.8"
 
 # For advanced batching of many HTTP requests.

Gemfile.lock

@@ -7,89 +7,84 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actioncable (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
+      mail (>= 2.8.0)
+    actionmailer (7.2.1)
+      actionpack (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activesupport (= 7.2.1)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+      useragent (~> 0.16)
+    actiontext (7.2.1)
+      actionpack (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activejob (7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.4)
-      activesupport (= 7.1.3.4)
-    activerecord (7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activestorage (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activesupport (= 7.2.1)
       marcel (~> 1.0)
-    activesupport (7.1.3.4)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     ast (2.4.2)
-    async (2.8.1)
-      console (~> 1.10)
+    async (2.16.1)
+      console (~> 1.26)
       fiber-annotation
-      io-event (~> 1.1)
-      timers (~> 4.1)
+      io-event (~> 1.6, >= 1.6.5)
     async-container (0.16.13)
       async
       async-io
@@ -101,12 +96,14 @@ GEM
       protocol-http1 (~> 0.16.0)
       protocol-http2 (~> 0.15.0)
       traces (>= 0.10.0)
-    async-http-cache (0.4.3)
+    async-http-cache (0.4.4)
       async-http (~> 0.56)
-    async-io (1.41.0)
+    async-io (1.43.2)
       async
-    async-pool (0.4.0)
+    async-pool (0.8.1)
       async (>= 1.25)
+      metrics
+      traces
     attr_required (1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
@@ -116,22 +113,25 @@ GEM
     base64 (0.2.0)
     bcrypt (3.1.20)
     benchmark (0.3.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     bindata (2.5.0)
     bindex (0.8.1)
-    bootsnap (1.18.3)
+    bootsnap (1.18.4)
       msgpack (~> 1.2)
     build-environment (1.13.0)
-    builder (3.2.4)
-    concurrent-ruby (1.2.3)
+    builder (3.3.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    console (1.23.4)
+    console (1.27.0)
       fiber-annotation
-      fiber-local
+      fiber-local (~> 1.1)
       json
     crass (1.0.6)
+    csv (3.3.0)
     date (3.3.4)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -144,12 +144,11 @@ GEM
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     e2mmap (0.1.0)
     email_validator (2.2.4)
       activemodel
-    erubi (1.12.0)
+    erubi (1.13.0)
     execjs (2.9.1)
     falcon (0.43.0)
       async
@@ -164,15 +163,18 @@ GEM
       process-metrics (~> 0.2.0)
       protocol-rack (~> 0.1)
       samovar (~> 2.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.11.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.1.0)
+    faraday-net_http (3.3.0)
       net-http
-    ffi (1.16.3)
+    ffi (1.17.0)
     fiber-annotation (0.2.0)
-    fiber-local (1.0.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (1.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     haml (6.3.0)
@@ -181,20 +183,21 @@ GEM
       tilt
     hashie (5.0.0)
     http_accept_language (2.1.1)
-    httparty (0.21.0)
+    httparty (0.22.0)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    io-event (1.4.4)
-    irb (1.11.2)
-      rdoc
+    io-event (1.6.5)
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jaro_winkler (1.6.0)
-    jsbundling-rails (1.3.0)
+    jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.7.1)
+    json (2.7.2)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -207,11 +210,13 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
+    launchy (3.0.1)
       addressable (~> 2.8)
-    letter_opener (1.9.0)
-      launchy (>= 2.2, < 3)
-    localhost (1.2.0)
+      childprocess (~> 5.0)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
+    localhost (1.3.1)
+    logger (1.6.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -222,34 +227,35 @@ GEM
       net-smtp
     mapping (1.1.1)
     marcel (1.0.4)
-    memory_profiler (1.0.1)
+    memory_profiler (1.0.2)
+    metrics (0.10.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
     msgpack (1.7.2)
-    multi_xml (0.6.0)
-    mutex_m (0.2.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
     mysql2 (0.5.6)
     net-http (0.4.1)
       uri
-    net-imap (0.4.10)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.2)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth_openid_connect (0.7.1)
@@ -270,28 +276,28 @@ GEM
       webfinger (~> 2.0)
     openssl (3.2.0)
     orm_adapter (0.5.0)
-    parallel (1.24.0)
-    parser (3.3.3.0)
+    parallel (1.26.3)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
     process-metrics (0.2.1)
       console (~> 1.8)
       samovar (~> 2.1)
-    protocol-hpack (1.4.2)
+    protocol-hpack (1.5.0)
     protocol-http (0.25.0)
     protocol-http1 (0.16.1)
       protocol-http (~> 0.22)
     protocol-http2 (0.15.1)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
-    protocol-rack (0.4.1)
+    protocol-rack (0.6.0)
       protocol-http (~> 0.23)
       rack (>= 1.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.4)
-    racc (1.7.3)
-    rack (3.0.9.1)
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rack (3.1.7)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-mini-profiler (3.3.1)
@@ -313,20 +319,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.3.4)
-      actioncable (= 7.1.3.4)
-      actionmailbox (= 7.1.3.4)
-      actionmailer (= 7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actiontext (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    rails (7.2.1)
+      actioncable (= 7.2.1)
+      actionmailbox (= 7.2.1)
+      actionmailer (= 7.2.1)
+      actionpack (= 7.2.1)
+      actiontext (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activemodel (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.4)
+      railties (= 7.2.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -334,22 +340,22 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      irb
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rbs (2.8.4)
     rdiscount (2.2.7.3)
-    rdoc (6.6.2)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
     react-rails (2.7.1)
       babel-transpiler (>= 0.7.0)
@@ -360,34 +366,33 @@ GEM
     record_tag_helper (1.0.1)
       actionview (>= 5)
     regexp_parser (2.9.2)
-    reline (0.4.2)
+    reline (0.5.9)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.3.1)
+    rexml (3.3.6)
       strscan
-    rubocop (1.64.1)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.1)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    samovar (2.2.0)
+    samovar (2.3.0)
       console (~> 1.0)
       mapping (~> 1.0)
-    sanitize (6.1.0)
+    sanitize (6.1.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sass-rails (6.0.0)
@@ -400,10 +405,12 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sentry-rails (5.16.1)
+    securerandom (0.3.1)
+    sentry-rails (5.19.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.16.1)
-    sentry-ruby (5.16.1)
+      sentry-ruby (~> 5.19.0)
+    sentry-ruby (5.19.0)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shell (0.8.1)
       e2mmap
@@ -430,12 +437,12 @@ GEM
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     stackprof (0.2.26)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
     swd (2.0.3)
       activesupport (>= 3)
@@ -444,22 +451,22 @@ GEM
       faraday-follow_redirects
     sync (0.5.0)
     temple (0.10.3)
-    terser (1.2.0)
+    terser (1.2.3)
       execjs (>= 0.3.0, < 3)
-    thor (1.3.0)
+    thor (1.3.1)
     thread-local (1.1.0)
-    tilt (2.3.0)
+    tilt (2.4.0)
     timeout (0.4.1)
-    timers (4.3.5)
-    traces (0.11.1)
-    turbo-rails (2.0.5)
+    traces (0.13.1)
+    turbo-rails (2.0.6)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    uri (0.13.0)
+    uri (0.13.1)
+    useragent (0.16.10)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
@@ -478,9 +485,9 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (4.0.0)
+    will_paginate (4.0.1)
     yard (0.9.36)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   ruby
@@ -497,7 +504,7 @@ DEPENDENCIES
   falcon (~> 0.43.0)
   haml (~> 6.1, >= 6.1.1)
   http_accept_language (~> 2.1, >= 2.1.1)
-  httparty (~> 0.21.0)
+  httparty (~> 0.22.0)
   jsbundling-rails (~> 1.1)
   letter_opener (~> 1.8, >= 1.8.1)
   memory_profiler (~> 1.0)
@@ -530,7 +537,7 @@ DEPENDENCIES
   will_paginate (~> 4.0)
 
 RUBY VERSION
-   ruby 3.3.0p0
+   ruby 3.3.4p94
 
 BUNDLED WITH
-   2.5.5
+   2.5.18

app/assets/javascripts/pets/bulk.js

@@ -1,5 +1,14 @@
 var DEBUG = document.location.search.substr(0, 6) == "?debug";
 
+function petThumbnailUrl(pet_name) {
+  // if first character is "@", use the hash url
+  if (pet_name[0] == "@") {
+    return "https://pets.neopets.com/cp/" + pet_name.substr(1) + "/1/1.png";
+  }
+
+  return "https://pets.neopets.com/cpn/" + pet_name + "/1/1.png";
+}
+
 /* Needed items form */
 (function () {
   var UI = {};
@@ -65,10 +74,6 @@ var DEBUG = document.location.search.substr(0, 6) == "?debug";
     loadItems(data.query);
   }
 
-  function petThumbnailUrl(pet_name) {
-    return "https://pets.neopets.com/cpn/" + pet_name + "/1/1.png";
-  }
-
   /* Items */
 
   function loadItems(query) {
@@ -127,7 +132,7 @@ var DEBUG = document.location.search.substr(0, 6) == "?debug";
 
     function Pet(name) {
       var el = $("#bulk-pets-submission-template")
-        .tmpl({ pet_name: name })
+        .tmpl({ pet_name: name, pet_thumbnail: petThumbnailUrl(name) })
         .appendTo(queue_el);
 
       this.load = function () {

app/helpers/items_helper.rb

@@ -113,13 +113,6 @@ module ItemsHelper
     SHOP_WIZARD_URL_TEMPLATE.expand(string: item_or_name).to_s
   end
 
-  SUPER_SHOP_WIZARD_URL_TEMPLATE = Addressable::Template.new(
-    "https://www.neopets.com/portal/supershopwiz.phtml{?string}"
-  )
-  def super_shop_wizard_url_for(item)
-    SUPER_SHOP_WIZARD_URL_TEMPLATE.expand(string: item.name).to_s
-  end
-  
   TRADING_POST_URL_TEMPLATE = Addressable::Template.new(
     "https://www.neopets.com/island/tradingpost.phtml?type=browse&criteria=item_exact{&search_string}"
   )

app/views/application/_analytics.html.erb

@@ -1,2 +1,2 @@
 <%= javascript_include_tag 'https://analytics.openneo.net/js/script.js',
-    defer: true, 'data-domain': 'impress.openneo.net' %>
+    async: true, 'data-domain': 'impress.openneo.net' %>

app/views/items/_item_header.html.haml

@@ -38,7 +38,6 @@
           title: nc_trade_value_updated_at_text(item.nc_trade_value)
       - unless item.nc?
         = link_to t('items.show.resources.shop_wizard'), shop_wizard_url_for(item)
-        = link_to t('items.show.resources.super_shop_wizard'), super_shop_wizard_url_for(item)
         = link_to t('items.show.resources.trading_post'), trading_post_url_for(item)
         = link_to t('items.show.resources.auction_genie'), auction_genie_url_for(item)
 

app/views/pets/bulk.html.haml

@@ -68,7 +68,7 @@
   
   %script#bulk-pets-submission-template{:type => 'text/x-jquery/tmpl'}
     %li.waiting
-      %img{:src => 'https://pets.neopets.com/cpn/${pet_name}/1/1.png'}
+      %img{:src => '${pet_thumbnail}'}
       %span.name ${pet_name}
       %span.waiting-message= t '.bulk_pets.waiting'
       %span.loading-message= t '.bulk_pets.loading'

config/locales/en-MEEP.yml

@@ -267,7 +267,6 @@ en-MEEP:
       resources:
         jn_items: JN Meepits
         shop_wizard: Meep Wizard
-        super_shop_wizard: Meeper Wizard
         trading_post: Treeps
         auction_genie: Aucteeps
       closet_hangers:

config/locales/en.yml

@@ -311,7 +311,6 @@ en:
         impress_2020: DTI 2020
         owls: "Owls: %{value}"
         shop_wizard: Shop Wizard
-        super_shop_wizard: Super Wizard
         trading_post: Trades
         auction_genie: Auctions
       closet_hangers:

config/locales/es.yml

@@ -211,7 +211,6 @@ es:
       resources:
         jn_items: Objetos de JN
         shop_wizard: Asistente de Tiendas
-        super_shop_wizard: Super Asistente de Tiendas
         trading_post: Quiosco del trueque
         auction_genie: Subastas
       closet_hangers:

config/locales/pt.yml

@@ -209,7 +209,6 @@ pt:
       resources:
         jn_items: JN Itens
         shop_wizard: Mágico Pecincheiro
-        super_shop_wizard: Super Mágico Pecincheiro
         trading_post: Trocas
         auction_genie: Leilões
       closet_hangers:

deploy/deploy.yml

@@ -60,7 +60,7 @@
     - name: Configure Bundler to run in deployment mode
       command:
         chdir: "{{ remote_app_root }}"
-        cmd: /opt/ruby-3.3.0/bin/bundle config set --local deployment true
+        cmd: /opt/ruby-3.3.4/bin/bundle config set --local deployment true
 
     # This ensures that, while attempting our current deploy, we don't
     # accidentally delete gems out from under the currently-running version.
@@ -70,7 +70,7 @@
     - name: Configure Bundler to *not* clean up old gems when installing
       command:
         chdir: "{{ remote_app_root }}"
-        cmd: /opt/ruby-3.3.0/bin/bundle config set --local clean false
+        cmd: /opt/ruby-3.3.4/bin/bundle config set --local clean false
 
     # NOTE: Bundler recommends this, and they're pretty smart about it: if the
     # Gemfile changes, this shouldn't disrupt the currently-running version,
@@ -79,7 +79,7 @@
     - name: Configure Bundler to use the bundle folder shared by all app versions
       command:
         chdir: "{{ remote_app_root }}"
-        cmd: "/opt/ruby-3.3.0/bin/bundle config set --local path {{ remote_project_root}}/shared/bundle"
+        cmd: "/opt/ruby-3.3.4/bin/bundle config set --local path {{ remote_project_root}}/shared/bundle"
 
     - name: Run `bundle install` to install dependencies in remote folder
       command:
@@ -87,7 +87,7 @@
         # The `--local` flag instructs Bundler to use the cached dependencies
         # in `vendor/cache`, instead of reading from the web, which is much
         # faster and more reliable!
-        cmd: /opt/ruby-3.3.0/bin/bundle install --local
+        cmd: /opt/ruby-3.3.4/bin/bundle install --local
 
     - name: Update the `current` folder to point to the new version
       file:
@@ -111,7 +111,7 @@
     - name: Clean up gems no longer used in the current app version
       command:
         chdir: "{{ remote_app_root }}"
-        cmd: /opt/ruby-3.3.0/bin/bundle clean
+        cmd: /opt/ruby-3.3.4/bin/bundle clean
       when: not skip_set_as_current
 
     - name: Find older app versions to clean up

deploy/files/authorized-ssh-keys.txt

@@ -14,3 +14,4 @@
 
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIu5a+mp2KKSGkOGWQPrARCrsqJS4g2vK7TmRIbj/YBh Matchu's Desktop (Leviathan 2023)
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFwWryq6slOQqkrJ7HIig7BvEQVQeH19hFwb+9VpXgz Matchu's Laptop (Ebon Hawk)
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINq0HDYIUwRnrlKBWyGWJbJsx3M8nLg4nRxaA+9lJp+o Matchu's Laptop (Death Star)

deploy/files/impress.service

@@ -5,7 +5,7 @@ Description=Dress to Impress webapp
 User=impress
 Restart=always
 WorkingDirectory=/srv/impress/current
-ExecStart=/opt/ruby-3.3.0/bin/bundle exec falcon host
+ExecStart=/opt/ruby-3.3.4/bin/bundle exec falcon host
 Environment="RAILS_ENV=production"
 ; Set EXECJS_RUNTIME to save us from needing to install Node
 Environment="EXECJS_RUNTIME=Disabled"

deploy/setup.yml

@@ -170,21 +170,21 @@
       git:
         repo: https://github.com/rbenv/ruby-build.git
         dest: /opt/ruby-build
-        version: e1b36a32fb87d61955ac38f1889b7e3cb3b2f407
+        version: d22fa95a6e4c77945304c16ebe0d9513fec98cfb
 
-    - name: Check if Ruby 3.3.0 is already installed
+    - name: Check if Ruby 3.3.4 is already installed
       stat:
-        path: /opt/ruby-3.3.0
+        path: /opt/ruby-3.3.4
       register: ruby_dir
 
-    - name: Install Ruby 3.3.0
-      command: "/opt/ruby-build/bin/ruby-build 3.3.0 /opt/ruby-3.3.0"
+    - name: Install Ruby 3.3.4
+      command: "/opt/ruby-build/bin/ruby-build 3.3.4 /opt/ruby-3.3.4"
       when: not ruby_dir.stat.exists
 
-    - name: Add Ruby 3.3.0 to the global PATH, for developer convenience
+    - name: Add Ruby 3.3.4 to the global PATH, for developer convenience
       copy:
         dest: /etc/profile.d/ruby_path.sh
-        content: PATH="/opt/ruby-3.3.0/bin:$PATH"
+        content: PATH="/opt/ruby-3.3.4/bin:$PATH"
 
     - name: Install system dependencies for impress's Ruby gems
       apt:
@@ -248,14 +248,14 @@
       become_user: impress
       command:
         chdir: /srv/impress/versions/initial-placeholder
-        cmd: /opt/ruby-3.3.0/bin/bundle config set --local deployment true
+        cmd: /opt/ruby-3.3.4/bin/bundle config set --local deployment true
       when: not current_app_version.stat.exists
 
     - name: Install the placeholder app's dependencies
       become_user: impress
       command:
         chdir: /srv/impress/versions/initial-placeholder
-        cmd: /opt/ruby-3.3.0/bin/bundle install
+        cmd: /opt/ruby-3.3.4/bin/bundle install
       when: not current_app_version.stat.exists
 
     - name: Set the placeholder app as the current version