mlb 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e82207f5345873c47ef01b18d32ed5dc131a7a2a2531b5c5adf2ca87e2c5d397
-  data.tar.gz: 597c40742c137216cc3210362b9a157dc28ef25cd5dacff689489821323cb804
+  metadata.gz: d6e28a22c9b934399e0edab2d391ef9dacc66209850caae9ad8e70a6bd524e1e
+  data.tar.gz: dd0f65a56582ec130bf1d46371fdf72cc4c48b6371af994632f0d663a6851c53
 SHA512:
-  metadata.gz: c9e096ebd1e2a1d88d618507c8e3d15b540f06c146b29c3dff1abe2dbf581521858fbf1b6362ad251c241db89330f3d2c4d6fb94753d8236056b5ec2910bfb69
-  data.tar.gz: e962f38e4fc333cafb5618ab1c5bdf66e53aed74b12a2e8be708877a2a8100af96410bfd8e196ce51ad4570490da98c4ade2eaefee845c9cf9230dacb2a7f5a2
+  metadata.gz: 7b57c8c9eda053930153f421a9447c4cd65f4fd7a55612d027faa9633a61783660a338d0468a752d2666b83223f23b2c9649c9a977e72354cb21c879000e2543
+  data.tar.gz: 5c866fb121cc4d6972e717b7466474d97d7dd044418d84a573b19f6f94ffd5b65569d66bf2a2eca4997c3b6bfc64f93cadefac7e6501cc659bb256d975ab5d83

data/CHANGELOG.md

@@ -1,2 +1,5 @@
-## [0.8.0] - 2024-05-02
+## [0.8.0] - 2024-05-22
+* Rewrite to use MLB Stats API
+
+## [0.8.0] - 2024-05-06
 * Rewrite

data/README.md

