move mittsu mesh loading into geom analysis job

only place it's now used

Author: Floppy

app/jobs/analysis/geometric_analysis_job.rb

@@ -9,11 +9,11 @@ class Analysis::GeometricAnalysisJob < ApplicationJob
   def perform(file_id)
     # Get model
     file = ModelFile.find(file_id)
-    return unless file.loadable?
+    return unless self.class.loader(file)
     if SiteSettings.analyse_manifold
       status[:step] = "jobs.analysis.geometric_analysis.loading_mesh" # i18n-tasks-use t('jobs.analysis.geometric_analysis.loading_mesh')
       # Get mesh
-      mesh = file.mesh
+      mesh = self.class.load_mesh(file)
       if mesh
         status[:step] = "jobs.analysis.geometric_analysis.manifold_check" # i18n-tasks-use t('jobs.analysis.geometric_analysis.manifold_check')
         # Check for manifold mesh
@@ -39,4 +39,18 @@ def perform(file_id)
       end
     end
   end
+
+  def self.loader(file)
+    case file.extension
+    when "stl"
+      Mittsu::STLLoader
+    when "obj"
+      Mittsu::OBJLoader
+    end
+  end
+
+  def self.load_mesh(file)
+    # TODO: This can be better, but needs changes upstream in Mittsu to allow loaders to parse from an IO object
+    loader(file)&.new&.parse(file.attachment.read)
+  end
 end

app/models/model_file.rb

@@ -178,12 +178,6 @@ def scene
     end
   end
 
-  def mesh
-    # TODO: This can be better, but needs changes upstream in Mittsu to allow loaders to parse from an IO object
-    loader&.new&.parse(attachment.read)
-  end
-  memoize :mesh
-
   def reattach!
     if attachment.id != path_within_library || attachment.storage_key != model.library.storage_key
       old_path = attachment.id
@@ -201,7 +195,7 @@ def convert_later(format, delay: 0.seconds)
   end
 
   def loadable?
-    loader.present?
+    true
   end
 
   delegate :manifold?, to: :mesh
@@ -269,15 +263,6 @@ def presupported_version_is_presupported
     end
   end
 
-  def loader
-    case extension
-    when "stl"
-      Mittsu::STLLoader
-    when "obj"
-      Mittsu::OBJLoader
-    end
-  end
-
   def clear_presupported_relation
     unsupported_version&.update presupported_version: nil
   end

spec/jobs/analysis/geometric_analysis_job_spec.rb

@@ -10,41 +10,41 @@
   end
 
   before do
-    allow(file).to receive(:mesh).and_return(mesh)
+    allow(described_class).to receive(:load_mesh).with(file).and_return(mesh)
     allow(ModelFile).to receive(:find).and_call_original
     allow(ModelFile).to receive(:find).with(file.id).and_return(file)
     allow(SiteSettings).to receive(:analyse_manifold).and_return(true)
   end
 
   it "does not create Problems for a good mesh" do
-    allow(file).to receive(:mesh).and_return(mesh)
+    allow(described_class).to receive(:load_mesh).with(file).and_return(mesh)
     expect { described_class.perform_now(file.id) }.not_to change(Problem, :count)
   end
 
   it "creates a Problem for a non-manifold mesh" do # rubocop:todo RSpec/MultipleExpectations
     allow(mesh).to receive(:manifold?).and_return(false)
-    allow(file).to receive(:mesh).and_return(mesh)
+    allow(described_class).to receive(:load_mesh).with(file).and_return(mesh)
     expect { described_class.perform_now(file.id) }.to change(Problem, :count).from(0).to(1)
     expect(Problem.first.category).to eq "non_manifold"
   end
 
   it "removes a manifold problem if the mesh is OK" do
-    allow(file).to receive(:mesh).and_return(mesh)
+    allow(described_class).to receive(:load_mesh).with(file).and_return(mesh)
     create(:problem, problematic: file, category: :non_manifold)
     expect { described_class.perform_now(file.id) }.to change(Problem, :count).from(1).to(0)
   end
 
   it "creates a Problem for an inside-out mesh" do # rubocop:todo RSpec/MultipleExpectations
     pending "not currently working reliably"
     allow(mesh).to receive(:solid?).and_return(false)
-    allow(file).to receive(:mesh).and_return(mesh)
+    allow(described_class).to receive(:load_mesh).with(file).and_return(mesh)
     expect { described_class.perform_now(file.id) }.to change(Problem, :count).from(0).to(1)
     expect(Problem.first.category).to eq "inside_out"
   end
 
   it "removes an inside-out problem if the mesh is OK" do
     pending "not currently working reliably"
-    allow(file).to receive(:mesh).and_return(mesh)
+    allow(described_class).to receive(:load_mesh).with(file).and_return(mesh)
     create(:problem, problematic: file, category: :inside_out)
     expect { described_class.perform_now(file.id) }.to change(Problem, :count).from(1).to(0)
   end