f1results 0.6 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b051ec7bbb7427df68b608f368ec9da378563ad
-  data.tar.gz: 7e0c83eaae83f0f033c0bd6137819b6d9f2e5fed
+  metadata.gz: 20e8936ca3cd5baf306ab90eb7ba9e6324c275f6
+  data.tar.gz: 6c019079bb2e03f2e55cd45616f27c64236160ab
 SHA512:
-  metadata.gz: 81e62187f6284f0a4449a31ca52e676b390e1dbb1ecbe946074f1020b139be6f628a2caee888582ec18ebb2ba0fb959ccbeff78a1adcd24a1c1565e76a046a32
-  data.tar.gz: b69492c988f8047988587a10097f0577ea3be5b8a19b6e3614249040f6917e3e092120361e97d848be6ffa0e2169153df71ff702d54d73882588e1e5ef0feb7d
+  metadata.gz: 3512907a131f27c0d834016b79061e342dc3a93d30bd2288544ba2109dd1bd13c1e0455bbdc72063c19387ebb7974c7c01d2d13e53fe1a2d942064403c7604fc
+  data.tar.gz: 81d89f42b758c3a673b0cedbe231150aef324bf22491a1da822b7aa0a4ac0cb8e7ae872734201f1b911b8a00e428bb5bc3117cf6c8328bf5ef9ea781c9d32883

data/bin/f1results

@@ -12,7 +12,7 @@ url        = nil
 
 optparse = OptionParser.new do |opts|
   opts.on('-y', '--year=YEAR', Integer)      { |val| year = val }
-  opts.on('-c', '--country=COUNTRY', String) { |val| country = val.downcase }
+  opts.on('-c', '--country=COUNTRY', String) { |val| country = val.titleize }
   opts.on('-e', '--event=EVENT', String)     { |val| event_type = val.downcase.to_sym }
   opts.on('-u', '--url=URL', String)         { |val| url = val }
   opts.parse!
@@ -24,33 +24,39 @@ begin
   else
     F1Results.fetch_with_url(url)
   end
-rescue
-  event_summary = url || "#{year} #{country} #{event_type}"
-  puts "No results for #{event_summary}"
+rescue RuntimeError => e
+  puts e
   exit
 end
 
-title = url.nil? ? "#{event.year} #{event.country_name} #{event.type_name}\n#{event.name}" : event.name
+title = url.nil? ? "#{event.year} #{event.country} #{event.type_name}\n#{event.name}" : event.name
 table = Terminal::Table.new title: title, rows: event.to_a
 
 if event.practice?
-  table.headings = %W(Pos Num Driver Team Time Gap Laps)
+  table.headings = %W(Pos No Driver Team Time Gap Laps)
   table.align_column 0, :right
   table.align_column 1, :right
   table.align_column 4, :right
+  table.align_column 5, :right
   table.align_column 6, :right
 
 elsif event.qualifying?
-  table.headings = %W(Pos Driver Team Q1 Q2 Q3 Laps)
+  table.headings = %W(Pos No Driver Team Q1 Q2 Q3 Laps)
   table.align_column 0, :right
+  table.align_column 1, :right
+  table.align_column 4, :right
+  table.align_column 5, :right
   table.align_column 6, :right
+  table.align_column 7, :right
 
 elsif event.race?
-  table.headings = %W(Pos Driver Country Team Time/Retired Points)
+  table.headings = %W(Pos No Driver Team Laps Time/Retired Points)
   table.align_column 0, :right
-  table.align_column 2, :center
+  table.align_column 1, :right
   table.align_column 4, :right
   table.align_column 5, :right
+  table.align_column 6, :right
 end
 
+puts event.results[0].inspect
 puts table

data/lib/f1results.rb

@@ -1,5 +1,6 @@
 require 'f1results/version'
 require 'f1results/agent'
+require 'f1results/parser'
 require 'f1results/event'
 require 'f1results/result'
 
@@ -16,12 +17,12 @@ module F1Results
 
   def self.fetch(year, country, type = :race)
     event = Event.new(year: year, country: country, type: type)
-    event.fetch_results
+    event.get_results
     return event
   end
 
   def self.fetch_with_url(url)
     agent = Agent.new
-    return agent.fetch_results_with_url(url)
+    return agent.get_results_with_url(url)
   end
 end

data/lib/f1results/agent.rb

@@ -2,103 +2,91 @@ require 'mechanize'
 
 module F1Results
   class Agent < ::Mechanize
-    attr_accessor :event
 
-    def initialize(event = nil)
-      if event.nil?
-        @event = F1Results::Event.new
-      else
-        self.event = event
-      end
-      super
-    end
-
-    def fetch_results
-      return fetch_results_with_url(@default_url)
+    def get_url(event)
+      @event = event
+      return url
     end
 
-    def fetch_results_with_url(url)
-      begin
-        get(url)
-        @event.type = parse_event_type if @event.type.nil?
-        @event.country = parse_event_country if @event.country.nil?
-        @event.name = parse_event_title
-        @event.results = parse_event_results
-        return @event
-      rescue Mechanize::ResponseCodeError, Net::HTTPNotFound
-        raise "No results found at #{url}"
-      end
+    def get_results(new_event)
+      @event = new_event
+      event.url ||= url
+      update_results
+      return event
     end
 
-    def event=(event)
-      path = "content/fom-website/en/championship/results/#{event.year}-race-results/#{event.year}-#{event.country_slug}-results/#{event.type_slug}.html"
-      @default_url = ::File.join F1Results::BASEURL, path
-      @event = event
+    def get_results_with_url(new_url)
+      event.url = new_url
+      update_results
+      return event
     end
 
     private
 
-      def parse_event_type
-        return page.parser.xpath('//h1[@class="headline"]').text.strip rescue nil
+      def event
+        @event ||= Event.new
       end
 
-      def parse_event_country
-        return page.parser.xpath('//a[@class="tag-link"]').text.strip.parameterize rescue nil
-      end
-
-      def parse_event_title
-        return page.parser.xpath('//a[contains(@class, "level-0")]').text rescue nil
-      end
-
-      def parse_event_results
-        results = []
-        table = page.parser.xpath('//tbody')
-
-        # Remove driver abbreviation from cell
-        table.xpath('//span[@class="tla"]').each(&:remove)
-
-        # Turn HTML table into an array of arrays
-        data = table.xpath('//tr').map do |row|
-          row.xpath('./td|./th').map do |cell|
-            cell = cell.text.gsub(/[[:space:]]+/, ' ').strip
-            cell.blank? ? nil : cell
-          end
+      def url
+        base_path = "content/fom-website/en/results.html/#{event.year}/"
+        year_url = URI.join F1Results::BASEURL, base_path, 'races.html'
+        begin
+          get(year_url)
+        rescue Mechanize::ResponseCodeError, Net::HTTPNotFound
+          raise "No results found for #{event.year}"
         end
 
-        # Remove rows that have the cell "Q1 107% Time"
-        regex = /107%/
-        data.reject! { |row| row.any? { |cell| regex =~ cell } }
+        file_name = html_file_name
+        key = meeting_key
 
-        header = parse_table_header(data.shift)
+        uri = URI.join F1Results::BASEURL, base_path, "races/#{key}/#{file_name}"
+        return uri.to_s
+      end
 
-        result_class = case
-        when @event.practice?
-          PracticeResult
-        when @event.qualifying?
-          QualifyingResult
-        else
-          RaceResult
+      def update_results
+        begin
+          get(event.url)
+          new_event = Parser.new(page).parse
+          event.results = new_event.results
+          event.type ||= new_event.type
+          event.country ||= new_event.country
+          event.name ||= new_event.name
+        rescue Mechanize::ResponseCodeError, Net::HTTPNotFound
+          raise "No results found at #{url}"
         end
+      end
 
