standings 0.3.0 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14e739692474cfd75e542d448de6970e2db4c55e
-  data.tar.gz: bb7c094302d98b0d0ed43c83c1b740cd598d7644
+  metadata.gz: 700e9733621553724b05a8a746763f723e7d18bc
+  data.tar.gz: 9c18dec1572ed95d2065352b7421b27408ef925d
 SHA512:
-  metadata.gz: bfd75712159f6175f2b64e6c45f63703a9253be582394ca7f56f73b36bc4184af671a36cc9722008cd55b73cb4a3fbf5f2d6ffd9d9e11bba9c6edc2f9ddffb3c
-  data.tar.gz: 320461c8c23fb7304257f8c14557483ae91817a6eb7887902bbe298debb0b776c8d7c3932c9d92c05dab86b186bfe4e7fb26fb7d1998a96538013a1440ce20c4
+  metadata.gz: 75d2738153f30ce9ad054d422d2b01f2f1d95a50b2726a7a7ce0b903113f0a3e8e2c8689912b521ea7621af4e318186ca14877bce19d54eef4b95f69279cb20f
+  data.tar.gz: ee40e8af850813cbd7fb7d19c1e63afffb2e6670ed261e5d4f8372931552dbce5818509b11eac46c021a4aadab6fb0d4a20c4b1b200c24828029b95ad0f8f2a0

data/bin/standings

@@ -1,2 +1,5 @@
 #!/usr/bin/env ruby
-require 'standings'
+# encoding: utf-8
+
+require 'standings'
+Standings::CLI.new.record_user_selection_and_show_results!

data/lib/standings.rb

@@ -1,37 +1,11 @@
-#!/bin/env ruby
-# encoding: utf-8
-
-require_relative '../config/environment'
-opts = Trollop::options do
-  version <<-EOS
-
-⚽  Standings 
-Version 0.3.0 | original version published December 2013
-Scott Luptowski | @scottluptowski
-
-EOS
-  banner <<-EOS
-\n⚽  Standings is a command line gem which lets users check the current standings in a number of European football/soccer leagues. The data is scraped and thus subject to availability.
-
-Usage:
-\n
-
-EOS
-  opt :epl, "🇬🇧  English Premier League"
-  opt :championship, "🇬🇧  English Championship"
-  opt :spl, "🇬🇧  Scottish Premier League"
-  opt :liga, "🇪🇸  La Liga"
-  opt :ligue, "🇫🇷  Ligue 1"
-  opt :seriea, "🇮🇹  Seria A"
-  opt :bundesliga, "🇩🇪  Bundesliga"
-end
-
-league_selection = opts.keys.detect { |k| opts[k] }
-
-if league_selection
-  LeagueReference.set_league_info(league_selection)
-  TableScraper.new.call
-  Displayer.new.call
-else 
-  puts "⚽  Standings requires you to pass in the flag of a league. Run with --help for help."
-end
+require 'nokogiri'
+require 'open-uri'
+require 'colorize'
+require 'trollop'
+require 'ostruct'
+
+require 'standings/cli'
+require 'standings/displayer'
+require 'standings/league_reference'
+require 'standings/league_results'
+require 'standings/table_fetcher'

data/lib/standings/cli.rb

@@ -0,0 +1,58 @@
+module Standings
+  class CLI
+    def record_user_selection_and_show_results!
+      league_selection = accept_input
+
+      if league_selection
+        handle_valid_league_selection(league_selection)
+      else
+        handle_help_message
+      end
+    end
+
+    private
+    
+    def accept_input
+      opts = Trollop::options do
+        version <<-EOS
+      ⚽  Standings
+      Version 1.0 | September 2016
+      Scott Luptowski | @scottluptowski
+      EOS
+        banner <<-EOS
+      \n⚽  Standings is a command line gem which lets users check the current standings in a number of European football/soccer leagues.
+      Usage:
+      \n
+      EOS
+        opt :epl, "🇬🇧  English Premier League", short: :e
+        opt :championship, "🇬🇧  English Championship", short: :c
+        opt :league1, "🇬🇧  English League One", short: :o
+        opt :league2, "🇬🇧  English League Two", short: :t
+        opt :spl, "🇬🇧  Scottish Premiership", short: :s
+        opt :liga, "🇪🇸  La Liga", short: :l
+        opt :ligue, "🇫🇷  Ligue 1", short: :f
+        opt :seriea, "🇮🇹  Seria A", short: :i
+        opt :bundesliga, "🇩🇪  Bundesliga", short: :d
+      end
+
+      opts.keys.detect { |k| opts[k] }
+    end
+
+    def handle_valid_league_selection(league_selection)
+      begin
+        results = TableFetcher.new(league_selection).call
+        Displayer.new(results).display_table
+      rescue TableFetcher::FetchError, TableFetcher::ParseError
+        handle_failure
+      end
+    end
+
+    def handle_help_message
+      puts "⚽  Standings requires you to pass in the flag of a league. Run with --help for help."
+    end
+
+    def handle_failure
+      puts "⚽  There was an error retrieving the scores!"
+    end
+  end
+end

data/lib/standings/displayer.rb

@@ -0,0 +1,55 @@
+module Standings
+  class Displayer
+    attr_reader :results
+
+    def initialize(results)
+      @results = results
+    end
+
+    def display_table
+      puts dividing_line
+      puts "#   GP  Pts  W    D    L   Team"
+      puts dividing_line
+
+      results.teams.each do |team|
+        puts template(team)
+        sleep 0.01
+      end
+
+      puts dividing_line
+    end
+
+    def template(team)
+      output =
+        "#{(team.position.to_s).ljust(3," ")} " \
+        "#{team.played.to_s.ljust(3, " ")} " \
+        "#{team.points.to_s.ljust(5, " ")}" \
+        "#{team.wins.to_s.ljust(5, " ")}" \
+        "#{team.draws.to_s.ljust(5, " ")}" \
+        "#{team.losses.to_s.ljust(5, " ")}"
+
+      if results.top?(team)
+        output += team.name.green
+      elsif results.middle?(team)
+        output += team.name.light_blue
+      elsif results.bottom?(team)
+        output += team.name.red
+      else
+        output += team.name
+      end
+    end
+
+    private
+
+    def dividing_line
+      # draw enough dashes so that teams with long names are still covered
+      # by the dashes. Given a team length integer, add it to 31
+      # (the length of the static puts statement in #display_table)
+      "-" * (31 + longest_team_name_length)
+    end
+
+    def longest_team_name_length
+      results.teams.map {|t| t.name.length }.max
+    end
+  end
+end

data/lib/standings/league_reference.rb

@@ -0,0 +1,58 @@
+module Standings
+  LeagueReference = {
+    epl: {
+      league_full_name: "premierleague",
+      top_teams: 4,
+      middle_teams: 5,
+      bottom_teams: 3
+    },
+    championship: {
+      league_full_name: "championship",
+      top_teams: 2,
+      middle_teams: 6,
+      bottom_teams: 3
+    },
+    league1: {
+      league_full_name: "leagueonefootball",
+      top_teams: 2,
+      middle_teams: 6,
+      bottom_teams: 4,
+    },
+    league2: {
+      league_full_name: "leaguetwofootball",
+      top_teams: 3,
+      middle_teams: 7,
+      bottom_teams: 2
+    },
+    spl: {
+      league_full_name: "scottish-premiership",
+      top_teams: 1,
+      middle_teams: 3,
+      bottom_teams: 2
+    },
+    liga: {
+      league_full_name: "laligafootball",
+      top_teams: 4,
+      middle_teams: 6,
+      bottom_teams: 3
+    },
+    ligue: {
+      league_full_name: "ligue1football",
+      top_teams: 3,
+      middle_teams: 4,
+      bottom_teams: 3
+    },
+    seriea: {
+      league_full_name: "serieafootball",
+      top_teams: 3,
+      middle_teams: 5,
+      bottom_teams: 3
+    },
+    bundesliga: {
+      league_full_name: "bundesligafootball",
+      top_teams: 4,
+      middle_teams: 6,
+      bottom_teams: 3
+    }
+  }
+end

data/lib/standings/league_results.rb

@@ -0,0 +1,24 @@
+module Standings
+  class LeagueResults
+    class Team < OpenStruct; end
+
+    attr_accessor :league, :teams
+
+    def initialize(league)
+      @league = league
+    end
+
+    def top?(team)
+      team.position <= LeagueReference[league][:top_teams]
+    end
+
+    def middle?(team)
+      LeagueReference[league][:middle_teams] &&
+      team.position <= LeagueReference[league][:middle_teams]
+    end
+
+    def bottom?(team)
+      team.position >= (teams.count - LeagueReference[league][:bottom_teams] + 1)
+    end
+  end
+end

data/lib/standings/table_fetcher.rb

@@ -0,0 +1,70 @@
+module Standings
+  class TableFetcher
+    class FetchError < StandardError; end
+    class ParseError < StandardError; end
+
+    attr_reader :league_selection
+
+    def initialize(league_selection)
+      @league_selection = league_selection
+    end
+
+    def call
+      begin
+        url = "https://www.theguardian.com/football/#{LeagueReference[league_selection][:league_full_name]}/table"
+        site = Nokogiri::HTML(open(url))
+      rescue
+        throw FetchError
+      end
+
+      begin
+        team_data = site.css('.table--league-table tbody tr')
+
+        LeagueResults.new(league_selection).tap do |lr|
+          lr.teams = build_teams(team_data)
+        end
+      rescue
+        throw ParseError
+      end
+    end
+
+    private
+
+    def build_teams(team_data_xml)
+      team_data_xml.length.times.map do |i|
+        source = team_data_xml[i].children.text
+        build_team(source)
+      end
+    end
+
+    def build_team(source)
+      team_info = source.split("\n").select { |s| s != "" }
+
+      # ["1", Position
+      #  "Chelsea", Team
+      #  "12", Played
+      #  "10", Win
+      #  "2", Draw
+      #  "0", Loss
+      #  "30", Goals For
+      #  "11", Goals Against
+      #  "19", Goal Difference
+      #  "32", Points
+      #  "Won against C Palace",
+      #  "Drew with Man Utd",
+      #  "Won against QPR",
+      #  "Won against Liverpool",
+      #  "Won against West Brom"]
+
+      LeagueResults::Team.new({
+        position: team_info[0].to_i,
+        name: team_info[1],
+        played: team_info[2].to_i,
+        wins: team_info[3].to_i,
+        draws: team_info[4].to_i,
+        losses: team_info[5].to_i,
+        points: team_info[9].to_i
+      })
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standings
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: '1.0'
 platform: ruby
 authors:
 - Scott Luptowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -53,8 +53,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: View European football/soccer standings from your terminal. Currently
-  supports Premier League, Scottish Premier League, La Liga, Ligue 1, Serie A, and
-  Bundesliga
+  supports English Premier League, Championship, League One and Two, Scottish Premiership,
+  La Liga, Ligue 1, Serie A, and Bundesliga
 email: scottluptowski@gmail.com
 executables:
 - standings
@@ -62,12 +62,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/standings
-- config/environment.rb
-- lib/displayer.rb
-- lib/league_reference.rb
 - lib/standings.rb
-- lib/table_scraper.rb
-- lib/team.rb
+- lib/standings/cli.rb
+- lib/standings/displayer.rb
+- lib/standings/league_reference.rb
+- lib/standings/league_results.rb
+- lib/standings/table_fetcher.rb
 homepage: http://www.github.com/scottluptowski/standings
 licenses:
 - MIT
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: football/soccer standings

data/config/environment.rb

@@ -1,10 +0,0 @@
-require 'nokogiri'
-require 'open-uri'
-require 'colorize'
-require 'trollop'
-require 'pry'
-
-require_relative '../lib/league_reference.rb'
-require_relative '../lib/displayer.rb'
-require_relative '../lib/table_scraper.rb'
-require_relative '../lib/team.rb'

data/lib/displayer.rb

@@ -1,35 +0,0 @@
-class Displayer
- 
-  def call
-    display_table
-  end
- 
-  def template(team)
-    output = "#{(team.position).ljust(3," ")} #{team.played.ljust(3, " ")} #{team.points.to_s.ljust(5, " ")}"
-
-    if team.top?
-      output += team.name.green
-    elsif team.middle?
-      output += team.name.light_blue
-    elsif team.bottom?
-      output += team.name.red
-    else
-      output += team.name
-    end
-  end
- 
-  def display_table
-    puts dashes_for_display_table
-    puts "#   P  Pts   Team"
-    puts dashes_for_display_table
-    Team::teams.each { |team| puts template(team); sleep 0.01  } 
-    puts dashes_for_display_table
-  end
-
-  def dashes_for_display_table
-    # draw enough dashes so that teams with long names are still covered 
-    #by the dashes. Given a team length integer, add it to 17 
-    #(the length of the static puts statement in #display_table)
-    "-" * (17 + Team.get_longest_team_name_length)
-  end
-end

data/lib/league_reference.rb

@@ -1,59 +0,0 @@
-class LeagueReference
-  class << self
-    attr_accessor :league_symbol, :league_full_name, :top_teams, :middle_teams, :bottom_teams
-  end
-
-  LeaguesHash = {
-    :epl => {
-      :league_full_name => "premierleague",
-      :top_teams => 4,
-      :middle_teams => 5,
-      :bottom_teams => 3
-    },
-    :championship => {
-      :league_full_name => "championship",
-      :top_teams => 2,
-      :middle_teams => 6,
-      :bottom_teams => 3
-    },
-    :spl => {
-      :league_full_name => "scottishpremierleague",
-      :top_teams => 1,
-      :middle_teams => 3,
-      :bottom_teams => 2
-    },
-    :liga => {
-      :league_full_name => "laligafootball",
-      :top_teams => 3,
-      :middle_teams => 6,
-      :bottom_teams => 3
-    },
-    :ligue => {
-      :league_full_name => "ligue1football",
-      :top_teams => 3,
-      :middle_teams => 4,
-      :bottom_teams => 3
-    },
-    :seriea => {
-      :league_full_name => "serieafootball",
-      :top_teams => 3,
-      :middle_teams => 5,
-      :bottom_teams => 3
-    },
-    :bundesliga => {
-      :league_full_name => "bundesligafootball",
-      :top_teams => 4,
-      :middle_teams => 6,
-      :bottom_teams => 3
-    }
-  }
-
-  def self.set_league_info(league_selection)
-    self.league_symbol = league_selection
-    %w(league_full_name top_teams middle_teams bottom_teams).each do |attr|
-      self.send("#{attr}=", LeaguesHash[league_symbol][attr.to_sym])
-    end
-
-    league_selection
-  end
-end

data/lib/table_scraper.rb

@@ -1,31 +0,0 @@
-class TableScraper
- 
-  attr_accessor :url, :teams
- 
-  def initialize
-    @url = "https://www.theguardian.com/football/" + LeagueReference::league_full_name + "/table"
-  end
- 
-  def call
-    site = Nokogiri::HTML(open(@url))
-    self.teams = site.css('.table--league-table tbody tr')
-    build_teams
-  end
-
-  def build_teams
-    teams.length.times do |i|
-      source = teams[i].children.text
-      team_data = source.split("\n").select { |s| s != "" }
-
-      #["1", "Spurs", "2", "2", "0", "0", "5", "0", "5", "6"]
-      #Pos  Team  P W D L F A GD  Pts
-
-      Team.new({
-        :position => team_data[0],
-        :name => team_data[1],
-        :played => team_data[2],
-        :points => team_data[9]
-      })
-    end
-  end
-end

data/lib/team.rb

@@ -1,41 +0,0 @@
-class Team
-  class << self
-    attr_accessor :longest_team_name_length
-  end
-
-  attr_accessor :name, :position, :played, :points
-
-  @@teams = []
-  
-  def initialize(info)
-    @name = info[:name]
-    @played = info[:played]
-    @points = info[:points]
-    @position = info[:position]
-    @@teams << self
-  end
-
-  def top?
-    position.to_i <= LeagueReference.top_teams
-  end
-
-  def middle?
-    LeagueReference.middle_teams && position.to_i <= LeagueReference.middle_teams
-  end
-
-  def bottom?
-    position.to_i >= (Team.teams_count - LeagueReference.bottom_teams + 1)
-  end
-
-  def self.teams
-    @@teams
-  end
-
-  def self.teams_count
-    @@teams.count
-  end
- 
-  def self.get_longest_team_name_length
-    @longest_team_name_length ||= teams.sort_by {|t| t.name.length }.last.name.length
-  end
-end