facets 1.8.8 → 1.8.20

data/lib/facets/core/dir/self/{multiglob_recurse.rb → multiglob_r.rb}

@@ -1,4 +1,4 @@
-# = multiglob-recurse.rb
+# = multiglob_recurse.rb
 #
 # Stub for multiglob.
 

data/lib/facets/core/dir/self/multiglob_with_default.rb

@@ -0,0 +1,3 @@
+# stub
+require 'facets/core/dir/self/multiglob'
+

data/lib/facets/core/enumerable/accumulate.rb

@@ -1,6 +1,4 @@
-#--
-# * George Moschovitis <gm@navel.gr>
-#++
+# CREDIT George Moschovitis
 
 require 'facets/more/functor'
 

data/lib/facets/core/enumerable/cart.rb

@@ -1,8 +1,4 @@
-#--
-# Cross product adapted from code by Michael Neuman.
-#++
-
-require 'generator'
+# CREDIT Thomas Hafner
 
 module Enumerable
 
@@ -17,65 +13,39 @@ module Enumerable
     #
     #   Enumerable.cross([1,2], [3,4])
     #   #=> [[1, 3], [1, 4], [2, 3], [2, 4]]
-    #
-    #--
-    # TODO Make a more efficient version just for Array (?)
-    #++
 
     def cartesian_product(*enums, &block)
-      raise if enums.empty?
-      gens = enums.map{|e| Generator.new(e)}
-      return [] if gens.any? {|g| g.end?}
-
-      sz = gens.size
-      res = []
-      tuple = Array.new(sz)
-
-      loop do
-        # fill tuple
-        (0 ... sz).each { |i|
-          tuple[i] = gens[i].current
-        }
-        if block.nil?
-          res << tuple.dup
-        else
-          block.call(tuple.dup)
-        end
-
-        # step forward
-        gens[-1].next
-        (sz-1).downto(0) do |i|
-          if gens[i].end?
-            if i > 0
-              gens[i].rewind
-              gens[i-1].next
-            else
-              return res
-            end
+      result = [[]]
+      while [] != enums
+        t, result = result, []
+        b, *enums = enums
+        t.each do |a|
+          b.each do |n|
+            result << a + [n]
           end
         end
-      end #loop
+      end
+      if block_given?
+        result.each{ |e| block.call(e) }
+      else
+        result
+      end
     end
 
-    alias :cart, :cartesian_product
+    alias :cart :cartesian_product
   end
 
-
   # The instance level version of <tt>Enumerable::cartesian_product</tt>.
   #
   #   a = []
   #   [1,2].cart([4,5]){|elem| a << elem }
   #   a  #=> [[1, 4],[1, 5],[2, 4],[2, 5]]
-  #
-  #--
-  # TODO Make a more efficient version just for Array (?)
-  #++
 
-  def cart(*enums, &block)
-    Enumerable.cart(self, *enums, &block)
+  def cartesian_product(*enums, &block)
+    Enumerable.cartesian_product(self, *enums, &block)
   end
 
-  alias :cart, :cartesian_product
+  alias :cart :cartesian_product
 end
 
 
@@ -90,12 +60,15 @@ end
 
   require 'test/unit'
 
-  class TCEnumerableClass < Test::Unit::TestCase
+  class TestEnumerableClass < Test::Unit::TestCase
 
-    def test_cross
+    def test_cart_01
       i = [[1,2], [3,4]]
       o = [[1, 3], [1, 4], [2, 3], [2, 4]]
       assert_equal( o, Enumerable.cart(*i) )
+    end
+
+    def test_cart_02
       i = [[1,2], [4], ["apple", "banana"]]
       o = [[1, 4, "apple"], [1, 4, "banana"], [2, 4, "apple"], [2, 4, "banana"]]
       assert_equal( o, Enumerable.cart(*i) )
@@ -103,12 +76,14 @@ end
 
   end
 
+  class TestEnumerable < Test::Unit::TestCase
 
-  class TCEnumerable < Test::Unit::TestCase
-
-    def test_cross
+    def test_cart_01
       a = [1,2,3].cart([4,5,6])
       assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )
+    end
+
+    def test_cart_02
       a = []
       [1,2,3].cart([4,5,6]) {|elem| a << elem }
       assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )

data/lib/facets/core/enumerable/graph.rb

@@ -31,9 +31,6 @@ module Enumerable
     end
   end
 
-  # no longer used
-  #alias_method( :build_hash, :graph )
-  #alias_method( :build_hash!, :graph! )
 end
 
 
@@ -48,7 +45,7 @@ end
 
   require 'test/unit'
 
-  class TCEnumerable < Test::Unit::TestCase
+  class TestEnumerable < Test::Unit::TestCase
 
     def test_graph
       numbers  = (1..3)

data/lib/facets/core/enumerable/self/cart.rb

@@ -1,120 +1,8 @@
-# CREDIT Michael Neuman# 
-# CREDIT Thomas Halfner (name correction from cross.rb)
-# 
-# Cross product adapted from code by Michael Neuman.
- 
-require 'generator'
-
-module Enumerable
-
-  class << self
-
-    # Provides the cross-product of two or more Enumerables.
-    # This is the class-level method. The instance method
-    # calls on this.
-    #
-    #   Enumerable.cross([1,2], [4], ["apple", "banana"])
-    #   #=> [[1, 4, "apple"], [1, 4, "banana"], [2, 4, "apple"], [2, 4, "banana"]]
-    #
-    #   Enumerable.cross([1,2], [3,4])
-    #   #=> [[1, 3], [1, 4], [2, 3], [2, 4]]
-    #
-    #--
-    # TODO Make a more efficient version just for Array (?)
-    #++
-
-    def cartesian_product(*enums, &block)
-      raise if enums.empty?
-      gens = enums.map{|e| Generator.new(e)}
-      return [] if gens.any? {|g| g.end?}
-
-      sz = gens.size
-      res = []
-      tuple = Array.new(sz)
-
-      loop do
-        # fill tuple
-        (0 ... sz).each { |i|
-          tuple[i] = gens[i].current
-        }
-        if block.nil?
-          res << tuple.dup
-        else
-          block.call(tuple.dup)
-        end
-
-        # step forward
-        gens[-1].next
-        (sz-1).downto(0) do |i|
-          if gens[i].end?
-            if i > 0
-              gens[i].rewind
-              gens[i-1].next
-            else
-              return res
-            end
-          end
-        end
-      end #loop
-    end
-
-    alias :cart, :cartesian_product
-  end
-
-
-  # The instance level version of <tt>Enumerable::cartesian_product</tt>.
-  #
-  #   a = []
-  #   [1,2].cart([4,5]){|elem| a << elem }
-  #   a  #=> [[1, 4],[1, 5],[2, 4],[2, 5]]
-  #
-  #--
-  # TODO Make a more efficient version just for Array (?)
-  #++
-
-  def cart(*enums, &block)
-    Enumerable.cart(self, *enums, &block)
-  end
-
-  alias :cart, :cartesian_product
-end
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
+# = cart.rb
 #
-=begin test
-
-  require 'test/unit'
-
-  class TCEnumerableClass < Test::Unit::TestCase
-
-    def test_cross
-      i = [[1,2], [3,4]]
-      o = [[1, 3], [1, 4], [2, 3], [2, 4]]
-      assert_equal( o, Enumerable.cart(*i) )
-      i = [[1,2], [4], ["apple", "banana"]]
-      o = [[1, 4, "apple"], [1, 4, "banana"], [2, 4, "apple"], [2, 4, "banana"]]
-      assert_equal( o, Enumerable.cart(*i) )
-    end
-
-  end
-
-
-  class TCEnumerable < Test::Unit::TestCase
-
-    def test_cross
-      a = [1,2,3].cart([4,5,6])
-      assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )
-      a = []
-      [1,2,3].cart([4,5,6]) {|elem| a << elem }
-      assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )
-    end
+# Stub for <tt>cart.rb</tt>.
+#
+# CREDIT Thomas Halfner
 
-  end
+require 'facets/core/enumerable/cart.rb'
 
-=end

data/lib/facets/core/enumerable/self/cartesian_product.rb

@@ -1,8 +1,8 @@
 # = cartesian_product.rb
 #
 # Stub for <tt>cart.rb</tt>.
-# 
-# CREDIT Thomas Halfner (for the name correction from cross.rb)
+#
+# CREDIT Thomas Halfner
 
-require 'facets/core/enumerable/self/cart.rb'
+require 'facets/core/enumerable/cart.rb'
 

data/lib/facets/core/file/self/create.rb

