Replace points method of trace file with read file method

Author: AntonKhorev

app/models/trace.rb

@@ -203,7 +203,7 @@ def import
     logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
 
     file.open do |file|
-      gpx = GPX::File.new(file.path, :maximum_points => Settings.max_trace_size)
+      gpx = GPX::File.new(:maximum_points => Settings.max_trace_size)
 
       f_lat = 0
       f_lon = 0
@@ -212,7 +212,7 @@ def import
       # If there are any existing points for this trace then delete them
       Tracepoint.where(:trace => id).delete_all
 
-      gpx.points.each_slice(1_000) do |points|
+      gpx.read(file.path).each_slice(1_000) do |points|
         # Gather the trace points together for a bulk import
         tracepoints = []
 

lib/gpx.rb

@@ -6,8 +6,7 @@ class File
 
     attr_reader :possible_points, :actual_points, :tracksegs
 
-    def initialize(file, options = {})
-      @file = file
+    def initialize(options = {})
       @maximum_points = options[:maximum_points] || Float::INFINITY
       @possible_points = 0
       @actual_points = 0
@@ -16,19 +15,19 @@ def initialize(file, options = {})
       @lons = []
     end
 
-    def points(&block)
-      return enum_for(:points) unless block
+    def read(file, &block)
+      return enum_for(:read, file) unless block
 
       begin
-        Archive::Reader.open_filename(@file).each_entry_with_data do |entry, data|
+        Archive::Reader.open_filename(file).each_entry_with_data do |entry, data|
           parse_file(XML::Reader.string(data), &block) if entry.regular?
         end
       rescue Archive::Error
-        io = ::File.open(@file)
+        io = ::File.open(file)
 
         case Marcel::MimeType.for(io)
-        when "application/gzip" then io = Zlib::GzipReader.open(@file)
-        when "application/x-bzip" then io = Bzip2::FFI::Reader.open(@file)
+        when "application/gzip" then io = Zlib::GzipReader.open(file)
+        when "application/x-bzip" then io = Bzip2::FFI::Reader.open(file)
         end
 
         parse_file(XML::Reader.io(io, :options => XML::Parser::Options::NOERROR), &block)