f1results 0.1.1 → 0.2.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1a55a64744c57fea1c16aee83239865fefd42ce
-  data.tar.gz: 16c7f5722e92ccdb9516b32b7f9e467a5fce57e7
+  metadata.gz: c381557affdd5f2d9ce7294b915df1120a78a04f
+  data.tar.gz: 067d5b07bae14ce0c051997d0668cf5d69fe85b3
 SHA512:
-  metadata.gz: d0a20348047c8dfc441ddd5a17f3798a09ff7342d4c8840d0bb56e302341b8b89da6a61e3484d85a29b07221b833c2e1a9fd16bf6cc34131ce956a27b796c3a0
-  data.tar.gz: e379bf7efb5f8947de78a2440dbe7eb876ca9392156566d17de080d0012705245c8d9e87fcae9635ae84de5f6835cf9bdf0678ab5b3de098712ecc94e765b6cf
+  metadata.gz: 7cec638c906397d24bfdfa57162387c800ad1fa571c83e6944d16feaca4885c5675aaa4f39ab5efde1b0b541265aa39230bd044e8a484a09094eaba2c6af09b1
+  data.tar.gz: e844bd99064029f4c3ac02f1c25580462f4726a410df61c5e7e86bc9a1a5d88b95a4a098b978e8b90646ab5bd05647aa57d98fcc07ee3461eace8c91e02f837c

data/Rakefile

@@ -2,9 +2,9 @@ require 'bundler/setup'
 require 'rake'
 require 'rake/testtask'
 
-task :default => :test
+task default: :test
 
 Rake::TestTask.new do |t|
   t.libs << 'test/lib'
   t.pattern = 'test/*_test.rb'
-end
+end

data/bin/f1results

@@ -3,51 +3,46 @@
 require 'rubygems'
 require 'optparse'
 require 'terminal-table'
-require 'f1results'
+require File.expand_path('../../lib/f1results.rb', __FILE__)
 
-options = {}
+year       = Time.now.year
+country    = ''
+event_type = :race
 
 optparse = OptionParser.new do |opts|
-  options[:type] = :race
-  opts.on('-q', '--qualifying', 'Qualifying') do
-    options[:type] = :qualifying
-  end
-end
-
-optparse.parse!
-
-season = ARGV[0] || Time.now.year
-country = if country = ARGV[1]
-  country.to_i == 0 ? country : country.to_i
-else
-  :latest
+  opts.on('-y', '--year=YEAR', Integer)      { |val| year = val }
+  opts.on('-c', '--country=COUNTRY', String) { |val| country = val.downcase }
+  opts.on('-e', '--event=EVENT', String)     { |val| event_type = val.downcase.to_sym }
+  opts.parse!
 end
 
 begin
-  event = F1Results.get(season, country, options[:type])
+  event = F1Results.get(year, country, event_type)
 rescue Exception => e
   puts e
   exit
 end
 
-title = [event.country, event.type.to_s.capitalize, event.grand_prix].join(' ')
-table = Terminal::Table.new :title => title, :rows => event.to_a
+title = "#{event.season} #{event.country} #{event.type_name}\n#{event.name}"
+table = Terminal::Table.new title: title, rows: event.to_a
 
-if event.qualifying?
-  cols = %W(Pos Num Driver Team Q1 Q2 Q3 Laps)
+if event.practice?
+  table.headings = %W(Pos Driver Team Time Laps)
+  table.align_column 0, :right
+  table.align_column 4, :right
+
+elsif event.qualifying?
+  table.headings = %W(Pos Driver Team Q1 Q2 Q3 Laps)
   table.align_column 0, :right
   table.align_column 1, :right
-  table.align_column 7, :right
+  table.align_column 6, :right
 
 elsif event.race?
-  cols = %W(Pos Num Driver Team Laps Time/Retired Grid Points)
+  table.headings = %W(Pos Driver Country Team Time/Retired Points)
   table.align_column 0, :right
-  table.align_column 1, :right
+  table.align_column 2, :center
   table.align_column 4, :right
   table.align_column 5, :right
-  table.align_column 6, :right
-  table.align_column 7, :right
 end
 
-table.headings = cols
 puts table

data/lib/f1results/agent.rb

@@ -3,49 +3,19 @@ require 'mechanize'
 module F1Results
   class Agent < ::Mechanize
     def get_event(season, country, type)
-      event = Event.new(:season => season, :type => type)
+      event = Event.new(season: season, country: country, type: type)
+      path = "content/fom-website/en/championship/results/#{season}-race-results/#{season}-#{event.country_slug}-results/#{event.type_slug}.html"
 
       begin
-        get(::File.join(F1Results::BASEURL, "results/season/#{season}/"))
-      rescue Mechanize::ResponseCodeError, 404
-        raise "No results for season: #{season}"
+        get(::File.join(F1Results::BASEURL, path))
+      rescue Mechanize::ResponseCodeError, Net::HTTPNotFound
+        raise 'No results'
       end
 
-      season_country_link = case
-      when country.is_a?(String)
-        event.country = country
-        page.link_with(:text => event.country)
-      when country.is_a?(Integer)
+      event.name = page.parser.xpath('//a[contains(@class, "level-0")]').text
+      table = page.parser.xpath('//tbody')
 
-        # Get the link to the country on the nth row
-
-        next_page = page.parser.at_xpath("//tr[not(position()=1)][#{country}]/td[1]/a")
-        event.country = next_page.text
-        page.link_with(:node => next_page)
-      when country == :latest
-
-        # Get the link to the country in the last row where results are present
-
-        next_page = page.parser.at_xpath('(//tr/td[3][node()])[last()]/../td[1]/a')
-        event.country = next_page.text
-        page.link_with(:node => next_page)
-      end
-      raise "Grand Prix not found: #{season} #{country}" if season_country_link.nil?
-
-      click(season_country_link)
-      event.grand_prix = page.parser.at_xpath('//h2').text
-
-      results_link = if event.qualifying?
-        page.link_with(:text => 'QUALIFYING') || page.link_with(:text => 'SUNDAY QUALIFYING')
-      elsif event.race?
-        page.link_with(:text => 'RACE', :dom_class => 'L3Selected')
-      end
-
-      raise "No #{event.type} results for: #{season} #{country}" if results_link.nil?
-      click(results_link) if event.qualifying?
-      table = page.parser.xpath('//table[contains(@class, "raceResults")]')
-
-      event.parse_results_table(table)
+      return event.parse_results_table(table)
     end
   end
 end

data/lib/f1results/event.rb

@@ -1,14 +1,49 @@
+require 'active_support/core_ext/string'
+
 module F1Results
   class Event
-    attr_accessor :season, :country, :type, :grand_prix, :results
+    attr_accessor :season, :country, :type, :name, :results
 
-    def initialize(args)
-      args.each { |k,v| send("#{k}=", v) }
+    TYPES = {
+      p1: :practice1,
+      p2: :practice2,
+      p3: :practice3,
+      q:  :qualifying,
+      r:  :race
+    }
+
+    def initialize(args = {})
       @results = []
+      args.each { |k,v| send("#{k}=", v) }
     end
 
     def country
-      @country.split(/(\W)/).map(&:capitalize).join
+      @country.titleize
+    end
+
+    def country_slug
+      @country.parameterize
+    end
+
+    def type=(type)
+      if type.to_s.length <= 2
+        @type = TYPES[type]
+      else
+        @type = type
+      end
+    end
+
+    # Human readable type, e.g. "Practice 1", "Qualifying"
+    def type_name
+      @type.to_s.gsub(/\d/, ' \0').capitalize
+    end
+
+    def type_slug
+      type_name.parameterize
+    end
+
+    def practice?
+      @type.to_s.gsub(/\d/, '') == 'practice'
     end
 
     def qualifying?
@@ -32,17 +67,35 @@ module F1Results
     end
 
     def parse_results_table(table)
-      data = table.xpath('//tr[not(position()=1)]').map do |row|
-        row.xpath('./td').map do |col|
-          col.text.strip
+      @results = []
+
+      # Remove driver abbreviation from cell, shown only in race results
+      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').map do |cell|
+          cell = cell.text.gsub(/[[:space:]]+/, ' ').strip
+          cell.blank? ? nil : cell
         end
       end
 
+      # Remove rows with empty position cells (Q1 107% Time), and table header if it's there
+      data.reject! { |row| row[0].nil? || row[0] == 'P' }
+
       data.each_with_index do |row, i|
-        klass = qualifying? ? QualifyingResult : RaceResult
+        klass = case
+        when practice?
+          PracticeResult
+        when qualifying?
+          QualifyingResult
+        when race?
+          RaceResult
+        end
+
         result = klass.new(row)
-        result.index = i + 1
-        @results << result unless result.position.nil?
+        result.index = i
+        @results << result
       end
 
       self

data/lib/f1results/result.rb

@@ -1,6 +1,6 @@
 module F1Results
   class Result
-    attr_accessor :index, :position, :driver, :driver_number, :team, :laps
+    attr_accessor :index, :position, :driver, :team, :laps
 
     def initialize(row = nil)
       build(row) unless row.nil?
@@ -8,7 +8,7 @@ module F1Results
 
     def position=(n)
       @position = case
-      when n == ''
+      when n.to_s.empty?
         nil
       when n.to_i == 0
         n
@@ -19,24 +19,35 @@ module F1Results
 
     private
 
-    def build(row)
-      row.map! do |col|
-        col = col.strip.gsub(/\s+/, ' ')
-        col == '' ? nil : col
+      def build(row)
+        self.position = row[0]
+        @driver       = row[1]
+        row
       end
-      self.position = row[0]
-      @driver_number = row[1].to_i
-      @driver = row[2]
-      @team = row[3]
-      row
+  end
+
+  class PracticeResult < Result
+    attr_accessor :time
+
+    def to_a
+      [position, driver, team, time, laps]
     end
+
+    private
+
+      def build(row)
+        row = super
+        @team = row[2]
+        @time = row[3]
+        @laps = row[4].to_i
+      end
   end
 
   class QualifyingResult < Result
     attr_accessor :q1, :q2, :q3
 
     def to_a
-      [position, driver_number, driver, team, q1, q2, q3, laps]
+      [position, driver, team, q1, q2, q3, laps]
     end
 
     def time
@@ -45,22 +56,21 @@ module F1Results
 
     private
 
-    def build(row)
-      row = super
-      @q1 = row[4]
-      if row.length > 5
-        @q2 = row[5]
-        @q3 = row[6]
-        @laps = row[7].to_i
+      def build(row)
+        row = super
+        @team = row[2]
+        @q1   = row[3]
+        @q2   = row[4]
+        @q3   = row[5]
+        @laps = row[6].to_i
       end
-    end
   end
 
   class RaceResult < Result
-    attr_accessor :time_or_retired, :time, :retired, :grid, :points
+    attr_accessor :driver_country_abbr, :time, :retired, :points
 
     def to_a
-      [position, driver_number, driver, team, laps, time_or_retired, grid, points]
+      [position, driver, driver_country_abbr, team, time_or_retired, points]
     end
 
     def time_or_retired=(str)
@@ -77,12 +87,12 @@ module F1Results
 
     private
 
-    def build(row)
-      row = super
-      @laps = row[4].to_i
-      self.time_or_retired = row[5]
-      @grid = row[6].to_i
-      @points = row[7].to_i
-    end
+      def build(row)
+        row = super
+        @driver_country_abbr = row[2]
+        @team                = row[3]
+        self.time_or_retired = row[4]
+        @points              = row[5].to_i
+      end
   end
 end

data/lib/f1results/version.rb

@@ -1,3 +1,3 @@
 module F1Results
-  VERSION = '0.1.1'
+  VERSION = '0.2-alpha.3'
 end

data/test/agent_test.rb

@@ -1,70 +1,51 @@
-# encoding: utf-8
 require 'test_helper'
 
-class AgentTest < MiniTest::Unit::TestCase
+class AgentTest < MiniTest::Test
   include Fixtures
 
   def setup
     @agent = F1Results::Agent.new
   end
 
-  def test_get_event_2012_great_britain
-    event = @agent.get_event(2012, 'Great Britain', :race)
+  def test_get_event_2015_australia_race
+    event = @agent.get_event(2015, 'Australia', :race)
     assert event.race?
-    assert_equal 'Great Britain', event.country
-    assert_equal '2012 FORMULA 1 SANTANDER BRITISH GRAND PRIX', event.grand_prix
-    assert_equal 24, event.results.size
-    assert_equal 'Mark Webber', event.winner
-    assert_equal 'Vitaly Petrov', event.loser
+    assert_equal 'Australia', event.country
+    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
   end
 
-  def test_get_event_2012_great_britain_qualifying
-    event = @agent.get_event(2012, 'Great Britain', :qualifying)
+  def test_get_event_2015_australia_qualifying
+    event = @agent.get_event(2015, 'Australia', :qualifying)
     assert event.qualifying?
-    assert_equal 'Great Britain', event.country
-    assert_equal '2012 FORMULA 1 SANTANDER BRITISH GRAND PRIX', event.grand_prix
-    assert_equal 24, event.results.size
-    assert_equal 'Fernando Alonso', event.winner
-    assert_equal 'Charles Pic', event.loser
-  end
-
-  def test_get_event_2005_australia_qualifyng
-    event = @agent.get_event(2005, 'Australia', :qualifying)
     assert_equal 'Australia', event.country
-    assert_equal "2005 FORMULA 1™ Foster's Australian Grand Prix", event.grand_prix
-    assert_equal 20, event.results.size
-    assert_equal 'Giancarlo Fisichella', event.winner
+    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
   end
 
-  def test_get_event_1992_hungary
-    event = @agent.get_event(1992, 'Hungary', :race)
-    assert_equal 'Hungary', event.country
-    assert_equal '1992 Hungarian Grand Prix', event.grand_prix
-    assert_equal 31, event.results.size
-    assert_equal 'Ayrton Senna', event.winner
+  def test_get_event_2015_australia_practice1
+    event = @agent.get_event(2015, 'Australia', :practice1)
+    assert event.practice?
+    assert_equal 'Australia', event.country
+    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
   end
 
   def test_get_event_with_bad_year
-    assert_raises RuntimeError, 'Invalid season: 1800' do
-      @agent.get_event(1800, 'Australia', :race)
+    assert_raises RuntimeError, 'No results' do
+      @agent.get_event(1900, 'Australia', :race)
     end
   end
 
   def test_get_event_with_bad_grand_prix
-    assert_raises RuntimeError, 'Invalid Grand Prix: New Zealand' do
-      @agent.get_event(2012, 'New Zealand', :race)
+    assert_raises RuntimeError, 'No results' do
+      @agent.get_event(2015, 'New Zealand', :race)
     end
   end
-
-  def test_get_event_2012_9th
-    event = @agent.get_event(2012, 9, :race)
-    assert_equal 'Great Britain', event.country
-    assert_equal '2012 FORMULA 1 SANTANDER BRITISH GRAND PRIX', event.grand_prix
-  end
-
-  def test_get_event_2012_latest
-    event = @agent.get_event(2012, :latest, :race)
-    assert_equal 'Hungary', event.country
-    assert_equal 'FORMULA 1 ENI MAGYAR NAGYDÍJ 2012', event.grand_prix
-  end
 end

data/test/event_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class EventTest < MiniTest::Test
+  def setup
+    @event = F1Results::Event.new
+    @event.results << F1Results::RaceResult.new([1, 'Mark Webber', 'AUS', 'Red Bull Racing-Renault', '1:25:11.288', 2])
+    @event.results << F1Results::RaceResult.new([2, 'Fernando Alonso', 'ESP', 'Ferrari', '+3.0 secs', 1])
+  end
+
+  def test_type
+    @event.type = :qualifying
+    assert_equal 'qualifying', @event.type_slug
+    @event.type = :practice3
+    assert_equal 'practice-3', @event.type_slug
+  end
+
+  def test_country
+    @event.country = 'Australia'
+    assert_equal 'Australia', @event.country
+    @event.country = 'great britain'
+    assert_equal 'Great Britain', @event.country
+  end
+
+  def test_to_array
+    array = @event.to_a
+    assert_equal 2, array.length
+    assert_kind_of Array, array.first
+    assert_kind_of F1Results::RaceResult, @event.results.first
+  end
+end

data/test/result_test.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 require 'test_helper'
 
-class ResultTest < MiniTest::Unit::TestCase
+class ResultTest < MiniTest::Test
   def test_time
     result = F1Results::RaceResult.new
     result.time_or_retired = '1:25:11.288'
@@ -30,46 +29,45 @@ class ResultTest < MiniTest::Unit::TestCase
     assert_equal '1:46.515', result.time
   end
 
-  def test_parse_race
-    result = F1Results::RaceResult.new(['5', '9', 'Kimi Räikkönen', 'Lotus-Renault', '52', '+10.3 secs', '6', '10'])
-    assert_equal 5, result.position
-    assert_equal 9, result.driver_number
-    assert_equal 'Kimi Räikkönen', result.driver
-    assert_equal 'Lotus-Renault', result.team
-    assert_equal 52, result.laps
-    assert_equal '+10.3 secs', result.time
-    assert_equal 6, result.grid
-    assert_equal 10, result.points
+  def test_parse_practice
+    result = F1Results::PracticeResult.new(['4', 'Carlos Sainz', 'Toro Rosso', '1:31.014',	'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
   end
 
   def test_parse_qualifying
-    result = F1Results::QualifyingResult.new(['1', '5', 'Fernando Alonso', 'Ferrari', '1:46.515', '1:56.921', '1:51.746', '25'])
-    assert_equal 1, result.position
-    assert_equal 5, result.driver_number
-    assert_equal 'Fernando Alonso', result.driver
+    result = F1Results::QualifyingResult.new(['2', 'Nico Rosberg', 'Mercedes', '1:28.906', '1:27.097', '1:26.921', '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
+  end
+
+  def test_parse_race
+    result = F1Results::RaceResult.new(['3', 'Sebastian Vettel', 'GER', 'Ferrari', '+34.523s', '15'])
+    assert_equal 3, result.position
+    assert_equal 'Sebastian Vettel', result.driver
     assert_equal 'Ferrari', result.team
-    assert_equal '1:46.515', result.q1
-    assert_equal '1:56.921', result.q2
-    assert_equal '1:51.746', result.q3
-    assert_equal 25, result.laps
+    assert_equal '+34.523s', result.time
+    assert_equal 15, result.points
   end
 
   def test_parse_qualifying_with_blank_values
-    result = F1Results::QualifyingResult.new(['1', '5', 'Fernando Alonso', 'Ferrari', '1:46.515', '', '', ''])
-    assert_equal '1:46.515', result.q1
+    result = F1Results::QualifyingResult.new(['16', 'Marcus Ericsson', 'Sauber', '1:31.376', nil, nil, 10])
+    assert_equal '1:31.376', result.q1
     assert_equal nil, result.q2
     assert_equal nil, result.q3
-    assert_equal 0, result.laps
-  end
-
-  def test_parse_with_extra_whitespace
-    result = F1Results::RaceResult.new(['14', '17', 'Valtteri  Bottas', "   \n\nWilliams-Renault    ", '57', '+1 Lap', '16', ''])
-    assert_equal 'Valtteri Bottas', result.driver
-    assert_equal 'Williams-Renault', result.team
+    assert_equal 10, result.laps
   end
 
   def test_race_to_a
-    result = F1Results::RaceResult.new(['5', '9', 'Kimi Räikkönen', 'Lotus-Renault', '52', '+10.3 secs', '6', '10'])
-    assert_equal [5, 9, 'Kimi Räikkönen', 'Lotus-Renault', 52, '+10.3 secs', 6, 10], result.to_a
+    result = F1Results::RaceResult.new(['3', 'Sebastian Vettel', 'GER', 'Ferrari', '+34.523s', '15'])
+    assert_equal [3, 'Sebastian Vettel', 'GER', 'Ferrari', '+34.523s', 15], result.to_a
   end
 end

metadata

@@ -1,85 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: f1results
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.pre.alpha.3
 platform: ruby
 authors:
 - Darren Jeacocke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.17'
 description: Get F1 results from formula1.com
 email: dazonic@me.com
 executables:
@@ -87,19 +101,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
 - bin/f1results
+- lib/f1results.rb
 - lib/f1results/agent.rb
 - lib/f1results/event.rb
 - lib/f1results/result.rb
 - lib/f1results/version.rb
-- lib/f1results.rb
 - test/agent_test.rb
+- test/event_test.rb
 - test/result_test.rb
-- Rakefile
-- README.md
-- LICENSE
 homepage: https://github.com/daz/f1results
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -107,17 +123,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: F1 Results