conway 0.1.0 → 0.1.1

data/README.md

@@ -1,15 +1,17 @@
 ## Conway
-A simple Game of Live implementation with formost focus on object design.
+A simple Game of Life implementation with foremost focus on object design.
 
-Currently very much leaky of object references.
+It's currently very much leaky of object references and has no mind for
+efficiency.
 
-Conway comes with a very simple ASCII visualize. It can be invoked like so,
-where the size argument determines the dimensions of the square cell grid:
+Conway comes with a very simple ASCII visualizer. It can be invoked as
+below, where the size argument determines the dimensions of the cell grid:
 
     conway --size 25 --cells="2,3 3,3 2,2 5,4 5,8 9,8, 7,6"
     conway -s 30 -c 2,3:3,3:3,2:2,2:3,4
 
-Please feel free to send feedback via the GitHub project or via email at
-mby _AT_ mattyoho _dot_ com.
+Please feel free to send feedback via the
+[GitHub project](https://github.com/mattyoho/conway) or via email at
+mby _AT_ mattyoho _DOT_ com.
+
 
-https://github.com/mattyoho/conway

data/bin/conway

@@ -9,7 +9,7 @@ require 'conway/visualizer/ascii'
 
 PROGRAM_VERSION = 1
 
-module ConwayAscii
+module ConwayCli
   def self.suppress_warnings
     original_verbosity = $VERBOSE
     begin
@@ -33,7 +33,7 @@ module ConwayAscii
   end
 end
 
-ConwayAscii.suppress_warnings do
+ConwayCli.suppress_warnings do
   Choice.options do
     header 'Conway Game of Life ASCII visualizer'
     header 'Available options:'
@@ -61,14 +61,14 @@ ConwayAscii.suppress_warnings do
 end
 
 Signal.trap("TERM") do
-  ConwayAscii.exit
+  ConwayCli.exit
 end
 
 Signal.trap("INT") do
-  ConwayAscii.exit
+  ConwayCli.exit
 end
 
-live_points = ConwayAscii.parse_points Choice[:cells]
+live_points = ConwayCli.parse_points Choice[:cells]
 grid        = Conway::Visualizer::Ascii.new(Choice[:size], live_points)
 
 grid.loop do |step|

data/lib/conway/point.rb

@@ -3,7 +3,7 @@ module Conway
     attr_reader :x, :y
 
     def initialize(x=0,y=0)
-      @x,@y = x,y
+      self.x, self.y = x,y
     end
 
     def eql?(other)
@@ -18,12 +18,20 @@ module Conway
       :"#{x}-#{y}".object_id
     end
 
+    def update(x, y)
+      self.x = x
+      self.y = y
+    end
+
     def adjacents
-      grid = (-1..1).map do |j|
+      (-1..1).map do |j|
         (-1..1).map do |i|
           Point.new(x+i, y+j) unless i == 0 && j == 0
         end
       end.flatten.compact
     end
+
+    protected
+    attr_writer :x, :y
   end
 end

data/lib/conway/visualizer/ascii.rb

@@ -16,9 +16,9 @@ module Conway
         puts "They live!!\n\n"
 
         begin
-          new_points = generation.cell_coordinates
+          live_cells = generation.cell_coordinates
 
-          if new_points.count == 0
+          if live_cells.count == 0
             puts "\nThey have all perished! D-:"
             break
           end
@@ -26,7 +26,7 @@ module Conway
           grid = ""
           (1..max_y).each do |y|
             (1..max_x).each do |x|
-              cell_char = cell_content_for(new_points, x,y)
+              cell_char = cell_content_for(live_cells, x,y)
               grid << "|#{cell_char}"
             end
             grid << "|\n"
@@ -34,8 +34,8 @@ module Conway
 
           grid << "\n"
 
-          grid <<  "Total objects: #{ObjectSpace.count_objects[:TOTAL]} "
-          grid <<  "Total LiveCells: #{new_points.count}\n"
+          grid <<  "Total objects: #{live_object_count} "
+          grid <<  "Total living cells: #{live_cells.count}\n"
 
           elapsed_minutes, elapsed_seconds = ((Time.now - start).to_i).divmod 60
           grid << "Elapsed time: #{elapsed_minutes} min, #{elapsed_seconds} secs\n"
@@ -50,7 +50,19 @@ module Conway
       attr_accessor :max_x, :max_y, :starting_cells, :loop_interval
 
       def cell_content_for(points, x,y)
-        points.detect {|p| p.x == x && p.y == y } ? "X" : " "
+        @comparison_point ||= Point.new(x,y)
+        @comparison_point.update(x,y)
+        points.detect {|p| p == @comparison_point } ? "X" : " "
+      end
+
+      def live_object_count
+        if ObjectSpace.respond_to?(:count_objects)
+          # Ruby 1.9.2
+          ObjectSpace.count_objects[:TOTAL]
+        else
+          # Ruby 1.8.7
+          ObjectSpace.live_objects
+        end
       end
     end
   end

data/spec/conway/point_spec.rb

@@ -34,5 +34,14 @@ describe Point do
       point.adjacents.should == neighbors
     end
   end
+
+  describe "#update" do
+    let(:point) { Point.new(2,2) }
+    it "updates the x and y points" do
+      point.update(1,3)
+      point.x.should eql(1)
+      point.y.should eql(3)
+    end
+  end
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: conway
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Matt Yoho
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -05:00
 default_executable: conway
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 1
@@ -78,6 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -86,6 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"