basketball 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a6709626d10c4b4c46fce577ec25ea57f28f89a12a40799bd625666d9c6a3b5
-  data.tar.gz: ac30e12cb15484913ba3b58c0e96f130575a08111d572b87b77e490727c7a528
+  metadata.gz: e72d5e9ae7173e7906499f251db75f25d65ead4cf7cf6a8171f615a7821ba2fb
+  data.tar.gz: 744511e1ce1b8dce785cc3dfbf18cb8e5e1e355c9686226b03703ccaddc29468
 SHA512:
-  metadata.gz: f2fd8e0024222767369b33abf749ba8b41d6320d181bc6e20144007bf1a6aedf6d67f42f0d6ce29fd995387b9540eed9c8c8ec6232809a35c56099389b33cada
-  data.tar.gz: de054db63b667f81a118b2e917894bdb7667bc64801959529c74b9da2d19afc78889a3efa8ee95f68d098880fc82f449fd661a33f2eca668bcfe656b839a40ef
+  metadata.gz: '0868c8152e6e0c1e52554b0546d289678c23fd73a3b855c42b9fe48982ee2decfe9d6b6433b72632909bdee64debb16169288fc423f5f16368d98a90b85f33bd'
+  data.tar.gz: eb0e17d0273548cffbf3dde7b96dda4655461939997723619e5be125fd56ebe24d0ec6ce7c82edfefa76d529e022dafb2b703b533e9553b9a867e3ae9bf1aef8

data/README.md

@@ -25,7 +25,6 @@ Element      | Description
 **Game** | Matches up a date with two teams (home and away) to represent a coordinatord match-up.
 **League** | Describes a league in terms of structure composed of conferences, divisions, teams, and players.
 **Match** | When the Coordinator needs an Arena instance to select a game winner, it will send the Arena a Match. A match is Game but also includes the active roster (players) for both teams that will participate in the game.
-**Org** | Bounded context (sub-module) dealing with overall organizational structure of a sports assocation.
 **Pick** | Result event emitted when a player is automatically or manually selected.
 **Player** | Identitiable as a person able to be drafted.  Meant to be subclassed and extended to include more intricate descriptions of a specific sport player, such as abilities, ratings, and statistics.  Right now it has none of these types of traits and it meant to only serve as the base with only an overall attribute.
 **Record** | Represents a team's overall record.
@@ -57,26 +56,21 @@ bundle add basketball
 
 ### Draft Module
 
-The input for the main object `Basketball::Draft::Room` is an array of teams (`Basketball::Draft::FrontOffice`) and players (`Basketball::Org::Players`). Once instantiated there are four main methods:
+The input for the main object `Basketball::Draft::Room` is an array of teams (`Basketball::Draft::FrontOffice`) and players (`Basketball::Draft::Players`). Once instantiated there are four main methods:
 
 * **Basketball::Draft::Room#sim!**: Simulate the next pick.
 * **Basketball::Draft::Room#skip!**: Skip the next pick.
 * **Basketball::Draft::Room#pick!(player)**: Pick an exact player for the current front office.
 * **Basketball::Draft::Room#sim_rest!**: Simulate the rest of the picks.
 
-### Org Module
-
-The Org module contains all the structural and transactional for the basketball league as a whole. A League can be made up of free agents and conferences, conferences can have divisions, divisions can have teams, and teams can have players.  The main object: `Basketball::Org::League` allows for the control through its API:
-
-* **Basketball::Org::League#sign!**: Sign a player to a team.
-* **Basketball::Org::League#release!**: Release a player from a team and place them in the free agent pool.
-
 ### Season Module
 
-The Season module knows how to execute a calendar of games for a League and generate results. The main object is the `Basketball::Season::Coordinator` class. Once instantiated there are four main methods:
+The Season module knows how to execute a calendar of games for a League and generate results. The main object is the `Basketball::Season::Coordinator` class. Once instantiated the main methods are:
 
-* **Basketball::Season::Coordinator#sim!**: Simulate the next day of games.
+* **Basketball::Season::Coordinator#release!**: Release a player from a team and place them in the free agent pool.
+* **Basketball::Season::Coordinator#sign!**: Sign a player to a team.
 * **Basketball::Season::Coordinator#sim_rest!**: Simulate the rest of the games.
