vegas_insider_scraper 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86035a4b5f5173d3dba297d344b415b7aae6e10
-  data.tar.gz: e2881b0fc643653bd53a0d0730baca318fc61068
+  metadata.gz: 3a02df40a50546346abca93962a41e2db68b124b
+  data.tar.gz: 9f5e27501aa14da7de8a49f840c4be1d85a8e21d
 SHA512:
-  metadata.gz: 10865cceb813ed8473a5c12bc93b3b6e9e7c3472f354732ace78169000ead6c836b98db87c751d2883b3a731800c120b283dcd676973657465cce4e41022cb81
-  data.tar.gz: 698369c5ec4897bfa52998377feb1413668349a38006cfeb403501c1e62f264ca119877c8d385de9faad449245f7ae5f9008997afdd8c19b4e821ceabd7bce56
+  metadata.gz: 69cf0956935f1f629da5a9a65211fb9c3996bf22b80d0d17d7bd423d170b2cd5c9d52815e5b9588783780a80cd9aaad8ccd65ee7ebf9217c0752699dd7a7057b
+  data.tar.gz: fe645dd5111a22ff77837e1c588c0b20805b59b1a2a5a54ec61368faa4d72e15f4cc4d354a9a7bf2f6a27f30ba4316f959b329f74a3f95f37465901124b7b1e7

data/lib/sports/mlb.rb

@@ -4,16 +4,13 @@ class MLB < ScraperLeague
 	def initialize
 		@sport_id = 4
 		@sport_name = :mlb
-		@moneyline_sport = true
 		super
+		@moneyline_sport = true
 	end
 
-	def get_games
-		urls = %w[http://www.vegasinsider.com/mlb/odds/las-vegas/ http://www.vegasinsider.com/mlb/odds/las-vegas/run]
-		urls.each do |url|
-			get_lines(url, sport_id)
-		end
-		return true
+	def current_games
+		@current_games ||= get_lines(["http://www.vegasinsider.com/#{sport_name}/odds/las-vegas/run/", 
+			"http://www.vegasinsider.com/#{sport_name}/odds/las-vegas/"])
 	end
 
 end

data/lib/sports/nhl.rb

@@ -4,15 +4,12 @@ class NHL < ScraperLeague
 	def initialize
 		@sport_id = 5
 		@sport_name = :nhl
-		@moneyline_sport = false
 		super
+		@moneyline_sport = true
 	end
 
-	def get_games
-		urls = %w[http://www.vegasinsider.com/nhl/odds/las-vegas/ http://www.vegasinsider.com/nhl/odds/las-vegas/puck]
-		urls.each do |url|
-			get_lines(url, sport_id)
-			Game.save_games(games)
-		end
+	def current_games
+		@current_games ||= get_lines(["http://www.vegasinsider.com/#{sport_name}/odds/las-vegas/puck/", 
+			"http://www.vegasinsider.com/#{sport_name}/odds/las-vegas/"])
 	end
 end

data/lib/sports/scraper_league.rb

@@ -18,7 +18,7 @@ class ScraperLeague
 
 	# Gets the upcoming/current games for the sport
 	def current_games
-		@current_games ||= get_lines("http://www.vegasinsider.com/#{sport_name}/odds/las-vegas/")
+		@current_games ||= get_lines(["http://www.vegasinsider.com/#{sport_name}/odds/las-vegas/","http://www.vegasinsider.com/#{sport_name}/odds/las-vegas/money/"])
 	end
 
 	# Gets all of the schedule and results for each team
@@ -239,29 +239,33 @@ class ScraperLeague
 
 	##########################################
 	# Gets the current lines for a given sport
-	def get_lines(url)
+	def get_lines(urls)
 		games = []
-		doc = Nokogiri::HTML(open(url))
-		doc.css('.viBodyBorderNorm .frodds-data-tbl tr').each do |game_row|
-
-			game_cell = game_row.at_css('td:first-child')
-			teams = game_cell_parser(game_cell)
-			game = Game.new(home_team: teams[1], away_team: teams[0], sport_id: sport_id)
-
-			if game.teams_found?
-				game.update(time: get_game_time(game_cell))
-				game.update(regular_lines(get_odds(game_row)))
-				games.push game
-
-			else
-				last_game = games.last
-				if last_game
-					last_game.update(notes: game_cell.content)
-					last_game.update(doubleheader: doubleheader_id(game_cell.content))
+
+		urls.each { |url|
+			is_first_url = games.empty?
+			doc = Nokogiri::HTML(open(url))
+			doc.css('.viBodyBorderNorm .frodds-data-tbl tr').each do |game_row|
+
+				game_cell = game_row.at_css('td:first-child')
+				teams = game_cell_parser(game_cell)
+				game = Game.new(home_team: teams[1], away_team: teams[0]) 
+				if game.teams_found?
+					game.update(time: get_game_time(game_cell))
+					is_first_url ? (games.push game) : (game = game.find_equal(games))
+					game.update(vegas_info: get_line(get_odds(game_row)))
+					game.update(vegas_info: get_line(get_odds_inner_html(game_row)))
+
+				else
+					last_game = games.last
+					if last_game
+						last_game.update(notes: game_cell.content)
+						last_game.update(doubleheader: doubleheader_id(game_cell.content))
+					end
 				end
 			end
-		end
-		games.map { |game| game.as_json }
+		}
+		games
 	end
 
 	# Utility method for scraping current lines
@@ -285,26 +289,37 @@ class ScraperLeague
 	# Utility method for scraping current lines
 	# * getting odds from the cell, removing whitespace, and converting 1/2 to 0.5
 	def get_odds(odds_element)
-		(odds_element.at_css('td:nth-child(3) a').content || '').gsub(" ","").gsub("½",".5").strip
+		(odds_element.at_css('td:nth-child(3) a')&.content || '').gsub(" ","").gsub("½",".5").strip
+	end
+	def get_odds_inner_html(odds_element)
+		((odds_element.at_css('td:nth-child(3) a'))&.inner_html || '').encode('utf-8').gsub(" ","").gsub("½",".5").strip
 	end
 
 	# Utility method for scraping current lines
 	# * parsing the lines for non-moneyline sports
-	def regular_lines(odds_string)
-		away_fav_odds = RegularExpressions::ODDS.match(odds_string) || {}
-		home_fav_odds = RegularExpressions::ALT_ODDS.match(odds_string) || {}
-			
-		result = {
-			home_team_odds: (home_fav_odds[:line] ? -odds_reader(home_fav_odds[:line]) : odds_reader(away_fav_odds[:line])),
-			away_team_odds: (away_fav_odds[:line] ? -odds_reader(away_fav_odds[:line]) : odds_reader(home_fav_odds[:line])),
-			over_under: (home_fav_odds[:ou] || away_fav_odds[:ou])
-		}
+	def get_line(odds_string)
+		odds = matchdata_to_hash(RegularExpressions::ODDS.match(odds_string)) || {}
+		runlines_odds = matchdata_to_hash(RegularExpressions::RUNLINE_ODDS.match(odds_string)) || {}
+		moneyline_odds = matchdata_to_hash(RegularExpressions::MONEYLINE_ODDS.match(odds_string)) || {}
+
+		result = odds.merge(runlines_odds).merge(moneyline_odds)
+		result.each { |k,v| result[k] = result[k].to_s.to_f if result[k] }
+		get_home_and_away(result)
+
+	end
+
+	# Utility method for scraping current lines
+	# * filling the home/away lines
+	def get_home_and_away(result)
+		result['away_line'] = -result['home_line'] if result['home_line']
+		result['home_line'] = -result['away_line'] if result['away_line']
+		result
 	end
 
 	# Utility method for scraping current lines
 	# * parsing the odds to get a number
 	def odds_reader(odds)
-		case odds when '' then nil when 'PK' then 0 else odds.to_f end
+		case odds&.strip when '',nil then nil when 'PK' then 0 else odds.to_f end
 	end
 
 	# Utility method for scraping current lines
@@ -337,12 +352,16 @@ class ScraperLeague
 				if game_finished?(row)
 					case m
 					when 2
-						unless moneyline_sport
-							formatted = odds_reader(remove_element_whitespace(cell))
-							game.update(home_team_odds: formatted, away_team_odds: (formatted ? -formatted : formatted))
+						formatted = odds_reader(remove_element_whitespace(cell))
+						home_team  = (game.home_or_away_team(team) == :home)
+						if moneyline_sport
+							home_team ? game.update(vegas_info: {home_moneyline: formatted}) : game.update(vegas_info: {away_moneyline: formatted})
+						else
+							home_line = (formatted && !home_team) ? -formatted : formatted
+							game.update(vegas_info: {home_line: home_line, away_line: (home_line ? -home_line : nil)})
 						end
 
-					when 3 then game.update(over_under: remove_element_whitespace(cell))
+					when 3 then game.update(vegas_info: { over_under: remove_element_whitespace(cell)})
 					when 4 then game.update(game_results(cell, team, opponent))
 					when 5 then game.update(ats_results(cell, team, opponent))
 					end
@@ -350,7 +369,7 @@ class ScraperLeague
 			end
 			game
 		end
-		{ team: team, games: games.compact.map{ |game| game.as_json } }
+		{ team: team, games: games.compact.map{ |game| game } }
 	end
 
 	# Utility method for scraping team page results
@@ -431,7 +450,7 @@ class ScraperLeague
 	end
 
 	def matchdata_to_hash(matchdata)
-		matchdata ? Hash[*matchdata.names.map{ |name| [name, (matchdata[name] ? matchdata[name].downcase.to_sym : nil)] }.flatten] : {}
+		matchdata ? Hash[*matchdata.names.map{ |name| [name,(matchdata[name] ? matchdata[name].downcase.to_sym : nil)] }.flatten].compact : {}
 	end
 
 	# Regular Expressions Module
@@ -442,8 +461,12 @@ class ScraperLeague
 
 		TIME_REGEX = /(?<mo>\d{2})\/(?<d>\d{2})  (?<h>\d+):(?<mi>\d{2}) (?<mer>\w{2})/
 		MONEYLINE_OVER_UNDER = /(?<ou>\d+(\.5)?)[ou]/x
-		ODDS = /-?(?<line>\w+(\.5)?)-\d\d(?<ou>\d+(\.5)?)[ou]-\d\d/x
-		ALT_ODDS = /(?<ou>\d+(\.5)?)[ou]-\d\d-?(?<line>\w+(\.5)?)-\d\d/x
+
+		ODDS = /(<br><br>(?<home_line>-\d+(\.5)?))|(<br>(?<away_line>-\d+(\.5)?)[+-]\d\d<br>)|
+			((?<over_under>\d+(\.5)?)[ou]-\d{2}(?<home_line>-\d+(.5)?)-\d\d\z)|
+			((?<away_line>-\d+(.5)?)-\d\d(?<over_under>\d+(\.5)?)[ou]-\d{2}\z)/x
+		RUNLINE_ODDS = /(?<away_line>(\+|-)\d+(\.5)?)\/(\+|-)\d{3}(?<home_line>(\+|-)\d+(\.5)?)\/(\+|-)\d{3}/
+		MONEYLINE_ODDS = /((?<over_under>\d+(\.5)?)[ou]-\d{2})?(?<away_moneyline>(\+|-)\d{3}\d*)(?<home_moneyline>(\+|-)\d{3}\d*)/
 		
 		DOUBLEHEADER = /DH Gm (?<id>\d)/
 		RESULTS_DOUBLEHEADER = /\(DH (?<doubleheader>\d)\)/
@@ -453,7 +476,7 @@ class ScraperLeague
 	end
 
 	class Game
-		attr_reader :time, :home_team, :away_team, :home_team_odds, :away_team_odds, :over_under, :sport_id,
+		attr_reader :time, :away_team, :home_team, :vegas_info,
 			:ending, :winning_team, :winning_score, :losing_score, :ats_winner, :over_under_result, :doubleheader, :notes
 
 		def initialize(args = {})
@@ -461,7 +484,10 @@ class ScraperLeague
 		end
 
 		def update(args = {})
-			Game.sanitize(args).map { |attribute, value| instance_variable_set("@#{attribute}", value) }
+			Game.sanitize(args).map { |attribute, value| 
+				new_val = (attribute == :vegas_info && value && vegas_info) ? value.merge(vegas_info) : value
+				instance_variable_set("@#{attribute}", new_val)
+			}
 			return self
 		end
 
@@ -469,16 +495,43 @@ class ScraperLeague
 			home_team && away_team
 		end
 
+		def find_equal(games)
+			games.each { |game| return game if game == self }
+		end
+
+		def ==(other_game)
+			home_team == other_game.home_team && away_team == other_game.away_team && time.to_date == other_game.time.to_date && doubleheader == other_game.doubleheader
+		end
+
+		def home_or_away_team(team)
+			case team
+			when home_team then :home
+			when away_team then :away
+			else nil end
+		end
+
 		def as_json
 			instance_variables.each_with_object({}) { |var, hash| hash[var.to_s.delete("@").to_sym] = instance_variable_get(var) }
 		end
 
 		private
 		def self.sanitize(args)
-			permitted_keys = [:time, :home_team, :away_team, :home_team_odds, :away_team_odds, :over_under, :sport_id,
+			permitted_keys = [:time, :away_team, :home_team, :vegas_info,
 				:ending, :winning_team, :winning_score, :losing_score, :ats_winner, :over_under_result, :doubleheader, :notes]
 			args.select { |key,_| permitted_keys.include? key }
 		end
 	end
 
+end
+
+class Array
+  def as_json
+    map { |v| v.as_json }
+  end
+end
+
+class Hash
+	def compact
+    self.select { |_, value| !value.nil? }
+  end
 end

data/lib/vegas_insider_scraper.rb

@@ -12,6 +12,7 @@ require 'sports/nhl'
 class VegasInsiderScraper
 
 	attr_reader :sports
+	# supported sports
 	SPORTS = [NCAAFB, NCAABB, NFL, NBA, MLB, NHL]
 
 	def initialize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vegas_insider_scraper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Matthew Reitz
@@ -14,16 +14,22 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
 description: A gem to scrape the web for sports statistics, teams, betting lines,
   records, and results!
 email: reitz1994@gmail.com
@@ -51,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="