antw-dyno 0.1.2 → 0.1.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 2
+:patch: 3
 :major: 0

data/lib/dyno/parsers/gtr2_parser.rb

@@ -3,7 +3,7 @@ module Dyno::Parsers
   # Parses a Race 07 results file which are almost identical to Race 07 files.
   #
   class GTR2Parser < Race07Parser
-    def self.parse_file( filename )
+    def self.parse_file( filename, mode = :race )
       # GTR2 files start with a line which isn't valid INI; remove it.
       parse( IniParse.parse(
         File.read( filename ).sub!(/^.*\n/, '')

data/lib/dyno/parsers/race07_parser.rb

@@ -7,10 +7,14 @@ module Dyno::Parsers
     ##
     # Takes a file path and parses it.
     #
-    # @param [String] filename The path to the results file.
+    # @param [String] filename
+    #   The path to the results file.
+    # @param [Symbol] mode
+    #   The order in which competitors should be ordered. Race mode uses the
+    #   normal means, while :lap will order by their fastest lap.
     #
-    def self.parse_file( filename )
-      parse( IniParse.open( filename ) )
+    def self.parse_file( filename, mode = :race )
+      parse( IniParse.open( filename ), mode )
     end
 
     ##
@@ -20,8 +24,8 @@ module Dyno::Parsers
     # @param  [IniParse::Document] results The results.
     # @return [Dyno::Event]
     #
-    def self.parse( results )
-      new( results ).parse
+    def self.parse( results, mode = :race )
+      new( results, mode ).parse
     end
 
     ##
@@ -42,8 +46,8 @@ module Dyno::Parsers
     #
     # @param [IniParse::Document] results The results.
     #
-    def initialize( results )
-      @raw = results
+    def initialize( results, mode = :race )
+      @raw, @mode = results, mode
     end
 
     ##
@@ -105,9 +109,16 @@ module Dyno::Parsers
         end
       end
 
-      # Sort finished competitors by their race time, lowest (P1) first.
-      finished_competitors = finished_competitors.sort_by do |c|
-        [ - c.laps, c.race_time ]
+      if @mode == :race
+        # Sort finished competitors by their race time, lowest (P1) first.
+        finished_competitors = finished_competitors.sort_by do |c|
+          [ - c.laps, c.race_time ]
+        end
+      else
+        # Sort finished competitors by their best lap time.
+        finished_competitors = finished_competitors.sort_by do |c|
+          c.best_lap
+        end
       end
 
       # ... and DNF'ed competitors by how many laps they've done.

data/lib/dyno/parsers/rfactor_parser.rb

@@ -8,9 +8,8 @@ module Dyno::Parsers
     #
     # @param [String] filename The path to the results file.
     #
-    def self.parse_file( filename )
-      xmlparser = LibXML::XML::Parser.new
-      xmlparser.file = filename
+    def self.parse_file( filename, mode = nil )
+      xmlparser = LibXML::XML::Parser.file( filename )
       parse( xmlparser.parse )
     end
 
@@ -21,7 +20,7 @@ module Dyno::Parsers
     # @param  [LibXML::XML::Document] results The results.
     # @return [Dyno::Event]
     #
-    def self.parse( results )
+    def self.parse( results, mode = nil )
       new( results ).parse
     end
 

data/spec/parsers/race07_parser_spec.rb

@@ -119,27 +119,6 @@ describe Dyno::Parsers::Race07Parser do
       ]
     end
 
-    it 'should correctly sort drivers by their finishing time, and assign their position' do
-      event = Dyno::Parsers::Race07Parser.parse_file(
-        'spec/fixtures/race07/full.ini'
-      )
-
-      event.competitors[0].name.should == 'Gabriel Lloyd'
-      event.competitors[0].position.should == 1
-
-      event.competitors[1].name.should == 'Jerry Lalich'
-      event.competitors[1].position.should == 2
-
-      event.competitors[2].name.should == 'Mark Voss'
-      event.competitors[2].position.should == 3
-
-      event.competitors[3].name.should == 'Corey Ball'
-      event.competitors[3].position.should == 4
-
-      event.competitors[4].name.should == 'Reino Lintula'
-      event.competitors[4].position.should == 5
-    end
-
     it 'should set a competitor as "did not finish" when necessary' do
       Dyno::Parsers::Race07Parser.parse_file(
         'spec/fixtures/race07/single_driver_dnf.ini'
@@ -151,5 +130,54 @@ describe Dyno::Parsers::Race07Parser do
         'spec/fixtures/race07/single_driver_dsq.ini'
       ).competitors[0].should be_dsq
     end
+
+    describe 'when in race mode' do
+      it 'should sort drivers by their finishing time, and assign '\
+         'their position' do
+        event = Dyno::Parsers::Race07Parser.parse_file(
+          'spec/fixtures/race07/full.ini'
+        )
+
+        event.competitors[0].name.should == 'Gabriel Lloyd'
+        event.competitors[0].position.should == 1
+
+        event.competitors[1].name.should == 'Jerry Lalich'
+        event.competitors[1].position.should == 2
+
+        event.competitors[2].name.should == 'Mark Voss'
+        event.competitors[2].position.should == 3
+
+        event.competitors[3].name.should == 'Corey Ball'
+        event.competitors[3].position.should == 4
+
+        event.competitors[4].name.should == 'Reino Lintula'
+        event.competitors[4].position.should == 5
+      end
+    end
+
+    describe 'when in lap mode' do
+      it 'should sort drivers by their fastest lap, and assign their ' \
+         'position' do
+        event = Dyno::Parsers::Race07Parser.parse_file(
+          'spec/fixtures/race07/full.ini', :lap
+        )
+
+        event.competitors[0].name.should == 'Jerry Lalich'
+        event.competitors[0].position.should == 1
+
+        event.competitors[1].name.should == 'Gabriel Lloyd'
+        event.competitors[1].position.should == 2
+
+        event.competitors[2].name.should == 'Mark Voss'
+        event.competitors[2].position.should == 3
+
+        event.competitors[3].name.should == 'Corey Ball'
+        event.competitors[3].position.should == 4
+
+        event.competitors[4].name.should == 'Reino Lintula'
+        event.competitors[4].position.should == 5
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: antw-dyno
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Anthony Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-08 00:00:00 -07:00
+date: 2009-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency