f1results 2.0 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 20e8936ca3cd5baf306ab90eb7ba9e6324c275f6
-  data.tar.gz: 6c019079bb2e03f2e55cd45616f27c64236160ab
+SHA256:
+  metadata.gz: aa2c935bee2392688a8b77b2c56668778bb6b84525c3fb6ea4331d5520675d59
+  data.tar.gz: 0a035e5ce0d87d87dad070597b860cdb33e2a32cb77f0c48e5b5f9bf4968f8b8
 SHA512:
-  metadata.gz: 3512907a131f27c0d834016b79061e342dc3a93d30bd2288544ba2109dd1bd13c1e0455bbdc72063c19387ebb7974c7c01d2d13e53fe1a2d942064403c7604fc
-  data.tar.gz: 81d89f42b758c3a673b0cedbe231150aef324bf22491a1da822b7aa0a4ac0cb8e7ae872734201f1b911b8a00e428bb5bc3117cf6c8328bf5ef9ea781c9d32883
+  metadata.gz: 7664c1698d0b058b1e7a2da0889e322869eac9fbc59c3589297690f843e5c4fcb38867b78448aa50aace0f9d73b32ec1415017f78f443d451497d98522c31235
+  data.tar.gz: d5deaedc384e08a0f02434cca1bd1e902c8b276b2bbf4d324ebc4b74ff44c1f51ab6709ea9e6df5ee3e5b1580052da5069b3eefd77ab4a6eea3f21683096a327

data/Rakefile

@@ -1,10 +1,58 @@
-require 'bundler/setup'
-require 'rake'
-require 'rake/testtask'
+require "bundler/setup"
+require "rake"
+require "rake/testtask"
+require "./test/lib/fixtures"
+require "open-uri"
+require "fileutils"
+require "tempfile"
 
 task default: :test
 
 Rake::TestTask.new do |t|
-  t.libs << 'test/lib'
-  t.pattern = 'test/*_test.rb'
+  t.libs << "test/lib"
+  t.pattern = "test/*_test.rb"
+  t.warning = false
 end
+
+def fixture_downloads
+  Fixtures::STUBS.flat_map do |_name, mappings|
+    mappings.filter_map do |path, fixture|
+      next if fixture.is_a?(Integer)
+
+      {
+        url: URI.join(F1Results::BASE_URL, path).to_s,
+        destination: File.join(Fixtures::FIXTURES_DIR, fixture)
+      }
+    end
+  end
+end
+
+namespace :fixtures do
+  desc "List fixture URLs and destinations without downloading them"
+  task :list do
+    fixture_downloads.each do |download|
+      puts "#{download[:url]} => #{download[:destination]}"
+    end
+  end
+
+  desc "Download fixtures from formula1.com"
+  task :download do
+    WebMock.disable!
+    FileUtils.mkdir_p(Fixtures::FIXTURES_DIR)
+
+    fixture_downloads.each do |download|
+      puts "Downloading #{download[:url]} => #{download[:destination]}"
+
+      Tempfile.create(["f1results-fixture-", ".html"], Fixtures::FIXTURES_DIR) do |temporary|
+        URI.open(download[:url]) do |remote_file|
+          IO.copy_stream(remote_file, temporary)
+        end
+        temporary.close
+        FileUtils.mv(temporary.path, download[:destination])
+      end
+    end
+  end
+end
+
+desc "Download fixtures from formula1.com (alias for fixtures:download)"
+task download_fixtures: "fixtures:download"

data/bin/f1results

@@ -3,24 +3,24 @@
 require 'rubygems'
 require 'optparse'
 require 'terminal-table'
-require File.expand_path('../../lib/f1results.rb', __FILE__)
+require_relative '../lib/f1results'
 
 year       = Time.now.year
-country    = ''
+grand_prix = ''
 event_type = :race
 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.titleize }
-  opts.on('-e', '--event=EVENT', String)     { |val| event_type = val.downcase.to_sym }
-  opts.on('-u', '--url=URL', String)         { |val| url = val }
+  opts.on('-y', '--year=YEAR', Integer)          { |val| year = val }
+  opts.on('-g', '--grandprix=GRANDPRIX', String) { |val| grand_prix = val.capitalize }
+  opts.on('-e', '--event=EVENT', String)         { |val| event_type = val.downcase.to_sym }
+  opts.on('-u', '--url=URL', String)             { |val| url = val }
   opts.parse!
 end
 
 begin
   event = if url.nil?
-    F1Results.fetch(year, country, event_type)
+    F1Results.fetch(year, grand_prix, event_type)
   else
     F1Results.fetch_with_url(url)
   end
@@ -29,7 +29,7 @@ rescue RuntimeError => e
   exit
 end
 
-title = url.nil? ? "#{event.year} #{event.country} #{event.type_name}\n#{event.name}" : event.name
+title = url.nil? ? "#{event.year} #{event.grand_prix} #{event.type_name}\n#{event.name}" : event.name
 table = Terminal::Table.new title: title, rows: event.to_a
 
 if event.practice?
@@ -58,5 +58,4 @@ elsif event.race?
   table.align_column 6, :right
 end
 
-puts event.results[0].inspect
 puts table

data/lib/f1results/agent.rb

@@ -2,6 +2,10 @@ require 'mechanize'
 
 module F1Results
   class Agent < ::Mechanize
+    def initialize
+      super
+      self.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
 
     def get_url(event)
       @event = event
@@ -11,13 +15,13 @@ module F1Results
     def get_results(new_event)
       @event = new_event
       event.url ||= url
-      update_results
+      update_event
       return event
     end
 
     def get_results_with_url(new_url)
       event.url = new_url
-      update_results
+      update_event
       return event
     end
 
@@ -28,64 +32,103 @@ module F1Results
       end
 
       def url
-        base_path = "content/fom-website/en/results.html/#{event.year}/"
-        year_url = URI.join F1Results::BASEURL, base_path, 'races.html'
+        base_uri = URI.join F1Results::BASE_URL, "en/results/#{event.year}/"
+        year_uri = URI.join base_uri, 'races'
         begin
-          get(year_url)
+          get(year_uri)
         rescue Mechanize::ResponseCodeError, Net::HTTPNotFound
           raise "No results found for #{event.year}"
         end
 
-        file_name = html_file_name
-        key = meeting_key
+        grand_prix_nodes = page.parser.xpath("//table//tbody/tr/td[1]//a[contains(@href, '/races/')]").map do |a|
+          # Remove SVG icons from the links
+          a2 = a.dup
+          a2.search('.//svg').remove
+          a2
+        end
 
-        uri = URI.join F1Results::BASEURL, base_path, "races/#{key}/#{file_name}"
-        return uri.to_s
-      end
+        grand_prix_node = grand_prix_nodes.find { |node| node.text.strip.downcase == event.grand_prix.downcase }
+        raise "No grand prix '#{event.grand_prix}' found for #{event.year}" if grand_prix_node.nil?
+
+        grand_prix_uri = URI.join base_uri, grand_prix_node.attr('href')
 
-      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
+          get(grand_prix_uri)
         rescue Mechanize::ResponseCodeError, Net::HTTPNotFound
-          raise "No results found at #{url}"
+          raise "Error fetching #{grand_prix_uri}"
         end
-      end
 
-      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}/
+        event_names = {
+          "race result" => :race_result_node,
+          "fastest laps" => :fastest_laps_node,
+          "pit stop summary" => :pit_stop_summary_node,
+          "starting grid" => :starting_grid_node,
+          "overall qualifying" => :overall_qualifying_node,
+          "qualifying" => :qualifying_node,
+          "practice 3" => :practice3_node,
+          "practice 2" => :practice2_node,
+          "practice 1" => :practice1_node,
+          "sprint" => :sprint_node,
+          "sprint grid" => :sprint_grid_node,
+          "sprint qualifying" => :sprint_qualifying_node
+        }
+
+        event_nodes = page.parser.xpath("//menu[@aria-labelledby='sidebar-dropdown']//li/a").map do |a|
+          # Remove SVG icons from the links
+          a2 = a.dup
+          a2.search('.//svg').remove
+          a2
         end
-        raise "No country '#{event.country}' found for #{event.year}" if meeting_key_node.nil?
-        return meeting_key_node.attr('value')
-      end
 
-      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
+        # Create a hash to store the nodes
+        nodes = {}
+        event_names.each do |name, key|
+          nodes[key] = event_nodes.find { |node| node.text.strip.downcase == name }
         end
 
         # TODO: add support for Starting Grid, Warm Up, Pit Stop Summary, Fastest Laps
-        file_name = case
+        node = case
         when event.race?
-          'race-result'
+          nodes[:race_result_node]
         when event.qualifying?
