0
@@ -20,44 +20,24 @@
0
 # b.collect_every(3,true,1)        #=> [[2, 3, 4], [5, 6, 7]]
0
 
0
 class Array
0
-  def collect_every(n,fill=false,offset=0)
0
-
0
-    if block_given?
0
-      while offset < size
0
-        ret=[]
0
-
0
-        if fill
0
-          n.times do |x| 
0
-            if offset+x > size - 1: ret << nil
0
-            else ret << self[offset+x] end
0
-          end
0
-        else
0
-          n.times { |x| ret << self[offset+x] unless offset+x > size-1 }
0
-        end
0
-
0
-        offset += n
0
-        yield ret
0
-        ret = nil
0
-      end
0
-
0
-    else
0
-      ret = []
0
-      while offset < size
0
-        ret << []
0
-
0
-        if fill
0
-          n.times do |x|
0
-            if offset+x > size - 1: ret.last << nil
0
-            else ret.last << self[offset+x] end
0
-          end
0
-        else
0
-          n.times { |x| ret.last << self[offset+x] unless offset+x > size-1 }
0
-        end
0
-
0
-        offset += n
0
-      end
0
-      return ret
0
+  
0
+  def collect_every(n, fill=false, offset=0)
0
+    result = [ ]
0
+  
0
+    self.slice!(0, offset)  
0
+  
0
+    result << self.slice!(0, n) until self.empty?  
0
+  
0
+    if fill && !result.empty?  
0
+      # ('result.last' cannot be assigned to; use array[i] access)
0
+      result[-1] += [nil] * (n - result[-1].size)
0
     end
0
-
0
-  end
0
-end
0
\ No newline at end of file
0
+  
0
+    if block_given? && !result.empty?
0
+      yield result.shift until result.empty?
0
+    end 
0
+  
0
+    result
0
+  end # collect_every
0
+  
0
+end # class 
0
\ No newline at end of file