Merge remote-tracking branch 'upstream/pull/3121'

[rails.git] / lib / gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 1a1d0b99659aa8be2f0c09c80a56cb877da2aac8..86cf2f49dab377fcaccde84920866430af8ffbc2 100644 (file)
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -37,15 +37,15 @@ module GPX
     end
 
     def points(&block)
-      return enum_for(:points) unless block_given?
+      return enum_for(:points) unless block
 
       @possible_points = 0
       @actual_points = 0
       @tracksegs = 0
 
       begin
-        Archive::Reader.open_filename(@file).each_entry_with_data do |_entry, data|
-          parse_file(XML::Reader.string(data), &block)
+        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)