Onion 0.0.1 → 0.0.2

data/Rakefile

@@ -21,7 +21,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'Onion'
-  s.version = '0.0.1'
+  s.version = '0.0.2'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Onion, or Array Onion, allows peeling an array like an onion.'
@@ -59,3 +59,15 @@ end
 Rake::TestTask.new do |t|
   t.test_files = FileList['test/**/*.rb']
 end
+
+desc("Count lines of code")
+task(:cloc) do
+  sh("cloc */* --exclude-dir=nbproject,doc,coverage --by-file")
+  puts("\tDone counting lines of code.")
+end
+
+desc("Calculate coverage (RCov)")
+task(:rcov) do
+  `rcov *\\*.rb`
+  puts( "\tDone performing code coverage. See the coverage folder")
+end

data/lib/onion.rb

@@ -24,43 +24,45 @@
 class Array
   # Returns the maximum depth in an array with or without nested arrays.
   def depth
-    depth = 1
+    depth = 0
 
     each do |element|
       if element.kind_of?(Array)
         n = element.depth
-        depth += n if (n >= depth)
+        depth = n if (n > depth)
       end
     end
 
-    depth
+    depth + 1
   end
 
   # Peels until the given specific depth is reached. It uses Array#depth to
   # determine how many layers to peel.
   def peel_until(depth = 0)
-    unless depth == 0
-      n = self.depth - depth
-      if n > 0
-        self.peel(n)
-      else
-        self
-      end
-    end
+    (depth < 2) ? self.flatten : 
+      (depth = self.depth - depth) > 0 ? self.peel(depth) : self
   end
 
   # Peels layers of an array according to the given depth.
   def peel(depth = 1)
-    result = []
-
-    raise RangeError, "Negative peeling depth", caller if depth < 0
-
-    each do |element|
-      element.kind_of?(Array) ?
-      result += element.peel(depth - 1) :
-      result << element
-    end unless depth <= 0
+    if ((depth < 0) || (depth >= self.depth))
+      self.flatten
+    elsif (depth > 0)
+      result = []
+      each do |element|
+        element.kind_of?(Array) ?
+          result += element.peel(depth - 1) :
+          result << element     # rcov wrongfully report it as uncovered.
+      end
+      result
+    else
+      self
+    end
+  end
 
-    result.empty? ? self : result
+  # Peels layers of an array according to the given depth and performs
+  # permanent change in the array.
+  def peel!(depth = 1)
+    replace peel(depth)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Onion
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ian Trudel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-28 00:00:00 -04:00
+date: 2009-04-16 00:00:00 -04:00
 default_executable: 
 dependencies: []