cellular_map 0.5.0 → 0.6.0

data/lib/cellular_map/cell.rb

@@ -37,6 +37,10 @@ module CellularMap
       [@x, @y, @map] == [other.x, other.y, other.map]
     end
 
+    def <=>(other) # :nodoc:
+      2 * (y <=> other.y) + (x <=> other.x)
+    end
+
     def eql?(other) # :nodoc:
       self == other
     end

data/lib/cellular_map/zone.rb

@@ -44,7 +44,7 @@ module CellularMap
     end
 
     def ==(other) # :nodoc:
-      [@x, @y, @map] == [other.x, other.y, other.map]
+      ! self.detect { |c| ! (other.map[c.x, c.y].content == c.content) }
     end
 
     # Iterating over each cells inside the zone.
@@ -79,5 +79,10 @@ module CellularMap
     def rangeize(x, y)
       [x, y].collect { |i| i.respond_to?(:to_i) ? (i.to_i..i.to_i) : i }
     end
+
+    def initialize_copy(other) # :nodoc:
+      @map = other.map.dup
+      @map.each { |c| c.content = nil unless x === c.x && y === c.y }
+    end
   end
 end

data/test/test_cell.rb

@@ -39,25 +39,40 @@ class TestCell < Test::Unit::TestCase
   context("An array of cells") {
     setup {
       @map = CellularMap::Map.new
-      @cells = [
+      @sorted = [
+        @map[6, -9],
         @map[0, 0],
+        @map[0, 5],
         @map[1, 5],
         @map[-4, 7],
+        @map[0, 7],
+        @map[3, 7],
+        @map[3, 8],
+      ]
+      @cells = [
         @map[3, 8],
-        @map[6, -9]
+        @map[3, 7],
+        @map[1, 5],
+        @map[0, 0],
+        @map[0, 7],
+        @map[-4, 7],
+        @map[0, 5],
+        @map[6, -9],
       ]
       @duplicated = @cells + [
         @map[0, 0],
         @map[1, 5],
       ]
-      @sort_order = lambda { |a, b| 2 * (a[0] <=> b[0]) + (a[1] <=> b[1]) }
     }
 
+    should("be easy to sort (by rows then by columns)") {
+      assert_equal @sorted, @cells.sort }
+
     should("remove duplicated elements") {
       expected, obtained = [
         @cells,
         @duplicated.uniq
-      ].collect { |a| a.collect { |c| [c.x, c.y] }.sort &@sort_order }
+      ].collect { |a| a.collect { |c| [c.x, c.y] }.sort }
       assert_equal expected, obtained
     }
   }

data/test/test_zone.rb

@@ -95,6 +95,22 @@ class TestZone < Test::Unit::TestCase
           } }
           assert_equal @positions, inside
         }
+
+        context("and its duplicate") {
+          setup { @duplicate = @zone.dup }
+          should("be identical") { assert_equal @zone, @duplicate }
+          should("not be the same instance") {
+            assert_not_same @zone, @duplicate }
+          should("not be on the same map") {
+            assert_not_same @zone.map, @duplicate.map }
+          should("have duplicated only the cells inside the zone") {
+            expected, obtained = [
+              @duplicate.map.to_a,
+              @duplicate.reject { |c| c.content.nil? }
+            ].collect { |a| a.sort }
+            assert_equal expected, obtained
+          }
+        }
       }
     }
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cellular_map
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Michel Belleville