c4 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea300d10d7612076f7efb5f18cfbfd763e674891d04f850674e3eaa4f2848b5
-  data.tar.gz: 80c62666aa92cc084e374ce707d533d38a4654d7accc5f13b883d30fffea23aa
+  metadata.gz: 66a7aac8830babe8d7ec56990db865b61d4222ad12d7c17ccfac22648d94a568
+  data.tar.gz: 116a2ff08fc4cfaa905b390f1016e699238baca6e8eda39644335d6f0f710ce6
 SHA512:
-  metadata.gz: 73d105ebb9ce2a126d9ed4bf54fb172d44bc3cdcdc8f185bfd5388b295a33b7c872a4804ac4cffee892350565bdb9ca9a53fcd2dd5ef8bc660095057aba8c231
-  data.tar.gz: b76aff003e7af64788a1f235417eda15d8c3b49ab601b7efcc669ad1a72ca088b660a510fcef3ba76541bfbc006652acdd3bf6baabca6ad1bb71af637faae2b8
+  metadata.gz: 5bb095ce8e3205c0cc21546c38e043a4254eea2eb38627cbc6a6817d651951a08400d79ab26f2849e4555ddeac9a5fe080e174893534d2cd23dda0809c826904
+  data.tar.gz: ebb9614deb44861b6ee5a3bab83d40027e55ed7c256cf09e16a020cc9ef66106bedd7543c5b784f9e8825c4c973b3c1d9485a57ef8fa26da9ad1987b4cb9d845

data/Gemfile.lock

@@ -9,14 +9,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
     jaro_winkler (1.5.2)
     json (2.1.0)
+    method_source (0.9.0)
     parallel (1.13.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rainbow (3.0.0)
     rake (10.5.0)
     require_all (2.0.0)
@@ -47,7 +52,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    thor (0.20.3)
+    thor (0.20.0)
     unicode-display_width (1.4.1)
 
 PLATFORMS
@@ -56,6 +61,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   c4!
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop (~> 0.63)

data/README.md

@@ -1,6 +1,8 @@
 # C4
 
-C4 is a CLI connect four game.
+[![Gem Version](https://badge.fury.io/rb/c4.svg)](https://badge.fury.io/rb/c4)
+
+C4 is a CLI connect-four game.
 
 ## Installation
 

data/c4.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.63'
   spec.add_development_dependency 'simplecov', '~> 0.16'
+  spec.add_development_dependency 'pry'
 
   spec.add_runtime_dependency 'require_all', '~> 2.0'
   spec.add_runtime_dependency 'thor', '~> 0.20'

data/lib/c4.rb

@@ -27,14 +27,21 @@ module C4
     def start
       until game.winner || game.impasse?
         viewer.print
-        puts 'Choose column: '
-        column = STDIN.gets.chomp.to_i
-        game.play!(column)
+        play
       end
 
       viewer.print
     end
 
+    def play
+      puts "Player \"#{game.current_player}\" - choose column (type a number from 0 to #{C4::Model::Game::COLUMNS}): "
+      column = STDIN.gets.chomp.to_i
+      game.play!(column)
+    rescue C4::Model::ColumnFullError, C4::Model::InvalidColumnError => e
+      puts e.message
+      retry
+    end
+
     def finish
       return puts("Player \"#{game.winner}\" won!") if game.winner
       return puts('No more moves possible. Game over.') if game.impasse?

data/lib/c4/model/board.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 require_relative 'column'
+require_relative 'matrix'
 
 module C4
   module Model
     class Board
       attr_reader :columns, :num_rows, :num_columns
 
+      using Refinement::Filler
+
       def initialize(num_rows, num_columns)
         @num_rows = num_rows
         @num_columns = num_columns
@@ -14,6 +17,8 @@ module C4
       end
 
       def put_stone!(column, mark)
+        raise InvalidColumnError, 'Column does not exist!' if column.negative? || column >= columns.size
+
         columns[column].put!(mark)
       end
 
@@ -22,30 +27,16 @@ module C4
       end
 
       def to_a(mode = :column_wise)
-        column_wise = columns.map(&:to_a)
-        return transpose if mode == :row_wise # Changes the shape
-        return transpose.reverse if mode == :print
-
-        column_wise
-      end
+        column_wise = Matrix.new(columns.map(&:to_a), num_rows, num_columns)
+        return column_wise.transpose.matrix if mode == :row_wise # Changes the shape
+        return column_wise.transpose.reverse.matrix if mode == :print
 
-      def transpose
-        board_array = to_a(:column_wise)
-        Array.new(num_rows).each_with_index.map do |_, row|
-          Array.new(num_columns).each_with_index.map do |_, column|
-            board_array[column][row]
-          end
-        end
+        column_wise.matrix
       end
 
       def diagonals
-        []
-      end
-
-      def diagonal(matrix)
-        Array.new(matrix.size).each_with_index.map do |_, i|
-          matrix[i][i]
-        end
+        matrix = Matrix.new(columns.map(&:to_a), num_rows, num_columns)
+        matrix.diagonals
       end
     end
   end

data/lib/c4/model/column.rb

@@ -16,7 +16,7 @@ module C4
       end
 
       def put!(mark)
-        raise ColumnFullError if full?
+        raise ColumnFullError, 'This column is full!' if full?
 
         stones.push(mark)
       end

data/lib/c4/model/errors.rb

@@ -3,5 +3,6 @@
 module C4
   module Model
     class ColumnFullError < StandardError; end
+    class InvalidColumnError < StandardError; end
   end
 end

data/lib/c4/model/matrix.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require_relative 'refinement/filler'
+
+module C4
+  module Model
+    class Matrix
+      using Refinement::Filler
+
+      attr_reader :matrix, :rows, :columns
+
+      def initialize(matrix, rows, columns)
+        @matrix = matrix
+        @rows = rows
+        @columns = columns
+      end
+
+      def transpose
+        self.class.new(
+          Array.new(rows).each_with_index.map do |_, row|
+            Array.new(columns).each_with_index.map do |_, column|
+              matrix[column][row]
+            end
+          end,
+          columns,
+          rows
+        )
+      end
+
+      def size
+        [rows, columns].max
+      end
+
+      def partial_square(from, to)
+        self.class.new(matrix[from..to].map { |a| a[from..to] }, to - from + 1, to - from + 1)
+      end
+
+      # rubocop:disable Metrics/AbcSize
+      def square
+        sq = matrix.map do |col|
+          col[0, size].fill_up_to(size, nil)
+        end
+        sq[0, size].fill_up_to(size, Array.new(size))
+        self.class.new(sq, size, size)
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      def diagonal
+        Array.new(size).each_with_index.map do |_, i|
+          matrix[i][i]
+        end
+      end
+
+      def reverse
+        self.class.new(matrix.reverse, rows, columns)
+      end
+
+      # rubocop:disable Metrics/AbcSize, Performance/TimesMap
+      def rotate
+        result = rows.times.map do |r|
+          columns.times.map do |c|
+            matrix[columns - c - 1][r]
+          end
+        end
+        self.class.new(result, columns, rows)
+      end
+      # rubocop:enable Metrics/AbcSize, Performance/TimesMap
+
+      def diagonals
+        quadrants.flat_map(&:quadrant_diagonals).uniq
+      end
+
+      def quadrants
+        [
+          square,
+          square.rotate,
+          square.rotate.rotate,
+          square.rotate.rotate.rotate
+        ]
+      end
+
+      def quadrant_diagonals
+        (0...size).map do |i|
+          partial_square(0, i).rotate.diagonal
+        end
+      end
+    end
+  end
+end

data/lib/c4/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module C4
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

data/lib/c4/view/cli.rb

@@ -28,7 +28,7 @@ module C4
       def printable_board
         board.map do |lv|
           lv.map do |e|
-            e.nil? ? '*' : e
+            e.nil? ? ' ' : e
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c4
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Akihiko Itoh
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,7 @@ files:
 - lib/c4/model/column.rb
 - lib/c4/model/errors.rb
 - lib/c4/model/game.rb
+- lib/c4/model/matrix.rb
 - lib/c4/model/refinement/filler.rb
 - lib/c4/model/refinement/streak.rb
 - lib/c4/version.rb
@@ -162,7 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A command line connect four.