minesweeper-curses 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5044d455ac72b38a323598331efbbcebb378e973
-  data.tar.gz: a0fc42e08fd4db82e3fb584c8e6db970a7c9435a
+  metadata.gz: 72a271c6a7011e3729fe7f9afc4ad0300e511dff
+  data.tar.gz: 2bbefb3ff25068f81b003bec8e2c995f4e941e54
 SHA512:
-  metadata.gz: cddaf8165b7f84a45dc59e5f53b168ec80cc3c1157b7a9a58c7b9b47a12d1f3b638222b8a012a2233756c9a0d5dbc7f4726888f774037107fdae8b4796c899d8
-  data.tar.gz: 188b9d315dd4e5fe31bcd7ec1205a79b54f2fe96237480e5b21fac75a399a3d113f0f95de0f013fb6bc3e5ca9c72a00203f4a3d37ca23cae23c2ab209bae1d70
+  metadata.gz: 66916578e24ee520662ee5c69f4f55da5f7403602d7177a265d443aa4695b05cb7657fea7a20a766bbe67e056841556824fdb30d676a9d6a3fa74c47167ce7a4
+  data.tar.gz: 226ffa6c95f0ff892dfefd11db791e858789cc1be5a58ee3ccd35590a4ca31a4a9090fb93e0f634343c642b30a1db47c1b1004ae664d88e5b4a8e3b57496e534

data/.rubocop.yml

@@ -1,3 +1,16 @@
+AllCops:
+  Includes:
+    - Rakefile
+    - config.ru
+  Excludes:
+    - db/**
+    - config/**
+    - script/**
+    - minesweeper.gemspec
+
+Documentation:
+  Enabled: false
+
 Metrics/LineLength:
   Max: 120
   # To make it possible to copy or click on URIs in the code, we allow lines

data/Gemfile.lock

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

data/lib/minesweeper/base_cell.rb

@@ -18,7 +18,7 @@ module Minesweeper
 
     def toggle_bomb_flag!
       return if opened?
-      if state.marked_as_bomb?
+      if marked_as_bomb?
         state.view = ' '
         state.color = COLOR_MAGENTA
         state.status = :initial

data/lib/minesweeper/board.rb

@@ -10,12 +10,12 @@ module Minesweeper
     SPACE = ' '
 
     def_delegators :@window, :curx, :cury
+    def_delegators :board_params, :height, :width
 
-    attr_reader :height, :width, :cells, :window
+    attr_reader :board_params, :cells, :window
 
-    def initialize(height:, width:, window:)
-      @height = height
-      @width  = width
+    def initialize(board_params:, window:)
+      @board_params = board_params
       @window = window
       @cells  = []
     end
@@ -38,12 +38,11 @@ module Minesweeper
         when KEY_RIGHT
           move_right
         when ENTER
-          open_cell(cury, curx)
-          play(cury, curx)
+          open_cell
         when SPACE
-          toggle_bomb_flag(cury, curx)
-          play(cury, curx)
+          toggle_bomb_flag
         end
+        play(cury, curx)
       end
     rescue GameWon, GameOver => e
       end_game(e)
@@ -67,14 +66,14 @@ module Minesweeper
       window.setpos(0, 1)
     end
 
-    def open_cell(y, x)
-      cell_x = x / 3 # / 3 because rendered cell 3 chars
-      open_original(y, cell_x)
+    def open_cell
+      cell_x = curx / STEP
+      open_original(cury, cell_x)
     end
 
-    def toggle_bomb_flag(y, x)
-      cell_x = x / 3 # / 3 because rendered cell 3 chars
-      cell = cells[y][cell_x]
+    def toggle_bomb_flag
+      cell_x = curx / STEP
+      cell = cells[cury][cell_x]
       cell.toggle_bomb_flag!
       raise GameWon if game_won?
     end

data/lib/minesweeper/board_builder.rb

@@ -13,30 +13,30 @@ module Minesweeper
     end
 
     def build
-      params_builder.prepare
-      board = create_board
-      fill_with_cells(board)
-      inject_bombs(board)
+      @board_params = params_builder.prepare
+      @board = create_board
+      fill_with_cells
+      inject_bombs
       board
     end
 
     private
 
-    attr_reader :window, :flush_params
+    attr_reader :window, :flush_params, :board_params, :board
 
-    def_delegators :params_builder, :height, :width, :level
+    def_delegators :board_params, :height, :width, :level
 
     def create_board
-      Minesweeper::Board.new(height: height, width: width, window: window)
+      Minesweeper::Board.new(board_params: board_params, window: window)
     end
 
-    def fill_with_cells(board)
+    def fill_with_cells
       height.times do
         board.cells << Array.new(width) { Cell.new }
       end
     end
 
-    def inject_bombs(board)
+    def inject_bombs
       bomb_injector.inject(board, level)
     end
 
@@ -45,7 +45,7 @@ module Minesweeper
     end
 
     def params_builder
-      @params_builder ||= Minesweeper::ParamsBuilder.new(window, flush_params)
+      Minesweeper::ParamsBuilder.new(window, flush_params)
     end
   end
 end

data/lib/minesweeper/bomb_cell.rb

@@ -8,7 +8,7 @@ module Minesweeper
 
     def open!(*)
       state.view = '*'
-      state.color = state.marked_as_bomb? ? COLOR_WHITE : COLOR_RED
+      state.color = marked_as_bomb? ? COLOR_WHITE : COLOR_RED
       state.status = :opened
     end
   end

data/lib/minesweeper/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minesweeper-curses
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Mykhailo Rybak