football-butler 1.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664d5c44e79a902f2d22bb75c73ca39dee02907732456193056a614fe673f1e5
-  data.tar.gz: d4424b42c0e1813b33ec2c1552d331d670d5242e412cb27634c0f9bf7a72ddb7
+  metadata.gz: 7654e08d510473c24d9918a1c0c17ad59bf099eaa8ffd7eb2d630e9bf01255e8
+  data.tar.gz: 7a921b8c15ea17bf504022db5ea3d5f162cbcaf5665ef0602147cf743f60fd0d
 SHA512:
-  metadata.gz: ac787493ada1bf0e49c29adecc0efd254cde6f59d02a4c0ae406898559ca001a6fa5bca5a31705633844c2e509fc928a856c7a2922b0d2465c4500cfe98f5102
-  data.tar.gz: 99c8a8c61d83d5a8d09ebd973f67d728e6c5fb8c595db8bb1ca0b3dc0658441f9c7fcae64f4d9780128ee6e7418222387f27ee040c2b9ffbfc1b34c68f455d1c
+  metadata.gz: a15049ca129fc638e56bb7097a261ac38a87f11f901e481f52115eb89ac6f0cd6047651ef451945317259cfb2f6001647be9b59bee5f6d3197c8d230dc814d8e
+  data.tar.gz: d7ecd05456a3a1be9b324a44ec1511d5256e4fba1253efe230715791b0a0f3531e14983a6485f05aa6576c830fc9009e8a25935fa54437ab7d45d33507b5ad53

data/lib/football/butler/api.rb

@@ -30,7 +30,7 @@ module Football
           end
 
           response = process_http_party(path, filters)
-          Tier.set_from_response_headers(response)
+          Configuration.tier_from_response(response)
 
           if reached_limit?(response)
             response = process_retry(path, filters)
@@ -50,7 +50,7 @@ module Football
             sleep(Tier.get_sleep_seconds) unless Rails.env.test?
 
             response = process_http_party(path, filters)
-            Tier.set_from_response_headers(response)
+            Configuration.tier_from_response(response)
 
             break unless reached_limit?(response)
           end
@@ -58,29 +58,23 @@ module Football
         end
 
         def process_http_party(path, filters)
-          headers = {
-            "X-Auth-Token": Configuration.api_token
-          }
-          url   = "#{Configuration.api_endpoint}/#{path}"
-          query = filters || {}
-
+          headers = Configuration.http_party_headers
+          url     = Configuration.http_party_url(path)
+          query   = filters || {}
           http_party_get(url, headers, query)
         end
 
         def process_response(response, result)
-          if response.dig('message')
+          if response.parsed_response.is_a?(Hash) && response.dig('message')
             error_message(response['message'])
           else
-            case result
-            when :default
-              response
-            else
-              response&.keys&.include?(result.to_s) ? response[result.to_s] : nil
-            end
+            Configuration.http_party_response(response, result)
           end
         end
 
         def http_party_get(url, headers, query)
+          Tier.count_request
+
           HTTParty.get "#{url}",
                        headers: headers,
                        query: query,
@@ -88,11 +82,14 @@ module Football
         end
 
         def invalid_config?
-          Configuration.api_token.blank? || Configuration.api_endpoint.blank?
+          Configuration.api_token.blank? || !Configuration.api_name_valid?(Configuration.api_name)
         end
 
         def log(text)
-          puts "\n\nFootball::Butler::VERSION: #{Football::Butler::VERSION} - #{text}\n\n"
+          log_text = "Football::Butler::VERSION: #{Football::Butler::VERSION} - #{text}"
+
+          puts "\n\n#{log_text}\n\n"
+          Football::Butler.logger.debug(log_text)
         end
       end
     end

data/lib/football/butler/api_football/base_api_football.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Football
+  module Butler
+    module ApiFootball
+      class BaseApiFootball < Base
+
+        # class << self
+        #   def build_path(action)
+        #     "action=#{action}"
+        #   end
+        # end
+
+      end
+    end
+  end
+end

