Move logic into Trial

dessy · dessy · commit 06d123945d62 · 2014-05-17T10:34:31.000-04:00
diff --git a/pedometer/chapter.pdf b/pedometer/chapter.pdf
diff --git a/pedometer/models/trial.rb b/pedometer/models/trial.rb
@@ -11,7 +11,6 @@ class Trial
   attr_reader :file_name, :parser, :user, :device, :analyzer
   attr_reader :user_params, :device_params
 
-  # TODO: Set user, device, parser, analyzer here? 
   def initialize(file_name = nil, input_data = nil, user_params = nil, device_params = nil)
     if file_name
       @file_name = file_name
@@ -28,8 +27,7 @@ def initialize(file_name = nil, input_data = nil, user_params = nil, device_para
         "#{device.trial.to_s.gsub(/\s+/, '')}-" + 
         "#{device.method}-#{parser.format[0]}.txt"
     else 
-      # TODO: Blow up and test
-      raise 'TODO: Blow up and tesr'
+      raise 'File name or input data must be passed in.'
     end
   end
 
@@ -50,14 +48,25 @@ def self.create(input_data, user_params, device_params)
     trial
   end
 
-  # -- Instance Methods -----------------------------------------------------
+  # TODO: Make sure to explain this part
+  def self.find_matching_filtered_data(trial)
+    files = Dir.glob(File.join('public/uploads', "*"))
+    files.delete(trial.file_name)
+
+    match = files.select { |f| trial.file_name == f.gsub('-s.', '-c.') }.first
+    match ||= files.select { |f| trial.file_name == f.gsub('-c.', '-s.') }.first
 
-  def data
-    @data ||= File.read(file_name)
+    match_filtered_data = if match
+      parser = Parser.new(File.read(match))
+      parser.filtered_data
+    end
+    match_filtered_data
   end
 
+  # -- Instance Methods -----------------------------------------------------
+
   def parser
-    @parser ||= Parser.new(data)
+    @parser ||= Parser.new(File.read(file_name))
   end
 
   def user
diff --git a/pedometer/pedometer.rb b/pedometer/pedometer.rb
@@ -19,8 +19,7 @@
 
 get '/trial/*' do
   @trial = Trial.find(params[:splat].first)
-
-  set_match_filtered_data
+  @match_filtered_data = Trial.find_matching_filtered_data(@trial)
   
   erb :trial
 end
@@ -34,29 +33,10 @@
       params[:user].values,
       params[:device].values
     )
-
-    set_match_filtered_data
+    @match_filtered_data = Trial.find_matching_filtered_data(@trial)
 
     erb :trial
   rescue Exception => e
     redirect '/trials?error=creation'
   end
 end
-
-# # TODO: MOVE THIS TO TRIAL
-# # - Can you add a comment here to explain what's going on? We spent a few minutes looking at it and couldn't figure it out.
-def set_match_filtered_data
-  files = Dir.glob(File.join('public/uploads', "*"))
-  files.delete(@trial.file_name)
-
-  match = if @trial.parser.is_data_combined?
-    files.select { |f| @trial.file_name == f.gsub('-s.', '-c.') }.first
-  else
-    files.select { |f| @trial.file_name == f.gsub('-c.', '-s.') }.first
-  end
-
-  @match_filtered_data = if match
-    parser = Parser.new(File.read(match))
-    parser.filtered_data
-  end
-end
diff --git a/pedometer/test/unit/trial_test.rb b/pedometer/test/unit/trial_test.rb
@@ -3,6 +3,12 @@
 
 class TrialTest < Test::Unit::TestCase
 
+  def test_new_no_params
+    assert_raise_with_message(RuntimeError, 'File name or input data must be passed in.') do
+      Trial.new
+    end
+  end
+
   def test_all
     trials = Trial.all
     assert (trials.count > 0)
@@ -47,4 +53,17 @@ def test_create
     assert_equal 9, trial.analyzer.steps
   end
 
+  def test_find_matching_filtered_data
+    trial = Trial.find('public/uploads/female-168.0-70.0_100-100-2-walk-c.txt')
+    matching_trial = Trial.find('public/uploads/female-168.0-70.0_100-100-2-walk-s.txt')
+    assert_equal matching_trial.parser.filtered_data, Trial.find_matching_filtered_data(trial)
+
+    trial = Trial.find('public/uploads/female-168.0-70.0_100-100-2-walk-s.txt')
+    matching_trial = Trial.find('public/uploads/female-168.0-70.0_100-100-2-walk-c.txt')
+    assert_equal matching_trial.parser.filtered_data, Trial.find_matching_filtered_data(trial)
+
+    trial = Trial.find('test/data/female-167-70_100-10-1-bagwalk-g.txt')
+    assert_nil Trial.find_matching_filtered_data(trial)
+  end
+
 end
