golr 0.5.2 → 0.5.3

data/lib/golr.rb

@@ -1,4 +1,5 @@
 require 'golr/game'
+require 'golr/key'
+require 'golr/rules'
 require 'golr/game_reader'
 require 'golr/game_printer'
-

data/lib/golr/game.rb

@@ -1,10 +1,7 @@
-require 'golr/key'
-require 'golr/rules'
-
 module Golr
   class Game
 
-    attr_reader :grid, :columns, :rows  
+    attr_reader :grid, :columns, :rows
 
     def initialize(columns, rows, living_cells = [])
       @columns = columns
@@ -15,15 +12,14 @@ module Golr
 
     def init_grid(living_cells = [])
       new_grid = {}
-      Range.new(1, @columns).to_a.each do |x|
-        Range.new(1, @rows).to_a.each do |y|
+      (1..@columns).map do |x|
+        (1..@rows).map do |y|
           key = Key.key(x, y)
           new_grid[key] = living_cells.include?(key) ? true : false
         end
       end
       new_grid
     end
-    
 
     def evolve
       next_grid = init_grid
@@ -39,8 +35,8 @@ module Golr
     end
 
     def living_neighbors(key)
-      living_neighbors = neighboring_keys(key).inject(0) do |result, _key|      
-        result += 1 if alive?(wrap_key_around_board_edges(_key))
+      living_neighbors = neighboring_keys(key).reduce(0) do |result, _key|
+        result += 1 if alive?(wrap_key_around_grid_edges(_key))
         result
       end
     end
@@ -48,15 +44,15 @@ module Golr
     def neighboring_keys(key)
       neighbor_keys = []
       x,y = Key.coordinates(key)
-      ((x-1)..(x+1)).to_a.each do |_x|
-        ((y-1)..(y+1)).to_a.each do |_y|
+      ((x-1)..(x+1)).map do |_x|
+        ((y-1)..(y+1)).map do |_y|
           neighbor_keys << Key.key(_x,_y) unless x == _x && y == _y
         end
       end
       neighbor_keys
     end
 
-    def wrap_key_around_board_edges(key)
+    def wrap_key_around_grid_edges(key)
       x,y = Key.coordinates(key)
       Key.key(wrap_coordinate(x, @columns), wrap_coordinate(y, @rows))
     end
@@ -66,7 +62,7 @@ module Golr
       wrapped = wrapped > limit ? 1 : wrapped
     end
 
-    private :init_grid, :living_neighbors, :neighboring_keys, :wrap_key_around_board_edges, :wrap_coordinate
+    private :init_grid, :living_neighbors, :neighboring_keys, :wrap_key_around_grid_edges, :wrap_coordinate
 
   end
 end

data/lib/golr/game_printer.rb

@@ -1,5 +1,4 @@
 module Golr
-
   class GamePrinter
 
     def self.print(game, io = STDOUT)
@@ -8,24 +7,20 @@ module Golr
       line_feed(io)
     end
 
-
     private
-
     def self.line_feed(io)
       printf(io, "\n")
     end
 
     def self.print_game_state(game, io)
-      Range.new(1, game.rows).to_a.each do |y|
+      (1..game.rows).to_a.each do |y|
         printf(io, '|')
-        Range.new(1, game.columns).to_a.each do |x|
+        (1..game.columns).to_a.each do |x|
           printf(io, game.grid[Key.key(x,y)] == true ? 'o' : ' ')
         end
         printf(io, '|')
         line_feed(io)
       end
     end
-
   end
-
 end

data/lib/golr/version.rb

@@ -1,3 +1,3 @@
 module Golr
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: golr
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -68,11 +68,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/golr/game.rb
-- lib/golr/game_printer.rb
-- lib/golr/game_reader.rb
 - lib/golr/key.rb
+- lib/golr/game_printer.rb
 - lib/golr/rules.rb
+- lib/golr/game.rb
+- lib/golr/game_reader.rb
 - lib/golr/version.rb
 - lib/golr.rb
 - bin/golr