text2048 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9db309419e40329c97f3490cacf5b307023929e5
-  data.tar.gz: 24055097be1b6246422694cb75b2b72685d37253
+  metadata.gz: 30b141b8b2c0dc4ac46adadb4c29b3bb9eb242a0
+  data.tar.gz: e975eab497eeb64b7d2cba4f5630f964b0291c15
 SHA512:
-  metadata.gz: d8d9031ff6562432a491aab20592ad4f81148522417e1f5ef08a13686bcf13e7ba5301da9d403ad302601ca43cc874532dae8958f43a56658b3fa4fbc1587cf6
-  data.tar.gz: 16d316b287ac2bd945e2e428026ad40990fac2d06fadfd9c742ef5cc7088d1ee9752fe9c23e713dc3337176d3e967551d65d91996cbfde0a6d440372fc2739f1
+  metadata.gz: 6983d688faca6be66191813f72fa171e3746cad2ebe211db7106c0b21a72987a5b285cc69c2b16e7dd8e57e95ea9f816594dc86eea2b39d357c0f25d3d0f1142
+  data.tar.gz: 29b156dd1b9c2aee69a85ca739c9fc4bdb81eb389daf116133645739a79544cad080cf48c96e90100dbfdd62187db4031b4f01aece4c4a3cc217282a2899edd7

data/README.md

@@ -28,6 +28,12 @@ Installation
 $ gem install text2048
 ```
 
+To upgrade to the latest version, use:
+
+```
+$ gem update text2048
+```
+
 How to Play
 -----------
 
@@ -35,9 +41,9 @@ How to Play
 $ 2048
 ```
 
-- Use your arrow keys or vi keys ('h'/'j'/'k'/'l') to move the tiles.
-- '+'/'-' to increase or decrease the size of the tiles displayed.
-- 'q' to quit.
+- Use your arrow keys or vi keys (h/j/k/l) to move the tiles.
+- +/- to increase or decrease the size of the tiles displayed.
+- q to quit.
 
 Links
 -----

data/lib/text2048/app.rb

@@ -21,10 +21,10 @@ module Text2048
     def show_title
       @view.high_score(@high_score)
       @view.message = 'PRESS ANY KEY TO START'
-      @board = Board.new([[0, 0, 0, 0],
+      @board = Board.new([[nil, nil, nil, nil],
                           [2, 0, 4, 8],
-                          [0, 0, 0, 0],
-                          [0, 0, 0, 0]])
+                          [nil, nil, nil, nil],
+                          [nil, nil, nil, nil]])
       @view.update(@board)
       @view.wait_any_key
     end

data/lib/text2048/board.rb

@@ -11,7 +11,7 @@ module Text2048
     # @return [Number] returns the current score
     attr_reader :score
 
-    def initialize(tiles = Array.new(4) { Array.new(4, 0) }, score = 0)
+    def initialize(tiles = Array.new(4, Array.new(4)), score = 0)
       @all_tiles = tiles.hashinize
       @score = score
     end
@@ -76,7 +76,7 @@ module Text2048
     # @return [Board] a new board
     def generate
       tiles = @all_tiles.dup
-      tiles[sample_zero_tile] = Tile.new(rand < 0.9 ? 2 : 4, :generated)
+      tiles[sample_empty_tile] = Tile.new(rand < 0.9 ? 2 : 4, :generated)
       new_board(tiles, @score)
     end
 
@@ -123,13 +123,13 @@ module Text2048
       new_board(to_a.transpose, @score)
     end
 
-    def zero_tiles
+    def empty_tiles
       @all_tiles.select { |_key, each| each.to_i == 0 }
     end
 
-    def sample_zero_tile
-      fail if zero_tiles.empty?
-      zero_tiles.keys.shuffle.first
+    def sample_empty_tile
+      fail if empty_tiles.empty?
+      empty_tiles.keys.shuffle.first
     end
 
     def new_board(tiles, score)

data/lib/text2048/curses_view.rb

@@ -122,7 +122,7 @@ module Text2048
       [0, 1, 2, 3].product([0, 1, 2, 3]).each do |row, col|
         tile = tiles[row][col]
         @tiles[[row, col]] =
-          Tile.new(tile, row, col, color(tile.to_i), @scale).show
+          Tile.new(tile, row, col, color(tile.value), @scale).show
         refresh
       end
     end

data/lib/text2048/curses_view/colorize.rb

@@ -10,7 +10,8 @@ module Text2048
       include Curses
 
       COLORS = {
-        0 => COLOR_BLACK,
+        nil => COLOR_BLACK,
+        0 => COLOR_WHITE,
         2 => COLOR_WHITE,
         4 => COLOR_GREEN,
         8 => COLOR_GREEN,

data/lib/text2048/curses_view/tile.rb

@@ -27,9 +27,9 @@ module Text2048
         (DEFAULT_HEIGHT * scale).to_i
       end
 
-      def initialize(value, row, col, color, scale = 1)
+      def initialize(tile, row, col, color, scale = 1)
         klass = self.class
-        @value = value.to_i
+        @value = tile.value
         @height = klass.height(scale)
         @width = klass.width(scale)
         @row = (@height + 1) * row + 2
@@ -70,7 +70,7 @@ module Text2048
       end
 
       def draw_number
-        return if @value == 0
+        return unless @value
         if @scale >= 1
           draw_lcd_number
         else
@@ -91,7 +91,7 @@ module Text2048
       end
 
       def col_padded
-        num_length = @value.to_s.length
+        num_length = @value.to_i.to_s.length
         @col + (@width - num_length * 4 + 1) / 2
       end
 
@@ -151,7 +151,7 @@ module Text2048
       def fill
         (0..(@height - 1)).each do |each|
           setpos(@row + each, @col)
-          if @value != 0 && each == @height / 2
+          if @value && each == @height / 2
             addstr @value.to_s.center(@width)
           else
             addstr('.' * @width)

data/lib/text2048/monkey_patch/array/board.rb

@@ -7,11 +7,11 @@ module Text2048
       # 2048 related methods
       module Board
         def hashinize
-          [0, 1, 2, 3].product([0, 1, 2, 3]).reduce({}) do |memo, (col, row)|
+          col_row = [0, 1, 2, 3].product([0, 1, 2, 3])
+          col_row.each_with_object({}) do |(col, row), memo|
             tile = self[col][row]
             memo[[col, row]] =
               tile.respond_to?(:status) ? tile : Text2048::Tile.new(tile)
-            memo
           end
         end
       end

data/lib/text2048/monkey_patch/array/tile.rb

@@ -28,7 +28,7 @@ module Text2048
 
         def fill_length(len)
           compact!
-          unshift(Text2048::Tile.new(0)) until size == len
+          unshift(Text2048::Tile.new(nil)) until size == len
           self
         end
       end

data/lib/text2048/tile.rb

@@ -6,12 +6,13 @@ require 'forwardable'
 module Text2048
   # 2048 tile
   class Tile
+    attr_reader :value
     attr_reader :status
 
     extend Forwardable
 
     def initialize(value, status = nil)
-      @value = value.to_i
+      @value = value
       @status = status
     end
 
@@ -25,7 +26,7 @@ module Text2048
     end
 
     def ==(other)
-      @value == other.to_i
+      @value.to_i == other.to_i
     end
 
     def_delegators :@value, :to_i, :to_s

data/lib/text2048/version.rb

@@ -3,5 +3,5 @@
 # This module smells of :reek:UncommunicativeModuleName
 module Text2048
   # gem version.
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.10.0'.freeze
 end

data/spec/text2048/board_spec.rb

@@ -45,10 +45,10 @@ describe Text2048::Board do
       When(:result) { board.right }
 
       Then do
-        result.to_a == [[0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0]]
+        result.to_a == [[nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil]]
       end
       And { result.score == 0 }
     end
@@ -57,10 +57,10 @@ describe Text2048::Board do
       When(:result) { board.left }
 
       Then do
-        result.to_a == [[0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0]]
+        result.to_a == [[nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil]]
       end
       And { result.score == 0 }
     end
@@ -69,10 +69,10 @@ describe Text2048::Board do
       When(:result) { board.up }
 
       Then do
-        result.to_a == [[0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0]]
+        result.to_a == [[nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil]]
       end
       And { result.score == 0 }
     end
@@ -81,10 +81,10 @@ describe Text2048::Board do
       When(:result) { board.down }
 
       Then do
-        result.to_a == [[0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0]]
+        result.to_a == [[nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil]]
       end
       And { result.score == 0 }
     end
@@ -92,20 +92,20 @@ describe Text2048::Board do
     describe '#to_a' do
       When(:result) { board.to_a }
       Then do
-        result == [[0, 0, 0, 0],
-                   [0, 0, 0, 0],
-                   [0, 0, 0, 0],
-                   [0, 0, 0, 0]]
+        result == [[nil, nil, nil, nil],
+                   [nil, nil, nil, nil],
+                   [nil, nil, nil, nil],
+                   [nil, nil, nil, nil]]
       end
     end
   end
 
   context 'with four 2s in diagonal' do
     Given(:initial_tiles) do
-      [[2, 0, 0, 0],
-       [0, 2, 0, 0],
-       [0, 0, 2, 0],
-       [0, 0, 0, 2]]
+      [[2, nil, nil, nil],
+       [nil, 2, nil, nil],
+       [nil, nil, 2, nil],
+       [nil, nil, nil, 2]]
     end
 
     describe '#tiles' do
@@ -144,10 +144,10 @@ describe Text2048::Board do
       When(:result) { board.right }
 
       Then do
-        result.to_a == [[0, 0, 0, 2],
-                        [0, 0, 0, 2],
-                        [0, 0, 0, 2],
-                        [0, 0, 0, 2]]
+        result.to_a == [[nil, nil, nil, 2],
+                        [nil, nil, nil, 2],
+                        [nil, nil, nil, 2],
+                        [nil, nil, nil, 2]]
       end
       And { result.merged_tiles.empty? }
       And { result.score == 0 }
@@ -157,10 +157,10 @@ describe Text2048::Board do
       When(:result) { board.left }
 
       Then do
-        result.to_a == [[2, 0, 0, 0],
-                        [2, 0, 0, 0],
-                        [2, 0, 0, 0],
-                        [2, 0, 0, 0]]
+        result.to_a == [[2, nil, nil, nil],
+                        [2, nil, nil, nil],
+                        [2, nil, nil, nil],
+                        [2, nil, nil, nil]]
       end
       And { result.merged_tiles.empty? }
       And { result.score == 0 }
@@ -171,9 +171,9 @@ describe Text2048::Board do
 
       Then do
         result.to_a == [[2, 2, 2, 2],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0]]
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil]]
       end
       And { result.merged_tiles.empty? }
       And { result.score == 0 }
@@ -183,9 +183,9 @@ describe Text2048::Board do
       When(:result) { board.down }
 
       Then do
-        result.to_a == [[0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0],
+        result.to_a == [[nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
                         [2, 2, 2, 2]]
       end
       And { result.merged_tiles.empty? }
@@ -195,20 +195,20 @@ describe Text2048::Board do
     describe '#to_a' do
       When(:result) { board.to_a }
       Then do
-        result == [[2, 0, 0, 0],
-                   [0, 2, 0, 0],
-                   [0, 0, 2, 0],
-                   [0, 0, 0, 2]]
+        result == [[2, nil, nil, nil],
+                   [nil, 2, nil, nil],
+                   [nil, nil, 2, nil],
+                   [nil, nil, nil, 2]]
       end
     end
   end
 
   context 'with six 2s that can be merged' do
     Given(:initial_tiles) do
-      [[2, 0, 2, 0],
-       [0, 2, 0, 0],
-       [0, 2, 0, 2],
-       [0, 0, 0, 2]]
+      [[2, nil, 2, nil],
+       [nil, 2, nil, nil],
+       [nil, 2, nil, 2],
+       [nil, nil, nil, 2]]
     end
 
     describe '#tiles' do
@@ -249,10 +249,10 @@ describe Text2048::Board do
       When(:result) { board.right }
 
       Then do
-        result.to_a == [[0, 0, 0, 4],
-                        [0, 0, 0, 2],
-                        [0, 0, 0, 4],
-                        [0, 0, 0, 2]]
+        result.to_a == [[nil, nil, nil, 4],
+                        [nil, nil, nil, 2],
+                        [nil, nil, nil, 4],
+                        [nil, nil, nil, 2]]
       end
       And { result.to_a[0][3].merged? }
       And { result.to_a[2][3].merged? }
@@ -264,10 +264,10 @@ describe Text2048::Board do
       When(:result) { board.left }
 
       Then do
-        result.to_a == [[4, 0, 0, 0],
-                        [2, 0, 0, 0],
-                        [4, 0, 0, 0],
-                        [2, 0, 0, 0]]
+        result.to_a == [[4, nil, nil, nil],
+                        [2, nil, nil, nil],
+                        [4, nil, nil, nil],
+                        [2, nil, nil, nil]]
       end
       And { result.to_a[0][0].merged? }
       And { result.to_a[2][0].merged? }
@@ -280,9 +280,9 @@ describe Text2048::Board do
 
       Then do
         result.to_a == [[2, 4, 2, 4],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0]]
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil]]
       end
       And { result.to_a[0][1].merged? }
       And { result.to_a[0][3].merged? }
@@ -294,9 +294,9 @@ describe Text2048::Board do
       When(:result) { board.down }
 
       Then do
-        result.to_a == [[0, 0, 0, 0],
-                        [0, 0, 0, 0],
-                        [0, 0, 0, 0],
+        result.to_a == [[nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
+                        [nil, nil, nil, nil],
                         [2, 4, 2, 4]]
       end
       And { result.to_a[3][1].merged? }
@@ -308,20 +308,20 @@ describe Text2048::Board do
     describe '#to_a' do
       When(:result) { board.to_a }
       Then do
-        result == [[2, 0, 2, 0],
-                   [0, 2, 0, 0],
-                   [0, 2, 0, 2],
-                   [0, 0, 0, 2]]
+        result == [[2, nil, 2, nil],
+                   [nil, 2, nil, nil],
+                   [nil, 2, nil, 2],
+                   [nil, nil, nil, 2]]
       end
     end
   end
 
   context 'with one 2048 tile' do
     Given(:initial_tiles) do
-      [[0, 0, 0, 0],
-       [0, 0, 0, 0],
-       [0, 2048, 0, 0],
-       [0, 0, 0, 0]]
+      [[nil, nil, nil, nil],
+       [nil, nil, nil, nil],
+       [nil, 2048, nil, nil],
+       [nil, nil, nil, nil]]
     end
 
     describe '#win?' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text2048
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler