acpc_poker_types 3.3.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd7d01d757da0d73681d9036950821b146f0a259
-  data.tar.gz: 764812a45f696ade63e20fea872e4816255eb917
+  metadata.gz: 7a9e6ab9e6c3c0f051e1c4fda11b8e55dc09c041
+  data.tar.gz: d6c1841264fa5ccef433e6ef8e0b23fcfed6ac28
 SHA512:
-  metadata.gz: 0a44162e009b32492ef5781c034885ca8c1f72317983ff5140af5137f9a2f6f688c971d6319566a370c2135c1b686d92add6db848eedf17aeec1d18ac3301df9
-  data.tar.gz: 898543b130efa4a932eff9073921ecec00f042127fc11d78bf589501aae5e42902259fd55976dcd1064f18e7078f916ffb91565c1d7aae7a5682a29b40a50d70
+  metadata.gz: 08e74a6ba4f9b9f8fe183ca8f747ee96de5439874c1c861fb6c9a78adb8d4012c52ffddbdf599ed053e8c9e129bd308c06606888b9c8253a0278a8d3039832ab
+  data.tar.gz: 70eedd40524b43b989434d87a5e8959a3e975efc552bccbb5ddcf8f081e6c7834db1ed1d3cbc45f22a7c7a625011dca514fc93dccb2aadf1f7de2f15f777e206

data/lib/acpc_poker_types.rb

@@ -12,7 +12,6 @@ require "acpc_poker_types/rank"
 require "acpc_poker_types/suit"
 require "acpc_poker_types/acpc_dealer_data"
 require 'acpc_poker_types/seat'
-require 'acpc_poker_types/integer_as_seat'
 
 module AcpcPokerTypes
 end

data/lib/acpc_poker_types/game_definition.rb

@@ -4,8 +4,7 @@ require 'acpc_poker_types/chip_stack'
 require 'acpc_poker_types/suit'
 require 'acpc_poker_types/rank'
 
-require 'acpc_poker_types/integer_as_seat'
-using AcpcPokerTypes::IntegerAsSeat
+require 'acpc_poker_types/seat'
 
 require 'contextual_exceptions'
 using ContextualExceptions::ClassRefinement
@@ -303,7 +302,7 @@ module AcpcPokerTypes
       end
 
       @number_of_rounds.times do |i|
