football-butler 1.1.0 → 2.1.1

data/lib/football/butler/odds.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require 'football/butler/football_data/odds'
+require 'football/butler/apifootball/odds'
+require 'football/butler/api_football/odds'
+
+module Football
+  module Butler
+    class Odds < Base
+
+      class << self
+        ## ODDS
+        def by_match(id:, from: nil, to: nil, result: api_switch_result)
+          api_switch_method(__method__, { id: id, from: from, to: to, result: result })
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/players.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+require 'football/butler/apifootball/players'
+require 'football/butler/football_data/players'
+require 'football/butler/api_football/players'
+
+module Football
+  module Butler
+    class Players < Base
+
+      class << self
+        ## PLAYER
+        def by_id(id:)
+          api_switch_method(__method__, { id: id })
+        end
+
+        def by_name(name:, result: api_switch_result)
+          api_switch_method(__method__, { name: name, result: result })
+        end
+
+        def by_id_and_season(id:, season:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { id: id, season: season, result: result, filters: filters })
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/predictions.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+require 'football/butler/apifootball/predictions'
+require 'football/butler/api_football/predictions'
+
+module Football
+  module Butler
+    class Predictions < Base
+
+      class << self
+        ## PREDICTIONS
+        def by_match(id:, filters: {}, result: api_switch_result)
+          api_switch_method(__method__, { id: id, filters: filters, result: result })
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/scorers.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'football/butler/football_data/scorers'
+require 'football/butler/apifootball/top_scorers'
+require 'football/butler/api_football/top_scorers'
+
+module Football
+  module Butler
+    class Scorers < Base
+
+      class << self
+        ## SCORER
+        def by_competition(id:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { id: id, result: result, filters: filters })
+        end
+
+        def by_competition_and_year(id:, year:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { id: id, year: year, result: result, filters: filters })
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/sidelineds.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require 'football/butler/api_football/sidelineds'
+
+module Football
+  module Butler
+    class Sidelineds < Base
+
+      class << self
+        ## SIDELINEDS
+        def by_player(player:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { player: player, result: result, filters: filters })
+        end
+
+        def by_coach(coach:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { coach: coach, result: result, filters: filters })
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/standings.rb

@@ -1,43 +1,30 @@
 # frozen_string_literal: true
+require 'football/butler/apifootball/standings'
+require 'football/butler/football_data/standings'
+require 'football/butler/api_football/standings'
 
 module Football
   module Butler
     class Standings < Base
-      PATH = :standings
 
-      STANDING_TYPE_HOME = 'HOME'
-      STANDING_TYPE_AWAY = 'AWAY'
+      class << self
+        def by_competition(id:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { id: id, result: result, filters: filters })
+        end
 
-      ## STANDINGS
-      #
-      # season={YEAR}
-      # standingType={standingType}
-      # standingType: [ TOTAL (default) | HOME | AWAY ]
-      #
-      # v2/competitions/{id}/standings
-      def self.by_competition(id:, result: PATH, filters: {})
-        path = "#{Competitions::PATH}/#{id}/#{PATH}"
-        Api.get(path: path, filters: filters, result: result)
-      end
+        def home_by_competition(id:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { id: id, result: result, filters: filters })
+        end
 
-      # v2/competitions/{id}/standings?standingType=HOME
-      def self.home_by_competition(id:, result: PATH, filters: {})
-        filters.merge!({ standingType: STANDING_TYPE_HOME })
-        by_competition(id: id, filters: filters, result: result)
-      end
+        def away_by_competition(id:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { id: id, result: result, filters: filters })
+        end
 
-      # v2/competitions/{id}/standings?standingType=AWAY
-      def self.away_by_competition(id:, result: PATH, filters: {})
-        filters.merge!({ standingType: STANDING_TYPE_AWAY })
-        by_competition(id: id, filters: filters, result: result)
+        def by_competition_and_year(id:, year:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { id: id, year: year, result: result, filters: filters })
+        end
       end
 