-        data.each_with_index do |row, i|
-          hash = Hash[header.zip(row)]
-          hash[:index] = i
-
-          result = result_class.new(hash)
-          results << result
+      def meeting_key
+        country = event.country.parameterize
+        options = page.parser.xpath('//select[@name="meetingKey"]/option')
+        meeting_key_node = options.detect do |node|
+          node.attr('value') =~ /^\d+\/#{country}/ || node.text.parameterize =~ /#{country}/
         end
-
-        return results
+        raise "No country '#{event.country}' found for #{event.year}" if meeting_key_node.nil?
+        return meeting_key_node.attr('value')
       end
 
-      # Turn array of words to symbols
-      def parse_table_header(header)
-        header.map do |cell|
-          # Fix i18n cells that look like this
-          # {'Position' @ i18n}, {'Driver' @ i18n}, ...
-          cell = cell.match(/(')(.+)(')/)[2] if /i18n/ =~ cell
-          cell.to_s.strip.parameterize('_').to_sym
+      def html_file_name
+        result_types = {}
+        page.parser.xpath('//a[@data-name="resultType"]').each do |node|
+          key = node.text.parameterize('_').to_sym
+          value = node.attr('data-value')
+          result_types[key] = value
         end
+
+        # TODO: add support for Starting Grid, Warm Up, Pit Stop Summary, Fastest Laps
+        file_name = case
+        when event.race?
+          'race-result'
+        when event.qualifying?
+          result_types[:qualifying] || result_types[:overall_qualifying]
+        when event.practice?
+          event.type_name.parameterize
+        else
+          raise "No results for event type '#{event.type}' at #{event.year} #{event.country}"
+        end
+        return file_name + '.html'
       end
+
   end
 end

data/lib/f1results/event.rb

@@ -2,7 +2,7 @@ require 'active_support/core_ext/string'
 
 module F1Results
   class Event
-    attr_accessor :year, :country, :type, :name, :results
+    attr_accessor :year, :country, :country_slug, :type, :name, :results, :url
 
     TYPE_ALIASES = {
       p1: :practice1,
@@ -17,14 +17,6 @@ module F1Results
       args.each { |k,v| send("#{k}=", v) }
     end
 
-    def country_name
-      @country.to_s.titleize
-    end
-
-    def country_slug
-      @country.to_s.parameterize
-    end
-
     def type=(type)
       type = type.to_s.downcase.gsub(' ', '').to_sym
       @type = TYPE_ALIASES[type] || type
@@ -55,21 +47,25 @@ module F1Results
       @results.map(&:to_a)
     end
 
-    def winner
-      @results.first.driver
+    def [](i)
+      @results[i]
+    end
+
+    def winning
+      self[0]
     end
 
-    def loser
-      @results.last.driver
+    def losing
+      self[-1]
     end
 
-    def fetch_results
-      agent = F1Results::Agent.new(self)
-      agent.fetch_results
+    def get_results
+      agent = F1Results::Agent.new
+      agent.get_results(self)
     end
 
-    def fetch_results_with_url(url)
-      agent = F1Results::Agent.new(self)
+    def get_results_with_url(url)
+      agent = F1Results::Agent.new
       agent.fetch_results_with_url(url)
     end
   end

data/lib/f1results/parser.rb

@@ -0,0 +1,87 @@
+module F1Results
+  class Parser
+    def initialize(page)
+      @page = page
+      @event = Event.new
+    end
+
+    def parse
+      @event.name = event_name
+      @event.type = event_type
+      @event.country = event_country
+      @event.results = event_results
+      # TODO: date
+      return @event
+    end
+
+    private
+
+      def event_name
+        # TODO: make helper method for .gsub(/[[:space:]]+/, ' ').strip
+        return @page.parser.xpath('//title').text
+          .gsub(/[[:space:]]+/, ' ').strip
+      end
+
+      def event_type
+        if match = @event.name.match(/(?:.+) - (.+)/)
+          result_title = match[1]
+            .gsub(/(?<=RACE )RESULT/, '')
+            .gsub(/OVERALL(?= QUALIFYING)/, '')
+            .gsub(/(?<=PRACTICE)( )(?=[1|2|3])/, '')
+            .parameterize('_')
+          return result_title.to_sym
+        else
+          return nil
+        end
+      end
+
+      def event_country
+        node = @page.parser.at_xpath('//select[@name="meetingKey"]/option[@selected]')
+        slug = node.attr('value').split('/')[-1]
+        text = node.text
+        return text
+      end
+
+      def event_results
+        results = []
+        table = @page.parser.xpath('//tbody')
+
+        # Remove driver abbreviation from driver cell
+        table.xpath('//span[@class="uppercase hide-for-desktop"]').each(&:remove)
+
+        # Turn HTML table into an array of arrays
+        data = table.xpath('//tr').map do |row|
+          row.xpath('./td|./th').map do |cell|
+            cell = cell.text.gsub(/[[:space:]]+/, ' ').strip
+            cell.blank? ? nil : cell
+          end
+        end
+
+        # Shift top row of table and convert cell text into symbols
+        header = data.shift.map do |cell|
+          cell.to_s.parameterize('_').to_sym
+        end
+
+        # Set result class type
+        result_class = case
+        when @event.practice?
+          PracticeResult
+        when @event.qualifying?
+          QualifyingResult
+        else
+          RaceResult
+        end
+
+        # Make each table row a Result
+        data.each_with_index do |row, i|
+          hash = Hash[header.zip(row)]
+          hash[:position] = i + 1
+
+          result = result_class.new(hash)
+          results << result
+        end
+
+        return results
+      end
+  end
+end

data/lib/f1results/result.rb

@@ -1,15 +1,10 @@
 module F1Results
   class Result
-    attr_accessor :index, :position, :driver, :driver_number, :driver_country_abbr, :team, :time, :gap, :laps
+    attr_accessor :position, :driver, :driver_number, :driver_country_abbr, :team, :time, :gap, :laps
+    attr_reader :position_name
 
-    alias :p=         :position=
-    alias :pos=       :position=
-    alias :name=      :driver=
-    alias :no=        :driver_number=
-    alias :country=   :driver_country_abbr=
-    alias :best_time= :time=
-    alias :race_time= :time=
-    alias :fastest=   :time=
+    alias_method :no=,  :driver_number=
+    alias_method :car=, :team=
 
     def initialize(args = {})
       args.each do |k, v|
@@ -18,16 +13,18 @@ module F1Results
       end
     end
 
-    def position=(n)
-      @position = case
+    def position_name=(n)
+      @position_name = case
       when n.to_s.empty?
         nil
       when n.to_i == 0
         n
       else
-        n.to_i
+        @position = n.to_i
       end
     end
+    alias_method :p=,   :position_name=
+    alias_method :pos=, :position_name=
 
     def driver_number
       @driver_number.to_i == 0 ? nil : @driver_number.to_i
@@ -38,35 +35,42 @@ module F1Results
     end
 
     def gap
+      # TODO: parse gap properly
       @gap.to_f == 0.0 ? nil : @gap.to_f
     end
   end
 
   class PracticeResult < Result
     def to_a
-      [position, driver_number, driver, team, time, gap, laps]
+      [position_name, driver_number, driver, team, time, gap, laps]
     end
+
+    # TODO: to_h, to_s
   end
 
   class QualifyingResult < Result
     attr_accessor :q1, :q2, :q3
 
     def to_a
-      [position, driver, team, q1, q2, q3, laps]
+      [position_name, driver_number, driver, team, q1, q2, q3, laps]
+    end
+
+    def q1
+      @time || @q1
     end
 
     def time
-      q3 || q2 || q1
+      @q3 || @q2 || @q1 || @time
     end
   end
 
   class RaceResult < Result
     attr_accessor :retired, :points
 
-    alias :points_awarded= :points=
+    alias_method :pts=, :points=
 
     def to_a
-      [position, driver, driver_country_abbr, team, time_or_retired, points]
+      [position_name, driver_number, driver, team, laps, time_or_retired, points]
     end
 
     def time_or_retired=(str)
@@ -76,6 +80,7 @@ module F1Results
         @retired = str
       end
     end
+    alias_method :time_retired=, :time_or_retired=
 
     def time_or_retired
       time || retired
@@ -85,4 +90,7 @@ module F1Results
       @points.to_i
     end
   end
+
+  # TODO: PitStop < Result
+  # TODO: FastestLap < Result
 end

data/lib/f1results/version.rb

@@ -1,3 +1,3 @@
 module F1Results
-  VERSION = '0.6'
+  VERSION = '2.0'
 end

data/test/agent_test.rb

@@ -7,68 +7,77 @@ class AgentTest < MiniTest::Test
     @agent = F1Results::Agent.new
   end
 
-  def test_get_event_2015_australia_race
-    event = F1Results::Event.new(year: 2015, country: 'Australia', type: :race)
-    @agent.event = event
-    @agent.fetch_results
-    assert_equal '2015 FORMULA 1 ROLEX AUSTRALIAN GRAND PRIX', event.name
-    assert_equal 17, event.results.length
-    assert_equal 'Lewis Hamilton', event.winner
-    assert_equal 'Kevin Magnussen', event.loser
+  def test_get_url_2016_australia_practice1
+    event = F1Results::Event.new(year: 2016, country: 'Australia', type: :practice1)
+    url = 'http://www.formula1.com/content/fom-website/en/results.html/2016/races/938/australia/practice-1.html'
+    assert_equal url, @agent.get_url(event)
   end
 
-  def test_get_event_2015_australia_qualifying
-    event = F1Results::Event.new(year: 2015, country: 'Australia', type: :qualifying)
-    @agent.event = event
-    @agent.fetch_results
-    assert_equal '2015 FORMULA 1 ROLEX AUSTRALIAN GRAND PRIX', event.name
-    assert_equal 20, event.results.length
-    assert_equal 'Lewis Hamilton', event.winner
-    assert_equal 'Roberto Merhi', event.loser
+  def test_get_url_2016_australia_qualifying
+    event = F1Results::Event.new(year: 2016, country: 'Australia', type: :qualifying)
+    url = 'http://www.formula1.com/content/fom-website/en/results.html/2016/races/938/australia/qualifying.html'
+    assert_equal url, @agent.get_url(event)
   end
 
-  def test_get_event_2015_australia_practice1
-    event = F1Results::Event.new(year: 2015, country: 'Australia', type: :practice1)
-    @agent.event = event
-    @agent.fetch_results
-    assert_equal '2015 FORMULA 1 ROLEX AUSTRALIAN GRAND PRIX', event.name
-    assert_equal 16, event.results.length
-    assert_equal 'Nico Rosberg', event.winner
-    assert_equal 'Romain Grosjean', event.loser
+  def test_get_url_2016_australia_race
+    event = F1Results::Event.new(year: 2016, country: 'Australia', type: :race)
+    url = 'http://www.formula1.com/content/fom-website/en/results.html/2016/races/938/australia/race-result.html'
+    assert_equal url, @agent.get_url(event)
   end
 
-  def test_get_event_2015_malaysia_practice2
-    event = F1Results::Event.new(year: 2015, country: 'Malaysia', type: :practice2)
-    @agent.event = event
-    @agent.fetch_results
-    assert_equal '2015 FORMULA 1 PETRONAS MALAYSIA GRAND PRIX', event.name
-    assert_equal 20, event.results.length
-    assert_equal 'Lewis Hamilton', event.winner
-    assert_equal 'Roberto Merhi', event.loser
+  def test_get_url_1984_brazil_qualifying
+    event = F1Results::Event.new(year: 1984, country: 'Brazil', type: :qualifying)
+    url = 'http://www.formula1.com/content/fom-website/en/results.html/1984/races/466/brazil/qualifying-0.html'
+    assert_equal url, @agent.get_url(event)
   end
 
-  def test_fetch_results_2015_hungary_race
-    event = @agent.fetch_results_with_url('http://www.formula1.com/content/fom-website/en/championship/results/2015-race-results/2015-Hungary-results/race.html')
-    assert_equal 'FORMULA 1 PIRELLI MAGYAR NAGYDÍJ 2015', event.name
-    assert_equal 'hungary', event.country
-    assert event.race?
-    assert_equal 20, event.results.length
-    assert_equal 'Sebastian Vettel', event.winner
-    assert_equal 'Nico Hulkenberg', event.loser
+  def test_get_url_1984_brazil_race
+    event = F1Results::Event.new(year: 1984, country: 'Brazil', type: :race)
+    url = 'http://www.formula1.com/content/fom-website/en/results.html/1984/races/466/brazil/race-result.html'
+    assert_equal url, @agent.get_url(event)
   end
 
-  def test_get_event_with_bad_year
-    assert_raises RuntimeError do
+  def test_get_url_1950_indianapolis_500_qualifying
+    event = F1Results::Event.new(year: 1950, country: 'United States', type: :qualifying)
+    url = 'http://www.formula1.com/content/fom-website/en/results.html/1950/races/96/indianapolis-500/qualifying-0.html'
+    assert_equal url, @agent.get_url(event)
+  end
+
+  def test_get_url_1950_indianapolis_500_race
+    event = F1Results::Event.new(year: 1950, country: 'United States', type: :race)
+    url = 'http://www.formula1.com/content/fom-website/en/results.html/1950/races/96/indianapolis-500/race-result.html'
+    assert_equal url, @agent.get_url(event)
+  end
+
+  def test_get_results_1950_indianapolis_500_race
+    event = F1Results::Event.new(year: 1950, country: 'United States', type: :race)
+    event = @agent.get_results(event)
+    assert_equal 36, event.results.length
+  end
+
+  def test_api
+    event = F1Results.fetch(1950, 'United States', :race)
+    assert_equal 36, event.results.length
+  end
+
+  def test_event_with_bad_year
+    assert_raise_with_message RuntimeError, 'No results found for 1900' do
       event = F1Results::Event.new(year: 1900, country: 'Australia', type: :race)
-      @agent.event = event
-      @agent.fetch_results
+      @agent.get_url(event)
+    end
+  end
+
+  def test_event_with_bad_grand_prix
+    assert_raise_with_message RuntimeError, "No country 'New Zealand' found for 2016" do
+      event = F1Results::Event.new(year: 2016, country: 'New Zealand', type: :race)
+      @agent.get_url(event)
     end
   end
 
-  def test_get_event_with_bad_grand_prix
-    assert_raises RuntimeError do
-      event = F1Results::Event.new(year: 2015, country: 'New Zealand', type: :race)
-      event.fetch_results
+  def test_event_with_bad_event_name
+    assert_raise_with_message RuntimeError, "No results for event type 'practice4' at 2016 Australia" do
+      event = F1Results::Event.new(year: 2016, country: 'Australia', type: :practice4)
+      @agent.get_url(event)
     end
   end
 end

data/test/event_test.rb

@@ -49,11 +49,6 @@ class EventTest < MiniTest::Test
     refute @event.practice?
   end
 
-  def test_country_name
-    @event.country = 'great britain'
-    assert_equal 'Great Britain', @event.country_name
-  end
-
   def test_to_array
     @event.results << F1Results::RaceResult.new(position: 1, driver: 'Mark Webber', driver_country_abbr: 'AUS', team: 'Red Bull Racing-Renault', time: '1:25:11.288', points: 2)
     @event.results << F1Results::RaceResult.new(position: 2, driver: 'Fernando Alonso', driver_country_abbr: 'ESP', team: 'Ferrari', time: '+3.0 secs', points: 1)

data/test/parser_test.rb

@@ -0,0 +1,76 @@
+require 'test_helper'
+
+class ParserTest < MiniTest::Test
+  include Fixtures
+
+  def test_2016_australia_practice1
+    event = events(:'2016_australia_practice_1')
+    assert_equal '2016 FORMULA 1 ROLEX AUSTRALIAN GRAND PRIX - PRACTICE 1', event.name
+    assert_equal 'Australia', event.country
+    assert_equal :practice1, event.type
+    assert_equal 22, event.results.length
+    assert_equal 'Lewis Hamilton', event.winning.driver
+    assert_equal 'Carlos Sainz', event.losing.driver
+  end
+
+  def test_2016_australia_qualifying
+    event = events(:'2016_australia_qualifying')
+    assert_equal '2016 FORMULA 1 ROLEX AUSTRALIAN GRAND PRIX - QUALIFYING', event.name
+    assert_equal 'Australia', event.country
+    assert_equal :qualifying, event.type
+    assert_equal 22, event.results.length
+    assert_equal 'Lewis Hamilton', event.winning.driver
+    assert_equal 'Pascal Wehrlein', event.losing.driver
+  end
+
+  def test_2016_australia_race
+    event = events(:'2016_australia_race_result')
+    assert_equal '2016 FORMULA 1 ROLEX AUSTRALIAN GRAND PRIX - RACE RESULT', event.name
+    assert_equal 'Australia', event.country
+    assert_equal :race, event.type
+    assert_equal 22, event.results.length
+    assert_equal 'Nico Rosberg', event.winning.driver
+    assert_equal 'Daniil Kvyat', event.losing.driver
+  end
+
+  def test_1984_brazil_qualifying
+    event = events(:'1984_brazil_qualifying_0')
+    assert_equal 'Brazilian Grand Prix 1984 - OVERALL QUALIFYING', event.name
+    assert_equal 'Brazil', event.country
+    assert_equal :qualifying, event.type
+    assert_equal 24, event.results.length
+    assert_equal 'Elio de Angelis', event.winning.driver
+    assert_equal 'Jonathan Palmer', event.losing.driver
+  end
+
+  def test_1984_brazil_race
+    event = events(:'1984_brazil_race_result')
+    assert_equal 'Brazilian Grand Prix 1984 - RACE RESULT', event.name
+    assert_equal 'Brazil', event.country
+    assert_equal :race, event.type
+    assert_equal 24, event.results.length
+    assert_equal 'Alain Prost', event.winning.driver
+    assert_equal 'Ayrton Senna', event.losing.driver
+  end
+
+  def test_1950_indianapolis_500_qualifying
+    event = events(:'1950_indianapolis_500_qualifying_0')
+    assert_equal '1950 Indianapolis 500 - QUALIFYING', event.name
+    assert_equal 'United States', event.country
+    assert_equal :qualifying, event.type
+    assert_equal 1, event.results.length
+    assert_equal 'Walt Faulkner', event.winning.driver
+    assert_equal 'Walt Faulkner', event.losing.driver
+  end
+
+  def test_1950_indianapolis_500_race
+    event = events(:'1950_indianapolis_500_race_result')
+    assert_equal '1950 Indianapolis 500 - RACE RESULT', event.name
+    assert_equal 'United States', event.country
+    assert_equal :race, event.type
+    # Note: 3 ties, so 36 finishers, 33 positions in this race
+    assert_equal 36, event.results.length
+    assert_equal 'Johnnie Parsons', event.winning.driver
+    assert_equal 'Duke Dinsmore', event.losing.driver
+  end
+end

data/test/result_test.rb

@@ -30,31 +30,34 @@ class ResultTest < MiniTest::Test
   end
 
   def test_parse_practice
-    result = F1Results::PracticeResult.new(position: '4', driver: 'Carlos Sainz', team: 'Toro Rosso', time: '1:31.014', laps:	'32')
-    assert_equal 4, result.position
-    assert_equal 'Carlos Sainz', result.driver
-    assert_equal 'Toro Rosso', result.team
-    assert_equal '1:31.014', result.time
-    assert_equal 32, result.laps
+    hash = { pos: '2', no: '26', driver: 'Daniil Kvyat', car: 'Red Bull Racing TAG Heuer', time: '1:30.146', gap: '+0.421s', laps: '14' }
+    result = F1Results::PracticeResult.new hash
+    assert_equal 2, result.position
+    assert_equal 'Daniil Kvyat', result.driver
+    assert_equal 'Red Bull Racing TAG Heuer', result.team
+    assert_equal '1:30.146', result.time
+    assert_equal 14, result.laps
   end
 
   def test_parse_qualifying
-    result = F1Results::QualifyingResult.new(position: '2', driver: 'Nico Rosberg', team: 'Mercedes', q1: '1:28.906', q2: '1:27.097', q3: '1:26.921', laps: '14')
-    assert_equal 2, result.position
-    assert_equal 'Nico Rosberg', result.driver
-    assert_equal 'Mercedes', result.team
-    assert_equal '1:28.906', result.q1
-    assert_equal '1:27.097', result.q2
-    assert_equal '1:26.921', result.q3
-    assert_equal 14, result.laps
+    hash = { pos: '8', no: '3', driver: 'Daniel Ricciardo', car: 'Red Bull Racing TAG Heuer', q1: '1:26.945', q2: '1:25.599', q3: '1:25.589', laps: '15' }
+    result = F1Results::QualifyingResult.new hash
+    assert_equal 8, result.position
+    assert_equal 'Daniel Ricciardo', result.driver
+    assert_equal 'Red Bull Racing TAG Heuer', result.team
+    assert_equal '1:26.945', result.q1
+    assert_equal '1:25.599', result.q2
+    assert_equal '1:25.589', result.q3
+    assert_equal 15, result.laps
   end
 
   def test_parse_race
-    result = F1Results::RaceResult.new(position: '3', driver: 'Sebastian Vettel', driver_country_abbr: 'GER', team: 'Ferrari', time: '+34.523s', points: '15')
+    hash = { pos: '3', no: '5', driver: 'Sebastian Vettel', car: 'Ferrari', laps: '57', time_retired: '+9.643s', pts: '15' }
+    result = F1Results::RaceResult.new hash
     assert_equal 3, result.position
     assert_equal 'Sebastian Vettel', result.driver
     assert_equal 'Ferrari', result.team
-    assert_equal '+34.523s', result.time
+    assert_equal '+9.643s', result.time
     assert_equal 15, result.points
   end
 
@@ -67,8 +70,9 @@ class ResultTest < MiniTest::Test
   end
 
   def test_race_to_a
-    result = F1Results::RaceResult.new(position: '3', driver: 'Sebastian Vettel', driver_country_abbr: 'GER', team: 'Ferrari', time: '+34.523s', points: '15')
-    assert_equal [3, 'Sebastian Vettel', 'GER', 'Ferrari', '+34.523s', 15], result.to_a
+    hash = { pos: '3', no: '5', driver: 'Sebastian Vettel', car: 'Ferrari', laps: '57', time_retired: '+9.643s', pts: '15' }
+    result = F1Results::RaceResult.new hash
+    assert_equal [3, 5, 'Sebastian Vettel', 'Ferrari', 57, '+9.643s', 15], result.to_a
   end
 
   def test_unknown_key_doesnt_raise_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: f1results
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '2.0'
 platform: ruby
 authors:
 - Darren Jeacocke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -108,10 +108,12 @@ files:
 - lib/f1results.rb
 - lib/f1results/agent.rb
 - lib/f1results/event.rb
+- lib/f1results/parser.rb
 - lib/f1results/result.rb
 - lib/f1results/version.rb
 - test/agent_test.rb
 - test/event_test.rb
+- test/parser_test.rb
 - test/result_test.rb
 homepage: https://github.com/daz/f1results
 licenses: