working on image feature

This commit is contained in:
2026-10-01 09:56:32 -06:00
parent 7d4e446d4a
commit 23d8154f17
26 changed files with 1259 additions and 57 deletions
+84 -2
View File
@@ -1,5 +1,8 @@
require "rails_helper"
require "base64"
require "digest/md5"
require "stringio"
require "tempfile"
require "zlib"
RSpec.describe "Backups" do
@@ -37,7 +40,8 @@ RSpec.describe "Backups" do
user = create(:user, name: "Driver", email: "driver@example.com")
vehicle = create(:vehicle, vin: "ABC123", licence_plate: "FLT1234")
create(:maintenance_schedule, vehicle: vehicle, maintenance_type: "Oil Change")
create(:fuel_entry, vehicle: vehicle, updated_by_user: user, odometer: 10_500)
fuel_entry = create(:fuel_entry, vehicle: vehicle, updated_by_user: user, odometer: 10_500)
fuel_entry.images.attach(image_attachment("receipt.png"))
create(:maintenance_entry, vehicle: vehicle, updated_by_user: user, name: "Oil Change", odometer: 10_600, ensure_matching_schedule: false)
AccessKey.current
UserSession.create_for!(user)
@@ -51,11 +55,34 @@ RSpec.describe "Backups" do
expect(response.media_type).to eq("application/gzip")
expect(response.headers.fetch("Content-Disposition")).to include(".yml.gz")
expect(backup.fetch("format")).to eq("car_tracker_backup")
expect(backup.fetch("version")).to eq(1)
expect(backup.fetch("version")).to eq(2)
expect(vehicle_data.fetch("vin")).to eq("ABC123")
expect(vehicle_data.fetch("fuel_entries").first.fetch("updated_by_user").fetch("email")).to eq("driver@example.com")
expect(gunzip(response.body)).not_to include("access_keys")
expect(gunzip(response.body)).not_to include("user_sessions")
expect(gunzip(response.body)).not_to include("data_base64")
end
end
describe "GET /backup/download_with_images" do
before { identify_user }
it "downloads app data and image content" do
user = create(:user, name: "Driver", email: "driver@example.com")
vehicle = create(:vehicle, vin: "ABC123", licence_plate: "FLT1234")
fuel_entry = create(:fuel_entry, vehicle: vehicle, updated_by_user: user, odometer: 10_500)
fuel_entry.images.attach(image_attachment("receipt.png"))
get download_with_images_backup_path
backup = YAML.safe_load(gunzip(response.body), aliases: false)
image_data = backup.fetch("vehicles").first.fetch("fuel_entries").first.fetch("images").first
expect(response).to have_http_status(:ok)
expect(response.headers.fetch("Content-Disposition")).to include("with-images")
expect(image_data.fetch("filename")).to eq("receipt.png")
expect(image_data.fetch("content_type")).to eq("image/png")
expect(Base64.strict_decode64(image_data.fetch("data_base64"))).to eq(png_bytes)
end
end
@@ -144,6 +171,35 @@ RSpec.describe "Backups" do
expect(response).to redirect_to(backup_path)
expect(flash[:alert]).to include("does not have an available migration path")
end
it "restores image-inclusive backups" do
payload = backup_payload_with_images
expect do
post restore_backup_path, params: {
mode: "replace",
backup_file: uploaded_backup(payload)
}
end.to change(FuelEntry, :count).by(1)
expect(response).to redirect_to(backup_path)
expect(FuelEntry.last.images.count).to eq(1)
expect(FuelEntry.last.images.first.filename.to_s).to eq("receipt.png")
end
it "deduplicates imported images by filename and checksum during merge" do
post restore_backup_path, params: {
mode: "merge",
backup_file: uploaded_backup(backup_payload_with_images)
}
post restore_backup_path, params: {
mode: "merge",
backup_file: uploaded_backup(backup_payload_with_images)
}
expect(FuelEntry.count).to eq(1)
expect(FuelEntry.last.images.count).to eq(1)
end
end
def backup_payload
@@ -216,6 +272,32 @@ RSpec.describe "Backups" do
Rack::Test::UploadedFile.new(file.path, "application/gzip")
end
def backup_payload_with_images
payload = backup_payload.deep_dup.merge("version" => 2)
payload.fetch("vehicles").first.fetch("fuel_entries").first["images"] = [
{
"filename" => "receipt.png",
"content_type" => "image/png",
"checksum" => Digest::MD5.base64digest(png_bytes),
"byte_size" => png_bytes.bytesize,
"data_base64" => Base64.strict_encode64(png_bytes)
}
]
payload
end
def image_attachment(filename)
{
io: StringIO.new(png_bytes),
filename: filename,
content_type: "image/png"
}
end
def png_bytes
Base64.decode64("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+/p9sAAAAASUVORK5CYII=")
end
def gzip(content)
buffer = StringIO.new
Zlib::GzipWriter.wrap(buffer) { |gzip| gzip.write(content) }
+370
View File
@@ -1,4 +1,7 @@
require "rails_helper"
require "base64"
require "stringio"
require "tempfile"
RSpec.describe "Vehicles" do
describe "unauthenticated access" do
@@ -242,6 +245,18 @@ RSpec.describe "Vehicles" do
expect(response.body).not_to include("Oil Change is overdue")
end
it "shows image counts without loading image URLs" do
vehicle = create(:vehicle)
fuel_entry = create(:fuel_entry, vehicle: vehicle)
fuel_entry.images.attach(image_attachment("receipt.png"))
get vehicle_path(vehicle)
expect(response).to have_http_status(:ok)
expect(response.body).to include("Show images (1)")
expect(response.body).not_to include("/rails/active_storage")
end
it "logs overdue notifications only when schedule status changes" do
vehicle = create(:vehicle, current_odometer: 15_000)
schedule = create(
@@ -337,6 +352,45 @@ RSpec.describe "Vehicles" do
expect(FuelEntry.last.updated_by_user).to eq(@identified_user)
end
it "creates a fuel entry with multiple images" do
vehicle = create(:vehicle, current_odometer: 10_000)
expect do
post vehicle_fuel_entries_path(vehicle), params: {
fuel_entry: valid_fuel_entry_params.merge(images: [ uploaded_image("receipt-one.png"), uploaded_image("receipt-two.png") ])
}
end.to change(FuelEntry, :count).by(1)
expect(response).to redirect_to(vehicle_path(vehicle))
expect(FuelEntry.last.images.count).to eq(2)
end
it "rejects duplicate images when creating a fuel entry" do
vehicle = create(:vehicle, current_odometer: 10_000)
expect do
post vehicle_fuel_entries_path(vehicle), params: {
fuel_entry: valid_fuel_entry_params.merge(images: [ uploaded_image("receipt-one.png", png_bytes), uploaded_image("receipt-two.png", png_bytes) ])
}
end.not_to change(FuelEntry, :count)
expect(response).to have_http_status(:unprocessable_content)
expect(response.body).to include("This image is already attached to this entry")
end
it "rejects unsupported fuel entry images" do
vehicle = create(:vehicle, current_odometer: 10_000)
expect do
post vehicle_fuel_entries_path(vehicle), params: {
fuel_entry: valid_fuel_entry_params.merge(images: [ uploaded_file("receipt.txt", "text/plain", "not an image") ])
}
end.not_to change(FuelEntry, :count)
expect(response).to have_http_status(:unprocessable_content)
expect(response.body).to include("Images must be JPEG or PNG")
end
it "updates the vehicle odometer when the fuel odometer is newer" do
vehicle = create(:vehicle, current_odometer: 10_000)
@@ -394,6 +448,34 @@ RSpec.describe "Vehicles" do
expect(MaintenanceEntry.last.updated_by_user).to eq(@identified_user)
end
it "creates a maintenance entry with multiple images" do
vehicle = create(:vehicle, current_odometer: 10_000)
create(:maintenance_schedule, vehicle: vehicle, maintenance_type: "Oil Change")
expect do
post vehicle_maintenance_entries_path(vehicle), params: {
maintenance_entry: valid_maintenance_entry_params.merge(images: [ uploaded_image("service-one.png"), uploaded_image("service-two.png") ])
}
end.to change(MaintenanceEntry, :count).by(1)
expect(response).to redirect_to(vehicle_path(vehicle))
expect(MaintenanceEntry.last.images.count).to eq(2)
end
it "rejects duplicate images when creating a maintenance entry" do
vehicle = create(:vehicle, current_odometer: 10_000)
create(:maintenance_schedule, vehicle: vehicle, maintenance_type: "Oil Change")
expect do
post vehicle_maintenance_entries_path(vehicle), params: {
maintenance_entry: valid_maintenance_entry_params.merge(images: [ uploaded_image("service-one.png", png_bytes), uploaded_image("service-two.png", png_bytes) ])
}
end.not_to change(MaintenanceEntry, :count)
expect(response).to have_http_status(:unprocessable_content)
expect(response.body).to include("This image is already attached to this entry")
end
it "updates the vehicle odometer when the maintenance odometer is newer" do
vehicle = create(:vehicle, current_odometer: 10_000)
create(:maintenance_schedule, vehicle: vehicle, maintenance_type: "Oil Change")
@@ -451,6 +533,270 @@ RSpec.describe "Vehicles" do
end
end
describe "GET /vehicles/:vehicle_id/fuel_entries/:id/images" do
before { identify_user }
it "loads fuel entry images inline" do
vehicle = create(:vehicle)
fuel_entry = create(:fuel_entry, vehicle: vehicle)
fuel_entry.images.attach(image_attachment("receipt.png"))
get images_vehicle_fuel_entry_path(vehicle, fuel_entry)
expect(response).to have_http_status(:ok)
expect(response.body).to include("receipt.png")
expect(response.body).to include("/rails/active_storage")
expect(response.body).not_to include("/rails/active_storage/representations")
end
end
describe "GET /vehicles/:vehicle_id/fuel_entries/:id/new_images" do
before { identify_user }
it "loads an inline upload form for an existing fuel entry" do
vehicle = create(:vehicle)
fuel_entry = create(:fuel_entry, vehicle: vehicle)
get new_images_vehicle_fuel_entry_path(vehicle, fuel_entry)
expect(response).to have_http_status(:ok)
expect(response.body).to include("Upload images")
expect(response.body).to include(images_vehicle_fuel_entry_path(vehicle, fuel_entry))
end
end
describe "POST /vehicles/:vehicle_id/fuel_entries/:id/images" do
before { identify_user }
it "adds images to an existing fuel entry and renders thumbnails immediately" do
vehicle = create(:vehicle)
fuel_entry = create(:fuel_entry, vehicle: vehicle)
expect do
post images_vehicle_fuel_entry_path(vehicle, fuel_entry), params: {
fuel_entry: { images: [ uploaded_image("receipt-one.png"), uploaded_image("receipt-two.png") ] }
}
end.to change { fuel_entry.reload.images.count }.from(0).to(2)
expect(response).to have_http_status(:ok)
expect(response.body).to include("receipt-one")
expect(response.body).to include("receipt-two")
expect(response.body).to include("/rails/active_storage")
end
it "adds images to an older fuel entry without rerunning odometer validation" do
vehicle = create(:vehicle, current_odometer: 10_000)
fuel_entry = create(:fuel_entry, vehicle: vehicle, odometer: 10_000)
vehicle.update!(current_odometer: 15_000)
expect do
post images_vehicle_fuel_entry_path(vehicle, fuel_entry), params: {
fuel_entry: { images: [ "", uploaded_image("receipt.png") ] }
}
end.to change { fuel_entry.reload.images.count }.from(0).to(1)
expect(response).to have_http_status(:ok)
expect(response.body).to include("receipt")
expect(response.body).to include("/rails/active_storage")
end
it "rejects an empty existing fuel entry image upload" do
vehicle = create(:vehicle)
fuel_entry = create(:fuel_entry, vehicle: vehicle)
expect do
post images_vehicle_fuel_entry_path(vehicle, fuel_entry), params: {
fuel_entry: { images: [ "" ] }
}
end.not_to change { fuel_entry.reload.images.count }
expect(response).to have_http_status(:unprocessable_content)
expect(response.body).to include("Images must be selected")
expect(response.body).to include("Upload images")
end
it "rejects unsupported images for an existing fuel entry" do
vehicle = create(:vehicle)
fuel_entry = create(:fuel_entry, vehicle: vehicle)
expect do
post images_vehicle_fuel_entry_path(vehicle, fuel_entry), params: {
fuel_entry: { images: [ uploaded_file("receipt.txt", "text/plain", "not an image") ] }
}
end.not_to change { fuel_entry.reload.images.count }
expect(response).to have_http_status(:unprocessable_content)
expect(response.body).to include("Images must be JPEG or PNG")
expect(response.body).to include("Upload images")
end
it "rejects duplicate images for an existing fuel entry" do
vehicle = create(:vehicle)
fuel_entry = create(:fuel_entry, vehicle: vehicle)
fuel_entry.images.attach(image_attachment("receipt.png"))
expect do
post images_vehicle_fuel_entry_path(vehicle, fuel_entry), params: {
fuel_entry: { images: [ uploaded_image("receipt-copy.png", png_bytes) ] }
}
end.not_to change { fuel_entry.reload.images.count }
expect(response).to have_http_status(:unprocessable_content)
expect(response.body).to include("This image is already attached to this entry")
expect(response.body).to include("Upload images")
end
it "allows the same image on a different fuel entry" do
vehicle = create(:vehicle)
first_entry = create(:fuel_entry, vehicle: vehicle)
second_entry = create(:fuel_entry, vehicle: vehicle)
first_entry.images.attach(image_attachment("receipt.png"))
expect do
post images_vehicle_fuel_entry_path(vehicle, second_entry), params: {
fuel_entry: { images: [ uploaded_image("receipt-copy.png", png_bytes) ] }
}
end.to change { second_entry.reload.images.count }.from(0).to(1)
expect(response).to have_http_status(:ok)
end
end
describe "GET /vehicles/:vehicle_id/maintenance_entries/:id/images" do
before { identify_user }
it "loads maintenance entry images inline" do
vehicle = create(:vehicle)
maintenance_entry = create(:maintenance_entry, vehicle: vehicle)
maintenance_entry.images.attach(image_attachment("service.png"))
get images_vehicle_maintenance_entry_path(vehicle, maintenance_entry)
expect(response).to have_http_status(:ok)
expect(response.body).to include("service.png")
expect(response.body).to include("/rails/active_storage")
expect(response.body).not_to include("/rails/active_storage/representations")
end
end
describe "GET /vehicles/:vehicle_id/maintenance_entries/:id/new_images" do
before { identify_user }
it "loads an inline upload form for an existing maintenance entry" do
vehicle = create(:vehicle)
maintenance_entry = create(:maintenance_entry, vehicle: vehicle)
get new_images_vehicle_maintenance_entry_path(vehicle, maintenance_entry)
expect(response).to have_http_status(:ok)
expect(response.body).to include("Upload images")
expect(response.body).to include(images_vehicle_maintenance_entry_path(vehicle, maintenance_entry))
end
end
describe "POST /vehicles/:vehicle_id/maintenance_entries/:id/images" do
before { identify_user }
it "adds images to an existing maintenance entry and renders thumbnails immediately" do
vehicle = create(:vehicle)
create(:maintenance_schedule, vehicle: vehicle, maintenance_type: "Oil Change")
maintenance_entry = create(:maintenance_entry, vehicle: vehicle)
expect do
post images_vehicle_maintenance_entry_path(vehicle, maintenance_entry), params: {
maintenance_entry: { images: [ uploaded_image("service-one.png"), uploaded_image("service-two.png") ] }
}
end.to change { maintenance_entry.reload.images.count }.from(0).to(2)
expect(response).to have_http_status(:ok)
expect(response.body).to include("service-one")
expect(response.body).to include("service-two")
expect(response.body).to include("/rails/active_storage")
end
it "ignores blank image params for an existing maintenance entry" do
vehicle = create(:vehicle)
create(:maintenance_schedule, vehicle: vehicle, maintenance_type: "Oil Change")
maintenance_entry = create(:maintenance_entry, vehicle: vehicle)
expect do
post images_vehicle_maintenance_entry_path(vehicle, maintenance_entry), params: {
maintenance_entry: { images: [ "", uploaded_image("service.png") ] }
}
end.to change { maintenance_entry.reload.images.count }.from(0).to(1)
expect(response).to have_http_status(:ok)
expect(response.body).to include("service")
end
it "rejects unsupported images for an existing maintenance entry" do
vehicle = create(:vehicle)
create(:maintenance_schedule, vehicle: vehicle, maintenance_type: "Oil Change")
maintenance_entry = create(:maintenance_entry, vehicle: vehicle)
expect do
post images_vehicle_maintenance_entry_path(vehicle, maintenance_entry), params: {
maintenance_entry: { images: [ uploaded_file("service.txt", "text/plain", "not an image") ] }
}
end.not_to change { maintenance_entry.reload.images.count }
expect(response).to have_http_status(:unprocessable_content)
expect(response.body).to include("Images must be JPEG or PNG")
expect(response.body).to include("Upload images")
end
it "rejects duplicate images for an existing maintenance entry" do
vehicle = create(:vehicle)
create(:maintenance_schedule, vehicle: vehicle, maintenance_type: "Oil Change")
maintenance_entry = create(:maintenance_entry, vehicle: vehicle)
maintenance_entry.images.attach(image_attachment("service.png"))
expect do
post images_vehicle_maintenance_entry_path(vehicle, maintenance_entry), params: {
maintenance_entry: { images: [ uploaded_image("service-copy.png", png_bytes) ] }
}
end.not_to change { maintenance_entry.reload.images.count }
expect(response).to have_http_status(:unprocessable_content)
expect(response.body).to include("This image is already attached to this entry")
expect(response.body).to include("Upload images")
end
end
describe "DELETE /vehicles/:vehicle_id/fuel_entries/:fuel_entry_id/images/:attachment_id" do
before { identify_user }
it "deletes one fuel entry image" do
vehicle = create(:vehicle)
fuel_entry = create(:fuel_entry, vehicle: vehicle)
fuel_entry.images.attach(image_attachment("receipt.png"))
attachment = fuel_entry.images.first
expect do
delete vehicle_fuel_entry_image_path(vehicle, fuel_entry, attachment)
end.to change { fuel_entry.reload.images.count }.from(1).to(0)
expect(response).to redirect_to(images_vehicle_fuel_entry_path(vehicle, fuel_entry))
end
end
describe "DELETE /vehicles/:vehicle_id/maintenance_entries/:maintenance_entry_id/images/:attachment_id" do
before { identify_user }
it "deletes one maintenance entry image" do
vehicle = create(:vehicle)
maintenance_entry = create(:maintenance_entry, vehicle: vehicle)
maintenance_entry.images.attach(image_attachment("service.png"))
attachment = maintenance_entry.images.first
expect do
delete vehicle_maintenance_entry_image_path(vehicle, maintenance_entry, attachment)
end.to change { maintenance_entry.reload.images.count }.from(1).to(0)
expect(response).to redirect_to(images_vehicle_maintenance_entry_path(vehicle, maintenance_entry))
end
end
describe "GET /vehicles/new" do
before { identify_user }
@@ -584,4 +930,28 @@ RSpec.describe "Vehicles" do
access_key = AccessKey.current
post session_path, params: { name: user.name, email: user.email, key: access_key.raw_key }
end
def image_attachment(filename)
{
io: StringIO.new(png_bytes),
filename: filename,
content_type: "image/png"
}
end
def uploaded_image(filename, content = nil)
uploaded_file(filename, "image/png", content || "image content for #{filename}")
end
def uploaded_file(filename, content_type, content)
file = Tempfile.new([ File.basename(filename, ".*"), File.extname(filename) ])
file.binmode
file.write(content)
file.rewind
Rack::Test::UploadedFile.new(file.path, content_type)
end
def png_bytes
Base64.decode64("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+/p9sAAAAASUVORK5CYII=")
end
end