Get this running on modern ruby/rmagick/etc.

Author: jqr

.ruby-version

@@ -1 +1 @@
-2.1.5
+3.3.5

Gemfile

@@ -1,10 +1,9 @@
 source "https://rubygems.org"
-ruby "2.1.5"
+ruby "3.3.5"
 
-gem 'rmagick'
-gem 'faraday'
-gem 'sinatra'
-gem "unicorn"
-gem 'instrumental_agent'
+gem "rmagick"
+gem "http"
+gem "sinatra"
+gem "puma"
 
 gem "foreman", group: "development"

Gemfile.lock

@@ -1,41 +1,68 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.2.6)
-    dotenv (1.0.2)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
-    foreman (0.76.0)
-      dotenv (~> 1.0.2)
-      thor (~> 0.19.1)
-    instrumental_agent (0.8.2)
-    kgio (2.9.2)
-    multipart-post (1.1.4)
-    rack (1.3.5)
-    rack-protection (1.1.4)
-      rack
-    raindrops (0.13.0)
-    rmagick (2.13.4)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    thor (0.19.1)
-    tilt (1.3.3)
-    unicorn (4.8.3)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    domain_name (0.6.20240107)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
+      rake
+    foreman (0.88.1)
+    http (5.2.0)
+      addressable (~> 2.8)
+      base64 (~> 0.1)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.5.0)
+    http-cookie (1.0.7)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
+    llhttp-ffi (0.5.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
+    mustermann (3.0.3)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.7.3)
+    observer (0.1.2)
+    pkg-config (1.5.6)
+    public_suffix (6.0.1)
+    puma (6.4.3)
+      nio4r (~> 2.0)
+    rack (3.1.7)
+    rack-protection (4.0.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rake (13.2.1)
+    rmagick (6.0.1)
+      observer (~> 0.1)
+      pkg-config (~> 1.4)
+    ruby2_keywords (0.0.5)
+    sinatra (4.0.0)
+      mustermann (~> 3.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.0.0)
+      rack-session (>= 2.0.0, < 3)
+      tilt (~> 2.0)
+    tilt (2.4.0)
 
 PLATFORMS
-  ruby
+  arm64-darwin-23
+  x86_64-linux
 
 DEPENDENCIES
-  faraday
   foreman
-  instrumental_agent
+  http
+  puma
   rmagick
   sinatra
-  unicorn
+
+RUBY VERSION
+   ruby 3.3.5p100
+
+BUNDLED WITH
+   2.5.18

Procfile

@@ -1,2 +1 @@
-web: bundle exec unicorn -p $PORT -E $RACK_ENV
-
+web: bin/puma --config config/puma.rb

achievement.rb

@@ -1,89 +1,121 @@
-require 'digest/md5'
-require 'faraday'
-require 'RMagick'
-
-def gravatar_image(email, dims = 46)
-  client = Faraday::Connection.new(:url => "http://www.gravatar.com/")
-  hash = Digest::MD5.hexdigest(email.downcase.strip)
-  client.get("/avatar/#{hash}?s=#{dims}&d=mm").body
+require_relative "./gravatar"
+require "rmagick"
+
+# TODO: better names
+BACKGROUND    = "#3B3F40"
+CIRCLE        = "#1B1D1A"
+CIRLCE_OFF    = "#5D5F5E"
+CIRCLE_CENTER = "#1B1D1A"
+GREEN         = "#6BBC6F"
+
+TRANSPARENT   = "rgba(0,0,0,255)"
+FULL_OPACITY  = "rgba(255,255,255,255)"
+
+def draw_circle(draw, x, y, radius)
+  draw.circle(x, y, x, y + radius)
+end
+
+def draw_rounded_area(draw, width, height)
+  radius = height / 2
+  draw_circle(draw, radius, radius, radius)
+  draw_circle(draw, width - radius - 1, radius, radius)
+  draw.rectangle(radius, 0, width - radius - 1, height)
 end
 
-def achievement(first_line, second_line, gravatar = nil)
-  canvas = Magick::Image.new(423, 67) { |c| c.background_color = "none"; c.format = "png" }
+def achievement(first_line, second_line, email: nil)
+  width = 423
+  height = 67
+
   draw = Magick::Draw.new
 
-  draw.fill("#3B3F40")
-  draw.circle(33,33, 33,66)
-  draw.circle(423 - 34,33, 423 - 34,66)
-  draw.rectangle(33, 0, 423 - 34,67)
-  
-  draw.fill("#1B1D1A")
-  draw.circle(33,33, 33,62)
+  draw.fill(BACKGROUND)
+  draw_rounded_area(draw, width, height)
+
+  radius = height / 2
+  dark_circle_radius = radius - 4
+
+  draw.fill(CIRCLE)
+  draw_circle(draw, radius, radius, dark_circle_radius)
 
-  draw.fill("#5D5F5E")
-  draw.circle(33,33, 33,60)
+  player_circle_outer_radius = dark_circle_radius - 2
+  draw.fill(CIRLCE_OFF)
+  draw_circle(draw, radius, radius, player_circle_outer_radius)
+
+  #
 
   odraw = Magick::Draw.new
   mdraw = Magick::Draw.new
-  overlay = Magick::Image.new(423, 67)
-  mask = Magick::Image.new(423, 67)
+  overlay = Magick::Image.new(width, height)
+  mask = Magick::Image.new(width, height)
 
-  odraw.fill("#6BBC6F")
-  odraw.rectangle(0,0,423,67)
+  odraw.fill(GREEN)
+  odraw.rectangle(0, 0, width, height)
   odraw.draw(overlay)
-  
-  mdraw.fill("rgba(0,0,0,255)")
-  mdraw.rectangle(0, 0, 423,67)
-  mdraw.fill("rgba(255,255,255,255)")
-  mdraw.circle(33,33, 33,60)
-  mdraw.fill("rgba(0,0,0,255)")
-  mdraw.rectangle(33, 0, 423,67)
-  mdraw.rectangle(0, 33, 423,67)
-  
+
+  # mdraw.fill(TRANSPARENT)
+  mdraw.rectangle(0, 0, width, height)
+  mdraw.fill(FULL_OPACITY)
+
+  player_circle_highlight_outer_radius = player_circle_outer_radius - 1
+  draw_circle(mdraw, radius, radius, player_circle_highlight_outer_radius)
+
+  mdraw.fill(TRANSPARENT)
+  mdraw.rectangle(radius, 0, width, height)
+  mdraw.rectangle(0, radius, radius, height)
+
   mdraw.draw(mask)
-  
-  mask.matte = false
-  overlay.matte = true
-  overlay.composite!(mask, 0, 0, Magick::CopyOpacityCompositeOp)
-  draw.composite(0, 0, 423, 67, overlay)
 
+  mask.alpha(Magick::OffAlphaChannel)
+  # mask.matte = false
+  # overlay.matte = true
+  overlay.alpha(Magick::OnAlphaChannel)
+
+  overlay.composite!(mask, 0, 0, Magick::CopyAlphaCompositeOp)
+  draw.composite(0, 0, width, height, overlay)
 
-  draw.fill("#1B1D1A")  
-  draw.rectangle(30, 6, 36,60)
-  draw.rectangle(6, 30, 60,36)
-  draw.circle(33,33, 33,54)
+  # Crosshair
+  draw.fill(CIRCLE_CENTER)
+  crosshair_width = 6
+  draw.rectangle(radius - crosshair_width / 2, radius - player_circle_highlight_outer_radius - 1, radius + crosshair_width / 2, radius * 2 - crosshair_width)
+  draw.rectangle(radius - player_circle_highlight_outer_radius - 1, radius - crosshair_width / 2, radius * 2 - crosshair_width, radius + crosshair_width / 2)
+  player_circle_highlight_inner_radius = player_circle_outer_radius - 7
+  draw_circle(draw, radius, radius, player_circle_highlight_inner_radius)
 
-  if gravatar && (avatar = gravatar_image(gravatar))
+  if email && (avatar = Gravatar.new(email).image_data)
     odraw = Magick::Draw.new
     mdraw = Magick::Draw.new
     aimg = Magick::Image.from_blob(avatar).first
-    overlay = Magick::Image.new(423, 67)
-    mask = Magick::Image.new(423, 67)
+    overlay = Magick::Image.new(width, height)
+    mask = Magick::Image.new(width, height)
 
-    odraw.composite(6, 8, 54, 54, aimg)
+    odraw.composite(radius - player_circle_highlight_outer_radius - 1, radius - player_circle_highlight_outer_radius - 1, 54, 54, aimg)
     odraw.draw(overlay)
-    mdraw.fill("rgba(0,0,0,255)")
-    mdraw.rectangle(0, 0, 423,67)
-    mdraw.fill("rgba(255,255,255,255)")
-    mdraw.circle(33, 33, 33, 52)
+    mdraw.fill(TRANSPARENT)
+    mdraw.rectangle(0, 0, width, height)
+    mdraw.fill(FULL_OPACITY)
+    draw_circle(mdraw, radius, radius, 16)
     mdraw.draw(mask)
-    mask.matte = false
-    overlay.matte = true
-    overlay.composite!(mask, 0, 0, Magick::CopyOpacityCompositeOp)
-    draw.composite(0, 0, 423, 67, overlay)
+    mask.alpha(Magick::OffAlphaChannel)
+    # mask.matte = false
+    # overlay.matte = true
+    overlay.alpha(Magick::OnAlphaChannel)
+
+    overlay.composite!(mask, 0, 0, Magick::CopyAlphaCompositeOp)
+    draw.composite(0, 0, width, height, overlay)
   end
 
   draw.fill("#FFFFFF")
 
-  draw.font('fonts/LiberationSans-Regular.ttf')
-  draw.font_size('15.5')
-  draw.kerning('0.65')
-  draw.text(75,29, first_line)
+  draw.font("fonts/LiberationSans-Regular.ttf")
+  draw.font_size("15.5")
+  draw.kerning("0.65")
+  draw.text(75, 29, first_line)
 
-  draw.font_size('15.5')
-  draw.kerning('0.4')
-  draw.text(75,50, second_line)
+  draw.font_size("15.5")
+  draw.kerning("0.4")
+  draw.text(75, 50, second_line)
 
+  canvas = Magick::Image.new(width, height) { |c| c.background_color = "none"; c.format = "png" }
   draw.draw(canvas)
   canvas
 end

bin/puma

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'puma' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("puma", "puma")

cli.rb

@@ -2,10 +2,9 @@
 require "bundler"
 Bundler.setup(:default)
 
-require './achievement'
+require_relative "./achievement"
 
-first_line = 'ACHIEVEMENT UNLOCKED'
-second_line = 'you created an achievement generator'
-
-achievement(first_line, second_line).write('image.png')
+first_line = "ACHIEVEMENT UNLOCKED"
+second_line = "you created an achievement generator"
 
+achievement(first_line, second_line, email: "elijah.miller@gmail.com").write("image.png")

config.ru

@@ -1,2 +1,2 @@
-require './server'
-run Sinatra::Application
+require "./server"
+run Sinatra::Application

config/puma.rb

@@ -0,0 +1,12 @@
+workers Integer(ENV["WEB_CONCURRENCY"] || 2)
+threads_count = Integer(ENV["RAILS_MAX_THREADS"] || 5)
+threads threads_count, threads_count
+
+preload_app!
+
+rackup      DefaultRackup if defined?(DefaultRackup)
+port        ENV["PORT"]     || 3000
+environment ENV["RACK_ENV"] || "development"
+
+on_worker_boot do
+end

gravatar.rb

@@ -0,0 +1,27 @@
+require "digest/md5"
+require "http"
+require "uri"
+
+class Gravatar
+  DEFAULT_DIMENSIONS = 46
+
+  attr_reader :email
+
+  def initialize(email)
+    @email = email
+  end
+
+  def image_data(dimensions: DEFAULT_DIMENSIONS)
+    HTTP.get("https://www.gravatar.com/avatar/#{email_hash}", params: { s: dimensions, d: "mm" }).body
+  end
+
+  def email_hash
+    Digest::MD5.hexdigest(email.downcase.strip)
+  end
+
+  def self.get(email, dimensions: 46)
+    client = Faraday::Connection.new(:url => "https://www.gravatar.com/")
+    hash = Digest::MD5.hexdigest(email.downcase.strip)
+    client.get("/avatar/#{hash}?s=#{dims}&d=mm").body
+  end
+end