-          result_types[:qualifying] || result_types[:overall_qualifying]
-        when event.practice?
-          event.type_name.parameterize
+          nodes[:qualifying_node] || nodes[:overall_qualifying_node]
+        when event.practice3?
+          nodes[:practice3_node]
+        when event.practice2?
+          nodes[:practice2_node]
+        when event.practice1?
+          nodes[:practice1_node]
         else
-          raise "No results for event type '#{event.type}' at #{event.year} #{event.country}"
+          raise "Unsupported event type '#{event.type}'"
+        end
+
+        raise "No results for event type '#{event.type}' at #{event.year} #{event.grand_prix}" if node.nil?
+
+        uri = URI.join base_uri, node.attr('href')
+        return uri.to_s
+      end
+
+      def update_event
+        begin
+          get(event.url)
+        rescue Mechanize::ResponseCodeError, Net::HTTPNotFound
+          raise "No results found at '#{url}'"
+        end
+
+        new_event = Parser.new(page).parse
+        event.type ||= new_event.type
+        validate_event(new_event)
+
+        event.grand_prix ||= new_event.grand_prix
+        event.circuit ||= new_event.circuit
+        event.name ||= new_event.name
+        event.results = new_event.results
+      end
+
+      def validate_event(new_event)
+        if event.type != new_event.type
+          raise "Results at '#{url}' are returning from '#{new_event.type_name}', not the requested '#{event.type_name}'"
         end
-        return file_name + '.html'
       end
 
   end

data/lib/f1results/event.rb

@@ -1,40 +1,42 @@
-require 'active_support/core_ext/string'
-
 module F1Results
   class Event
-    attr_accessor :year, :country, :country_slug, :type, :name, :results, :url
-
-    TYPE_ALIASES = {
-      p1: :practice1,
-      p2: :practice2,
-      p3: :practice3,
-      q:  :qualifying,
-      r:  :race
-    }
+    attr_accessor :year, :grand_prix, :circuit, :type, :name, :results, :url
 
     def initialize(args = {})
       @results = []
       args.each { |k,v| send("#{k}=", v) }
     end
 
-    def type=(type)
-      type = type.to_s.downcase.gsub(' ', '').to_sym
-      @type = TYPE_ALIASES[type] || type
+    def grand_prix_slug
+      grand_prix.strip.downcase.gsub(/[:space:]+/, '-')
     end
 
-    # Human readable type, e.g. "Practice 1", "Qualifying"
+    # Human readable type, e.g. "Practice 1", "Qualifying", "Starting Grid"
     def type_name
-      @type.to_s.gsub(/\d/, ' \0').capitalize
-    end
-
-    def type_slug
-      type_name.parameterize
+      @type.to_s
+        .gsub(/\d/, ' \0')
+        .gsub('_', ' ')
+        .split(' ')
+        .map(&:capitalize)
+        .join(' ')
     end
 
     def practice?
       /^practice(1|2|3)$/ =~ @type.to_s
     end
 
+    def practice1?
+      @type == :practice1
+    end
+
+    def practice2?
+      @type == :practice2
+    end
+
+    def practice3?
+      @type == :practice3
+    end
+
     def qualifying?
       @type == :qualifying
     end

data/lib/f1results/parser.rb

@@ -8,7 +8,8 @@ module F1Results
     def parse
       @event.name = event_name
       @event.type = event_type
-      @event.country = event_country
+      @event.grand_prix = event_grand_prix
+      @event.circuit = event_circuit
       @event.results = event_results
       # TODO: date
       return @event
@@ -17,49 +18,56 @@ module F1Results
     private
 
       def event_name
-        # TODO: make helper method for .gsub(/[[:space:]]+/, ' ').strip
-        return @page.parser.xpath('//title').text
-          .gsub(/[[:space:]]+/, ' ').strip
+        return @page.parser.at_xpath('//h1').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
+        if m = @event.name.match(/(?:.+) - (.+)/)
+          result = m[1]
+            .gsub(/(?<=RACE )RESULT/i, '')
+            .gsub(/OVERALL(?= QUALIFYING)/i, '')
+            .gsub(/(?<=PRACTICE)( )(?=[1-3])/i, '')
+            .sub(/(?<=QUALIFYING)\s*\d+\z/i, '') # strip numbers for Qualifying
+            .strip
+            .downcase
+          result.to_sym
         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
+      def event_grand_prix
+        node = @page.parser.at_xpath('(//dialog)[3]//a[.//title[text()="Active"]]')
+        node.xpath('.//svg').remove
+
+        return node.text.strip
+      end
+
+      def event_circuit
+        node = @page.parser.at_xpath('//h1/../../../../../div/following-sibling::div[1]//p[2]')
+        return node.text
       end
 
       def event_results
         results = []
-        table = @page.parser.xpath('//tbody')
+        tbody = @page.parser.at_xpath('//tbody')
 
         # Remove driver abbreviation from driver cell
-        table.xpath('//span[@class="uppercase hide-for-desktop"]').each(&:remove)
+        tbody.xpath('.//span[@class="md:hidden"]').each(&:remove)
 
-        # Turn HTML table into an array of arrays
-        data = table.xpath('//tr').map do |row|
+        # Turn HTML tbody into an array of arrays
+        data = tbody.xpath('.//tr').map do |row|
           row.xpath('./td|./th').map do |cell|
             cell = cell.text.gsub(/[[:space:]]+/, ' ').strip
-            cell.blank? ? nil : cell
+            cell.empty? ? 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
+        header = @page.parser.xpath('//thead//th').map do |cell|
+          cell.text.to_s
+            .gsub(/\./, '') # Pos. -> Pos
+            .gsub(/[[:space:]]+/, '')
+            .gsub(/\/.*/, '') # Time/Retired -> Time
+            .downcase
+            .to_sym
         end
 
         # Set result class type

data/lib/f1results/version.rb

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

data/lib/f1results.rb

@@ -1,13 +1,13 @@
-require 'f1results/version'
-require 'f1results/agent'
-require 'f1results/parser'
-require 'f1results/event'
-require 'f1results/result'
+require_relative './f1results/version'
+require_relative './f1results/agent'
+require_relative './f1results/parser'
+require_relative './f1results/event'
+require_relative './f1results/result'
 
 module F1Results
-  BASEURL = 'http://www.formula1.com'
+  BASE_URL = 'https://www.formula1.com/'
 
-  # Get results from formula1.com for a given year, country, and event type
+  # Get results from formula1.com for a given year, grand prix, and event type
   # (race or qualifying)
   #
   #   F1Results.f1results(2010, 'australia', :qualifying)
@@ -15,8 +15,8 @@ module F1Results
   # Returns an `F1Results::Event` object which has a method `results`, which
   # returns multiple objects of type `F1Results::Result`
 
-  def self.fetch(year, country, type = :race)
-    event = Event.new(year: year, country: country, type: type)
+  def self.fetch(year, grand_prix, type = :race)
+    event = Event.new(year: year, grand_prix: grand_prix, type: type)
     event.get_results
     return event
   end

data/test/agent_test.rb

@@ -1,82 +1,83 @@
 require 'test_helper'
 
-class AgentTest < MiniTest::Test
+class AgentTest < Minitest::Test
   include Fixtures
 
   def setup
+    stub_all
     @agent = F1Results::Agent.new
   end
 
   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'
+    event = F1Results::Event.new(year: 2016, grand_prix: 'Australia', type: :practice1)
+    url = 'https://www.formula1.com/en/results/2016/races/938/australia/practice/1'
     assert_equal url, @agent.get_url(event)
   end
 
   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'
+    event = F1Results::Event.new(year: 2016, grand_prix: 'Australia', type: :qualifying)
+    url = 'https://www.formula1.com/en/results/2016/races/938/australia/qualifying'
     assert_equal url, @agent.get_url(event)
   end
 
   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'
+    event = F1Results::Event.new(year: 2016, grand_prix: 'Australia', type: :race)
+    url = 'https://www.formula1.com/en/results/2016/races/938/australia/race-result'
     assert_equal url, @agent.get_url(event)
   end
 
   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'
+    event = F1Results::Event.new(year: 1984, grand_prix: 'Brazil', type: :qualifying)
+    url = 'https://www.formula1.com/en/results/1984/races/466/brazil/qualifying/0'
     assert_equal url, @agent.get_url(event)
   end
 
   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'
+    event = F1Results::Event.new(year: 1984, grand_prix: 'Brazil', type: :race)
+    url = 'https://www.formula1.com/en/results/1984/races/466/brazil/race-result'
     assert_equal url, @agent.get_url(event)
   end
 
   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'
+    event = F1Results::Event.new(year: 1950, grand_prix: 'Indianapolis', type: :qualifying)
+    url = 'https://www.formula1.com/en/results/1950/races/96/indianapolis/qualifying/0'
     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'