-      # v2/competitions/{id}/standings
-      def self.by_competition_and_year(id:, year:, result: PATH, filters: {})
-        path = "#{Competitions::PATH}/#{id}/#{PATH}"
-        filters.merge!({ season: year })
-        Api.get(path: path, filters: filters, result: result)
-      end
     end
   end
 end

data/lib/football/butler/statistics.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+require 'football/butler/apifootball/statistics'
+require 'football/butler/api_football/statistics'
+
+module Football
+  module Butler
+    class Statistics < Base
+
+      class << self
+        ## STATISTICS
+        def by_match(id:, result: api_switch_result)
+          api_switch_method(__method__, { id: id, result: result })
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/teams.rb

@@ -1,34 +1,34 @@
 # frozen_string_literal: true
+require 'football/butler/apifootball/teams'
+require 'football/butler/football_data/teams'
+require 'football/butler/api_football/teams'
 
 module Football
   module Butler
     class Teams < Base
-      PATH = :teams
 
-      ## TEAM
-      # v2/teams/{id}
-      # returns team object directly as a hash
-      def self.by_id(id:)
-        path = "#{PATH}/#{id}"
-        Api.get(path: path)
-      end
+      class << self
+        ## TEAM
+        def by_id(id:)
+          api_switch_method(__method__, { id: id })
+        end
 
-      ## COMPETITION
-      #
-      # season={YEAR}
-      # stage={STAGE}
-      #
-      # v2/competitions/{id}/teams
-      def self.by_competition(id:, result: PATH, filters: {})
-        path = "#{Competitions::PATH}/#{id}/#{PATH}"
-        Api.get(path: path, result: result, filters: filters)
-      end
+        def by_name(name:)
+          api_switch_method(__method__, { name: name })
+        end
+
+        def by_country_name(name:)
+          api_switch_method(__method__, { name: name })
+        end
+
+        ## COMPETITION
+        def by_competition(id:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { id: id, result: result, filters: filters })
+        end
 
-      # v2/competitions/{id}/teams?year={year}
-      def self.by_competition_and_year(id:, year:, result: PATH, filters: {})
-        path = "#{Competitions::PATH}/#{id}/#{PATH}"
-        filters.merge!({ year: year })
-        Api.get(path: path, result: result, filters: filters)
+        def by_competition_and_year(id:, year:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { id: id, year: year, result: result, filters: filters })
+        end
       end
     end
   end

data/lib/football/butler/tier.rb

@@ -9,11 +9,24 @@ module Football
         attr_accessor :available_minute, :counter_reset, :last_request, :total_requests, :sleep_seconds
 
         def set_from_response_headers(response)
-          if available_minute?(response) && counter_reset?(response)
-            set_tier_from_response(
-              response.headers['x-requests-available-minute'],
-              response.headers['x-requestcounter-reset']
-            )
+          case Configuration.api_name
+          when :apifootball_com
+            # n/a
+          when :football_data_org
+            if available_minute?(response, 'x-requests-available-minute') &&
+              counter_reset?(response, 'x-requestcounter-reset')
+              set_tier_from_response(
+                response.headers['x-requests-available-minute'],
+                response.headers['x-requestcounter-reset']
+              )
+            end
+          when :api_football_com
+            if available_minute?(response, 'x-ratelimit-remaining')
+              set_tier_from_response(
+                response.headers['x-ratelimit-remaining'],
+                '60'
+              )
+            end
           end
         end
 
@@ -22,17 +35,15 @@ module Football
           @counter_reset    = counter_reset.to_i
           @last_request     = Time.current
 
-          @total_requests = @total_requests.is_a?(Integer) ? @total_requests + 1 : 1
-
           true
         end
 
-        def available_minute?(response)
-          response&.headers&.dig('x-requests-available-minute')&.present?
+        def available_minute?(response, key_remaining_minute)
+          response&.headers&.dig(key_remaining_minute)&.present?
         end
 
-        def counter_reset?(response)
-          response&.headers&.dig('x-requestcounter-reset')&.present?
+        def counter_reset?(response, key_reset)
+          response&.headers&.dig(key_reset)&.present?
         end
 
         def get_sleep_seconds
@@ -53,6 +64,10 @@ module Football
           @total_requests = 0
         end
 
+        def count_request
+          @total_requests = @total_requests.is_a?(Integer) ? @total_requests + 1 : 1
+        end
+
         def reset_sleep_seconds
           @sleep_seconds = 0
         end

data/lib/football/butler/timezones.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+require 'football/butler/api_football/timezones'
+
+module Football
+  module Butler
+    class Timezones < Base
+
+      class << self
+        ## TIMEZONE
+        def all(result: api_switch_result)
+          api_switch_method(__method__, { result: result })
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/top_scorers.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+require 'football/butler/football_data/scorers'
+require 'football/butler/apifootball/top_scorers'
+require 'football/butler/api_football/top_scorers'
+
+module Football
+  module Butler
+    class TopScorers < Scorers
+    end
+  end
+end

data/lib/football/butler/transfers.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require 'football/butler/api_football/transfers'
+
+module Football
+  module Butler
+    class Transfers < Base
+
+      class << self
+        ## TRANSFERS
+        #
+        def by_player(player:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { player: player, result: result, filters: filters })
+        end
+
+        def by_team(team:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { team: team, result: result, filters: filters })
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/trophies.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require 'football/butler/api_football/trophies'
+
+module Football
+  module Butler
+    class Trophies < Base
+
+      class << self
+        ## TROPHIES
+        #
+        def by_player(player:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { player: player, result: result, filters: filters })
+        end
+
+        def by_coach(coach:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { coach: coach, result: result, filters: filters })
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/venues.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+require 'football/butler/api_football/venues'
+
+module Football
+  module Butler
+    class Venues < Base
+
+      class << self
+        ## VENUES
+        #
+        def by_city(city:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { city: city, result: result, filters: filters })
+        end
+
+        def by_country(country:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { country: country, result: result, filters: filters })
+        end
+
+        def by_name(name:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { name: name, result: result, filters: filters })
+        end
+
+        def by_id(id:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { id: id, result: result, filters: filters })
+        end
+
+        def search(search:, result: api_switch_result, filters: {})
+          api_switch_method(__method__, { search: search, result: result, filters: filters })
+        end
+
+      end
+    end
+  end
+end

data/lib/football/butler/version.rb

@@ -2,7 +2,13 @@
 
 module Football
   module Butler
-    # TIER_ONE with Standings (new packages) - April 2021
-    VERSION = "1.1.0"
+    # Minor Adjustments and Feauture Freeze due to follow up gem: sports-butler
+    # January 2022
+    #
+    # Supported APIs;
+    # - https://www.football-data.org (>= 1.0.0)
+    # - https://apifootball.com (>= 2.0.0)
+    # - https://api-football.com (>= 2.1.0)
+    VERSION = "2.1.1"
   end
 end

data/lib/football/butler.rb

@@ -10,6 +10,25 @@ require 'football/butler/matches'
 require 'football/butler/areas'
 require 'football/butler/teams'
 require 'football/butler/standings'
+require 'football/butler/countries'
+require 'football/butler/events'
+require 'football/butler/players'
+require 'football/butler/scorers'
+require 'football/butler/top_scorers'
+require 'football/butler/lineups'
+require 'football/butler/statistics'
+require 'football/butler/odds'
+require 'football/butler/head_to_head'
+require 'football/butler/predictions'
+require 'football/butler/leagues'
+require 'football/butler/fixtures'
+require 'football/butler/timezones'
+require 'football/butler/venues'
+require 'football/butler/injuries'
+require 'football/butler/coachs'
+require 'football/butler/transfers'
+require 'football/butler/trophies'
+require 'football/butler/sidelineds'
 
 module Football
   module Butler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: football-butler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jörg Kirschstein
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -66,7 +66,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-description: API Wrapper with endpoint classes for https://www.football-data.org
+description: Multiple API Wrapper with endpoint classes for football-data.org, apifootball.com,
+  api-football.com
 email:
 - info@joerg-kirschstein.de
 executables: []
