cellular_map 0.1.0 → 0.2.0

data/lib/cellular_map/zone.rb

@@ -13,8 +13,7 @@ module CellularMap
     attr_reader :map
 
     def initialize(x, y, map) # :nodoc:
-      @x = x.respond_to?(:to_i) ? (x.to_i..x.to_i) : x
-      @y = y.respond_to?(:to_i) ? (y.to_i..y.to_i) : y
+      @x, @y = rangeize(x, y)
       @map = map
     end
     
@@ -35,14 +34,12 @@ module CellularMap
 
     # Access to a cell inside the zone.
     def [](x, y)
-      if x.respond_to?(:to_i) && y.respond_to?(:to_i)
-        @map[@x.min + x.to_i, @y.min + y.to_i]
-      else
-        x = x.to_i..x.to_i if x.respond_to?(:to_i)
-        y = y.to_i..y.to_i if y.respond_to?(:to_i)
-        @map[(@x.min + x.min)..(@x.min + x.max),
-             (@y.min + y.min)..(@y.min + y.max)]
-      end
+      @map[*relative(x, y)]
+    end
+
+    # Modification of a cell's content inside the zone.
+    def []=(x, y, content)
+      @map[*relative(x, y)] = content
     end
 
     def ==(other) # :nodoc:
@@ -62,5 +59,23 @@ module CellularMap
     def to_a
       @y.collect { |y| @x.collect { |x| Cell.new(x, y, @map) } }
     end
+
+    protected
+
+    # Converts coordinates to coordinates relative to inside the map.
+    def relative(x, y)
+      if x.respond_to?(:to_i) && y.respond_to?(:to_i)
+        [@x.min + x.to_i, @y.min + y.to_i]
+      else
+        x, y = rangeize(x, y)
+        [ (@x.min + x.min)..(@x.min + x.max),
+          (@y.min + y.min)..(@y.min + y.max) ]
+      end
+    end
+
+    # Converts given coordinates to ranges if necessary.
+    def rangeize(x, y)
+      [x, y].collect { |i| i.respond_to?(:to_i) ? (i.to_i..i.to_i) : i }
+    end
   end
 end

data/test/test_zone.rb

@@ -20,6 +20,12 @@ class TestZone < Test::Unit::TestCase
 
       should("allow access to other zones relatively to boundaries") {
         assert_equal @map[-2..5, 6..11], @zone[-1..6, 9..14] }
+
+      should("allow to fill cells relatively to its boundaries") {
+        @zone[2, 1] = 'thingy'
+        assert_equal 'thingy', @zone[2, 1].content
+        assert_equal 'thingy', @map[1, -2].content
+      }
     }
 
     context("with a few filled cells") {

metadata

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