Clean

jeffli678 · Oct 27, 2014 · 953d05f · 953d05f
1 parent 73ec129
commit 953d05f
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/pedometer/models/upload.rb b/pedometer/models/upload.rb
@@ -11,6 +11,8 @@ class Upload
 
   def initialize(file_path)
     @file_path = file_path
+    @user_params = file_name.first.split('-')
+    @trial_params = file_name.last.split('-')
   end
 
   # -- Class Methods --------------------------------------------------------
@@ -46,20 +48,10 @@ def self.all
     file_paths.map { |file_path| self.new(file_path) }
   end
 
-  # -- Instance Methods -----------------------------------------------------
-
-  def user_params
-    file_name.first.split('-')
-  end
-
-  def trial_params
-    file_name.last.split('-')
-  end
-
 private
 
   def file_name
-    @file_name ||= file_path.split('/').last.split('.txt').first.split('_')
+    @file_name ||= @file_path.split('/').last.split('.txt').first.split('_')
   end
 
 end