footballdata 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 306876da856af0139c78807cc9cb6613bb7ee6be
-  data.tar.gz: 3963a026833ed2ee76d3e810bb721c10e41ee8d0
+  metadata.gz: cee2ff276684851524daba751370189e186547ee
+  data.tar.gz: f12ee272a685ab22cb6789979dd5ae9c83129e19
 SHA512:
-  metadata.gz: fe2393e1d7d571b505a4e65947bfcd94f05558bc5ced6f7794bdd60e94cae1f3bedc20af39d94a5d0790f9025cf06d8c51418951bd92367f78599d926446ac58
-  data.tar.gz: b33cb0af68e7ee3adf5ff1f1d0ed02d87e0c35eeebfb0e04ce3ed6abaa36f9bc95b8a4533f5a7436c50b2e1c8d72475589d2d36d145051c3d63ec32806cdc007
+  metadata.gz: 6acc26ccdaf3ffb7f4fb1a10d2226f906c4154ba487e94b238cf2aab1130d6704a9f4c0a338a62d5ca880c6268f76b07063ce6955ff346eae4ab3439003ac39f
+  data.tar.gz: 60f6b3572e57034bf49b6de1fec87cb441587b835586ec6e09056fa6c24118348e34e7f0ecd5ff51fbc40c53bd037615389ef870a98dc88efdc76bb219e526f6

data/footballdata.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = 'footballdata'
-  gem.version       = '0.2'
+  gem.version       = '0.3'
   gem.date          = '2016-01-27'
   gem.authors       = ["Joshua Jansen"]
   gem.email         = ["joshuajansen88@gmail.com"]

data/lib/footballdata.rb

@@ -1,5 +1,5 @@
 require "json"
-require "open-uri"
+require 'net/http'
 
 require 'models/fixture'
 require 'models/team'
@@ -8,33 +8,53 @@ require 'configuration'
 
 BASE_URL = "http://api.football-data.org/v1"
 
-def api_key
-  Footballdata.configuration.api_key
-end
-
 module Footballdata
-  def self.leagues(season: current_season)
-    open("#{BASE_URL}/soccerseasons?season=#{season}", "X-Auth-Token" => api_key) do |response|
-      JSON.parse(response.read).map do |league|
-        League.new(
-          id: league["id"],
-          name: league["caption"]
-        )
-      end
+  def self.api_key
+    Footballdata.configuration.api_key
+  end
+
+  def self.api_request(path)
+    uri = URI([BASE_URL, path].join)
+    req = Net::HTTP::Get.new(uri)
+    req['X-Auth-Token'] = api_key
+
+    response = Net::HTTP.start(uri.hostname, uri.port) do |http|
+      http.request(req)
+    end
+
+    case response
+    when Net::HTTPSuccess then
+      response
+    when Net::HTTPTooManyRequests then
+      raise RuntimeError, "API limit reached"
+    else
+      response
     end
   end
 
-  def self.team(id)
-    open("#{BASE_URL}/teams/#{id}", "X-Auth-Token" => api_key) do |response|
-      team = JSON.parse(response.read)
-      id = team["_links"]["fixtures"]["href"].split("/")[-2]
-      Team.new(
-        id: id,
-        name: team["name"]
+  def self.leagues(season: current_season)
+    response = Footballdata::api_request("/soccerseasons?season=#{season}")
+
+    JSON.parse(response.body).map do |league|
+      League.new(
+        id: league["id"],
+        name: league["caption"],
+        number_of_teams: league["numberOfTeams"]
       )
     end
   end
 
+  def self.team(id)
+    response = Footballdata::api_request("/teams/#{id}")
+
+    team = JSON.parse(response.body)
+    id = team["_links"]["fixtures"]["href"].split("/")[-2]
+    Team.new(
+      id: id,
+      name: team["name"]
+    )
+  end
+
   def self.current_season
     Time.now.month >= 7 ? Time.now.year : Time.now.year - 1
   end

data/lib/models/fixture.rb

@@ -1,5 +1,8 @@
 module Footballdata
   class Fixture
+    attr_reader :id, :soccerseason_id, :date, :matchday, :home_team_name, :home_team_id,
+                :away_team_name, :away_team_id, :goals_home_team, :goals_away_team
+
     def initialize(id:, soccerseason_id:, date:, matchday:, home_team_name:, home_team_id:,
                    away_team_name:, away_team_id:, goals_home_team:, goals_away_team:)
       @id = id

data/lib/models/league.rb

@@ -1,40 +1,40 @@
 module Footballdata
   class League
-    attr_reader :id, :name
+    attr_reader :id, :name, :number_of_teams
 
-    def initialize(id:, name:)
+    def initialize(id:, name:, number_of_teams:)
       @id = id
       @name = name
+      @number_of_teams = number_of_teams
     end
 
     def teams
-      open("#{BASE_URL}/soccerseasons/#{id}/teams", "X-Auth-Token" => api_key) do |response|
-        JSON.parse(response.read)["teams"].map do |team|
-          id = team["_links"]["fixtures"]["href"].split("/")[-2]
-          Footballdata::Team.new(
-            id: id,
-            name: team["name"]
-          )
-        end
+      response = Footballdata::api_request("/soccerseasons/#{id}/teams")
+      JSON.parse(response.body)["teams"].map do |team|
+        id = team["_links"]["fixtures"]["href"].split("/")[-2]
+        Footballdata::Team.new(
+          id: id,
+          name: team["name"]
+        )
       end
     end
 
-    def fixtures
-      open("#{BASE_URL}/soccerseasons/#{id}/fixtures", "X-Auth-Token" => api_key) do |response|
-        JSON.parse(response.read)["fixtures"].map do |team|
-          Footballdata::Fixture.new(
-            id:              team["id"],
-            soccerseason_id: team["soccerseasonId"],
-            date:            team["date"],
-            matchday:        team["matchday"],
-            home_team_name:  team["homeTeamName"],
-            home_team_id:    team["homeTeamId"],
-            away_team_name:  team["awayTeamName"],
-            away_team_id:    team["awayTeamId"],
-            goals_home_team: team["result"]["goalsHomeTeam"],
-            goals_away_team: team["result"]["goalsAwayTeam"]
-          )
-        end
+    def fixtures(timeframe: "n#{self.number_of_teams}")
+      response = Footballdata::api_request("/soccerseasons/#{id}/fixtures?timeFrame=#{timeframe}")
+
+      JSON.parse(response.body)["fixtures"].map do |team|
+        Footballdata::Fixture.new(
+          id:              team["id"],
+          soccerseason_id: team["soccerseasonId"],
+          date:            team["date"],
+          matchday:        team["matchday"],
+          home_team_name:  team["homeTeamName"],
+          home_team_id:    team["homeTeamId"],
+          away_team_name:  team["awayTeamName"],
+          away_team_id:    team["awayTeamId"],
+          goals_home_team: team["result"]["goalsHomeTeam"],
+          goals_away_team: team["result"]["goalsAwayTeam"]
+        )
       end
     end
   end

data/lib/models/team.rb

@@ -8,21 +8,21 @@ module Footballdata
     end
 
     def fixtures
-      open("#{BASE_URL}/teams/#{id}/fixtures", "X-Auth-Token" => api_key) do |response|
-        JSON.parse(response.read)["fixtures"].map do |team|
-          Footballdata::Fixture.new(
-            id:              team["id"],
-            soccerseason_id: team["soccerseasonId"],
-            date:            team["date"],
-            matchday:        team["matchday"],
-            home_team_name:  team["homeTeamName"],
-            home_team_id:    team["homeTeamId"],
-            away_team_name:  team["awayTeamName"],
-            away_team_id:    team["awayTeamId"],
-            goals_home_team: team["result"]["goalsHomeTeam"],
-            goals_away_team: team["result"]["goalsAwayTeam"]
-          )
-        end
+      response = Footballdata::api_request("/teams/#{id}/fixtures")
+
+      JSON.parse(response.body)["fixtures"].map do |team|
+        Footballdata::Fixture.new(
+          id:              team["id"],
+          soccerseason_id: team["soccerseasonId"],
+          date:            team["date"],
+          matchday:        team["matchday"],
+          home_team_name:  team["homeTeamName"],
+          home_team_id:    team["homeTeamId"],
+          away_team_name:  team["awayTeamName"],
+          away_team_id:    team["awayTeamId"],
+          goals_home_team: team["result"]["goalsHomeTeam"],
+          goals_away_team: team["result"]["goalsAwayTeam"]
+        )
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: footballdata
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Joshua Jansen