+* **Basketball::Season::Coordinator#sim!**: Simulate the next day of games.
 
 ## Contributing
 

data/lib/basketball/{org → common}/player.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Basketball
-  module Org
+  module Common
     # Base class describing a player.
     # A consumer application should extend these specific to their specific sports traits.
     class Player < Entity

data/lib/basketball/{org → common}/position.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Basketball
-  module Org
+  module Common
     # Describes a player position.
     class Position < ValueObject
       extend Forwardable

data/lib/basketball/common.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require_relative 'common/player'
+require_relative 'common/position'

data/lib/basketball/draft/front_office.rb

@@ -52,6 +52,10 @@ module Basketball
 
       private
 
+      def top_players(assessment)
+        scout.top_for(players: assessment.undrafted_players)
+      end
+
       def adaptive_search(assessment)
         drafted_positions = assessment.drafted_players.map(&:position)
 
@@ -69,15 +73,15 @@ module Basketball
           break if players.any?
         end
 
-        players = players.any? ? players : scout.top_for
+        players
       end
 
       def all_random_positions
-        Org::Position::ALL_VALUES.to_a.shuffle.map { |v| Org::Position.new(v) }
+        Position::ALL_VALUES.to_a.shuffle.map { |v| Position.new(v) }
       end
 
       def random_positions_queue
-        all_random_positions + all_random_positions + [Org::Position.random] + [Org::Position.random]
+        all_random_positions + all_random_positions + [Position.random] + [Position.random]
       end
 
       def available_prioritized_positions(drafted_players)

data/lib/basketball/draft/player.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Basketball
+  module Draft
+    # Defines a player currently in the draft.
+    class Player < Common::Player; end
+  end
+end

data/lib/basketball/draft/position.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Basketball
+  module Draft
+    # Defines a position a player can hold.
+    class Position < Common::Position; end
+  end
+end

data/lib/basketball/draft/room.rb

@@ -32,19 +32,6 @@ module Basketball
         events.each        { |event| add_event!(event) }
       end
 
-      # This method will return a materialized list of teams and their selections.
-      def teams
-        front_offices.each_with_object([]) do |front_office, memo|
-          team = Org::Team.new(id: front_office.id)
-
-          drafted_players(front_office).each do |player|
-            team.sign!(player)
-          end
-
-          memo << team
-        end
-      end
-
       ### Peek Methods
 
       def assessment
@@ -188,12 +175,12 @@ module Basketball
         add_event!(event)
       end
 
-      private
-
       def player_events
         events.select { |e| e.respond_to?(:player) }
       end
 
+      private
+
       # rubocop:disable Metrics/AbcSize
       def add_event!(event)
         raise EndOfDraftError, "#{total_picks} pick limit reached" if done?

data/lib/basketball/draft.rb

@@ -7,6 +7,8 @@ require_relative 'draft/scout'
 require_relative 'draft/assessment'
 require_relative 'draft/event'
 require_relative 'draft/front_office'
+require_relative 'draft/player'
+require_relative 'draft/position'
 
 # Event Subclasses
 require_relative 'draft/pick'

data/lib/basketball/{org → season}/conference.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Basketball
-  module Org
+  module Season
     # A collection of divisions, teams, and players.
     class Conference < Entity
       include HasDivisions

data/lib/basketball/season/coordinator.rb

@@ -50,6 +50,14 @@ module Basketball
         assert_all_known_teams
       end
 
+      def release!(player)
+        tap { league.release!(player) }
+      end
+
+      def sign!(player:, team:)
+        tap { league.sign!(player:, team:) }
+      end
+
       def sim_rest!(&)
         events = []
 
@@ -62,16 +70,6 @@ module Basketball
         events
       end
 
-      def assert_current_date
-        if current_date < exhibition_start_date
-          raise OutOfBoundsError, "current date #{current_date} should be on or after #{exhibition_start_date}"
-        end
-
-        return unless current_date > regular_end_date
-
-        raise OutOfBoundsError, "current date #{current_date} should be on or after #{exhibition_start_date}"
-      end
-
       def sim!
         raise ArgumentError, 'league is required' unless league
 
@@ -160,6 +158,16 @@ module Basketball
 
       attr_writer :arena
 
+      def assert_current_date
+        if current_date < exhibition_start_date
+          raise OutOfBoundsError, "current date #{current_date} should be on or after #{exhibition_start_date}"
+        end
+
+        return unless current_date > regular_end_date
+
+        raise OutOfBoundsError, "current date #{current_date} should be on or after #{exhibition_start_date}"
+      end
+
       def opponent_team(opponent)
         league.teams.find { |t| t == opponent }
       end

data/lib/basketball/{org → season}/division.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Basketball
-  module Org
+  module Season
     # A collection of teams and players.
     class Division < Entity
       include HasTeams

data/lib/basketball/{org → season}/has_divisions.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Basketball
-  module Org
+  module Season
     # Helper methods for objects that can be composed of divisions which are also composed of teams
     # and players.
     module HasDivisions

data/lib/basketball/{org → season}/has_players.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Basketball
-  module Org
+  module Season
     # Helper methods for objects that can be composed of players.
     module HasPlayers
       def player?(player)

data/lib/basketball/{org → season}/has_teams.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Basketball
-  module Org
+  module Season
     # Helper methods for objects that can be composed of teams which are also made up of players.
     module HasTeams
       include HasPlayers

data/lib/basketball/{org → season}/league.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Basketball
-  module Org
+  module Season
     # Describes a collection of conferences, divisions, teams, and players.
     # Holds the rules which support adding teams and players to ensure the all the
     # teams are cohesive, such as:
@@ -52,9 +52,12 @@ module Basketball
 
         raise NotSignedError, 'player was not found to be signed by any team' unless team
 
-        team.release!(player)
+        # We will use player as a comparable object but we will keep the same
+        # player instance already in the league's object graph instead of replacing it
+        # with the passed in instance.
+        actual_player = team.release!(player)
 
-        free_agents << player
+        free_agents << actual_player
 
         self
       end
@@ -75,11 +78,11 @@ module Basketball
 
         # If this player was a free agent then make sure we remove them from the free agent pool.
         # It is OK if they weren't, they can still be directly signed.
-        free_agents.delete(player) if free_agent?(player)
+        actual_player = free_agent?(player) ? free_agents.delete(player) : player
 
         # It is OK to pass in a detached team as long as its equivalent resides in this
         # League's object graph.
-        team_for(team.id).sign!(player)
+        team_for(team.id).sign!(actual_player)
 
         self
       end

data/lib/basketball/season/player.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Basketball
+  module Season
+    # A player in context of a Season.
+    class Player < Common::Player; end
+  end
+end

data/lib/basketball/season/position.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Basketball
+  module Season
+    # Describes a player position in context of a Season.
+    class Position < Common::Position; end
+  end
+end

data/lib/basketball/{org → season}/team.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Basketball
-  module Org
+  module Season
     # Base class describing a team.  A team here is bare metal and is just described by an ID
     # and a collection of Player objects.
     class Team < Entity
@@ -35,9 +35,8 @@ module Basketball
         raise ArgumentError, 'player is required' unless player
         raise PlayerNotSignedError, "#{player} id not signed by #{self}" unless signed?(player)
 
+        # Returns deleted player
         players.delete(player)
-
-        self
       end
 
       def sign!(player)

data/lib/basketball/season.rb

@@ -3,10 +3,23 @@
 # Common
 require_relative 'season/arena'
 require_relative 'season/calendar'
-require_relative 'season/result'
 require_relative 'season/game'
 require_relative 'season/matchup'
 require_relative 'season/opponent'
+require_relative 'season/result'
+
+# League Common
+require_relative 'season/has_players'
+require_relative 'season/has_teams' # uses has_players
+require_relative 'season/has_divisions' # uses has_teams
+
+# League Object Graph
+require_relative 'season/conference'
+require_relative 'season/division'
+require_relative 'season/league'
+require_relative 'season/player'
+require_relative 'season/position'
+require_relative 'season/team'
 
 # Game Subclasses
 require_relative 'season/exhibition'
@@ -20,3 +33,12 @@ require_relative 'season/standings'
 # Specific
 require_relative 'season/coordinator'
 require_relative 'season/scheduler'
+
+module Basketball
+  module Season
+    class DivisionAlreadyRegisteredError < StandardError; end
+    class PlayerAlreadySignedError < StandardError; end
+    class TeamAlreadyRegisteredError < StandardError; end
+    class UnregisteredTeamError < StandardError; end
+  end
+end

data/lib/basketball/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Basketball
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

data/lib/basketball.rb

@@ -5,13 +5,13 @@ require 'fileutils'
 require 'forwardable'
 require 'json'
 
-# Generic
+# Foundational Domain Building Blocks
 require_relative 'basketball/entity'
 require_relative 'basketball/value_object'
 
-# Dependent on Generic
-require_relative 'basketball/org'
+# Common (be careful!)
+require_relative 'basketball/common'
 
-# Dependent on Org
+# Bounded Contexts
 require_relative 'basketball/draft'
 require_relative 'basketball/season'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basketball
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2023-06-24 00:00:00.000000000 Z
 dependencies: []
 description: "    This library is meant to serve as the domain for a basketball league/season
   simulator/turn-based game. It models core ideas such as: players, general managers,
@@ -33,39 +33,43 @@ files:
 - Rakefile
 - basketball.gemspec
 - lib/basketball.rb
+- lib/basketball/common.rb
+- lib/basketball/common/player.rb
+- lib/basketball/common/position.rb
 - lib/basketball/draft.rb
 - lib/basketball/draft/assessment.rb
 - lib/basketball/draft/event.rb
 - lib/basketball/draft/front_office.rb
 - lib/basketball/draft/pick.rb
+- lib/basketball/draft/player.rb
+- lib/basketball/draft/position.rb
 - lib/basketball/draft/room.rb
 - lib/basketball/draft/scout.rb
 - lib/basketball/draft/skip.rb
 - lib/basketball/entity.rb
-- lib/basketball/org.rb
-- lib/basketball/org/conference.rb
-- lib/basketball/org/division.rb
-- lib/basketball/org/has_divisions.rb
-- lib/basketball/org/has_players.rb
-- lib/basketball/org/has_teams.rb
-- lib/basketball/org/league.rb
-- lib/basketball/org/player.rb
-- lib/basketball/org/position.rb
-- lib/basketball/org/team.rb
 - lib/basketball/season.rb
 - lib/basketball/season/arena.rb
 - lib/basketball/season/calendar.rb
+- lib/basketball/season/conference.rb
 - lib/basketball/season/coordinator.rb
 - lib/basketball/season/detail.rb
+- lib/basketball/season/division.rb
 - lib/basketball/season/exhibition.rb
 - lib/basketball/season/game.rb
+- lib/basketball/season/has_divisions.rb
+- lib/basketball/season/has_players.rb
+- lib/basketball/season/has_teams.rb
+- lib/basketball/season/league.rb
 - lib/basketball/season/matchup.rb
 - lib/basketball/season/opponent.rb
+- lib/basketball/season/player.rb
+- lib/basketball/season/position.rb
 - lib/basketball/season/record.rb
 - lib/basketball/season/regular.rb
 - lib/basketball/season/result.rb
 - lib/basketball/season/scheduler.rb
 - lib/basketball/season/standings.rb
+- lib/basketball/season/team.rb
 - lib/basketball/value_object.rb
 - lib/basketball/value_object_dsl.rb
 - lib/basketball/version.rb

data/lib/basketball/org.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-# Cross-cutting Concerns
-require_relative 'org/has_players'
-require_relative 'org/has_teams'
-require_relative 'org/has_divisions'
-
-# Domain Models
-require_relative 'org/conference'
-require_relative 'org/division'
-require_relative 'org/league'
-require_relative 'org/player'
-require_relative 'org/position'
-require_relative 'org/team'
-
-module Basketball
-  module Org
-    class DivisionAlreadyRegisteredError < StandardError; end
-    class PlayerAlreadySignedError < StandardError; end
-    class TeamAlreadyRegisteredError < StandardError; end
-    class UnregisteredTeamError < StandardError; end
-  end
-end