+    event = F1Results::Event.new(year: 1950, grand_prix: 'Indianapolis', type: :race)
+    url = 'https://www.formula1.com/en/results/1950/races/96/indianapolis/race-result'
     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 = F1Results::Event.new(year: 1950, grand_prix: 'Indianapolis', type: :race)
     event = @agent.get_results(event)
     assert_equal 36, event.results.length
   end
 
   def test_api
-    event = F1Results.fetch(1950, 'United States', :race)
+    event = F1Results.fetch(1950, 'Indianapolis', :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)
+    assert_raise_with_message RuntimeError, "No grand prix 'Australia' found for 1900" do
+      event = F1Results::Event.new(year: 1900, grand_prix: 'Australia', type: :race)
       @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)
+  def test_event_with_bad_country
+    assert_raise_with_message RuntimeError, "No grand prix 'New Zealand' found for 2016" do
+      event = F1Results::Event.new(year: 2016, grand_prix: 'New Zealand', type: :race)
       @agent.get_url(event)
     end
   end
 
   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)
+    assert_raise_with_message RuntimeError, "Unsupported event type 'practice4'" do
+      event = F1Results::Event.new(year: 2016, grand_prix: 'Australia', type: :practice4)
       @agent.get_url(event)
     end
   end

data/test/event_test.rb

@@ -1,37 +1,31 @@
 require 'test_helper'
 
-class EventTest < MiniTest::Test
-  include Fixtures
-
+class EventTest < Minitest::Test
   def setup
     @event = F1Results::Event.new
   end
 
-  def test_type
-    @event.type = :qualifying
-    assert_equal 'qualifying', @event.type_slug
-    @event.type = :practice3
-    assert_equal 'practice-3', @event.type_slug
-    @event.type = :p3
-    assert_equal :practice3, @event.type
-  end
-
   def test_type_name
+    @event.type = :practice1
+    assert_equal 'Practice 1', @event.type_name
     @event.type = :practice3
     assert_equal 'Practice 3', @event.type_name
     @event.type = :qualifying
     assert_equal 'Qualifying', @event.type_name
     @event.type = :race
     assert_equal 'Race', @event.type_name
-  end
-
-  def test_type_setter_with_humanized_input
-    @event.type = 'Practice 3'
-    assert_equal :practice3, @event.type
-    @event.type = 'Qualifying'
-    assert_equal :qualifying, @event.type
-    @event.type = 'Race'
-    assert_equal :race, @event.type
+    @event.type = :starting_grid
+    assert_equal 'Starting Grid', @event.type_name
+    @event.type = :warm_up
+    assert_equal 'Warm Up', @event.type_name
+    @event.type = :pit_stop_summary
+    assert_equal 'Pit Stop Summary', @event.type_name
+    @event.type = :fastest_laps
+    assert_equal 'Fastest Laps', @event.type_name
+    @event.type = :sprint
+    assert_equal 'Sprint', @event.type_name
+    @event.type = :sprint_grid
+    assert_equal 'Sprint Grid', @event.type_name
   end
 
   def test_type_boolean_methods

data/test/parser_test.rb

@@ -1,12 +1,13 @@
 require 'test_helper'
 
-class ParserTest < MiniTest::Test
+class ParserTest < Minitest::Test
   include Fixtures
 
   def test_2016_australia_practice1
-    event = events(:'2016_australia_practice_1')
+    event = events(:event_2016_australia_practice_1)
     assert_equal '2016 FORMULA 1 ROLEX AUSTRALIAN GRAND PRIX - PRACTICE 1', event.name
-    assert_equal 'Australia', event.country
+    assert_equal 'Australia', event.grand_prix
+    assert_equal 'Albert Park Grand Prix Circuit, Melbourne', event.circuit
     assert_equal :practice1, event.type
     assert_equal 22, event.results.length
     assert_equal 'Lewis Hamilton', event.winning.driver
@@ -14,19 +15,22 @@ class ParserTest < MiniTest::Test
   end
 
   def test_2016_australia_qualifying
-    event = events(:'2016_australia_qualifying')
+    event = events(:event_2016_australia_qualifying)
     assert_equal '2016 FORMULA 1 ROLEX AUSTRALIAN GRAND PRIX - QUALIFYING', event.name
-    assert_equal 'Australia', event.country
+    assert_equal 'Australia', event.grand_prix
+    assert_equal 'Albert Park Grand Prix Circuit, Melbourne', event.circuit
     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')