@@ -1,14 +1,15 @@
 [![Tests](https://github.com/sferik/mlb-ruby/actions/workflows/test.yml/badge.svg)](https://github.com/sferik/mlb-ruby/actions/workflows/test.yml)
-[![Linter](https://github.com/sferik/mlb-ruby/actions/workflows/lint.yml/badge.svg)](https://github.com/sferik/mlb-ruby/actions/workflows/lint.yml)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/fc32f80cb778b773a5b2/test_coverage)](https://codeclimate.com/github/sferik/mlb-ruby/test_coverage)
 [![Mutant](https://github.com/sferik/mlb-ruby/actions/workflows/mutant.yml/badge.svg)](https://github.com/sferik/mlb-ruby/actions/workflows/mutant.yml)
-[![Typer Checker](https://github.com/sferik/mlb-ruby/actions/workflows/steep.yml/badge.svg)](https://github.com/sferik/mlb-ruby/actions/workflows/steep.yml)
+[![Linter](https://github.com/sferik/mlb-ruby/actions/workflows/lint.yml/badge.svg)](https://github.com/sferik/mlb-ruby/actions/workflows/lint.yml)
+[![Maintainability](https://api.codeclimate.com/v1/badges/fc32f80cb778b773a5b2/maintainability)](https://codeclimate.com/github/sferik/mlb-ruby/maintainability)
 [![Gem Version](https://badge.fury.io/rb/mlb.svg)](https://rubygems.org/gems/mlb)
 
-# A [Ruby](https://www.ruby-lang.org) interface to the [MLB Data API](https://appac.github.io/mlb-data-api-docs/)
+# A [Ruby](https://www.ruby-lang.org) interface to the [MLB Stats API](https://statsapi.mlb.com)
 
 ## Follow
 
-For updates and announcements, follow [@sferik](https://x.com/sferik) on X.
+For updates and announcements, follow [@sferik](https://x.com/sferik).
 
 ## Installation
 
@@ -25,33 +26,34 @@ Or, if Bundler is not being used to manage dependencies:
 ```ruby
 require "mlb"
 
-dbacks = MLB::Team.all(season: 2024).first
-dbacks.name_display_full       # => "Arizona Diamondbacks"
-dbacks.name_display_brief      # => "D-backs"
-dbacks.name_abbrev             # => "AZ"
-dbacks.city                    # => "Phoenix"
-dbacks.league_full             # => "National League"
-dbacks.league_abbrev           # => "NL"
-dbacks.spring_league_full      # => "Cactus League"
-dbacks.spring_league_abbrev    # => "CL"
-dbacks.division_full           # => "National League West"
-dbacks.division_abbrev         # => "NLW"
-dbacks.first_year_of_play      # => "1996"
-dbacks.venue_name              # => "Chase Field"
-
-blaze = dbacks.roster.first
-blaze.name_display_first_last  # => "Blaze Alexander"
-blaze.jersey_number            # => "9"
-blaze.primary_position         # => "6"
-blaze.position_txt             # => "SS"
-blaze.height_feet              # => "5"
-blaze.height_inches            # => "11"
-blaze.weight                   # => "160"
-blaze.bats                     # => "R"
-blaze.throws                   # => "R"
-blaze.birth_date               # => "1999-06-11T00:00:00"
-blaze.start_date               # => "2022-11-15T00:00:00"
-blaze.pro_debut_date           # => "2024-03-28T00:00:00"
+mets = MLB::Teams.all(season: 2024).last
+mets.name                   # => "New York Mets"
+mets.short_name             # => "NY Mets"
+mets.abbreviation           # => "NYM"
+mets.league.name            # => "National League"
+mets.spring_league.name     # => "Grapefruit League"
+mets.division.name          # => "National League East"
+mets.first_year_of_play     # => 1962
+mets.location_name          # => "Flushing"
+mets.venue.name             # => "Citi Field"
+
+adam = MLB::Players.all(season: 2024).find { |player| player.id == mets.roster.first.player.id }
+
+adam.full_name              # => "Adam Ottavino"
+adam.primary_number         # => 0
+adam.primary_position.name  # => "Pitcher"
+adam.pitch_hand.description # => "Right"
+adam.bat_side.description   # => "Switch"
+adam.current_age            # => 38
+adam.birth_date.to_s        # => "1985-11-22"
+adam.birth_city             # => "New York"
+adam.birth_state_province   # => "NY"
+adam.birth_country          # => "USA"
+adam.draft_year             # => 2006
+adam.mlb_debut_date.to_s    # => "2010-05-29"
+adam.height                 # => "6' 5\""
+adam.weight                 # => 246
+adam.active?                # => true
 ```
 
 ## Sponsorship
@@ -112,10 +114,6 @@ Pull requests will only be accepted if they meet all the following criteria:
 
        bundle exec rake mutant
 
-5. RBS type signatures (in `sig/mlb.rbs`). This can be verified with:
-
-       bundle exec rake steep
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/mlb/client.rb

@@ -2,17 +2,15 @@ require "forwardable"
 require_relative "connection"
 require_relative "redirect_handler"
 require_relative "request_builder"
-require_relative "response_parser"
+require_relative "error_handler"
 
 module MLB
   class Client
     extend Forwardable
 
-    DEFAULT_BASE_URL = "https://lookup-service-prod.mlb.com/json/".freeze
-    DEFAULT_ARRAY_CLASS = Array
-    DEFAULT_OBJECT_CLASS = Hash
+    DEFAULT_BASE_URL = "https://statsapi.mlb.com/api/v1/".freeze
 
-    attr_accessor :base_url, :default_array_class, :default_object_class
+    attr_accessor :base_url
 
     def_delegators :@connection, :open_timeout, :read_timeout, :write_timeout, :proxy_url, :debug_output
     def_delegators :@connection, :open_timeout=, :read_timeout=, :write_timeout=, :proxy_url=, :debug_output=
@@ -25,47 +23,39 @@ module MLB
       write_timeout: Connection::DEFAULT_WRITE_TIMEOUT,
       debug_output: Connection::DEFAULT_DEBUG_OUTPUT,
       proxy_url: nil,
-      default_array_class: DEFAULT_ARRAY_CLASS,
-      default_object_class: DEFAULT_OBJECT_CLASS,
       max_redirects: RedirectHandler::DEFAULT_MAX_REDIRECTS)
 
       @base_url = base_url
-      initialize_default_classes(default_array_class, default_object_class)
       @connection = Connection.new(open_timeout:, read_timeout:, write_timeout:, debug_output:, proxy_url:)
       @request_builder = RequestBuilder.new
       @redirect_handler = RedirectHandler.new(connection: @connection, request_builder: @request_builder, max_redirects:)
-      @response_parser = ResponseParser.new
+      @error_handler = ErrorHandler.new
     end
 
-    def get(endpoint, headers: {}, array_class: default_array_class, object_class: default_object_class)
-      execute_request(:get, endpoint, headers:, array_class:, object_class:)
+    def get(endpoint, headers: {})
+      execute_request(:get, endpoint, headers:)
     end
 
-    def post(endpoint, body = nil, headers: {}, array_class: default_array_class, object_class: default_object_class)
-      execute_request(:post, endpoint, body:, headers:, array_class:, object_class:)
+    def post(endpoint, body = nil, headers: {})
+      execute_request(:post, endpoint, body:, headers:)
     end
 
-    def put(endpoint, body = nil, headers: {}, array_class: default_array_class, object_class: default_object_class)
-      execute_request(:put, endpoint, body:, headers:, array_class:, object_class:)
+    def put(endpoint, body = nil, headers: {})
+      execute_request(:put, endpoint, body:, headers:)
     end
 
-    def delete(endpoint, headers: {}, array_class: default_array_class, object_class: default_object_class)
-      execute_request(:delete, endpoint, headers:, array_class:, object_class:)
+    def delete(endpoint, headers: {})
+      execute_request(:delete, endpoint, headers:)
     end
 
     private
 
-    def initialize_default_classes(default_array_class, default_object_class)
-      @default_array_class = default_array_class
-      @default_object_class = default_object_class
-    end
-
-    def execute_request(http_method, endpoint, body: nil, headers: {}, array_class: default_array_class, object_class: default_object_class)
+    def execute_request(http_method, endpoint, headers:, body: nil)
       uri = URI.join(base_url, endpoint)
       request = @request_builder.build(http_method:, uri:, body:, headers:)
       response = @connection.perform(request:)
       response = @redirect_handler.handle(response:, request:, base_url:)
-      @response_parser.parse(response:, array_class:, object_class:)
+      @error_handler.handle(response:)
     end
   end
 

data/lib/mlb/connection.rb

@@ -8,7 +8,7 @@ module MLB
   class Connection
     extend Forwardable
 
-    DEFAULT_HOST = "lookup-service-prod.mlb.com".freeze
+    DEFAULT_HOST = "statsapi.mlb.com".freeze
     DEFAULT_PORT = 443
     DEFAULT_OPEN_TIMEOUT = 60 # seconds
     DEFAULT_READ_TIMEOUT = 60 # seconds

data/lib/mlb/division.rb

@@ -0,0 +1,42 @@
+require "shale"
+require_relative "league"
+require_relative "sport"
+
+module MLB
+  class Division < Shale::Mapper
+    include Comparable
+
+    attribute :id, Shale::Type::Integer
+    attribute :name, Shale::Type::String
+    attribute :season, Shale::Type::String
+    attribute :name_short, Shale::Type::String
+    attribute :link, Shale::Type::String
+    attribute :abbreviation, Shale::Type::String
+    attribute :league, League
+    attribute :sport, Sport
+    attribute :has_wildcard, Shale::Type::Boolean
+    attribute :sort_order, Shale::Type::Integer
+    attribute :active, Shale::Type::Boolean
+
+    alias_method :active?, :active
+    alias_method :wildcard?, :has_wildcard
+
+    json do
+      map "id", to: :id
+      map "name", to: :name
+      map "season", to: :season
+      map "nameShort", to: :name_short
+      map "link", to: :link
+      map "abbreviation", to: :abbreviation
+      map "league", to: :league
+      map "sport", to: :sport
+      map "hasWildcard", to: :has_wildcard
+      map "sortOrder", to: :sort_order
+      map "active", to: :active
+    end
+
+    def <=>(other)
+      sort_order <=> other.sort_order
+    end
+  end
+end

data/lib/mlb/divisions.rb

@@ -0,0 +1,30 @@
+require "shale"
+require "uri"
+require_relative "sport"
+require_relative "division"
+
+module MLB
+  class Divisions < Shale::Mapper
+    attribute :copyright, Shale::Type::String
+    attribute :divisions, Division, collection: true
+
+    def self.all(sport: Sport.new(id: 1))
+      sport_id = sport.respond_to?(:id) ? sport.id : sport
+      params = {sportId: sport_id}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("divisions?#{query_string}")
+      divisions = from_json(response)
+      divisions.divisions.sort!
+    end
+
+    def self.find(division, sport: Sport.new(id: 1))
+      id = division.respond_to?(:id) ? division.id : division
+      sport_id = sport.respond_to?(:id) ? sport.id : sport
+      params = {sportId: sport_id}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("divisions/#{id}?#{query_string}")
+      divisions = from_json(response)
+      divisions.divisions.first
+    end
+  end
+end

data/lib/mlb/{response_parser.rb → error_handler.rb}

@@ -1,4 +1,3 @@
-require "json"
 require "net/http"
 require_relative "errors/bad_gateway"
 require_relative "errors/bad_request"
@@ -17,7 +16,7 @@ require_relative "errors/unauthorized"
 require_relative "errors/unprocessable_entity"
 
 module MLB
-  class ResponseParser
+  class ErrorHandler
     ERROR_MAP = {
       400 => BadRequest,
       401 => Unauthorized,
@@ -34,14 +33,11 @@ module MLB
       503 => ServiceUnavailable,
       504 => GatewayTimeout
     }.freeze
-    JSON_CONTENT_TYPE_REGEXP = %r{application/json}
 
-    def parse(response:, array_class: nil, object_class: nil)
+    def handle(response:)
       raise error(response) unless response.is_a?(Net::HTTPSuccess)
 
-      return unless json?(response)
-
-      JSON.parse(response.body, array_class:, object_class:, symbolize_names: true)
+      response.body
     end
 
     private
@@ -53,9 +49,5 @@ module MLB
     def error_class(response)
       ERROR_MAP[Integer(response.code)] || HTTPError
     end
-
-    def json?(response)
-      JSON_CONTENT_TYPE_REGEXP.match?(response["content-type"])
-    end
   end
 end

data/lib/mlb/handedness.rb

@@ -0,0 +1,13 @@
+require "shale"
+
+module MLB
+  class Handedness < Shale::Mapper
+    attribute :code, Shale::Type::String
+    attribute :description, Shale::Type::String
+
+    json do
+      map "code", to: :code
+      map "description", to: :description
+    end
+  end
+end

data/lib/mlb/league.rb

@@ -0,0 +1,66 @@
+require "shale"
+require_relative "season_date_info"
+require_relative "sport"
+
+module MLB
+  class League < Shale::Mapper
+    include Comparable
+
+    attribute :id, Shale::Type::Integer
+    attribute :name, Shale::Type::String
+    attribute :link, Shale::Type::String
+    attribute :abbreviation, Shale::Type::String
+    attribute :name_short, Shale::Type::String
+    attribute :season_state, Shale::Type::String
+    attribute :has_wild_card, Shale::Type::Boolean
+    attribute :has_split_season, Shale::Type::Boolean
+    attribute :num_games, Shale::Type::Integer
+    attribute :has_playoff_points, Shale::Type::Boolean
+    attribute :num_teams, Shale::Type::Integer
+    attribute :num_wildcard_teams, Shale::Type::Integer
+    attribute :season_date_info, SeasonDateInfo
+    attribute :season, Shale::Type::Integer
+    attribute :org_code, Shale::Type::String
+    attribute :conferences_in_use, Shale::Type::Boolean
+    attribute :divisions_in_use, Shale::Type::Boolean
+    attribute :sport, Sport
+    attribute :sort_order, Shale::Type::Integer
+    attribute :active, Shale::Type::Boolean
+
+    alias_method :active?, :active
+    alias_method :wild_card?, :has_wild_card
+    alias_method :has_wildcard, :has_wild_card
+    alias_method :wildcard?, :has_wild_card
+    alias_method :split_season?, :has_split_season
+    alias_method :playoff_points?, :has_playoff_points
+    alias_method :conferences?, :conferences_in_use
+    alias_method :divisions?, :divisions_in_use
+
+    json do
+      map "id", to: :id
+      map "name", to: :name
+      map "link", to: :link
+      map "abbreviation", to: :abbreviation
+      map "nameShort", to: :name_short
+      map "seasonState", to: :season_state
+      map "hasWildCard", to: :has_wild_card
+      map "hasSplitSeason", to: :has_split_season
+      map "numGames", to: :num_games
+      map "hasPlayoffPoints", to: :has_playoff_points
+      map "numTeams", to: :num_teams
+      map "numWildcardTeams", to: :num_wildcard_teams
+      map "seasonDateInfo", to: :season_date_info
+      map "season", to: :season
+      map "orgCode", to: :org_code
+      map "conferencesInUse", to: :conferences_in_use
+      map "divisionsInUse", to: :divisions_in_use
+      map "sport", to: :sport
+      map "sortOrder", to: :sort_order
+      map "active", to: :active
+    end
+
+    def <=>(other)
+      sort_order <=> other.sort_order
+    end
+  end
+end

data/lib/mlb/leagues.rb

@@ -0,0 +1,30 @@
+require "shale"
+require "uri"
+require_relative "sport"
+require_relative "league"
+
+module MLB
+  class Leagues < Shale::Mapper
+    attribute :copyright, Shale::Type::String
+    attribute :leagues, League, collection: true
+
+    def self.all(sport: Sport.new(id: 1))
+      sport_id = sport.respond_to?(:id) ? sport.id : sport
+      params = {sportId: sport_id}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("leagues?#{query_string}")
+      leagues = from_json(response)
+      leagues.leagues.sort!
+    end
+
+    def self.find(league, sport: Sport.new(id: 1))
+      id = league.respond_to?(:id) ? league.id : league
+      sport_id = sport.respond_to?(:id) ? sport.id : sport
+      params = {sportId: sport_id}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("leagues/#{id}?#{query_string}")
+      leagues = from_json(response)
+      leagues.leagues.first
+    end
+  end
+end

data/lib/mlb/player.rb

@@ -1,21 +1,68 @@
+require "shale"
+require_relative "position"
+require_relative "handedness"
+require_relative "team"
+
 module MLB
-  Player = Struct.new(:bats, :birth_date, :college, :end_date, :height_feet,
-    :height_inches, :jersey_number, :name_display_first_last,
-    :name_display_last_first, :name_first, :name_full, :name_last, :name_use,
-    :player_id, :position_txt, :primary_position, :pro_debut_date, :start_date,
-    :starter_sw, :status_code, :team_abbrev, :team_code, :team_id, :team_name,
-    :throws, :weight, keyword_init: true) do
-    def team
-      require_relative "team"
-      sport_code = "'mlb'"
-      season = Time.now.year
-      all_star_sw = "'N'"
-      params = {sport_code:, season:, all_star_sw:}
-      query_string = URI.encode_www_form(params)
-      response = CLIENT.get("named.team_all_season.bam?#{query_string}")
-      teams = response[:team_all_season][:queryResults][:row]
-      team = teams.find { |t| t[:team_id] == team_id.to_s }
-      Team.new(**team)
+  class Player < Shale::Mapper
+    attribute :id, Shale::Type::Integer
+    attribute :full_name, Shale::Type::String
+    attribute :link, Shale::Type::String
+    attribute :first_name, Shale::Type::String
+    attribute :last_name, Shale::Type::String
+    attribute :primary_number, Shale::Type::Integer
+    attribute :birth_date, Shale::Type::Date
+    attribute :current_age, Shale::Type::Integer
+    attribute :birth_city, Shale::Type::String
+    attribute :birth_state_province, Shale::Type::String
+    attribute :birth_country, Shale::Type::String
+    attribute :height, Shale::Type::String
+    attribute :weight, Shale::Type::Integer
+    attribute :active, Shale::Type::Boolean
+    attribute :current_team, Team
+    attribute :primary_position, Position
+    attribute :use_name, Shale::Type::String
+    attribute :middle_name, Shale::Type::String
+    attribute :boxscore_name, Shale::Type::String
+    attribute :gender, Shale::Type::String
+    attribute :is_player, Shale::Type::Boolean
+    attribute :is_verified, Shale::Type::Boolean
+    attribute :draft_year, Shale::Type::Integer
+    attribute :mlb_debut_date, Shale::Type::Date
+    attribute :bat_side, Handedness
+    attribute :pitch_hand, Handedness
+
+    alias_method :verified?, :is_verified
+    alias_method :player?, :is_player
+    alias_method :active?, :active
+
+    json do
+      map "id", to: :id
+      map "fullName", to: :full_name
+      map "link", to: :link
+      map "firstName", to: :first_name
+      map "lastName", to: :last_name
+      map "primaryNumber", to: :primary_number
+      map "birthDate", to: :birth_date
+      map "currentAge", to: :current_age
+      map "birthCity", to: :birth_city
+      map "birthStateProvince", to: :birth_state_province
+      map "birthCountry", to: :birth_country
+      map "height", to: :height
+      map "weight", to: :weight
+      map "active", to: :active
+      map "currentTeam", to: :current_team
+      map "primaryPosition", to: :primary_position
+      map "useName", to: :use_name
+      map "middleName", to: :middle_name
+      map "boxscoreName", to: :boxscore_name
+      map "gender", to: :gender
+      map "isPlayer", to: :is_player
+      map "isVerified", to: :is_verified
+      map "draftYear", to: :draft_year
+      map "mlbDebutDate", to: :mlb_debut_date
+      map "batSide", to: :bat_side
+      map "pitchHand", to: :pitch_hand
     end
   end
 end

data/lib/mlb/players.rb

@@ -0,0 +1,25 @@
+require "shale"
+require "uri"
+require_relative "sport"
+require_relative "player"
+
+module MLB
+  class Players < Shale::Mapper
+    attribute :copyright, Shale::Type::String
+    attribute :players, Player, collection: true
+
+    json do
+      map "copyright", to: :copyright
+      map "people", to: :players
+    end
+
+    def self.all(season: Time.now.year, sport: Sport.new(id: 1))
+      sport_id = sport.respond_to?(:id) ? sport.id : sport
+      params = {season:}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("sports/#{sport_id}/players?#{query_string}")
+      players = from_json(response)
+      players.players
+    end
+  end
+end

data/lib/mlb/position.rb

@@ -0,0 +1,17 @@
+require "shale"
+
+module MLB
+  class Position < Shale::Mapper
+    attribute :code, Shale::Type::String
+    attribute :name, Shale::Type::String
+    attribute :type, Shale::Type::String
+    attribute :abbreviation, Shale::Type::String
+
+    json do
+      map "code", to: :code
+      map "name", to: :name
+      map "type", to: :type
+      map "abbreviation", to: :abbreviation
+    end
+  end
+end

data/lib/mlb/roster.rb

@@ -0,0 +1,22 @@
+require "shale"
+require "uri"
+require_relative "roster_entry"
+require_relative "sport"
+require_relative "team"
+
+module MLB
+  class Roster < Shale::Mapper
+    attribute :copyright, Shale::Type::String
+    attribute :roster, RosterEntry, collection: true
+
+    def self.find(team:, season: Time.now.year, sport: Sport.new(id: 1))
+      team_id = team.respond_to?(:id) ? team.id : team
+      sport_id = sport.respond_to?(:id) ? sport.id : sport
+      params = {season:, sportId: sport_id}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("teams/#{team_id}/roster?#{query_string}")
+      roster = from_json(response)
+      roster.roster
+    end
+  end
+end

data/lib/mlb/roster_entry.rb

@@ -0,0 +1,22 @@
+require "shale"
+require_relative "player"
+require_relative "position"
+require_relative "status"
+
+module MLB
+  class RosterEntry < Shale::Mapper
+    attribute :player, Player
+    attribute :jersey_number, Shale::Type::Integer
+    attribute :position, Position
+    attribute :status, Status
+    attribute :team_id, Shale::Type::Integer
+
+    json do
+      map "person", to: :player
+      map "jerseyNumber", to: :jersey_number
+      map "position", to: :position
+      map "status", to: :status
+      map "parentTeamId", to: :team_id
+    end
+  end
+end

data/lib/mlb/season_date_info.rb

@@ -0,0 +1,49 @@
+require "shale"
+
+module MLB
+  class SeasonDateInfo < Shale::Mapper
+    attribute :season_id, Shale::Type::String
+    attribute :pre_season_start_date, Shale::Type::Date
+    attribute :pre_season_end_date, Shale::Type::Date
+    attribute :season_start_date, Shale::Type::Date
+    attribute :spring_start_date, Shale::Type::Date
+    attribute :spring_end_date, Shale::Type::Date
+    attribute :regular_season_start_date, Shale::Type::Date
+    attribute :last_date_1st_half, Shale::Type::Date
+    attribute :all_star_date, Shale::Type::Date
+    attribute :first_date_2nd_half, Shale::Type::Date
+    attribute :regular_season_end_date, Shale::Type::Date
+    attribute :post_season_start_date, Shale::Type::Date
+    attribute :post_season_end_date, Shale::Type::Date
+    attribute :season_end_date, Shale::Type::Date
+    attribute :offseason_start_date, Shale::Type::Date
+    attribute :off_season_end_date, Shale::Type::Date
+    attribute :season_level_gameday_type, Shale::Type::String
+    attribute :game_level_gameday_type, Shale::Type::String
+    attribute :qualifier_plate_appearances, Shale::Type::Float
+    attribute :qualifier_outs_pitched, Shale::Type::Float
+
+    json do
+      map "seasonId", to: :season_id
+      map "preSeasonStartDate", to: :pre_season_start_date
+      map "preSeasonEndDate", to: :pre_season_end_date
+      map "seasonStartDate", to: :season_start_date
+      map "springStartDate", to: :spring_start_date
+      map "springEndDate", to: :spring_end_date
+      map "regularSeasonStartDate", to: :regular_season_start_date
+      map "lastDate1stHalf", to: :last_date_1st_half
+      map "allStarDate", to: :all_star_date
+      map "firstDate2ndHalf", to: :first_date_2nd_half
+      map "regularSeasonEndDate", to: :regular_season_end_date
+      map "postSeasonStartDate", to: :post_season_start_date
+      map "postSeasonEndDate", to: :post_season_end_date
+      map "seasonEndDate", to: :season_end_date
+      map "offseasonStartDate", to: :offseason_start_date
+      map "offSeasonEndDate", to: :off_season_end_date
+      map "seasonLevelGamedayType", to: :season_level_gameday_type
+      map "gameLevelGamedayType", to: :game_level_gameday_type
+      map "qualifierPlateAppearances", to: :qualifier_plate_appearances
+      map "qualifierOutsPitched", to: :qualifier_outs_pitched
+    end
+  end
+end

data/lib/mlb/sport.rb

@@ -0,0 +1,31 @@
+require "shale"
+
+module MLB
+  class Sport < Shale::Mapper
+    include Comparable
+
+    attribute :id, Shale::Type::Integer
+    attribute :code, Shale::Type::String
+    attribute :link, Shale::Type::String
+    attribute :name, Shale::Type::String
+    attribute :abbreviation, Shale::Type::String
+    attribute :sort_order, Shale::Type::Integer
+    attribute :active, Shale::Type::Boolean
+
+    alias_method :active?, :active
+
+    json do
+      map "id", to: :id
+      map "code", to: :code
+      map "link", to: :link
+      map "name", to: :name
+      map "abbreviation", to: :abbreviation
+      map "sortOrder", to: :sort_order
+      map "activeStatus", to: :active
+    end
+
+    def <=>(other)
+      sort_order <=> other.sort_order
+    end
+  end
+end

data/lib/mlb/sports.rb

@@ -0,0 +1,22 @@
+require "shale"
+require_relative "sport"
+
+module MLB
+  class Sports < Shale::Mapper
+    attribute :copyright, Shale::Type::String
+    attribute :sports, Sport, collection: true
+
+    def self.all
+      response = CLIENT.get("sports")
+      sports = from_json(response)
+      sports.sports.sort!
+    end
+
+    def self.find(sport)
+      id = sport.respond_to?(:id) ? sport.id : sport
+      response = CLIENT.get("sports/#{id}")
+      sports = from_json(response)
+      sports.sports.first
+    end
+  end
+end

data/lib/mlb/status.rb

@@ -0,0 +1,8 @@
+require "shale"
+
+module MLB
+  class Status < Shale::Mapper
+    attribute :code, Shale::Type::String
+    attribute :description, Shale::Type::String
+  end
+end

data/lib/mlb/team.rb

@@ -1,38 +1,65 @@
-require "uri"
+require "shale"
+require_relative "division"
+require_relative "league"
+require_relative "sport"
+require_relative "venue"
 
 module MLB
-  Team = Struct.new(:active_sw, :address, :address_city,
-    :address_country, :address_intl, :address_line1, :address_line2,
-    :address_line3, :address_province, :address_state, :address_zip, :all_star_sw,
-    :base_url, :bis_team_code, :city, :division, :division_abbrev, :division_full,
-    :division_id, :file_code, :first_year_of_play, :franchise_code, :home_opener,
-    :home_opener_time, :last_year_of_play, :league, :league_abbrev, :league_full,
-    :league_id, :mlb_org, :mlb_org_abbrev, :mlb_org_brief, :mlb_org_id,
-    :mlb_org_short, :name, :name_abbrev, :name_display_brief, :name_display_full,
-    :name_display_long, :name_display_short, :name_short, :phone_number, :season,
-    :sport_code, :sport_code_display, :sport_code_name, :sport_id, :spring_league,
-    :spring_league_abbrev, :spring_league_full, :spring_league_id, :state,
-    :store_url, :team_code, :team_id, :time_zone, :time_zone_alt,
-    :time_zone_generic, :time_zone_num, :time_zone_text, :venue_id, :venue_name,
-    :venue_short, :website_url, keyword_init: true) do
-    def self.all(season: Time.now.year, sort_order: "name_asc", all_star: false)
-      sport_code = "'mlb'"
-      season = "'#{season}'"
-      all_star_sw = all_star ? "'Y'" : "'N'"
-      params = {sport_code:, season:, sort_order:, all_star_sw:}
-      query_string = URI.encode_www_form(params)
-      response = CLIENT.get("named.team_all_season.bam?#{query_string}")
-      teams = response[:team_all_season][:queryResults][:row]
-      teams.collect { |team| Team.new(**team) }
+  class Team < Shale::Mapper
+    attribute :spring_league, League
+    attribute :all_star_status, Shale::Type::String
+    attribute :id, Shale::Type::Integer
+    attribute :name, Shale::Type::String
+    attribute :link, Shale::Type::String
+    attribute :season, Shale::Type::Integer
+    attribute :venue, Venue
+    attribute :spring_venue, Venue
+    attribute :team_code, Shale::Type::String
+    attribute :file_code, Shale::Type::String
+    attribute :abbreviation, Shale::Type::String
+    attribute :team_name, Shale::Type::String
+    attribute :location_name, Shale::Type::String
+    attribute :first_year_of_play, Shale::Type::Integer
+    attribute :league, League
+    attribute :division, Division
+    attribute :sport, Sport
+    attribute :short_name, Shale::Type::String
+    attribute :franchise_name, Shale::Type::String
+    attribute :club_name, Shale::Type::String
+    attribute :active, Shale::Type::Boolean
+
+    alias_method :active?, :active
+
+    json do
+      map "springLeague", to: :spring_league
+      map "allStarStatus", to: :all_star_status
+      map "id", to: :id
+      map "name", to: :name
+      map "link", to: :link
+      map "season", to: :season
+      map "venue", to: :venue
+      map "springVenue", to: :spring_venue
+      map "teamCode", to: :team_code
+      map "fileCode", to: :file_code
+      map "abbreviation", to: :abbreviation
+      map "teamName", to: :team_name
+      map "locationName", to: :location_name
+      map "firstYearOfPlay", to: :first_year_of_play
+      map "league", to: :league
+      map "division", to: :division
+      map "sport", to: :sport
+      map "shortName", to: :short_name
+      map "franchiseName", to: :franchise_name
+      map "clubName", to: :club_name
+      map "active", to: :active
     end
 
-    def roster
-      require_relative "player"
-      params = {team_id:}
+    def roster(season: Time.now.year)
+      params = {season:}
       query_string = URI.encode_www_form(params)
-      response = CLIENT.get("named.roster_40.bam?#{query_string}")
-      players = response[:roster_40][:queryResults][:row]
-      players.collect { |player| Player.new(**player) }
+      response = CLIENT.get("teams/#{id}/roster?#{query_string}")
+      roster = Roster.from_json(response)
+      roster.roster
     end
   end
 end

data/lib/mlb/teams.rb

@@ -0,0 +1,30 @@
+require "shale"
+require "uri"
+require_relative "sport"
+require_relative "team"
+
+module MLB
+  class Teams < Shale::Mapper
+    attribute :copyright, Shale::Type::String
+    attribute :teams, Team, collection: true
+
+    def self.all(season: Time.now.year, sport: Sport.new(id: 1))
+      sport_id = sport.respond_to?(:id) ? sport.id : sport
+      params = {sportId: sport_id, season:}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("teams?#{query_string}")
+      teams = from_json(response)
+      teams.teams
+    end
+
+    def self.find(team, season: Time.now.year, sport: Sport.new(id: 1))
+      id = team.respond_to?(:id) ? team.id : team
+      sport_id = sport.respond_to?(:id) ? sport.id : sport
+      params = {sportId: sport_id, season:}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("teams/#{id}?#{query_string}")
+      teams = from_json(response)
+      teams.teams.first
+    end
+  end
+end

data/lib/mlb/transaction.rb

@@ -1,37 +1,31 @@
-require "date"
-require "uri"
+require "shale"
+require_relative "player"
+require_relative "team"
 
 module MLB
-  Transaction = Struct.new(:conditional_sw, :effective_date, :final_asset,
-    :final_asset_type, :from_team, :from_team_id, :name_display_first_last,
-    :name_display_last_first, :name_sort, :note, :orig_asset, :orig_asset_type,
-    :player, :player_id, :resolution_cd, :resolution_date, :team, :team_id,
-    :trans_date, :trans_date_cd, :transaction_id, :type, :type_cd, keyword_init: true) do
-    def self.all(start_date: Date.today, end_date: Date.today)
-      sport_code = "'mlb'"
-      start_date = Date.parse(start_date.to_s).strftime("%Y%m%d")
-      end_date = Date.parse(end_date.to_s).strftime("%Y%m%d")
-      params = {sport_code:, start_date:, end_date:}
-      query_string = URI.encode_www_form(params)
-      response = CLIENT.get("named.transaction_all.bam?#{query_string}")
-      transactions = response.fetch(:transaction_all, {}).fetch(:queryResults, {}).fetch(:row, [])
-      transactions.collect { |transaction| Transaction.new(**transaction) }
-    end
-
-    def team
-      require_relative "team"
-      teams = effective_date.to_s.empty? ? Team.all : Team.all(season: effective_date.to_s[0...4].to_i)
-      teams.find { |t| t[:team_id] == team_id.to_s }
-    end
+  class Transaction < Shale::Mapper
+    attribute :id, Shale::Type::Integer
+    attribute :player, Player
+    attribute :from_team, Team, default: nil
+    attribute :to_team, Team
+    attribute :date, Shale::Type::Date
+    attribute :effective_date, Shale::Type::Date
+    attribute :resolution_date, Shale::Type::Date
+    attribute :type_code, Shale::Type::String
+    attribute :type_desc, Shale::Type::String
+    attribute :description, Shale::Type::String
 
-    def player
-      params = {team_id:}
-      query_string = URI.encode_www_form(params)
-      response = CLIENT.get("named.roster_40.bam?#{query_string}")
-      players = response[:roster_40][:queryResults][:row]
-      player = players.find { |p| p[:player_id] == player_id.to_s }
-      require_relative "player"
-      Player.new(**player)
+    json do
+      map "id", to: :id
+      map "person", to: :player
+      map "fromTeam", to: :from_team
+      map "toTeam", to: :to_team
+      map "date", to: :date
+      map "effectiveDate", to: :effective_date
+      map "resolutionDate", to: :resolution_date
+      map "typeCode", to: :type_code
+      map "typeDesc", to: :type_desc
+      map "description", to: :description
     end
   end
 end

data/lib/mlb/transactions.rb

@@ -0,0 +1,18 @@
+require "shale"
+require "uri"
+require_relative "transaction"
+
+module MLB
+  class Transactions < Shale::Mapper
+    attribute :copyright, Shale::Type::String
+    attribute :transactions, Transaction, collection: true
+
+    def self.between(start_date: Date.today, end_date: start_date)
+      params = {startDate: start_date, endDate: end_date}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("transactions?#{query_string}")
+      transactions = from_json(response)
+      transactions.transactions
+    end
+  end
+end

data/lib/mlb/venue.rb

@@ -0,0 +1,13 @@
+require "shale"
+
+module MLB
+  class Venue < Shale::Mapper
+    attribute :id, Shale::Type::Integer
+    attribute :name, Shale::Type::String
+    attribute :link, Shale::Type::String
+    attribute :active, Shale::Type::Boolean
+    attribute :season, Shale::Type::Integer
+
+    alias_method :active?, :active
+  end
+end

data/lib/mlb/venues.rb

@@ -0,0 +1,30 @@
+require "shale"
+require "uri"
+require_relative "sport"
+require_relative "venue"
+
+module MLB
+  class Venues < Shale::Mapper
+    attribute :copyright, Shale::Type::String
+    attribute :venues, Venue, collection: true
+
+    def self.all(season: Time.now.year, sport: Sport.new(id: 1))
+      sport_id = sport.respond_to?(:id) ? sport.id : sport
+      params = {sportId: sport_id, season:}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("venues?#{query_string}")
+      venues = from_json(response)
+      venues.venues
+    end
+
+    def self.find(venue, season: Time.now.year, sport: Sport.new(id: 1))
+      id = venue.respond_to?(:id) ? venue.id : venue
+      sport_id = sport.respond_to?(:id) ? sport.id : sport
+      params = {sportId: sport_id, season:}
+      query_string = URI.encode_www_form(params)
+      response = CLIENT.get("venues/#{id}?#{query_string}")
+      venues = from_json(response)
+      venues.venues.first
+    end
+  end
+end

data/lib/mlb/version.rb

@@ -1,5 +1,5 @@
 require "rubygems/version"
 
 module MLB
-  VERSION = Gem::Version.create("0.8.0")
+  VERSION = Gem::Version.create("0.9.0")
 end

data/lib/mlb.rb

@@ -1,3 +1,9 @@
 require_relative "mlb/client"
-require_relative "mlb/team"
-require_relative "mlb/transaction"
+require_relative "mlb/divisions"
+require_relative "mlb/leagues"
+require_relative "mlb/players"
+require_relative "mlb/roster"
+require_relative "mlb/sports"
+require_relative "mlb/teams"
+require_relative "mlb/transactions"
+require_relative "mlb/venues"

data/sig/mlb.rbs

@@ -127,11 +127,11 @@ module MLB
     def send_new_request: (URI::Generic new_uri, Net::HTTPRequest new_request) -> Net::HTTPResponse
   end
 
-  class ResponseParser
+  class ErrorHandler
     ERROR_MAP: Hash[Integer, singleton(BadGateway) | singleton(BadRequest) | singleton(ConnectionException) | singleton(Forbidden) | singleton(GatewayTimeout) | singleton(Gone) | singleton(InternalServerError) | singleton(NotAcceptable) | singleton(NotFound) | singleton(PayloadTooLarge) | singleton(ServiceUnavailable) | singleton(TooManyRequests) | singleton(Unauthorized) | singleton(UnprocessableEntity)]
     JSON_CONTENT_TYPE_REGEXP: Regexp
 
-    def parse: (response: Net::HTTPResponse, ?array_class: Class?, ?object_class: Class?) -> untyped
+    def parse: (response: Net::HTTPResponse) -> untyped
 
     private
     def error: (Net::HTTPResponse response) -> HTTPError
@@ -141,26 +141,21 @@ module MLB
 
   class Client
     DEFAULT_BASE_URL: String
-    DEFAULT_ARRAY_CLASS: singleton(Array)
-    DEFAULT_OBJECT_CLASS: singleton(Hash)
     extend Forwardable
     @connection: Connection
     @request_builder: RequestBuilder
     @redirect_handler: RedirectHandler
-    @response_parser: ResponseParser
+    @error_handler: ErrorHandler
 
     attr_accessor base_url: String
-    attr_accessor default_array_class: singleton(Array)
-    attr_accessor default_object_class: singleton(Hash)
-    def initialize: (?base_url: String, ?open_timeout: Integer, ?read_timeout: Integer, ?write_timeout: Integer, ?debug_output: untyped, ?proxy_url: nil, ?default_array_class: singleton(Array), ?default_object_class: singleton(Hash), ?max_redirects: Integer) -> void
-    def get: (String endpoint, ?headers: Hash[String, String], ?array_class: Class, ?object_class: Class) -> untyped
-    def post: (String endpoint, ?String? body, ?headers: Hash[String, String], ?array_class: Class, ?object_class: Class) -> untyped
-    def put: (String endpoint, ?String? body, ?headers: Hash[String, String], ?array_class: Class, ?object_class: Class) -> untyped
-    def delete: (String endpoint, ?headers: Hash[String, String], ?array_class: Class, ?object_class: Class) -> untyped
+    def initialize: (?base_url: String, ?open_timeout: Integer, ?read_timeout: Integer, ?write_timeout: Integer, ?debug_output: untyped, ?proxy_url: nil, ?max_redirects: Integer) -> void
+    def get: (String endpoint, ?headers: Hash[String, String]) -> untyped
+    def post: (String endpoint, ?String? body, ?headers: Hash[String, String]) -> untyped
+    def put: (String endpoint, ?String? body, ?headers: Hash[String, String]) -> untyped
+    def delete: (String endpoint, ?headers: Hash[String, String]) -> untyped
 
     private
-    def initialize_default_classes: (singleton(Array) default_array_class, singleton(Hash) default_object_class) -> singleton(Hash)
-    def execute_request: (:delete | :get | :post | :put http_method, String endpoint, ?body: String?, ?headers: Hash[String, String], ?array_class: Class, ?object_class: Class) -> nil
+    def execute_request: (:delete | :get | :post | :put http_method, String endpoint, ?body: String?, ?headers: Hash[String, String]) -> nil
   end
 
   attr_accessor effective_date: String

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mlb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Erik Berlin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
-dependencies: []
+date: 2024-05-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: shale
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description:
 email: sferik@gmail.com
 executables: []
@@ -24,6 +38,9 @@ files:
 - lib/mlb.rb
 - lib/mlb/client.rb
 - lib/mlb/connection.rb
+- lib/mlb/division.rb
+- lib/mlb/divisions.rb
+- lib/mlb/error_handler.rb
 - lib/mlb/errors/bad_gateway.rb
 - lib/mlb/errors/bad_request.rb
 - lib/mlb/errors/client_error.rb
@@ -44,12 +61,26 @@ files:
 - lib/mlb/errors/too_many_requests.rb
 - lib/mlb/errors/unauthorized.rb
 - lib/mlb/errors/unprocessable_entity.rb
+- lib/mlb/handedness.rb
+- lib/mlb/league.rb
+- lib/mlb/leagues.rb
 - lib/mlb/player.rb
+- lib/mlb/players.rb
+- lib/mlb/position.rb
 - lib/mlb/redirect_handler.rb
 - lib/mlb/request_builder.rb
-- lib/mlb/response_parser.rb
+- lib/mlb/roster.rb
+- lib/mlb/roster_entry.rb
+- lib/mlb/season_date_info.rb
+- lib/mlb/sport.rb
+- lib/mlb/sports.rb
+- lib/mlb/status.rb
 - lib/mlb/team.rb
+- lib/mlb/teams.rb
 - lib/mlb/transaction.rb
+- lib/mlb/transactions.rb
+- lib/mlb/venue.rb
+- lib/mlb/venues.rb
 - lib/mlb/version.rb
 - sig/mlb.rbs
 homepage: https://sferik.github.io/mlb-ruby
@@ -78,8 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
-summary: A Ruby interface to the MLB Data API.
+summary: A Ruby interface to the MLB Stats API.
 test_files: []