minesweeper-curses 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8abc68f343b643d941f7d2d71ace49e11d4a4a
-  data.tar.gz: 765ec1d03544b1e805c805145ccaf38a1102c875
+  metadata.gz: 5044d455ac72b38a323598331efbbcebb378e973
+  data.tar.gz: a0fc42e08fd4db82e3fb584c8e6db970a7c9435a
 SHA512:
-  metadata.gz: 798a153672f1d695da862d95519396e81910a0460e2df638377169d44839d0e28bc86466f964b60fe4a3e158f09ee66a33b5d8d79fba9056caabb4def6945bcb
-  data.tar.gz: d42bb024e845971fe02c5715fa8875f80d262c5ccb2decb003360d6c1810191fe8385e328c35a74a093004dc8e87722be6749850a34b9749a6172e6908e1decc
+  metadata.gz: cddaf8165b7f84a45dc59e5f53b168ec80cc3c1157b7a9a58c7b9b47a12d1f3b638222b8a012a2233756c9a0d5dbc7f4726888f774037107fdae8b4796c899d8
+  data.tar.gz: 188b9d315dd4e5fe31bcd7ec1205a79b54f2fe96237480e5b21fac75a399a3d113f0f95de0f013fb6bc3e5ca9c72a00203f4a3d37ca23cae23c2ab209bae1d70

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    minesweeper-curses (0.2.0)
+    minesweeper-curses (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/minesweeper/base_cell.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Minesweeper
+  class BaseCell
+    extend Forwardable
+
+    def_delegators :@state, :view, :color, :opened?, :marked_as_bomb?
+
+    attr_reader :state
+
+    def initialize
+      @state = initial_state
+    end
+
+    def bomb?
+      raise NotImplementedError, 'defined in subclass'
+    end
+
+    def toggle_bomb_flag!
+      return if opened?
+      if state.marked_as_bomb?
+        state.view = ' '
+        state.color = COLOR_MAGENTA
+        state.status = :initial
+      else
+        state.view = '*'
+        state.color = COLOR_MAGENTA
+        state.status = :marked_as_bomb
+      end
+    end
+
+    def open!(*)
+      raise NotImplementedError, 'defined in subclass'
+    end
+
+    private
+
+    def initial_state
+      CellState.new(color: COLOR_MAGENTA, view: ' ', status: :initial)
+    end
+  end
+end

data/lib/minesweeper/board.rb

@@ -1,18 +1,6 @@
 # frozen_string_literal: true
 
 module Minesweeper
-  class GameOver < StandardError
-    def message
-      'You Lost'
-    end
-  end
-
-  class GameWon < StandardError
-    def message
-      'You Won'
-    end
-  end
-
   class Board
     extend Forwardable
 
@@ -71,7 +59,7 @@ module Minesweeper
           cell = cells[row_index][index]
           window.setpos(row_index, cell_ary[0])
           window.attron(color_pair(COLOR_BLUE)) { window.addstr '[' }
-          window.attron(color_pair(cell.color)) { window.addstr cell.draw }
+          window.attron(color_pair(cell.color)) { window.addstr cell.view }
           window.attron(color_pair(COLOR_BLUE)) { window.addstr ']' }
         end
       end
@@ -148,19 +136,25 @@ module Minesweeper
       window.setpos(height + 3, 0)
       window.addstr e.message
       window.setpos(height + 5, 0)
-      window.addstr <<-STR
-Game Stats: you have found #{found_bombs_count} out of #{bombs.count} bombs
+      window.addstr <<~STR
+        Game Stats: you have found #{found_bombs_count} out of #{bombs.count} bombs
 
-- `R` to replay with same parameters
-- `Enter` to start a new game
-- any other key to exit
+        - `R` to replay with same parameters
+        - `Enter` to start a new game
+        - any other key to exit
       STR
+      start_or_restart_game
+    end
+
+    # used when user won/lose game & decided to begin anew
+    # eventually will be moved to game initializer
+    def start_or_restart_game
       case window.getch
       when ENTER
         echo
-        Minesweeper::GameInitializer.new.start
+        game_initializer.start
       when 'r', 'R'
-        Minesweeper::BoardBuilder.new(window, flush_params: false).build.play
+        game_initializer.restart
       end
     end
 
@@ -207,6 +201,10 @@ Game Stats: you have found #{found_bombs_count} out of #{bombs.count} bombs
       cells.flatten(1).reject(&:bomb?)
     end
 
+    def game_initializer
+      @game_initializer ||= Minesweeper::GameInitializer.new
+    end
+
     public
 
     def bombs

data/lib/minesweeper/board_builder.rb

@@ -1,4 +1,9 @@
+# frozen_string_literal: true
+
 module Minesweeper
+  # create empty instance of board
+  # fill it with cells & bomb cells
+  # return assembled instance of board
   class BoardBuilder
     extend Forwardable
 

data/lib/minesweeper/board_params.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Minesweeper
   Sequel::Model.db = Sequel.sqlite
   Sequel::Model.strict_param_setting = false

data/lib/minesweeper/bomb_cell.rb

@@ -1,63 +1,15 @@
-module Minesweeper
-  class BombCell
-    attr_accessor :status, :pointer, :force_color
-
-    def initialize(status: :initial)
-      @status = status
-      @pointer = nil
-      @force_color = nil
-    end
+# frozen_string_literal: true
 
+module Minesweeper
+  class BombCell < BaseCell
     def bomb?
       true
     end
 
-    def draw
-      case status
-      when :initial
-        ' '
-      when :marked_as_bomb
-        '*'
-      when :opened
-        '*'
-      end
-    end
-
-    def toggle_bomb_flag!
-      if marked_as_bomb?
-        self.force_color = nil
-        self.status = :initial
-      else
-        self.force_color = COLOR_WHITE
-        self.status = :marked_as_bomb
-      end
-    end
-
     def open!(*)
-      self.status = :opened
-    end
-
-    %i[initial marked_as_bomb opened].each do |method|
-      define_method("#{method}?") do
-        status == method
-      end
-    end
-
-    def color
-      case status
-      when :initial
-        COLOR_MAGENTA
-      when :marked_as_bomb
-        COLOR_MAGENTA
-      when :opened
-        color_when_opened
-      end
-    end
-
-    private
-
-    def color_when_opened
-      force_color.nil? ? COLOR_RED : force_color
+      state.view = '*'
+      state.color = state.marked_as_bomb? ? COLOR_WHITE : COLOR_RED
+      state.status = :opened
     end
   end
 end

data/lib/minesweeper/bomb_injector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Minesweeper
   class BombInjector
     def inject(board, level)

data/lib/minesweeper/cell.rb

@@ -1,52 +1,15 @@
-module Minesweeper
-  class Cell
-    attr_accessor :status, :pointer
-
-    def initialize(status: :initial)
-      @status = status
-      @pointer = nil
-    end
+# frozen_string_literal: true
 
+module Minesweeper
+  class Cell < BaseCell
     def bomb?
       false
     end
 
-    def draw
-      case status
-      when :initial
-        ' '
-      when :marked_as_bomb
-        '*'
-      when :opened
-        pointer.to_s
-      end
-    end
-
-    def toggle_bomb_flag!
-      return if opened?
-      self.status = marked_as_bomb? ? :initial : :marked_as_bomb
-    end
-
     def open!(number_of_boms_nearby)
-      self.pointer = number_of_boms_nearby
-      self.status = :opened
-    end
-
-    %i[initial marked_as_bomb opened].each do |method|
-      define_method("#{method}?") do
-        status == method
-      end
-    end
-
-    def color
-      case status
-      when :initial
-        COLOR_MAGENTA
-      when :marked_as_bomb
-        COLOR_MAGENTA
-      when :opened
-        COLOR_CYAN
-      end
+      state.view = number_of_boms_nearby.to_s
+      state.color = COLOR_CYAN
+      state.status = :opened
     end
   end
 end

data/lib/minesweeper/cell_state.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Minesweeper
+  class CellState
+    attr_accessor :color, :view, :status
+
+    def initialize(color:, status:, view:)
+      @view = view
+      @color = color
+      @status = status
+    end
+
+    def opened?
+      status == :opened
+    end
+
+    def marked_as_bomb?
+      status == :marked_as_bomb
+    end
+  end
+end

data/lib/minesweeper/exceptions.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Minesweeper
+  class GameOver < StandardError
+    def message
+      'You Lost'
+    end
+  end
+
+  class GameWon < StandardError
+    def message
+      'You Won'
+    end
+  end
+end

data/lib/minesweeper/game_initializer.rb

@@ -14,20 +14,28 @@ module Minesweeper
       window.refresh
       window.addch("\n")
       window.addstr("Welcome to Minesweeper \n")
-      window.addstr("screen size: rows: #{window.maxy}; columns: #{window.maxx} \n")
+      window.addstr("screen size: rows: #{window.maxy}; columns: #{window.maxx / Minesweeper::Board::STEP} \n")
       window.addstr("controls: `space` to mark/unmark cell as bomb, `arrow keys` to navigate \n")
-      Minesweeper::BoardBuilder
-        .new(window, flush_params: true)
-        .build
-        .play
+      play
     rescue SystemExit, Interrupt
     ensure
       close_screen
       at_exit { puts 'good bye' }
     end
 
+    def restart
+      play(false)
+    end
+
     private
 
+    def play(flush_params = true)
+      Minesweeper::BoardBuilder
+        .new(window, flush_params: flush_params)
+        .build
+        .play
+    end
+
     attr_reader :window
 
     def init_colors

data/lib/minesweeper/params_builder.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module Minesweeper
+  # used for reading / creating board params.
   class ParamsBuilder
     extend Forwardable
+
     DEFAULTS = { height: 10, width: 10, level: 'advanced' }.freeze
 
     attr_reader :window, :flush_params
@@ -23,20 +27,21 @@ module Minesweeper
       ::Minesweeper::BoardParams.first
     end
 
-    def build(pos = 4)
+    def build(y_position = 4)
       window.addstr('Start game with default parameters? (Y/N)')
-      window.setpos(pos, 42)
+      window.setpos(y_position, 42)
       str = window.getstr
-      instance =
+      params =
         if str.casecmp('y').zero?
-          ::Minesweeper::BoardParams.new(DEFAULTS)
+          DEFAULTS
         else
-          ::Minesweeper::BoardParams.new(height: ask_y, width: ask_x, level: ask_level)
+          { height: ask_y, width: ask_x, level: ask_level }
         end
-      validate(instance)
+      board_params = ::Minesweeper::BoardParams.new(params)
+      validate_and_save(board_params)
     end
 
-    def validate(instance)
+    def validate_and_save(instance)
       if instance.valid?
         instance.save
         instance
@@ -52,15 +57,14 @@ module Minesweeper
     def ask_x
       window.addstr('Number of columns: ')
       x = window.getstr
-      x = window.maxx - 1 if x.to_i > window.maxx
-      x
+      max_x = window.maxx / Minesweeper::Board::STEP
+      x.to_i > max_x ? max_x : x
     end
 
     def ask_y
       window.addstr('Number of rows: ')
       y = window.getstr
-      y = window.maxy - 1 if y.to_i > window.maxy
-      y
+      y.to_i > window.maxy ? window.maxy - 1 : y
     end
 
     def ask_level

data/lib/minesweeper/version.rb

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

data/lib/minesweeper.rb

@@ -6,14 +6,17 @@ include Curses
 require 'pry'
 require 'forwardable'
 require 'sequel'
+require_relative 'minesweeper/exceptions'
 require_relative 'minesweeper/board_params'
 require_relative 'minesweeper/board'
 require_relative 'minesweeper/board_builder'
 require_relative 'minesweeper/params_builder'
+require_relative 'minesweeper/base_cell'
+require_relative 'minesweeper/cell'
 require_relative 'minesweeper/bomb_cell'
 require_relative 'minesweeper/bomb_injector'
-require_relative 'minesweeper/cell'
 require_relative 'minesweeper/game_initializer'
+require_relative 'minesweeper/cell_state'
 
 module Minesweeper
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minesweeper-curses
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mykhailo Rybak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,12 +130,15 @@ files:
 - bin/minesweeper-curses
 - bin/setup
 - lib/minesweeper.rb
+- lib/minesweeper/base_cell.rb
 - lib/minesweeper/board.rb
 - lib/minesweeper/board_builder.rb
 - lib/minesweeper/board_params.rb
 - lib/minesweeper/bomb_cell.rb
 - lib/minesweeper/bomb_injector.rb
 - lib/minesweeper/cell.rb
+- lib/minesweeper/cell_state.rb
+- lib/minesweeper/exceptions.rb
 - lib/minesweeper/game_initializer.rb
 - lib/minesweeper/params_builder.rb
 - lib/minesweeper/version.rb