facets 2.2.1 → 2.3.0

data/lib/{more → class}/facets/recorder.rb

@@ -95,43 +95,3 @@ class Recorder
 
 end
 
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin test
-
-  require 'test/unit'
-
-  #class Object
-  #  def &(o)
-  #    self && o
-  #  end
-  #end
-
-  class TCRecorder < Test::Unit::TestCase
-
-    class Z
-      def name ; 'George' ; end
-      def age ; 12 ; end
-    end
-
-    def setup
-      @z = Z.new
-    end
-
-    def test_001
-      r = Recorder.new
-      q = proc { |x| (x.name == 'George') & (x.age > 10) }
-      x = q[r]
-      assert( x.__call__(@z) )
-    end
-
-  end
-
-=end

data/lib/{more → class}/facets/syncarray.rb

@@ -120,27 +120,3 @@ end
 ### Array::Sync = SyncArray
 #++
 
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin testing
-
-require 'test/unit'
-
-# TODO
-
-class TC_SyncArray < Test::Unit::TestCase
-
-  def test_01
-    assert_nothing_raised{ @s = SyncArray.new }
-  end
-
-end
-
-=end

data/lib/{more → class}/facets/synchash.rb

@@ -146,28 +146,4 @@ end #class SyncHash
 # I'm leaving this comment here as a reminder.
 ### Hash::Sync = SyncHash
 #++
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin testing
-
-require 'test/unit'
-
-# TODO
-
-class TC_SyncHash < Test::Unit::TestCase
-
-  def test_01
-    assert_nothing_raised{ @h = SyncHash.new }
-  end
-
-end
-
-=end
+

data/lib/{more → class}/facets/timer.rb

@@ -245,65 +245,3 @@ module Kernel
 
 end
 
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin test
-
-require 'test/unit'
-
-class TC_Timer < Test::Unit::TestCase
-
-  def test_timed
-    timed { |timer|
-      assert_equal 0, timer.total_time.round
-      sleep 1
-      assert_equal 1, timer.total_time.round
-      timer.stop
-      assert_equal 1, timer.total_time.round
-      sleep 1
-      assert_equal 1, timer.total_time.round
-      timer.start
-      assert_equal 1, timer.total_time.round
-      sleep 1
-      assert_equal 2, timer.total_time.round
-    }
-  end
-
-  def test_outoftime
-    t = Timer.new(1)
-    assert_raises( TimeoutError ) {
-      t.start
-      sleep 2
-      t.stop
-    }
-  end
-
-  # This has been removed becuase it is too close to call.
-  # Sometimes and error is returned sometimes it is not.
-  #def test_nickoftime
-  #  assert_raises( TimeoutError ) {
-  #    @t.start
-  #    sleep 2
-  #    @t.stop
-  #  }
-  #end
-
-  def test_intime
-    t = Timer.new(2)
-    assert_nothing_raised {
-      t.start
-      sleep 1
-      t.stop
-    }
-  end
-
-end
-
-=end

data/lib/{more → class}/facets/tuple.rb

@@ -308,63 +308,3 @@ class ::Array
 
 end
 
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin testing
-
-  require 'test/unit'
-
-  class TC_Tuple < Test::Unit::TestCase
-
-    def test_01
-      t1 = Tuple[1,2,3]
-      t2 = Tuple[2,4,5]
-      assert( t1 < t2 )
-      assert( t2 > t1 )
-    end
-
-    def test_02
-      t1 = Tuple[1,2,3]
-      a1 = t1.to_a
-      assert( Array === a1 )
-    end
-
-    def test_03
-      t1 = Tuple[1,2,3]
-      t2 = Tuple[1,2,3]
-      assert( t1.object_id === t2.object_id )
-    end
-
-    def test_04
-      t1 = Tuple[1,2,3]
-      t1 = t1 << 4
-      assert( Tuple === t1 )
-      t2 = Tuple[1,2,3,4]
-      assert( t1.object_id == t2.object_id )
-    end
-
-    def test_05
-      t1 = "1.2.3".to_t
-      assert( Tuple === t1 )
-      t2 = Tuple[1,2,3]
-      assert( t1.object_id == t2.object_id )
-    end
-
-    def test_06
-      t1 = "1.2.3a".to_t
-      assert( Tuple === t1 )
-      t2 = Tuple[1,2,'3a']
-      assert_equal( t2, t1 )
-      assert( t2.object_id == t1.object_id )
-    end
-
-  end
-
-=end

data/lib/core/facets/dir/multiglob.rb

@@ -25,6 +25,9 @@ class Dir
   #
   #   Dir.multiglob('**/*')
   #
+  #--
+  # DEPRECATED
+  #
   # Multiglob also accepts '+' and '-' prefixes. Any entry that begins with a '-'
   # is treated as an exclusion glob and will be removed from the final result.
   # For example, to collect all files in the current directory, less ruby scripts:
@@ -33,10 +36,16 @@ class Dir
   #
   # This is very useful in collecting files as specificed by a configuration
   # parameter.
+  #++
 
   def self.multiglob(*patterns)
     options  = (Hash === patterns.last ? patterns.pop : {})
 
+    if options.delete(:recurse)
+      #patterns += patterns.collect{ |f| File.join(f, '**', '**') }
+      multiglob_r(*patterns)
+    end
+
     bitflags = 0
     bitflags |= File::FNM_NOESCAPE if options[:noescape]
     bitflags |= File::FNM_CASEFOLD if options[:casefold]
@@ -46,7 +55,7 @@ class Dir
     patterns = [patterns].flatten.compact
 
     if options[:recurse]
-      patterns += patterns.collect{ |f| File.join(f, '**', '*') }
+      patterns += patterns.collect{ |f| File.join(f, '**', '**') }
     end
 
     files = []
