cellular_map 0.3.2 → 0.4.0

data/lib/cellular_map/map.rb

@@ -8,6 +8,7 @@ module CellularMap
   #
   # (see README for examples)
   class Map
+    include Enumerable
 
     # Store of actually filled cells.
     attr_reader :store
@@ -40,16 +41,6 @@ module CellularMap
       self
     end
 
-    # Collecting all filled cells
-    def collect # :yields: cell
-      @store.keys.collect { |k| yield Cell.new(*(k + [self])) }
-    end
-
-    # Converts to map to an array of filled cells
-    def to_a
-      @store.keys.collect { |k| Cell.new(*(k + [self])) }
-    end
-
     # Empties the map filled cells.
     def empty!
       @store = {}

data/lib/cellular_map/zone.rb

@@ -6,6 +6,7 @@ module CellularMap
   #
   # (see README for examples)
   class Zone
+    include Enumerable
 
     # Zone's boundaries
     attr_reader :x, :y
@@ -54,13 +55,6 @@ module CellularMap
       self
     end
 
-    # Collecting cells inside the zone.
-    #
-    # see each
-    def collect # :yields: cell
-      @y.inject([]) { |r, y| r + @x.collect { |x| yield Cell.new(x, y, @map) } }
-    end
-
     # Making an array of arrays of all cells inside the zone.
     #
     # see each

data/test/test_map.rb

@@ -50,7 +50,13 @@ class TestMap < Test::Unit::TestCase
 
     should("collect all filled cells") {
       expected = @sample.collect { |c, v| c + [v] }.sort!
-      inside = @map.collect { |cell| [cell.x, cell.y, cell.content] }.sort!
+      inside = @map.collect { |cell| [cell.x, cell.y, cell.content] }.sort
+      assert_equal expected, inside
+    }
+
+    should("inject its filled cells in a result") {
+      expected = @sample.collect { |c, v| c + [v] }.sort!
+      inside = @map.inject([]) { |r, c| r + [[c.x, c.y, c.content]] }.sort
       assert_equal expected, inside
     }
 

data/test/test_zone.rb

@@ -39,6 +39,7 @@ class TestZone < Test::Unit::TestCase
           [53, 11] => /dolor sid amet/,
           [7, -22] => 0..11
         }).each { |k, v| @map[*k] = v }
+        @sort_order = lambda { |a, b| (a[0] <=> b[0]) * 2 + (a[1] <=> b[1]) }
       }
 
       context("a certain zone") {
@@ -65,8 +66,18 @@ class TestZone < Test::Unit::TestCase
         }
 
         should("collect all its cells in a basic one-dimension array") {
-          inside = @zone.collect { |cell| [cell.x, cell.y, cell.content] }.sort!
-          outside = @positions.collect { |x, y| [x, y, @sample[[x, y]]] }.sort!
+          inside, outside = [
+            @zone.collect { |cell| [cell.x, cell.y, cell.content] },
+            @positions.collect { |x, y| [x, y, @sample[[x, y]]] }
+          ].collect { |a| a.sort &@sort_order }
+          assert_equal outside, inside
+        }
+
+        should("inject its cells in a result") {
+          inside, outside = [
+            @zone.inject([]) { |r, c| r + [[c.x, c.y, c.content]] },
+            @positions.collect { |x, y| [x, y, @sample[[x, y]]] }
+          ].collect { |a| a.sort &@sort_order }
           assert_equal outside, inside
         }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cellular_map
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Michel Belleville
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 +01:00
+date: 2010-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency