arraysugar 0.1.0 → 0.2.0

data/lib/{array_sugar.rb → arraysugar.rb}

@@ -26,7 +26,6 @@
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 module ArraySugar
   class IterationProxy
     instance_methods.each do |m|
@@ -36,12 +35,12 @@ module ArraySugar
     def initialize(array, mode)
       @array = array
       @mode = mode
-      @depth = 0
+      @leafs = false
     end
 
-    def __do_call(e, depth = @depth)
-      if (depth != 0) && (e.is_a?(Array) || e.is_a?(Range))
-        e.send(@mode) {|e| __do_call(e, depth - 1) }
+    def __do_call(e)
+      if @leafs && (e.is_a?(Array) || e.is_a?(Range))
+        e.send(@mode) {|e| __do_call(e) }
       else
         if @nils_okay && e.nil?
           nil
@@ -57,20 +56,11 @@ module ArraySugar
       self
     end
 
-    def to_a
-      @array
-    end
-
     def leafs
-      @depth = -1
+      throw 'sorry, select does not yet work with leafs' if @mode =~ /select/ || @mode =~ /find_all/
+      @leafs = true
       self
     end
-    def deep(depth = -1)
-      @depth = -1
-    end
-    def shallow(depth = 0)
-      @depth = depth
-    end
 
     def nils_okay
       @nils_okay = true
@@ -78,15 +68,30 @@ module ArraySugar
     end
     alias_method :nils_ok, :nils_okay
 
+    def to_a
+      @array
+    end
+
     def inspect
       to_a.inspect
     end
 
+    def compact
+      @array = @array.compact
+      self
+    end
+
+    def uniq
+      @array = @array.uniq
+      self
+    end
+
     [:all?, :any?, :map, :map!, :collect, :collect!, :detect, :find, :find_all,
      :reject, :reject!, :reverse_each, :select, :sort_by, :each].each do |m|
       class_eval <<-CODE
       def #{m}(*args, &b)
         if args.size == 0 && !block_given?
+          throw 'sorry, select does not yet work with leafs' if @leafs && @mode =~ /select/ || @mode =~ /find_all/
           @mode = :#{m}
           self
         else

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: arraysugar
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-10-06 00:00:00 +00:00
+  version: 0.2.0
+date: 2007-10-07 00:00:00 +00:00
 summary: Nice Ruby Array manipulation syntax
 require_paths: 
 - lib
@@ -29,7 +29,7 @@ post_install_message:
 authors: []
 
 files: 
-- lib/array_sugar.rb
+- lib/arraysugar.rb
 test_files: []
 
 rdoc_options: []