Avoid using generic variable name file

dessy · dessy · commit a5f414bc9873 · 2014-04-13T19:07:11.000-04:00
diff --git a/pedometer/pedometer.rb b/pedometer/pedometer.rb
@@ -12,7 +12,6 @@
 include FileUtils::Verbose
 
 # TODO
-# - file as a variable name is a little too generic. Maybe file_name, or file_object.
 # - Is file sanitized here? We don't want to be passing around untrusted data, especially not if it's touching the filesystem.
 post '/create' do
   begin
@@ -38,12 +37,12 @@
   end
 
   @data = []
-  files = Dir.glob(File.join('public/uploads', "*"))
-  files.each do |file|
-    user_params, device_params = FileHelper.parse_file_name(file)
-    build_with_params(File.read(file), user_params, device_params)
+  files_names = Dir.glob(File.join('public/uploads', "*"))
+  files_names.each do |file_name|
+    user_params, device_params = FileHelper.parse_file_name(file_name)
+    build_with_params(File.read(file_name), user_params, device_params)
 
-    @data << {:file => file, :analyzer => @analyzer}
+    @data << {:file_name => file_name, :analyzer => @analyzer}
   end
 
   erb :trials
diff --git a/pedometer/views/trials.erb b/pedometer/views/trials.erb
@@ -13,7 +13,7 @@
     <% @data.each do |h| %>
       <tr>
         <%= erb :summary, :locals => {:analyzer => h[:analyzer]} %>
-        <td><a href=<%= "trial/" + h[:file] %>>Detail</a></td>
+        <td><a href=<%= "trial/" + h[:file_name] %>>Detail</a></td>
       </tr>
     <% end %>
   </table>