data/lib/football/butler/api_football/coachs.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+require 'football/butler/api_football/base_api_football'
+
+module Football
+  module Butler
+    module ApiFootball
+      class Coachs < BaseApiFootball
+        PATH = :coachs
+
+        class << self
+          ## COACHS
+          #
+          # id
+          # integer
+          # The id of the coach
+          #
+          # team
+          # integer
+          # The id of the team
+          #
+          # search
+          # string >= 3 characters
+          # The name of the coach
+          #
+          # /coachs?id={id}
+          def by_id(id:, result:, filters:)
+            filters.merge!({ id: id })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+
+          # /coachs?search={name}
+          def search_by_name(name:, result:, filters:)
+            filters.merge!({ search: name })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+
+          # /coachs?team={team}
+          def by_team(team:, result:, filters:)
+            filters.merge!({ team: team })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/api_football/countries.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+require 'football/butler/api_football/base_api_football'
+
+module Football
+  module Butler
+    module ApiFootball
+      class Countries < BaseApiFootball
+        PATH = :countries
+
+        class << self
+          ## COUNTRY
+          # /countries?name={name}
+          def by_name(name:, result:, filters:)
+            filters.merge!({ name: name })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+
+          # /countries?code={code}
+          def by_code(code:, result:, filters:)
+            filters.merge!({ code: code })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+
+          ## COUNTRIES
+          # /countries
+          def all(result:)
+            Api.get(path: PATH, result: result)
+          end
+
+          # /countries?search={name}
+          def search_by_name(name:, result:, filters:)
+            filters.merge!({ search: name })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/api_football/fixtures.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+require 'football/butler/api_football/base_api_football'
+
+module Football
+  module Butler
+    module ApiFootball
+      class Fixtures < BaseApiFootball
+        PATH = :fixtures
+
+        class << self
+          ## FIXTURE
+          # /fixtures?id={id}
+          def by_id(id:)
+            filters = { id: id }
+            Api.get(path: PATH, filters: filters, result: :response)
+          end
+
+          ## FIXTURES
+          #
+          # id
+          # integer
+          # The id of the fixture
+          #
+          # live
+          # string
+          # Enum: "all" "id-id"
+          # date
+          # stringYYYY-MM-DD
+          # A valid date
+          #
+          # league
+          # integer
+          # The id of the league
+          #
+          # season
+          # integer 4 characters YYYY
+          # The season of the league
+          #
+          # team
+          # integer
+          # The id of the team
+          #
+          # last
+          # integer <= 2 characters
+          # For the X last fixtures
+          #
+          # next
+          # integer <= 2 characters
+          # For the X next fixtures
+          #
+          # from
+          # stringYYYY-MM-DD
+          # A valid date
+          #
+          # to
+          # stringYYYY-MM-DD
+          # A valid date
+          #
+          # round
+          # string
+          # The round of the fixture
+          #
+          # status
+          # string
+          # The status short of the fixture
+          #
+          # timezone
+          # string
+          # A valid timezone from the endpoint Timezone
+          #
+          # /fixtures?league={id}&season={year}
+          def by_competition_and_year(id:, year:, result:, filters:)
+            filters.merge!({ league: id, season: year })
+            Api.get(path: PATH, filters: filters, result: result)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/api_football/head_to_head.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Football
+  module Butler
+    module ApiFootball
+      class HeadToHead < Base
+        PATH = 'fixtures/headtohead'
+
+        class << self
+          ## HEAD TO HEAD
+          #
+          # h2h
+          # required
+          # stringID-ID
+          # The ids of the teams
+          #
+          # date
+          # stringYYYY-MM-DD
+          # league
+          # integer
+          # The id of the league
+          #
+          # season
+          # integer 4 characters YYYY
+          # The season of the league
+          #
+          # last
+          # integer
+          # For the X last fixtures
+          #
+          # next
+          # integer
+          # For the X next fixtures
+          #
+          # from
+          # stringYYYY-MM-DD
+          # to
+          # stringYYYY-MM-DD
+          # status
+          # string
+          # The status short of the fixture
+          #
+          # timezone
+          # string
+          # A valid timezone from the endpoint Timezone
+          #
+          # fixtures/headtohead?h2h={team_id-second_team_id}
+          def by_teams(team_id:, second_team_id:, filters:, result:)
+            filters.merge!(h2h: "#{team_id}-#{second_team_id}")
+            Api.get(path: PATH, filters: filters, result: result)
+          end
+        end
+      end
+    end
+  end
+end 

data/lib/football/butler/api_football/injuries.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+require 'football/butler/api_football/base_api_football'
+
+module Football
+  module Butler
+    module ApiFootball
+      class Injuries < BaseApiFootball
+        PATH = :injuries
+
+        class << self
+          ## Injuries
+          #
+          # league
+          # integer
+          # The id of the league
+          #
+          # season
+          # integer 4 characters YYYY
+          # The season of the league, required with league, team and player parameters
+          #
+          # fixture
+          # integer
+          # The id of the fixture
+          #
+          # team
+          # integer
+          # The id of the team
+          #
+          # player
+          # integer
+          # The id of the player
+          #
+          # date
+          # stringYYYY-MM-DD
+          # A valid date
+          #
+          # timezone
+          # string
+          # A valid timezone from the endpoint Timezone
+          #
+          # /injuries?ccompetition={competition}&season={season}
+          def by_competition_and_season(competition:, season:, result:, filters:)
+            filters.merge!({ league: competition, season: season })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+
+          # /injuries?fixture={match}
+          def by_match(match:, result:, filters:)
+            filters.merge!({ fixture: match })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+
+          # /injuries?team={team}&season={season}
+          def by_team_and_season(team:, season:, result:, filters:)
+            filters.merge!({ team: team, season: season })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/football/butler/api_football/leagues.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+require 'football/butler/api_football/base_api_football'
+
+module Football
+  module Butler
+    module ApiFootball
+      class Leagues < BaseApiFootball
+        PATH = :leagues
+
+        class << self
+          ## LEAGUE
+          # /leagues?id={id}
+          def by_id(id:)
+            filters = { id: id }
+            Api.get(path: PATH, filters: filters, result: :response)
+          end
+
+          # /leagues?country={country}
+          def by_country_name(name:, result:)
+            filters = { country: name }
+            Api.get(path: PATH, filters: filters, result: result)
+          end
+
+          # /leagues/seasons
+          def all_seasons(result:)
+            path = "#{PATH}/seasons"
+            Api.get(path: path, result: result)
+          end
+
+          ## LEAGUES
+          # https://www.api-football.com/documentation-v3#operation/get-leagues
+          #
+          # id
+          # integer
+          # The id of the league
+          #
+          # name
+          # string
+          # The name of the league
+          #
+          # country
+          # string
+          # The country name of the league
+          #
+          # code
+          # string 2 characters FR, GB, IT…
+          # The Alpha2 code of the country
+          #
+          # season
+          # integer 4 characters YYYY
+          # The season of the league
+          #
+          # team
+          # integer
+          # The id of the team
+          #
+          # type
+          # string
+          # Enum: "league" "cup"
+          # The type of the league
+          #
+          # current
+          # string
+          # Enum: "true" "false"
+          # The state of the league
+          #
+          # search
+          # string >= 3 characters
+          # The name or the country of the league
+          #
+          # last
+          # integer <= 2 characters
+          #
+          # /leagues
+          def all(result:, filters:)
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+
+          # /leagues?search={name}
+          def search_by_name(name:, filters:, result:)
+            filters.merge!({ search: name })
+            Api.get(path: PATH, filters: filters, result: result)
+          end
+
+          # /leagues?type=league
+          def all_leagues(result:, filters:)
+            filters.merge!({ type: 'league' })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+
+          # /leagues?type=cup
+          def all_cups(result:, filters:)
+            filters.merge!({ type: 'cup' })
+            Api.get(path: PATH, result: result, filters: filters)
+          end
+        end
+
+      end
+    end
+  end
+end