Add run method to Pipeline

jeffli678 · Nov 4, 2014 · 9d36b55 · 9d36b55
1 parent 00733d8
commit 9d36b55
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/pedometer/models/pipeline.rb b/pedometer/models/pipeline.rb
@@ -6,14 +6,24 @@
 
 class Pipeline
 
-  attr_reader :user, :trial, :parser, :processor, :analyzer
+  attr_reader :file_path, :user, :trial, :parser, :processor, :analyzer
+
+  def self.run(upload)
+    pipeline = Pipeline.new(upload)
+    pipeline.feed
+    pipeline
+  end
 
   def initialize(upload)
+    @file_path = upload.file_path
     @user      = upload.user
     @trial     = upload.trial
-    @parser    = Parser.run(File.read(upload.file_path))
+  end
+
+  def feed
+    @parser    = Parser.run(File.read(@file_path))
     @processor = Processor.run(@parser.parsed_data)
-    @analyzer  = Analyzer.run(@processor.filtered_data, user, trial)
+    @analyzer  = Analyzer.run(@processor.filtered_data, @user, @trial)
   end
 
 end
diff --git a/pedometer/pedometer.rb b/pedometer/pedometer.rb
@@ -7,7 +7,7 @@
 get '/uploads' do
   @error = "A #{params[:error]} error has occurred." if params[:error]
   @pipelines = Upload.all.inject([]) do |a, upload|
-    a << Pipeline.new(upload)
+    a << Pipeline.run(upload)
     a
   end
 
@@ -16,7 +16,7 @@
 
 get '/upload/*' do |file_path|
   upload = Upload.find(file_path)
-  @pipeline = Pipeline.new(upload)
+  @pipeline = Pipeline.run(upload)
 
   erb :upload
 end

diff --git a/pedometer/test/unit/pipeline_test.rb b/pedometer/test/unit/pipeline_test.rb
@@ -7,7 +7,7 @@ class PipelineTest < Test::Unit::TestCase
   def test_new_combined_data
     file_path = 'test/data/female-167-70_1-100-10-bagwalk.txt'
     upload = Upload.find(file_path)
-    pipeline = Pipeline.new(upload)
+    pipeline = Pipeline.run(upload)
 
     assert_equal upload.user, pipeline.user
     assert_equal upload.trial, pipeline.trial
@@ -32,7 +32,7 @@ def test_new_combined_data
   def test_new_separated_data
     file_path = 'test/data/female-167-70_2-100-10-bagwalk.txt'
     upload = Upload.find(file_path)
-    pipeline = Pipeline.new(upload)
+    pipeline = Pipeline.run(upload)
 
     assert_equal upload.user, pipeline.user
     assert_equal upload.trial, pipeline.trial