@@ -75,14 +76,76 @@ extra_rdoc_files: []
 files:
 - lib/football/butler.rb
 - lib/football/butler/api.rb
+- lib/football/butler/api_football/base_api_football.rb
+- lib/football/butler/api_football/coachs.rb
+- lib/football/butler/api_football/countries.rb
+- lib/football/butler/api_football/fixtures.rb
+- lib/football/butler/api_football/head_to_head.rb
+- lib/football/butler/api_football/injuries.rb
+- lib/football/butler/api_football/leagues.rb
+- lib/football/butler/api_football/lineups.rb
+- lib/football/butler/api_football/odds.rb
+- lib/football/butler/api_football/players.rb
+- lib/football/butler/api_football/predictions.rb
+- lib/football/butler/api_football/sidelineds.rb
+- lib/football/butler/api_football/standings.rb
+- lib/football/butler/api_football/statistics.rb
+- lib/football/butler/api_football/teams.rb
+- lib/football/butler/api_football/timezones.rb
+- lib/football/butler/api_football/top_scorers.rb
+- lib/football/butler/api_football/transfers.rb
+- lib/football/butler/api_football/trophies.rb
+- lib/football/butler/api_football/venues.rb
+- lib/football/butler/apifootball/base_apifootball.rb
+- lib/football/butler/apifootball/competitions.rb
+- lib/football/butler/apifootball/countries.rb
+- lib/football/butler/apifootball/events.rb
+- lib/football/butler/apifootball/head_to_head.rb
+- lib/football/butler/apifootball/lineups.rb
+- lib/football/butler/apifootball/odds.rb
+- lib/football/butler/apifootball/players.rb
+- lib/football/butler/apifootball/predictions.rb
+- lib/football/butler/apifootball/standings.rb
+- lib/football/butler/apifootball/statistics.rb
+- lib/football/butler/apifootball/teams.rb
+- lib/football/butler/apifootball/top_scorers.rb
 - lib/football/butler/areas.rb
 - lib/football/butler/base.rb
+- lib/football/butler/coachs.rb
 - lib/football/butler/competitions.rb
 - lib/football/butler/configuration.rb
+- lib/football/butler/countries.rb
+- lib/football/butler/events.rb
+- lib/football/butler/fixtures.rb
+- lib/football/butler/football_data/areas.rb
+- lib/football/butler/football_data/competitions.rb
+- lib/football/butler/football_data/head_to_head.rb
+- lib/football/butler/football_data/lineups.rb
+- lib/football/butler/football_data/matches.rb
+- lib/football/butler/football_data/odds.rb
+- lib/football/butler/football_data/players.rb
+- lib/football/butler/football_data/scorers.rb
+- lib/football/butler/football_data/standings.rb
+- lib/football/butler/football_data/teams.rb
+- lib/football/butler/head_to_head.rb
+- lib/football/butler/injuries.rb
+- lib/football/butler/leagues.rb
+- lib/football/butler/lineups.rb
 - lib/football/butler/matches.rb
+- lib/football/butler/odds.rb
+- lib/football/butler/players.rb
+- lib/football/butler/predictions.rb
+- lib/football/butler/scorers.rb
+- lib/football/butler/sidelineds.rb
 - lib/football/butler/standings.rb
+- lib/football/butler/statistics.rb
 - lib/football/butler/teams.rb
 - lib/football/butler/tier.rb
+- lib/football/butler/timezones.rb
+- lib/football/butler/top_scorers.rb
+- lib/football/butler/transfers.rb
+- lib/football/butler/trophies.rb
+- lib/football/butler/venues.rb
 - lib/football/butler/version.rb
 homepage: https://github.com/frontimax/football-butler
 licenses:
@@ -90,7 +153,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/frontimax/football-butler
   source_code_uri: https://rubygems.org/gems/football_butler
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -106,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Football data via API
 test_files: []