f1results 0.1 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a1a55a64744c57fea1c16aee83239865fefd42ce
+  data.tar.gz: 16c7f5722e92ccdb9516b32b7f9e467a5fce57e7
+SHA512:
+  metadata.gz: d0a20348047c8dfc441ddd5a17f3798a09ff7342d4c8840d0bb56e302341b8b89da6a61e3484d85a29b07221b833c2e1a9fd16bf6cc34131ce956a27b796c3a0
+  data.tar.gz: e379bf7efb5f8947de78a2440dbe7eb876ca9392156566d17de080d0012705245c8d9e87fcae9635ae84de5f6835cf9bdf0678ab5b3de098712ecc94e765b6cf

data/README.md

@@ -2,6 +2,8 @@
 
 Get F1 results from formula1.com
 
+![F1Results](http://daz.github.com/f1results/screenshot.png)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/f1results/agent.rb

@@ -35,17 +35,17 @@ module F1Results
       click(season_country_link)
       event.grand_prix = page.parser.at_xpath('//h2').text
 
-      if event.qualifying?
-        grand_prix_link = page.link_with(:text => 'QUALIFYING') || page.link_with(:text => 'SUNDAY QUALIFYING')
-        raise "No qualifying results for: #{season} #{country}" if grand_prix_link.nil?
-        click(grand_prix_link)
+      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")]')
-      raise "No results for: #{season} #{country}" if table.empty?
 
       event.parse_results_table(table)
-      event
     end
   end
 end

data/lib/f1results/event.rb

@@ -32,7 +32,7 @@ module F1Results
     end
 
     def parse_results_table(table)
-      data = table.xpath('//tr')[1..-1].map do |row|
+      data = table.xpath('//tr[not(position()=1)]').map do |row|
         row.xpath('./td').map do |col|
           col.text.strip
         end
@@ -44,6 +44,8 @@ module F1Results
         result.index = i + 1
         @results << result unless result.position.nil?
       end
+
+      self
     end
   end
 end

data/lib/f1results/result.rb

@@ -1,6 +1,6 @@
 module F1Results
   class Result
-    attr_accessor :index, :position, :driver, :driver_number, :team, :time, :retired, :laps
+    attr_accessor :index, :position, :driver, :driver_number, :team, :laps
 
     def initialize(row = nil)
       build(row) unless row.nil?
@@ -17,25 +17,18 @@ module F1Results
       end
     end
 
-    def time_or_retired=(str)
-      if /^[0-9]|\+/ =~ str
-        @time = str
-      else
-        @retired = str
-      end
-    end
-
-    def time_or_retired
-      time || retired
-    end
-
     private
 
     def build(row)
+      row.map! do |col|
+        col = col.strip.gsub(/\s+/, ' ')
+        col == '' ? nil : col
+      end
       self.position = row[0]
       @driver_number = row[1].to_i
       @driver = row[2]
       @team = row[3]
+      row
     end
   end
 
@@ -46,34 +39,50 @@ module F1Results
       [position, driver_number, driver, team, q1, q2, q3, laps]
     end
 
+    def time
+      q3 || q2 || q1
+    end
+
     private
 
     def build(row)
+      row = super
       @q1 = row[4]
       if row.length > 5
         @q2 = row[5]
         @q3 = row[6]
         @laps = row[7].to_i
       end
-      super
     end
   end
 
   class RaceResult < Result
-    attr_accessor :grid, :points
+    attr_accessor :time_or_retired, :time, :retired, :grid, :points
 
     def to_a
       [position, driver_number, driver, team, laps, time_or_retired, grid, points]
     end
 
+    def time_or_retired=(str)
+      if /^[0-9]|\+/ =~ str
+        @time = str
+      else
+        @retired = str
+      end
+    end
+
+    def time_or_retired
+      time || retired
+    end
+
     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
-      super
     end
   end
 end

data/lib/f1results/version.rb

@@ -1,3 +1,3 @@
 module F1Results
-  VERSION = "0.1"
+  VERSION = '0.1.1'
 end

data/test/result_test.rb

@@ -22,6 +22,14 @@ class ResultTest < MiniTest::Unit::TestCase
     assert_equal 'Gear box', result.retired
   end
 
+  def test_qualifying_time
+    result = F1Results::QualifyingResult.new
+    result.q1 = '1:46.000'
+    result.q2 = '1:46.515'
+    result.q3 = nil
+    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
@@ -46,6 +54,20 @@ class ResultTest < MiniTest::Unit::TestCase
     assert_equal 25, result.laps
   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
+    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
+  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

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: f1results
 version: !ruby/object:Gem::Version
-  version: '0.1'
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Darren Jeacocke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Get F1 results from formula1.com
@@ -111,26 +100,25 @@ files:
 - LICENSE
 homepage: https://github.com/daz/f1results
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: F1 Results
 test_files: []