+    event = events(:event_2016_australia_race_result)
     assert_equal '2016 FORMULA 1 ROLEX AUSTRALIAN GRAND PRIX - RACE RESULT', event.name
-    assert_equal 'Australia', event.country
+    assert_equal 'Australia', event.grand_prix
+    assert_equal 'Albert Park Grand Prix Circuit, Melbourne', event.circuit
     assert_equal :race, event.type
     assert_equal 22, event.results.length
     assert_equal 'Nico Rosberg', event.winning.driver
@@ -34,9 +38,10 @@ class ParserTest < MiniTest::Test
   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
+    event = events(:event_1984_brazil_qualifying_0)
+    assert_equal 'BRAZILIAN GRAND PRIX 1984 - OVERALL QUALIFYING', event.name
+    assert_equal 'Brazil', event.grand_prix
+    assert_equal 'Autódromo Internacional do Rio de Janeiro, Brazil', event.circuit
     assert_equal :qualifying, event.type
     assert_equal 24, event.results.length
     assert_equal 'Elio de Angelis', event.winning.driver
@@ -44,9 +49,10 @@ class ParserTest < MiniTest::Test
   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
+    event = events(:event_1984_brazil_race_result)
+    assert_equal 'BRAZILIAN GRAND PRIX 1984 - RACE RESULT', event.name
+    assert_equal 'Brazil', event.grand_prix
+    assert_equal 'Autódromo Internacional do Rio de Janeiro, Brazil', event.circuit
     assert_equal :race, event.type
     assert_equal 24, event.results.length
     assert_equal 'Alain Prost', event.winning.driver
@@ -54,9 +60,10 @@ class ParserTest < MiniTest::Test
   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
+    event = events(:event_1950_indianapolis_qualifying_0)
+    assert_equal '1950 INDIANAPOLIS 500 - QUALIFYING', event.name
+    assert_equal 'Indianapolis', event.grand_prix
+    assert_equal 'Indianapolis Motor Speedway, United States', event.circuit
     assert_equal :qualifying, event.type
     assert_equal 1, event.results.length
     assert_equal 'Walt Faulkner', event.winning.driver
@@ -64,13 +71,27 @@ class ParserTest < MiniTest::Test
   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
+    event = events(:event_1950_indianapolis_race_result)
+    assert_equal '1950 INDIANAPOLIS 500 - RACE RESULT', event.name
+    assert_equal 'Indianapolis', event.grand_prix
+    assert_equal 'Indianapolis Motor Speedway, United States', event.circuit
     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
+
+  def test_2024_belgium_race
+    event = events(:event_2024_belgium_race_result)
+    assert_equal 'FORMULA 1 ROLEX BELGIAN GRAND PRIX 2024 - RACE RESULT', event.name
+    assert_equal 'Belgium', event.grand_prix
+    assert_equal 'Circuit de Spa-Francorchamps, Spa-Francorchamps', event.circuit
+    assert event.race?
+    assert_equal 20, event.results.length
+    # Note: George Russell won but was DQ'd, but still shows as first result
+    assert_equal 'George Russell', event.winning.driver
+    assert_equal 'DQ', event.results[0].position_name
+    assert_equal 'Zhou Guanyu', event.losing.driver
+  end
 end

data/test/result_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ResultTest < MiniTest::Test
+class ResultTest < Minitest::Test
   def test_time
     result = F1Results::RaceResult.new
     result.time_or_retired = '1:25:11.288'
@@ -64,8 +64,8 @@ class ResultTest < MiniTest::Test
   def test_parse_qualifying_with_blank_values
     result = F1Results::QualifyingResult.new(position: '16', driver: 'Marcus Ericsson', team: 'Sauber', q1: '1:31.376', q2: nil, q3: nil, laps: 10)
     assert_equal '1:31.376', result.q1
-    assert_equal nil, result.q2
-    assert_equal nil, result.q3
+    assert_nil result.q2
+    assert_nil result.q3
     assert_equal 10, result.laps
   end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: f1results
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '3.0'
 platform: ruby
 authors:
 - Darren Jeacocke
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -16,84 +15,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.25'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 3.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 3.25.1
 description: Get F1 results from formula1.com
 email: dazonic@me.com
 executables:
@@ -119,7 +104,6 @@ homepage: https://github.com/daz/f1results
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -134,9 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: F1 Results
 test_files: []