-        unless @first_player_positions[i].seat_in_bounds? @number_of_players
+        unless Seat.in_bounds?(@first_player_positions[i], @number_of_players)
           raise(
             ParseError,
             "Invalid first player #{@first_player_positions[i]} on round #{i+1}"

data/lib/acpc_poker_types/seat.rb

@@ -1,85 +1,42 @@
 require 'delegate'
 
 module AcpcPokerTypes
-  module SeatLike
-    # @param [Integer] seat The seat to which the relative position is desired.
-    # @param [Integer] number_of_players The number of players at the table.
-    # @return [Integer] The relative position of +self+ to +seat+, given the
-    #  number of players at the table, +number_of_players+, indexed such that
-    #  the seat immediately to the left of +seat+ has a +position_relative_to+ of
-    #  zero.
-    # @example <code>1.position_relative_to 0, 3</code> == 0
-    # @example <code>1.position_relative_to 1, 3</code> == 2
-    def position_relative_to(seat, number_of_players)
-      unless seat.seat_in_bounds?(number_of_players) &&
-        seat_in_bounds?(number_of_players)
-        raise "Seat #{seat} out of bounds for #{number_of_players} players"
-      end
+  class Seat < DelegateClass(Integer)
+    attr_reader :seat, :table_size
 
-      adjusted_seat = if self > seat
-        self
-      else
-        self + number_of_players
-      end
-      adjusted_seat - seat - 1
+    # @return [Bool] Reports whether or not +seat+ represents an out of
+    #   bounds seat for the number of seats, +num_seats+.
+    def self.in_bounds?(seat, num_seats)
+      seat < num_seats && seat >= 0
     end
 
-    # Inverse operation of +position_relative_to+.
-    # Given
-    #  <code>relative_position = seat.position_relative_to to_seat, number_of_players</code>
-    # then
-    #  <code>to_seat = seat.seat_from_relative_position relative_position, number_of_players</code>
-    #
-    # @param [Integer] relative_position_of_self_to_result The relative position
-    #  of seat +self+ to the seat that is returned by this function.
-    # @param [Integer] number_of_players The number of players at the table.
-    # @return [Integer] The seat to which the relative position,
-    #  +relative_position_of_self_to_result+, of +self+ was derived, given the
-    #  number of players at the table, +number_of_players+, indexed such that
-    #  the seat immediately to the left of +from_seat+ has a
-    #  +position_relative_to+ of zero.
-    # @example <code>1.seat_from_relative_position 0, 3</code> == 0
-    # @example <code>1.seat_from_relative_position 2, 3</code> == 1
-    def seat_from_relative_position(
-      relative_position_of_self_to_result,
-      number_of_players
-    )
-      unless seat_in_bounds?(number_of_players)
-        raise "Seat #{seat} out of bounds for #{number_of_players} players"
-      end
+    def initialize(seat, num_seats_at_table)
+      @seat = seat.to_i
+      @table_size = num_seats_at_table.to_i
 
-      unless relative_position_of_self_to_result.seat_in_bounds?(
-        number_of_players
-      )
-        raise "Relative position #{relative_position_of_self_to_result} out of bounds for #{number_of_players} players"
+      unless in_bounds?
+        raise "Seat #{@seat} out of bounds for #{num_seats_at_table} players"
       end
 
-      position_adjustment = relative_position_of_self_to_result + 1
+      super @seat
+    end
+    def seats_to(other_seat_number)
+      other_seat = self.class.new(other_seat_number, @table_size)
 
-      to_seat = self.class.new(
-        self + number_of_players - position_adjustment
-      )
-      if self > to_seat || !to_seat.seat_in_bounds?(number_of_players)
-        self - position_adjustment
+      if @seat > other_seat
+        other_seat + @table_size
       else
-        to_seat
-      end
+        other_seat
+      end - @seat
     end
-
-    # @param [Integer] number_of_players The number of players at the table.
-    # @return [Bool] Reports whether or not +self+ represents an out of bounds
-    #  seat.
-    def seat_in_bounds?(number_of_players)
-      self < number_of_players && self >= 0
+    def seats_from(other_seat_number)
+      Seat.new(other_seat_number, @table_size).seats_to(@seat)
     end
-  end
-
-  class Seat < DelegateClass(Integer)
-    include SeatLike
-
-    def initialize(seat)
-      @seat = seat.to_i
-      super @seat
+    def n_seats_away(n)
+      Seat.new((n + @seat) % @table_size, @table_size)
+    end
+    def in_bounds?
+      self.class.in_bounds?(@seat, @table_size)
     end
   end
 end

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '3.3.1'
+  VERSION = '4.0.0'
 end

data/spec/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.7.1/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2013-06-03T17:03:54-06:00">2013-06-03T17:03:54-06:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2013-06-05T14:17:27-06:00">2013-06-05T14:17:27-06:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">

data/spec/seat_spec.rb

@@ -5,59 +5,36 @@ require "acpc_poker_types/seat"
 include AcpcPokerTypes
 
 describe Seat do
-  describe '#position_relative_to' do
+  describe '#seats_to' do
     it 'works for basic examples' do
-      Seat.new(1).position_relative_to(Seat.new(0), 3).must_equal 0
-      Seat.new(1).position_relative_to(Seat.new(1), 3).must_equal 2
+      Seat.new(1, 3).seats_to(0).must_equal 2
+      Seat.new(1, 3).seats_to(1).must_equal 0
+      Seat.new(1, 3).seats_to(2).must_equal 1
     end
-    it 'works for more cases' do
-      (0..10).each do |patient|
-        (0..10).each do |target|
-          (1..10).each do |num_players|
-            next if patient >= num_players || target >= num_players
-
-            Seat.new(patient).position_relative_to(Seat.new(target), num_players)
-              .must_equal(
-                (
-                  if patient > target
-                    patient
-                  else
-                    patient + num_players
-                  end
-                ) - (target + 1)
-              )
-          end
-        end
-      end
+  end
+  describe '#seats_from' do
+    it 'works for basic examples' do
+      Seat.new(1, 3).seats_from(0).must_equal 1
+      Seat.new(1, 3).seats_from(1).must_equal 0
+      Seat.new(1, 3).seats_from(2).must_equal 2
     end
   end
-  describe '#seat_from_relative_position' do
+  describe '#n_seats_away' do
     it 'works for basic examples' do
-      Seat.new(1).seat_from_relative_position(Seat.new(0), 3).must_equal 0
-      Seat.new(1).seat_from_relative_position(Seat.new(2), 3).must_equal 1
+      Seat.new(1, 3).n_seats_away(0).must_equal 1
+      Seat.new(1, 3).n_seats_away(1).must_equal 2
+      Seat.new(1, 3).n_seats_away(2).must_equal 0
+      Seat.new(1, 3).n_seats_away(3).must_equal 1
+      Seat.new(1, 3).n_seats_away(6).must_equal 1
     end
-    it 'works for more cases' do
-      (0..10).each do |patient|
-        (0..10).each do |rel_position|
-          (1..10).each do |num_players|
-            next if patient >= num_players || rel_position >= num_players
-
-            position_adjustment = rel_position + 1
-
-            to_seat = Seat.new(patient + num_players - position_adjustment)
-            x_seat = if patient > to_seat || !to_seat.seat_in_bounds?(num_players)
-              patient - position_adjustment
-            else
-              to_seat
-            end
-
-            Seat.new(patient).seat_from_relative_position(
-              Seat.new(rel_position),
-              num_players
-            ).must_equal(x_seat)
-          end
-        end
-      end
+  end
+  describe '::in_bounds?' do
+    it 'works for basic examples' do
+      Seat.in_bounds?(0, 3).must_equal true
+      Seat.in_bounds?(1, 3).must_equal true
+      Seat.in_bounds?(3, 3).must_equal false
+      Seat.in_bounds?(4, 3).must_equal false
+      Seat.in_bounds?(-1, 3).must_equal false
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_types
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process_runner
@@ -172,7 +172,6 @@ files:
 - lib/acpc_poker_types/pile_of_cards.rb
 - lib/acpc_poker_types/game_definition.rb
 - lib/acpc_poker_types/rank.rb
-- lib/acpc_poker_types/integer_as_seat.rb
 - lib/acpc_poker_types/suit.rb
 - lib/acpc_poker_types/chip_stack.rb
 - lib/acpc_poker_types/version.rb

data/lib/acpc_poker_types/integer_as_seat.rb

@@ -1,8 +0,0 @@
-require 'acpc_poker_types/seat'
-module AcpcPokerTypes
-  module IntegerAsSeat
-    refine Integer do
-      include SeatLike
-    end
-  end
-end