@@ -1,6 +1,4 @@
-#--
-# Copyright (c) 2005 George Moschovitis <gm@navel.gr>
-#++
+# CREDIT George Moschovitis 
 
 # Creates a new file, or overwrites an existing file,
 # and writes a string into it. Can also take a block

data/lib/facets/core/hash/rekey.rb

@@ -1,7 +1,3 @@
-#--
-# CREDIT Gavin Sinclair -- Adapted fron #convert_keys
-#++
-
 require 'facets/core/symbol/to_proc'
 
 class Hash
@@ -81,7 +77,7 @@ end
       foo = { "a"=>1, "b"=>2 }
       assert_equal( { :a=>1, :b=>2 }, foo.rekey! )
       assert_equal( { :a=>1, :b=>2 }, foo )
-    end 
+    end
 
   end
 

data/lib/facets/core/kernel/ask.rb

@@ -6,8 +6,8 @@ module Kernel
   def ask( question, answers=nil )
     print "#{question}"
     print " [#{answers}] " if answers
-    until inp = $stdin.gets[0,1] ; sleep 1 ; end ; puts
-    inp
+    until inp = $stdin.gets ; sleep 1 ; end ; puts
+    inp.strip
   end
 
 end

data/lib/facets/core/kernel/autoreload.rb

@@ -1,7 +1,5 @@
-#--
-# Michael Neumann
-# George Moschovitis <gm@navel.gr>
-#++
+# CREDIT Michael Neumann
+# CREDIT George Moschovitis
 
 module Kernel
 
@@ -80,7 +78,7 @@ module Kernel
   # This is equivalent to as adding a 'false' parameter to #autoreload.
 
   def autoreload_files( *args )
-    autoreload( *args, false )
+    autoreload( false, *args )
   end
 
   # deprecate

data/lib/facets/core/module/attr_tester.rb

@@ -1,12 +1,10 @@
-require 'facet/kernel/nack'
-
 class Module
 
   # Create an tester attribute. This creates two methods for
   # each given variable name. One is used to test
   # the attribute and the other is used to set or toggle it.
   #
-  #   attr_switch :a
+  #   attr_tester :a
   #
   # is equivalent to
   #
@@ -14,11 +12,11 @@ class Module
   #     @a ? true : @a
   #   end
   #
-  #   def a!(switch=nack)
-  #     if switch == nack
-  #       @a = ! @a
+  #   def a!(switch=Exception)
+  #     if switch == Exception
+  #       @a = !@a
   #     else
-  #       @a = @a ? switch : @a
+  #       @a = switch ? true : @a
   #       self
   #     end
   #   end
@@ -26,13 +24,17 @@ class Module
   def attr_tester(*args)
     make = {}
     args.each { |a|
-      make["#{a}?".to_sym] = %{ def #{a}?; @#{a} ? true : @#{a}; end }
+      make["#{a}?".to_sym] = %{
+        def #{a}?(true_value=true)
+          @#{a} ? true_value : @#{a}
+        end
+      }
       make["#{a}!".to_sym] = %{
-        def #{a}!(switch=nack)
-          if switch==nack
+        def #{a}!(switch=Exception)
+          if switch == Exception
             @#{a} = !@#{a}
           else
-            @#{a} = @#{a} ? switch : @#{a}
+            @#{a} = switch ? true : @#{a}
             self
           end
         end
@@ -53,4 +55,30 @@ end
 #   | |  __/\__ \ |_
 #   |_|\___||___/\__|
 #
-# TODO
+=begin test
+  require 'test/unit'
+
+  class TestAttrTester < Test::Unit::TestCase
+    class X
+      attr_tester :a
+    end
+
+    def test_attr_tester_exclimation
+      x = X.new
+      assert_equal(nil, x.a?)
+      x.a!
+      assert_equal(true, x.a?)
+      x.a!
+      assert_equal(false, x.a?)
+    end
+
+    def test_attr_tester_return
+      x = X.new
+      x.a!
+      assert_equal(true, x.a?)
+      x.a!("whatever")
+      assert_equal(true, x.a?)
+    end
+  end
+=end
+

data/lib/facets/core/module/on_included.rb

@@ -1,6 +1,4 @@
-#--
-# George Moschovitis <gm@navel.gr>
-#++
+# CREDIT George Moschovitis
 
 class Module