Add extension to filename, implement /show route, and prepare for lan…

…ding on it

app/controllers/expanding_brain_controller.rb

@@ -1,3 +1,5 @@
+require 'aws-sdk'
+
 class ExpandingBrainController < ApplicationController
   def index
   end
@@ -8,9 +10,13 @@ def new
   def create
     brains = params["expanding_brain"]
     @brains = ExpandingBrain.new(brains["brain_1"], brains["brain_2"], brains["brain_3"], brains["brain_4"]).generate
-    redirect_to @brains.url, status: 303
+    redirect_to @brains.url, status: 303 # redirect_to "/expanding_brain/show/#{@brains.name}/", status: 303 # Use this with websockets and the queue
   end
 
   def show
+    s3 = Aws::S3::Client.new(region: 'us-east-2')
+    signer = Aws::S3::Presigner.new(client: s3)
+    key_name = "#{params[:id]}.png"
+    @url = signer.presigned_url(:get_object, bucket: "expanding-brain", key: key_name)
   end
 end

app/models/expanding_brain.rb

@@ -88,19 +88,18 @@ def generate
         logger.debug "Successfully processed #{path}"
 
         begin
-          # post to s3
-
-          logger.debug "Putting #{path} on S3"
-
+          # Put image on S3
+          key_name = "#{name}.png"
           s3 = Aws::S3::Client.new(region: 'us-east-2')
           File.open(path, 'rb') do |file|
-            s3.put_object(bucket: 'expanding-brain', key: name, body: file)
+            s3.put_object(bucket: 'expanding-brain', key: key_name, body: file)
           end
 
-          signer = Aws::S3::Presigner.new(client: s3)
-          @url = signer.presigned_url(:get_object, bucket: "expanding-brain", key: name)
-          logger.debug "Image is ready at #{@url}"
+          logger.debug "Placed #{path} on S3"
 
+          # Get a public url for the image
+          signer = Aws::S3::Presigner.new(client: s3)
+          @url = signer.presigned_url(:get_object, bucket: "expanding-brain", key: key_name)
         rescue StandardError => e
           logger.debug e.inspect
           # logger.debug e.backtrace

app/views/expanding_brain/show.html.erb

@@ -0,0 +1 @@
+<%= image_tag(@url) %>

config/routes.rb

@@ -1,14 +1,11 @@
 Rails.application.routes.draw do
   root to: 'expanding_brain#new'
+
   get 'expanding_brain/new'
 
   post 'expanding_brain/create'
 
-  get 'expanding_brain/show'
-
-  get 'brain/new'
-
-  get 'brain/create'
+  get 'expanding_brain/show/', to: redirect('/')
 
-  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+  get 'expanding_brain/show/:id', to: 'expanding_brain#show'
 end