golr 0.5.1 → 0.5.2

data/bin/golr

@@ -26,10 +26,11 @@ optparse.parse!
 # load game from file
 game_file = ARGV[0]
 begin
+  game_file = "nil" if game_file.nil?
   game_string = File.read(game_file)
   game = Golr::GameReader.from_string(game_string)
 rescue Errno::ENOENT, Errno::EACCES => e
-  puts "Cannot read #{game_file} - Does it exist and is it readable?"
+  puts "Cannot read file \"#{game_file}\" - Does it exist and is it readable?"
   exit 1
 end
 

data/lib/golr/game.rb

@@ -2,10 +2,9 @@ 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
@@ -24,7 +23,7 @@ module Golr
       end
       new_grid
     end
-    private :init_grid
+    
 
     def evolve
       next_grid = init_grid
@@ -40,13 +39,11 @@ module Golr
     end
 
     def living_neighbors(key)
-      living_neighbors = neighboring_keys(key).inject(0) do |result, _key|
-        folded_key = fold_key_if_required(_key)
-        result += 1 if alive?(folded_key)
+      living_neighbors = neighboring_keys(key).inject(0) do |result, _key|      
+        result += 1 if alive?(wrap_key_around_board_edges(_key))
         result
       end
     end
-    private :living_neighbors
 
     def neighboring_keys(key)
       neighbor_keys = []
@@ -58,19 +55,18 @@ module Golr
       end
       neighbor_keys
     end
-    private :neighboring_keys
 
-    # FIXME: smelly
-    def fold_key_if_required(key)
+    def wrap_key_around_board_edges(key)
       x,y = Key.coordinates(key)
-      _x = x < 1 ? @columns : x
-      _x = _x > @columns ? 1 : _x
-      _y = y < 1 ? @rows : y
-      _y = _y > @rows ? 1 : _y
-      Key.key(_x,_y)
+      Key.key(wrap_coordinate(x, @columns), wrap_coordinate(y, @rows))
     end
-    private :fold_key_if_required
 
-  end
+    def wrap_coordinate(value, limit)
+      wrapped = value < 1 ? limit : value
+      wrapped = wrapped > limit ? 1 : wrapped
+    end
 
+    private :init_grid, :living_neighbors, :neighboring_keys, :wrap_key_around_board_edges, :wrap_coordinate
+
+  end
 end

data/lib/golr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: golr
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec