cellular_map 0.2.1 → 0.3.0

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rake'
- 
+
 begin
   require 'jeweler'
   include_file_globs = ["README*",
@@ -24,13 +24,13 @@ begin
     gem.has_rdoc = true
     gem.extra_rdoc_files = ["README*"]
     gem.rdoc_options << '--line-numbers' << '--inline-source'
-    gem.add_development_dependency("thoughtbot-shoulda", ">= 0")
+    gem.add_development_dependency("shoulda", ">= 0")
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
- 
+
 require 'rake/testtask'
 desc 'Test the cellular map gem.'
 Rake::TestTask.new(:test) do |t|
@@ -56,7 +56,7 @@ end
 task :test => :check_dependencies
 
 task :default => :test
- 
+
 require 'rake/rdoctask'
 desc 'Generate documentation for the cellular map gem.'
 Rake::RDocTask.new(:rdoc) do |rdoc|

data/lib/cellular_map/map.rb

@@ -3,7 +3,7 @@ require 'cellular_map/zone'
 
 module CellularMap
   # =Map
-  # 
+  #
   # Maps are limitless, only non-empty (nil content) cells are actually stored.
   #
   # (see README for examples)
@@ -40,6 +40,11 @@ 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])) }

data/lib/cellular_map/zone.rb

@@ -6,7 +6,7 @@ module CellularMap
   #
   # (see README for examples)
   class Zone
-    
+
     # Zone's boundaries
     attr_reader :x, :y
     # Map the zone's part of
@@ -16,7 +16,7 @@ module CellularMap
       @x, @y = rangeize(x, y)
       @map = map
     end
-    
+
     # Zone's length.
     def length
       width * height
@@ -53,9 +53,16 @@ module CellularMap
       @y.each { |y| @x.each { |x| yield Cell.new(x, y, @map) } }
     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.
     #
-    # (first to last lines, first to last columns for each line)
+    # see each
     def to_a
       @y.collect { |y| @x.collect { |x| Cell.new(x, y, @map) } }
     end

data/test/test_map.rb

@@ -43,6 +43,12 @@ class TestMap < Test::Unit::TestCase
       assert_equal @map, result
     }
 
+    should("collect all filled cells") {
+      expected = @sample.collect { |c, v| c + [v] }.sort!
+      inside = @map.collect { |cell| [cell.x, cell.y, cell.content] }.sort!
+      assert_equal expected, inside
+    }
+
     should("be convertible to an array of cells") {
       res = @map.to_a
       assert res.is_a? Array

data/test/test_zone.rb

@@ -59,6 +59,12 @@ class TestZone < Test::Unit::TestCase
           assert_equal @positions, inside
         }
 
+        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!
+          assert_equal outside, inside
+        }
+
         should("be convertible to an array of all its cells") {
           res = @zone.to_a
           assert res.is_a? Array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cellular_map
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Michel Belleville
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +01:00
+date: 2010-01-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement