added some tests for the cell and for the conways class also, put eve…

…rything in namespace etc

bin/conways

@@ -23,13 +23,14 @@ dead cells, i.e. all the edges of the grid should be made
 up of zeros (dead cells)
   EOS
 end
+Conways::Life.new(ARGV.join("")).live
 
-begin
-  input = eval(ARGV[0])
-  life = Conways::Life.new(input)
-  life.live
-rescue StandardError => e
-  puts "Your input was invalid somehow: #{e}"
-rescue SyntaxError => e
-  puts "Your input didn't have correct syntax: #{e}"
-end
+#begin
+  #input = eval(ARGV[0])
+  #life = Conways::Life.new(input)
+  #life.live
+#rescue StandardError => e
+  #puts "Your input was invalid somehow: #{e}"
+#rescue SyntaxError => e
+  #puts "Your input didn't have correct syntax: #{e}"
+#end

lib/conways.rb

@@ -1,17 +1,72 @@
+require 'conways/cell'
 require 'conways/grid'
 
 module Conways 
   class Life 
+#some possible inputs
+#[[0,0,0,0,0,0], [0,0,1,1,1,0], [0,1,1,1,0,0], [0,0,0,0,0,0]]
+#[[0,0,0,0,0], [0,0,1,0,0], [0,0,0,1,0], [0,1,1,1,0], [0,0,0,0,0]]
+#[[0,0,0,0,0,0,0], [0,1,0,0,1,0,0],[0,0,0,0,0,1,0],[0,1,0,0,0,1,0],[0,0,1,1,1,1,0],[0,0,0,0,0,0,0]]
+    CROSS = [[0,0,0,0,0], [0,1,1,1,0], [0,0,0,0,0]]
+    ACORN = [[0,0,0,0,0,0,0,0,0], [0,0,1,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0],[0,1,1,0,0,1,1,1,0],[0,0,0,0,0,0,0,0,0]]
+
     def initialize(input)
-      @input = input
+      input = input.gsub(/\s+/,"")
+      begin
+        @input = (input.class == String ? eval(input) : input)
+      rescue StandardError => e
+        raise "Your input was invalid somehow: #{e}"
+      rescue SyntaxError => e
+        raise "Your input didn't have correct syntax: #{e}"
+      end
+      raise "Input must be a two dimensional array" unless two_dimensional? @input
+      raise "Input must only contain 0 or 1 as values" unless cell_values_correct? @input
+      raise "Input rows must all be of the same size" unless even_rows? @input
+
       @exit = false
       trap("SIGINT") do
         @exit = true
       end
     end
 
+    def two_dimensional?(input)
+      input.each do |row|
+        return false unless row.class == Array
+      end
+      true
+    end
+
+    def cell_values_correct?(input)
+      input.each do |row|
+        row.each do |cell|
+          return false unless Conways::Cell::LIVE || Conways::Cell::DEAD
+        end
+      end
+      true
+    end
+
+    def even_rows?(input)
+      current_row_size = nil
+      input.each do |row|
+        return false if current_row_size && current_row_size != row.size
+        current_row_size = row.size
+      end
+      true
+    end
+
+    #def live
+      #grid = InputToGrid.convert @input
+      #loop do
+        #@output_writer.write grid
+        #grid.tick
+        #sleep(1)
+        #exit if @exit
+      #end
+      #@output_writer.write grid
+    #end
+
     def live
-      grid = CellGrid.build_from(@input)
+      grid = Grid.from_input @input
       loop do
         puts grid.to_s
         puts
@@ -25,9 +80,3 @@ def live
   end
 end 
 
-#some possible inputs
-#[[0,0,0,0,0], [0,1,1,1,0], [0,0,0,0,0]]
-#[[0,0,0,0,0,0], [0,0,1,1,1,0], [0,1,1,1,0,0], [0,0,0,0,0,0]]
-#[[0,0,0,0,0], [0,0,1,0,0], [0,0,0,1,0], [0,1,1,1,0], [0,0,0,0,0]]
-#[[0,0,0,0,0,0,0], [0,1,0,0,1,0,0],[0,0,0,0,0,1,0],[0,1,0,0,0,1,0],[0,0,1,1,1,1,0],[0,0,0,0,0,0,0]]
-#[[0,0,0,0,0,0,0,0,0], [0,0,1,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0],[0,1,1,0,0,1,1,1,0],[0,0,0,0,0,0,0,0,0]] #acorn

lib/conways/cell.rb

@@ -1,30 +1,35 @@
-class Cell
- class << self
-   def live
-     1
-   end
+module Conways 
+  class Cell
+    LIVE = 1
+    DEAD = 0
+    class << self
+      def live_one
+        Cell.new Cell::LIVE
+      end
 
-   def dead
-     0
-   end
- end
+      def dead_one
+        Cell.new Cell::DEAD
+      end
+    end
 
- attr_accessor :neighbours, :state, :next_state, :previous_state
- def initialize(state)
-   @state = state
-   @next_state = nil
- end
+    attr_accessor :state, :next_state
+    def initialize(state)
+      raise "Cell must be live or dead" unless state == Cell::LIVE || state == Cell::DEAD
+      @state = state
+      @next_state = nil
+    end
 
- def live?
-   @state == Cell.live
- end
+    def live?
+      @state == Cell::LIVE
+    end
 
- def dead?
-   @state == Cell.dead
- end
+    def dead?
+      @state == Cell::DEAD
+    end
 
- def update_to_next_generation_state
-   @state = @next_state
-   @next_state = nil
- end
+    def move_to_next_state
+      @state = @next_state
+      @next_state = nil
+    end
+  end
 end