@@ -65,13 +74,19 @@ class Dir
   #
   # The effect of which is
   #
-  #   Dir.multiglob( 'folder', 'folder/**/*' )
+  #   Dir.multiglob( 'folder', 'folder/**/**' )
+  #
 
   def self.multiglob_r(*patterns)
     options = (Hash === patterns.last ? patterns.pop : {})
-    options[:recurse] = true
-    patterns << options
-    multiglob(*patterns)
+    matches = multiglob(*patterns)
+    directories = matches.select{ |m| File.directory?(m) }
+    matches += directories.collect{ |d| multiglob_r(File.join(d, '**'), options) }.flatten
+    matches.uniq
+    #options = (Hash === patterns.last ? patterns.pop : {})
+    #options[:recurse] = true
+    #patterns << options
+    #multiglob(*patterns)
   end
 
 end

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

@@ -4,10 +4,10 @@ module Enumerable
   # This is the class-level method. The instance method
   # calls on this.
   #
-  #   Enumerable.cart([1,2], [4], ["apple", "banana"])
+  #   Enumerable.cartesian_product([1,2], [4], ["apple", "banana"])
   #   #=> [[1, 4, "apple"], [1, 4, "banana"], [2, 4, "apple"], [2, 4, "banana"]]
   #
-  #   Enumerable.cart([1,2], [3,4])
+  #   Enumerable.cartesian_product([1,2], [3,4])
   #   #=> [[1, 3], [1, 4], [2, 3], [2, 4]]
   #
   #   CREDIT: Thomas Hafner

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

@@ -10,7 +10,7 @@ module Enumerable
   #   a = %w|a b|
   #   b = %w|a x|
   #   c = %w|x y|
-  #   Array.combinations(a, b, c).each { |x| p x }
+  #   Enumerable.combinations(a, b, c).each { |x| p x }
   #
   # produces
   #
@@ -32,6 +32,14 @@ module Enumerable
     }
   end
 
+  #
+
+  def combinations(k=2)
+    a = []
+    each_combination(k){ |c| a << c }
+    a
+  end
+
   # Yields the block to each unique combination of _n_ elements.
   #
   #   a = %w|a b c d|

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

@@ -30,7 +30,7 @@ module Kernel
   #   "ABC".object_hexid  #=> "0x402d359c"
 
   def object_hexid
-    return "0x" << ('%.x' % (2*self.__id__))[1..-1]
+    return "0x" << ('%.x' % (2*self.__id__))  #[1..-1]
   end
 
   # Send only to public methods.

data/lib/{more → mixin}/facets/binreadable.rb

@@ -222,65 +222,3 @@ end
 # Compatability with old version.
 BinaryReader = BinReadable
 
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-# TODO
-
-=begin test
-
-  require 'test/unit'
-
-  class TC_ByteOrder < Test::Unit::TestCase
-
-    include BinaryReader
-
-    def test_equal
-      assert_equal ByteOrder.little?, ByteOrder.little_endian?
-      assert_equal ByteOrder.big?, ByteOrder.big_endian?
-      assert_equal ByteOrder.network?, ByteOrder.big_endian?
-      assert_equal ByteOrder.byte_order, ByteOrder.byteorder
-
-      assert_equal ByteOrder::Big, ByteOrder::BigEndian
-      assert_equal ByteOrder::Network, ByteOrder::BigEndian
-      assert_equal ByteOrder::Little, ByteOrder::LittleEndian
-
-      assert_equal ByteOrder.byte_order, ByteOrder::LittleEndian if ByteOrder.little?
-      assert_equal ByteOrder.byte_order, ByteOrder::BigEndian if ByteOrder.big?
-    end
-
-    def test_uname_byteorder
-      assert_equal(ByteOrder.little?, true) if `uname -m` =~ /i386/
-    end
-
-    def test_byteorder
-      if ByteOrder.little?
-        assert_equal "\x12\x34\x56\x78".unpack("L").first, 0x78563412
-        assert_equal "\x78\x56\x34\x12".unpack("L").first, 0x12345678
-        assert_equal [0x12345678].pack("L"), "\x78\x56\x34\x12"
-        assert_equal [0x78563412].pack("L"), "\x12\x34\x56\x78"
-      else
-        assert_equal "\x12\x34\x56\x78".unpack("L").first, 0x12345678
-        assert_equal "\x78\x56\x34\x12".unpack("L").first, 0x78563412
-        assert_equal [0x12345678].pack("L"), "\x12\x34\x56\x78"
-        assert_equal [0x78563412].pack("L"), "\x78\x56\x34\x12"
-      end
-    end
-
-  end
-
-  class TC_BinaryReader < Test::Unit::TestCase
-
-    def test_todo
-      assert(true)  # to do
-    end
-
-  end
-
-=end

data/lib/{more → mixin}/facets/buildable.rb

@@ -77,54 +77,6 @@ module Buildable
 
 end
 
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin test
-  require 'test/unit'
-
-  class TestBuildable < Test::Unit::TestCase
-
-    module M
-      include Buildable
-
-      extend self
-
-      def m(n,*m) ; "#{n}{#{m}}"; end
-      def t(n) ; "#{n}"; end
-
-      alias :build :m
-    end
-
-    def test_01
-      str = M.build do
-        html do
-          head do
-            title "Test"
-          end
-          body do
-            i "Hello"
-            build! :not
-            t "Test"
-            t "Hey"
-          end
-        end
-      end
-
-      r = "html{head{title{Test}}body{i{Hello}not{}TestHey}}"
-
-      assert_equal( r, M.builder.to_s )
-    end
-
-  end
-
-=end
-
-
 # Author::    Thomas Sawyer
 # Copyright:: Copyright (c) 2007 Thomas Sawyer
 # License::   Ruby License