minesweeper-curses 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64be9ef9dc42505ad9ad3ffb3fcfd36b96764b33
-  data.tar.gz: 543fecb9214ee82fe7322f912c00bd0a38649dc6
+  metadata.gz: fb8abc68f343b643d941f7d2d71ace49e11d4a4a
+  data.tar.gz: 765ec1d03544b1e805c805145ccaf38a1102c875
 SHA512:
-  metadata.gz: 78a7c34b9471a412186efb69ca487ad817b597208cec909d9cd20bec4cfa4d59649e15f1680d46d432fd1229930bcfdf7cfaa276348591698705353807b89280
-  data.tar.gz: 4f84c02f4a405d629f0b6e3aeec7b7cafac85a99a249b804e3e2d84ac1268ac0eee7cd9435c6696e245ed8eecbff640dced226af69eeda14ce556e4d43c03743
+  metadata.gz: 798a153672f1d695da862d95519396e81910a0460e2df638377169d44839d0e28bc86466f964b60fe4a3e158f09ee66a33b5d8d79fba9056caabb4def6945bcb
+  data.tar.gz: d42bb024e845971fe02c5715fa8875f80d262c5ccb2decb003360d6c1810191fe8385e328c35a74a093004dc8e87722be6749850a34b9749a6172e6908e1decc

data/Gemfile.lock

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

data/lib/minesweeper/board.rb

@@ -209,7 +209,6 @@ Game Stats: you have found #{found_bombs_count} out of #{bombs.count} bombs
 
     public
 
-    # stats
     def bombs
       cells.flatten(1).select(&:bomb?)
     end
@@ -217,7 +216,6 @@ Game Stats: you have found #{found_bombs_count} out of #{bombs.count} bombs
     def found_bombs
       bombs.select(&:marked_as_bomb?)
     end
-    # stats
 
     def number_of_cells
       height * width

data/lib/minesweeper/board_builder.rb

@@ -4,12 +4,12 @@ module Minesweeper
 
     def initialize(window, flush_params:)
       @window = window
-      @params_builder = Minesweeper::BoardParams.new(window, flush_params)
-      @bomb_injector = BombInjector.new(level: level)
+      @flush_params = flush_params
     end
 
     def build
-      board = Minesweeper::Board.new(height: height, width: width, window: window)
+      params_builder.prepare
+      board = create_board
       fill_with_cells(board)
       inject_bombs(board)
       board
@@ -17,10 +17,14 @@ module Minesweeper
 
     private
 
-    attr_reader :window, :bomb_injector, :params_builder
+    attr_reader :window, :flush_params
 
     def_delegators :params_builder, :height, :width, :level
 
+    def create_board
+      Minesweeper::Board.new(height: height, width: width, window: window)
+    end
+
     def fill_with_cells(board)
       height.times do
         board.cells << Array.new(width) { Cell.new }
@@ -28,7 +32,15 @@ module Minesweeper
     end
 
     def inject_bombs(board)
-      bomb_injector.inject(board)
+      bomb_injector.inject(board, level)
+    end
+
+    def bomb_injector
+      @bomb_injector ||= BombInjector.new
+    end
+
+    def params_builder
+      @params_builder ||= Minesweeper::ParamsBuilder.new(window, flush_params)
     end
   end
 end

data/lib/minesweeper/board_params.rb

@@ -1,67 +1,22 @@
 module Minesweeper
-  class BoardParams
-    DEFAULTS = { height: 10, width: 10, level: 'advanced' }.freeze
-
-    attr_reader :window, :flush_params
-
-    def initialize(window, flush_params)
-      @window = window
-      @flush_params = flush_params
-      prepare
-    end
-
-    def height
-      storage.read[:height]
-    end
-
-    def width
-      storage.read[:width]
-    end
-
-    def level
-      storage.read[:level]
-    end
-
-    private
-
-    def prepare
-      storage.flush if flush_params
-      storage.read || build
-    end
-
-    def storage
-      ::Minesweeper::Storage.instance
-    end
-
-    def build
-      window.addstr('Start game with default parameters? (Y/N)')
-      window.setpos(4, 42)
-      str = window.getstr
-      if str.casecmp('y').zero?
-        storage.insert(DEFAULTS)
-      else
-        storage.insert(height: ask_y, width: ask_x, level: ask_level)
-      end
-      storage.read
-    end
-
-    def ask_x
-      window.addstr('Number of columns: ')
-      x = window.getstr
-      x = window.maxx - 1 if x.to_i > window.maxx
-      x
-    end
-
-    def ask_y
-      window.addstr('Number of rows: ')
-      y = window.getstr
-      y = window.maxy - 1 if y.to_i > window.maxy
-      y
-    end
-
-    def ask_level
-      window.addstr('Your Level (beginner/advanced/expert): ')
-      window.getstr
+  Sequel::Model.db = Sequel.sqlite
+  Sequel::Model.strict_param_setting = false
+  Sequel::Model.db.execute <<-SQL
+    CREATE TABLE IF NOT EXISTS board_params (
+      id integer PRIMARY KEY,
+      height integer,
+      width integer,
+      level varchar(255)
+    );
+  SQL
+
+  class BoardParams < Sequel::Model
+    plugin :validation_helpers
+
+    def validate
+      super
+      validates_integer %i[height width]
+      validates_includes %w[beginner advanced expert], :level
     end
   end
 end

data/lib/minesweeper/bomb_injector.rb

@@ -1,18 +1,15 @@
 module Minesweeper
   class BombInjector
-    attr_reader :board, :level
-
-    def initialize(level:)
-      @level = level
-    end
-
-    def inject(board)
+    def inject(board, level)
       @board = board
+      @level = level
       add_bombs
     end
 
     private
 
+    attr_reader :board, :level
+
     def add_bombs(number = number_of_bombs)
       return if number.zero?
       row_index = random_row
@@ -26,18 +23,17 @@ module Minesweeper
     end
 
     def number_of_bombs
-      bomb_percent =
-        case level.to_sym
-        when :beginner
-          0.05
-        when :advanced
-          0.15
-        when :expert
-          0.25
-        end
       (bomb_percent * board.number_of_cells).ceil
     end
 
+    def bomb_percent
+      case level.to_sym
+      when :beginner then 0.05
+      when :advanced then 0.15
+      when :expert   then 0.25
+      end
+    end
+
     def random_row
       Random.rand(board.height)
     end

data/lib/minesweeper/params_builder.rb

@@ -0,0 +1,71 @@
+module Minesweeper
+  class ParamsBuilder
+    extend Forwardable
+    DEFAULTS = { height: 10, width: 10, level: 'advanced' }.freeze
+
+    attr_reader :window, :flush_params
+
+    def initialize(window, flush_params)
+      @window = window
+      @flush_params = flush_params
+    end
+
+    def_delegators :entry, :height, :width, :level
+
+    def prepare
+      entry && entry.delete if flush_params
+      entry || build
+    end
+
+    private
+
+    def entry
+      ::Minesweeper::BoardParams.first
+    end
+
+    def build(pos = 4)
+      window.addstr('Start game with default parameters? (Y/N)')
+      window.setpos(pos, 42)
+      str = window.getstr
+      instance =
+        if str.casecmp('y').zero?
+          ::Minesweeper::BoardParams.new(DEFAULTS)
+        else
+          ::Minesweeper::BoardParams.new(height: ask_y, width: ask_x, level: ask_level)
+        end
+      validate(instance)
+    end
+
+    def validate(instance)
+      if instance.valid?
+        instance.save
+        instance
+      else
+        window.clear
+        window.addstr("Some of the parameters were invalid \n")
+        window.addstr(instance.errors.full_messages.join("\n"))
+        window.addstr("\n")
+        build(instance.errors.count + 1)
+      end
+    end
+
+    def ask_x
+      window.addstr('Number of columns: ')
+      x = window.getstr
+      x = window.maxx - 1 if x.to_i > window.maxx
+      x
+    end
+
+    def ask_y
+      window.addstr('Number of rows: ')
+      y = window.getstr
+      y = window.maxy - 1 if y.to_i > window.maxy
+      y
+    end
+
+    def ask_level
+      window.addstr('Your Level (beginner/advanced/expert): ')
+      window.getstr
+    end
+  end
+end

data/lib/minesweeper/version.rb

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

data/lib/minesweeper.rb

@@ -6,10 +6,10 @@ include Curses
 require 'pry'
 require 'forwardable'
 require 'sequel'
-require_relative 'minesweeper/storage'
+require_relative 'minesweeper/board_params'
 require_relative 'minesweeper/board'
 require_relative 'minesweeper/board_builder'
-require_relative 'minesweeper/board_params'
+require_relative 'minesweeper/params_builder'
 require_relative 'minesweeper/bomb_cell'
 require_relative 'minesweeper/bomb_injector'
 require_relative 'minesweeper/cell'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minesweeper-curses
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Mykhailo Rybak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,7 @@ files:
 - lib/minesweeper/bomb_injector.rb
 - lib/minesweeper/cell.rb
 - lib/minesweeper/game_initializer.rb
-- lib/minesweeper/storage.rb
+- lib/minesweeper/params_builder.rb
 - lib/minesweeper/version.rb
 - minesweeper.gemspec
 - readme.md

data/lib/minesweeper/storage.rb

@@ -1,34 +0,0 @@
-require 'singleton'
-
-module Minesweeper
-  class Storage
-    include Singleton
-
-    DB = Sequel.sqlite
-    DB.execute <<-SQL
-      CREATE TABLE IF NOT EXISTS board_params (
-        height integer,
-        width integer,
-        level varchar(255)
-      );
-    SQL
-
-    def read
-      table.first
-    end
-
-    def flush
-      table.delete
-    end
-
-    def insert(**args)
-      table.insert(args)
-    end
-
-    private
-
-    def table
-      DB[:board_params]
-    end
-  end
-end