facets 2.8.0 → 2.8.1

data/AUTHORS

@@ -9,6 +9,9 @@
 The following developers have recently contributed to the development of Facets.
 They are held in the highest regard for their efforts.
 
+* Roger Pack          Added generational depth to Class#descendants.
+* Marco Otte-Witte    Fixed return value of Kernel#extend.
+* Mauro Tortonesi     Fixed issues with duration.rb and date.rb.
 * Sandor Szücs        Fixes for String#align_right and #align_left.
 * Tyler Rick          Fixed bug in Time#hence and #ago.
 * Brian Candler       Provided Enumerator::Filter.
@@ -64,6 +67,8 @@ All of their hard work is greatly appreciated.
 * Jan Molic
 * George Moschovitis
 * Michael Neumann
+* Marco Otte-Witte
+* Roger Pack
 * Tim Pease
 * Jonas Pfenniger
 * Ryan Platte
@@ -75,6 +80,7 @@ All of their hard work is greatly appreciated.
 * Gavin Sinclair
 * Tilo Sloboda
 * Phil Tomson
+* Mauro Tortonesi
 * Peter Vanbroekhoven
 * Jim Weirich
 * Jeff Wood

data/MANIFEST

@@ -37,6 +37,7 @@ lib/core/facets/class/cattr.rb
 lib/core/facets/class/cattr_accessor.rb
 lib/core/facets/class/cattr_reader.rb
 lib/core/facets/class/cattr_writer.rb
+lib/core/facets/class/descendants.rb
 lib/core/facets/class/descendents.rb
 lib/core/facets/class/methodize.rb
 lib/core/facets/class/pathize.rb
@@ -63,6 +64,7 @@ lib/core/facets/duplicable.rb
 lib/core/facets/enumerable/accumulate.rb
 lib/core/facets/enumerable/cluster_by.rb
 lib/core/facets/enumerable/collect.rb
+lib/core/facets/enumerable/collect_with_index.rb
 lib/core/facets/enumerable/commonality.rb
 lib/core/facets/enumerable/compact_map.rb
 lib/core/facets/enumerable/count.rb
@@ -164,7 +166,6 @@ lib/core/facets/hash.rb
 lib/core/facets/indexable.rb
 lib/core/facets/integer/even.rb
 lib/core/facets/integer/factorial.rb
-lib/core/facets/integer/length.rb
 lib/core/facets/integer/multiple.rb
 lib/core/facets/integer/odd.rb
 lib/core/facets/integer/of.rb
@@ -270,7 +271,9 @@ lib/core/facets/nilclass/to_f.rb
 lib/core/facets/nilclass.rb
 lib/core/facets/numeric/approx.rb
 lib/core/facets/numeric/distance.rb
+lib/core/facets/numeric/length.rb
 lib/core/facets/numeric/round.rb
+lib/core/facets/numeric/size.rb
 lib/core/facets/numeric.rb
 lib/core/facets/objectspace/classes.rb
 lib/core/facets/objectspace/op_fetch.rb
@@ -467,20 +470,20 @@ lib/more/facets/uri.rb
 lib/more/facets/version.rb
 lib/more/facets/yaml.rb
 lib/more/facets/zlib.rb
-meta/abstract
 meta/authors
+meta/collection
 meta/contact
 meta/contributors
 meta/created
+meta/description
 meta/homepage
 meta/license
 meta/loadpath
-meta/package
+meta/name
 meta/released
 meta/repository
 meta/sitemap
 meta/slogan
-meta/suite
 meta/summary
 meta/version
 script/conflicts
@@ -519,8 +522,8 @@ test/core/dir/test_multiglob.rb
 test/core/dir/test_parent.rb
 test/core/dir/test_recurse.rb
 test/core/enumerable/test_cluster_by.rb
-test/core/enumerable/test_collect.rb
 test/core/enumerable/test_commonality.rb
+test/core/enumerable/test_compact_map.rb
 test/core/enumerable/test_count.rb
 test/core/enumerable/test_defer.rb
 test/core/enumerable/test_each_by.rb
@@ -531,6 +534,7 @@ test/core/enumerable/test_frequency.rb
 test/core/enumerable/test_group_by.rb
 test/core/enumerable/test_inject.rb
 test/core/enumerable/test_map_detect.rb
+test/core/enumerable/test_map_with_index.rb
 test/core/enumerable/test_mash.rb
 test/core/enumerable/test_modulate.rb
 test/core/enumerable/test_none.rb
@@ -659,6 +663,7 @@ test/core/string/test_divide.rb
 test/core/string/test_each_char.rb
 test/core/string/test_each_word.rb
 test/core/string/test_end_with.rb
+test/core/string/test_expand_tabs.rb
 test/core/string/test_fold.rb
 test/core/string/test_indent.rb
 test/core/string/test_interpolate.rb
@@ -737,7 +742,6 @@ test/more/test_openobject.rb
 test/more/test_ostruct.rb
 test/more/test_partial.rb
 test/more/test_random.rb
-test/more/test_recorder.rb
 test/more/test_shellwords.rb
 test/more/test_succ.rb
 test/more/test_thread.rb

data/lib/core/facets.rb

@@ -1,5 +1,5 @@
-# Generated @ Wed Nov 11 12:32:01 -0500 2009  #:till: ^@ <%= Time.now %>
-#:till+377: <%= Dir['facets/**/*.rb'].map{ |f| %[require "#{f}"] }.sort.join("\n") %>
+# Generated @ Fri Dec 25 11:47:16 -0500 2009  #:till: ^@ <%= Time.now %>
+#:till+380: <%= Dir['facets/**/*.rb'].map{ |f| %[require "#{f}"] }.sort.join("\n") %>
 require "facets/array.rb"
 require "facets/array/combination.rb"
 require "facets/array/conjoin.rb"
@@ -37,6 +37,7 @@ require "facets/class/cattr.rb"
 require "facets/class/cattr_accessor.rb"
 require "facets/class/cattr_reader.rb"
 require "facets/class/cattr_writer.rb"
+require "facets/class/descendants.rb"
 require "facets/class/descendents.rb"
 require "facets/class/methodize.rb"
 require "facets/class/pathize.rb"
@@ -63,6 +64,7 @@ require "facets/enumerable.rb"
 require "facets/enumerable/accumulate.rb"
 require "facets/enumerable/cluster_by.rb"
 require "facets/enumerable/collect.rb"
+require "facets/enumerable/collect_with_index.rb"
 require "facets/enumerable/commonality.rb"
 require "facets/enumerable/compact_map.rb"
 require "facets/enumerable/count.rb"
@@ -164,7 +166,6 @@ require "facets/indexable.rb"
 require "facets/integer.rb"
 require "facets/integer/even.rb"
 require "facets/integer/factorial.rb"
-require "facets/integer/length.rb"
 require "facets/integer/multiple.rb"
 require "facets/integer/odd.rb"
 require "facets/integer/of.rb"
@@ -270,7 +271,9 @@ require "facets/nilclass/to_f.rb"
 require "facets/numeric.rb"
 require "facets/numeric/approx.rb"
 require "facets/numeric/distance.rb"
+require "facets/numeric/length.rb"
 require "facets/numeric/round.rb"
+require "facets/numeric/size.rb"
 require "facets/objectspace.rb"
 require "facets/objectspace/classes.rb"
 require "facets/objectspace/op_fetch.rb"

data/lib/core/facets/class/descendants.rb

@@ -0,0 +1,48 @@
+class Class
+
+  # List all descedents of this class.
+  #
+  #   class X ; end
+  #   class A < X; end
+  #   class B < X; end
+  #   X.descendents  #=> [A,B]
+  #
+  # You may also limit the generational distance
+  # the subclass may be from the parent class.
+  #
+  #   class X ; end
+  #   class A < X; end
+  #   class B < A; end
+  #   X.descendents    #=> [A, B]
+  #   X.descendents(1) #=> [A]
+  #
+  # NOTE: This is a intensive operation. Do not
+  # expect it to be super fast.
+
+  def descendants(generations=nil)
+    subclass = []
+    ObjectSpace.each_object(Class) do |c|
+      ancestors = c.ancestors[0..(generations || -1)]
+      if ancestors.include?(self) and self != c
+        subclass << c
+      end
+    end
+    return subclass
+  end
+
+  #
+  alias_method :descendents, :descendants
+
+  unless defined?(::ActiveSupport)
+
+    # Obvious alias for descendants.
+    #
+    # NOTE: ActiveSupport returns string names rather
+    # then actual classes, so this is excluded
+    # if ActiveSupport has already been loaded.
+    alias_method :subclasses, :descendants
+
+  end
+
+end
+

data/lib/core/facets/class/descendents.rb

@@ -1,34 +1 @@
-class Class
-
-  # List all descedents of this class.
-  #
-  #   class X ; end
-  #   class A < X; end
-  #   class B < X; end
-  #   X.descendents  #=> [A,B]
-  #
-  # NOTE: This is a intesive operation. Do not
-  # expect it to be super fast.
-  def descendents
-    subclass = []
-    ObjectSpace.each_object( Class ) do |c|
-      if c.ancestors.include?( self ) and self != c
-        subclass << c
-      end
-    end
-    return subclass
-  end
-
-  unless defined?(::ActiveSupport)
-
-    # Obvious alias for descendents.
-    #
-    # NOTE: ActiveSupport returns string names rather
-    # then actual classes, so this is excluded
-    # if ActiveSupport has already been loaded.
-    alias_method :subclasses, :descendents
-
-  end
-
-end
-
+require 'facets/class/descendants'

data/lib/core/facets/denumerable.rb

@@ -3,8 +3,8 @@ require 'facets/enumerator'
 
 # = Denumerable
 #
-# Classes which include Enumerable::Filterable will get versions
-# of map, select etc. which return a Filter, so that they work
+# Classes which include Denumerable will get versions
+# of map, select etc. which return a Denumerator, so that they work
 # horizontally without creating intermediate arrays.
 #
 module Denumerable

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

@@ -0,0 +1,2 @@
+require 'facets/enumerable/map_with_index'
+

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

@@ -3,7 +3,7 @@ module Enumerable
   # A more versitle #compact method. It can be used to
   # collect and filter items out in one single step.
   #
-  #   [1,2,3].compact_map do |n|
+  #   (1..3).compact_map do |n|
   #     n < 1 ? nil : n
   #   end
   #
@@ -11,8 +11,6 @@ module Enumerable
   #
   #   [2,3]
   #
-  # NOTE: Perhaps nicer to have as added functionality for #compact.
-  #
   # CREDIT: Trans
 
   def compact_map(trash=nil, &block)
@@ -31,5 +29,6 @@ module Enumerable
   end
 
   alias_method :compact_collect, :compact_map
+
 end
 

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

@@ -23,10 +23,6 @@ module Enumerable
   #     take(10).
   #     each { |i| puts i }
   #
-  # Using with a block, defer(&b), is equivalent to:
-  #
-  #   defer.filter(&b)
-  #
   # Use a method like to_a or to_h at the end of the chain when you want an
   # Array or Hash built with the results, or each{...} if you just want
   # to output each result and discard it.

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

@@ -5,6 +5,7 @@ module Kernel
   def extend(*mod, &blk)
     _extend *mod unless mod.empty?
     _extend Module.new(&blk) if blk
+    self
   end
 
 end

data/lib/core/facets/numeric/length.rb

@@ -0,0 +1,10 @@
+class Numeric
+
+  # Returns +self+.
+
+  def length
+    self
+  end
+
+end
+

data/lib/core/facets/numeric/size.rb

@@ -0,0 +1,10 @@
+class Numeric
+
+  # Returns +self+.
+
+  def size
+    self
+  end
+
+end
+

data/lib/core/facets/string/expand_tab.rb

@@ -4,10 +4,13 @@ class String
   # then tabs are simply removed. Raises an exception if +n+
   # is negative.
   #
-  #   "\t\tHey".expand_tab(2)  #=> "    Hey"
+  #   "\t\tHey".expand_tabs(2)  #=> "    Hey"
   #
   # Thanks to GGaramuno for a more efficient algorithm. Very nice.
   #
+  # TODO: Don't much care for the name String#expand_tab.
+  # What about a more concise name like #detab?
+  #
   # CREDIT: Gavin Sinclair, Noah Gibbs, GGaramuno
 
   def expand_tab(n=8)
@@ -28,8 +31,5 @@ class String
   # Pluralized form of #expand_tab.
   alias_method :expand_tabs, :expand_tab
 
-  # NOTE: Don't much care for the name String#expand_tab.
-  # What about a more concise name like #detab?
-
 end
 

data/lib/core/facets/string/indent.rb

@@ -23,85 +23,3 @@ class String
 
 end
 
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-=begin test
-require 'test/unit'
-
-class TC_String_Indent < Test::Unit::TestCase
-
-  def test_positive_indent
-    assert_equal '    xyz', "xyz".  indent(4)
-    assert_equal '    xyz', "  xyz".indent(2)
-  end
-
-  def test_multi_line_positive_indent
-    assert_equal  "  abc\n" +
-                  "  xyz"   ,
-                 ("abc\n"   +
-                  "xyz"     ).indent(2)
-  end
-
-  def test_0_indent
-    assert_equal 'xyz', 'xyz'.indent(0)
-  end
-
-  def test_negative_indent
-    assert_equal '  xyz', '    xyz'.indent(-2)
-    assert_equal 'xyz',   '  xyz'.  indent(-2)
-  end
-
-  def test_multi_line_negative_indent
-    assert_equal  "  abc\n" +
-                  "  xyz"   ,
-                 ("    abc\n"   +
-                  "    xyz"     ).indent(-2)
-  end
-
-  def test_outdent_is_alias_for_negative_indent
-    assert_equal 'xyz', '  xyz'.outdent(2)
-  end
-
-  def test_negative_indent_more_than_is_possible
-    assert_equal 'xyz', '  xyz'.indent(-3)
-  end
-
-  #-----------------------------------
-  # Using a character other than space
-
-  def test_nonspace_positive__indent
-    assert_equal '----xyz', "xyz".indent(4, '-')
-  end
-
-  def test_nonspace_0_indent
-    assert_equal 'xyz', 'xyz'.indent(0, '-')
-  end
-
-  def test_nonspace_negative_indent_nonmatching_character
-    assert_equal '    xyz', '    xyz'.indent(-2, '-')
-    assert_equal '  xyz',   '  xyz'.  indent(-2, '-')
-  end
-
-  def test_nonspace_negative_indent
-    assert_equal '--xyz', '----xyz'.indent(-2, '-')
-    assert_equal 'xyz',   '--xyz'.indent(-2, '-')
-  end
-
-  def test_special_regexp_characters_are_escaped
-    # make sure . is treated as a literal '.' and not an "any character" wildcard
-    assert_equal '  xyz', '  xyz'.indent(-2, '.')
-    assert_equal 'xyz',   '..xyz'.indent(-2, '.')
-
-    assert_equal '  xyz', '  xyz'.indent(-2, '^')
-    assert_equal 'xyz',   '^^xyz'.indent(-2, '^')
-
-    assert_equal '  xyz', '  xyz'.indent(-2, '*')
-    assert_equal 'xyz',   '**xyz'.indent(-2, '*')
-  end
-end
-=end

data/lib/core/facets/string/tab.rb

@@ -1,7 +1,4 @@
 require 'facets/string/tabto'
-require 'facets/string/margin'
-require 'facets/string/indent'
-require 'facets/string/expand_tab'
 
 class String
 
@@ -13,7 +10,7 @@ class String
     gsub(/^ */, ' ' * n)
   end
 
-  # LOG: Deprecated #taballto which was an alias for #tab.
+  # NOTE: Deprecated #taballto which was an alias for #tab.
   #alias_method :taballto, :tab
 
 end

data/lib/more/facets/date.rb

@@ -208,7 +208,7 @@ class DateTime
   # self will just be returned unaltered, since there's no clean way
   # to map it to a Time
   def to_time
-    self.offset == 0 ? ::Time.utc_time(year, month, day, hour, min, sec) : self
+    self.offset == 0 ? ::Time.utc(year, month, day, hour, min, sec) : self
   end
 
   # To be able to keep Times, Dates and DateTimes interchangeable on conversions

data/lib/more/facets/duration.rb

@@ -128,7 +128,7 @@ class Duration
     self.class.new(@seconds - other.to_i, segments)
   end
 
-  def +(other)
+  def *(other)
     self.class.new(@seconds * other.to_i, segments)
   end
 

data/lib/more/facets/filelist.rb

@@ -113,14 +113,14 @@ class FileList
 
   # List of array methods (that are not in +Object+) that need to be
   # delegated.
-  ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).map(&:to_sym)
+  ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).map(&:to_s)
 
   # List of additional methods that must be delegated.
-  MUST_DEFINE = %w[to_a inspect].map(&:to_sym)
+  MUST_DEFINE = %w[to_a inspect].map(&:to_s)
 
   # List of methods that should not be delegated here (we define
   # special versions of them explicitly below).
-  MUST_NOT_DEFINE = %w[to_a to_ary partition *].map(&:to_sym)
+  MUST_NOT_DEFINE = %w[to_a to_ary partition *].map(&:to_s)
 
   # List of delegated methods that return new array values which
   # need wrapping.
@@ -128,7 +128,7 @@ class FileList
     map collect sort sort_by select find_all reject grep
     compact flatten uniq values_at
     + - & |
-  ].map(&:to_sym)
+  ].map(&:to_s)
 
   DELEGATING_METHODS = (ARRAY_METHODS + MUST_DEFINE - MUST_NOT_DEFINE).sort.uniq
 

data/lib/more/facets/pathname.rb

@@ -86,59 +86,40 @@ class Pathname
     self.class.new(File.rootname(to_s))
   end
 
-#   # Already included in 1.8.4+ version of Ruby (except for inclusion flag)
-#   if not instance_methods.include?(:ascend)
-#
-#     # Calls the _block_ for every successive parent directory of the
-#     # directory path until the root (absolute path) or +.+ (relative path)
-#     # is reached.
-#     def ascend(inclusive=false,&block) # :yield:
-#       cur_dir = self
-#       yield( cur_dir.cleanpath ) if inclusive
-#       until cur_dir.root? or cur_dir == Pathname.new(".")
-#         cur_dir = cur_dir.parent
-#         yield cur_dir
-#       end
-#     end
-#
-#   end
-#
-#   # Already included in 1.8.4+ version of Ruby
-#   if ! instance_methods.include?(:descend)
-#
-#     # Calls the _block_ for every successive subdirectory of the
-#     # directory path from the root (absolute path) until +.+
-#     # (relative path) is reached.
-#     def descend()
-#       @path.scan(%r{[^/]*/?})[0...-1].inject('') do |path, dir|
-#         yield Pathname.new(path << dir)
-#       path
-#       end
-#     end
-#
-#   end
-
   #
   def split_root
     head, tail = *::File.split_root(to_s)
     [self.class.new(head), self.class.new(tail)]
   end
 
-  #
+  # Glob pathnames.
   def glob(match, *opts)
-    flags = 0
-    opts.each do |opt|
-      case opt when Symbol, String
-        flags += ::File.const_get("FNM_#{opt}".upcase)
-      else
-        flags += opt
-      end
-    end
+    flags = glob_flags(opts)
     Dir.glob(::File.join(self.to_s, match), flags).collect{ |m| self.class.new(m) }
   end
 
+  # Return the first glob match.
   #
+  # DEPRECATE: While slightly faster then glob().first, not really worth it
+  # unless this can be rewritten to shortcut on first match (using fnmatch?).
+  # In wich case, is there a better name for this method?
   def glob_first(match, *opts)
+    flags = glob_flags(opts)
+    file = ::Dir.glob(::File.join(self.to_s, match), flags).first
+    file ? self.class.new(file) : nil
+  end
+
+  # Return globbed matches with pathnames relative to the current pathname.
+  def glob_relative(match, *opts)
+    flags = glob_flags(opts)
+    files = Dir.glob(::File.join(self.to_s, match), flags)
+    files = files.map{ |f| f.sub(self.to_s.chomp('/') + '/', '') }
+    files.collect{ |m| self.class.new(m) }
+  end
+
+  private
+
+  def glob_flags(opts)
     flags = 0
     opts.each do |opt|
       case opt when Symbol, String
@@ -147,10 +128,11 @@ class Pathname
         flags += opt
       end
     end
-    file = ::Dir.glob(::File.join(self.to_s, match), flags).first
-    file ? self.class.new(file) : nil
+    flags
   end
 
+  public
+
   #
   def empty?
     Dir.glob(::File.join(self.to_s, '*')).empty?
@@ -166,6 +148,38 @@ class Pathname
     ::FileUtils.outofdate?(to_s, sources.flatten)
   end
 
+#   # Already included in 1.8.4+ version of Ruby (except for inclusion flag)
+#   if not instance_methods.include?(:ascend)
+#
+#     # Calls the _block_ for every successive parent directory of the
+#     # directory path until the root (absolute path) or +.+ (relative path)
+#     # is reached.
+#     def ascend(inclusive=false,&block) # :yield:
+#       cur_dir = self
+#       yield( cur_dir.cleanpath ) if inclusive
+#       until cur_dir.root? or cur_dir == Pathname.new(".")
+#         cur_dir = cur_dir.parent
+#         yield cur_dir
+#       end
+#     end
+#
+#   end
+#
+#   # Already included in 1.8.4+ version of Ruby
+#   if ! instance_methods.include?(:descend)
+#
+#     # Calls the _block_ for every successive subdirectory of the
+#     # directory path from the root (absolute path) until +.+
+#     # (relative path) is reached.
+#     def descend()
+#       @path.scan(%r{[^/]*/?})[0...-1].inject('') do |path, dir|
+#         yield Pathname.new(path << dir)
+#       path
+#       end
+#     end
+#
+#   end
+
 end
 
 class NilClass

data/meta/version

@@ -1 +1 @@
-2.8.0
+2.8.1

data/test/core/enumerable/{test_collect.rb → test_compact_map.rb}

@@ -1,6 +1,4 @@
-# Test for facets/enumerable/collect
-
-require 'facets/enumerable/collect.rb'
+require 'facets/enumerable/compact_map.rb'
 require 'test/unit'
 
 class TestEnumerable < Test::Unit::TestCase
@@ -14,16 +12,11 @@ class TestEnumerable < Test::Unit::TestCase
   #  assert_equal( e, a )
   #end
 
-  def test_compact_collect
-    a = [1,2,nil,4].compact_collect { |e| e }
+  def test_compact_map
+    a = [1,2,nil,4].compact_map { |e| e }
     assert_equal( [1,2,4], a )
   end
 
-  def test_collect_with_index
-    a = [1,2,3].collect_with_index{ |e,i| e*i }
-    assert_equal( [0,2,6], a )
-  end
-
 =begin
   def test_map_send
     r = [1,2,3].map_send(:+, 1)

data/test/core/enumerable/test_map_with_index.rb

@@ -0,0 +1,11 @@
+require 'facets/enumerable/map_with_index.rb'
+require 'test/unit'
+
+class TestEnumerable < Test::Unit::TestCase
+
+  def test_collect_with_index
+    a = [1,2,3].collect_with_index{ |e,i| e*i }
+    assert_equal( [0,2,6], a )
+  end
+
+end

data/test/core/string/test_expand_tabs.rb

@@ -0,0 +1,67 @@
+require 'facets/string/expand_tab'
+require 'test/unit'
+
+class TC_String_Expand_Tab < Test::Unit::TestCase
+
+  def setup
+    @tabs = <<-EOF
+
+\tOne tab
+ \tOne space and one tab
+    \t Six spaces, a tab, and a space
+    EOF
+  end  # def setup
+
+  def test_expand_tabs_1
+    expected = <<-EOF
+
+        One tab
+        One space and one tab
+         Six spaces, a tab, and a space
+    EOF
+    assert_equal(expected, @tabs.expand_tabs)
+    assert_equal(expected, @tabs.expand_tabs(8))
+  end
+
+  def test_expand_tabs_2
+    expected = <<-EOF
+
+    One tab
+    One space and one tab
+         Six spaces, a tab, and a space
+    EOF
+    assert_equal(expected, @tabs.expand_tabs(4))
+  end
+
+  def test_expand_tabs_3
+    expected = <<-EOF
+
+                One tab
+                One space and one tab
+                 Six spaces, a tab, and a space
+    EOF
+    assert_equal(expected, @tabs.expand_tabs(16))
+  end
+
+  def test_expand_tabs_4
+    expected = <<-EOF
+
+ One tab
+  One space and one tab
+      Six spaces, a tab, and a space
+    EOF
+    assert_equal(expected, @tabs.expand_tabs(1))
+  end
+
+  def test_expand_tabs_5
+    expected = <<-EOF
+
+One tab
+ One space and one tab
+     Six spaces, a tab, and a space
+    EOF
+    assert_equal(expected, @tabs.expand_tabs(0))
+  end
+
+end
+

data/test/core/string/test_tab.rb

@@ -3,71 +3,11 @@ require 'test/unit'
 
 class TC_String_Tab < Test::Unit::TestCase
 
-  def setup
-    @tabs = <<-EOF
-
-\tOne tab
- \tOne space and one tab
-    \t Six spaces, a tab, and a space
-    EOF
-  end  # def setup
-
   def test_tab
     a = "xyz".tab(4)
     assert_equal( '    ', a[0..3] )
     # Need to expand on this
   end
 
-  def test_expand_tabs_1
-    expected = <<-EOF
-
-        One tab
-        One space and one tab
-         Six spaces, a tab, and a space
-    EOF
-    assert_equal(expected, @tabs.expand_tabs)
-    assert_equal(expected, @tabs.expand_tabs(8))
-  end
-
-  def test_expand_tabs_2
-    expected = <<-EOF
-
-    One tab
-    One space and one tab
-         Six spaces, a tab, and a space
-    EOF
-    assert_equal(expected, @tabs.expand_tabs(4))
-  end
-
-  def test_expand_tabs_3
-    expected = <<-EOF
-
-                One tab
-                One space and one tab
-                 Six spaces, a tab, and a space
-    EOF
-    assert_equal(expected, @tabs.expand_tabs(16))
-  end
-
-  def test_expand_tabs_4
-    expected = <<-EOF
-
- One tab
-  One space and one tab
-      Six spaces, a tab, and a space
-    EOF
-    assert_equal(expected, @tabs.expand_tabs(1))
-  end
-
-  def test_expand_tabs_5
-    expected = <<-EOF
-
-One tab
- One space and one tab
-     Six spaces, a tab, and a space
-    EOF
-    assert_equal(expected, @tabs.expand_tabs(0))
-  end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facets
 version: !ruby/object:Gem::Version 
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors: 
 - Thomas Sawyer <transfire@gmail.com>
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 -05:00
+date: 2009-12-25 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -79,6 +79,7 @@ files:
 - lib/core/facets/class/cattr_accessor.rb
 - lib/core/facets/class/cattr_reader.rb
 - lib/core/facets/class/cattr_writer.rb
+- lib/core/facets/class/descendants.rb
 - lib/core/facets/class/descendents.rb
 - lib/core/facets/class/methodize.rb
 - lib/core/facets/class/pathize.rb
@@ -105,6 +106,7 @@ files:
 - lib/core/facets/enumerable/accumulate.rb
 - lib/core/facets/enumerable/cluster_by.rb
 - lib/core/facets/enumerable/collect.rb
+- lib/core/facets/enumerable/collect_with_index.rb
 - lib/core/facets/enumerable/commonality.rb
 - lib/core/facets/enumerable/compact_map.rb
 - lib/core/facets/enumerable/count.rb
@@ -206,7 +208,6 @@ files:
 - lib/core/facets/indexable.rb
 - lib/core/facets/integer/even.rb
 - lib/core/facets/integer/factorial.rb
-- lib/core/facets/integer/length.rb
 - lib/core/facets/integer/multiple.rb
 - lib/core/facets/integer/odd.rb
 - lib/core/facets/integer/of.rb
@@ -312,7 +313,9 @@ files:
 - lib/core/facets/nilclass.rb
 - lib/core/facets/numeric/approx.rb
 - lib/core/facets/numeric/distance.rb
+- lib/core/facets/numeric/length.rb
 - lib/core/facets/numeric/round.rb
+- lib/core/facets/numeric/size.rb
 - lib/core/facets/numeric.rb
 - lib/core/facets/objectspace/classes.rb
 - lib/core/facets/objectspace/op_fetch.rb
@@ -509,20 +512,20 @@ files:
 - lib/more/facets/version.rb
 - lib/more/facets/yaml.rb
 - lib/more/facets/zlib.rb
-- meta/abstract
 - meta/authors
+- meta/collection
 - meta/contact
 - meta/contributors
 - meta/created
+- meta/description
 - meta/homepage
 - meta/license
 - meta/loadpath
-- meta/package
+- meta/name
 - meta/released
 - meta/repository
 - meta/sitemap
 - meta/slogan
-- meta/suite
 - meta/summary
 - meta/version
 - script/conflicts
@@ -561,8 +564,8 @@ files:
 - test/core/dir/test_parent.rb
 - test/core/dir/test_recurse.rb
 - test/core/enumerable/test_cluster_by.rb
-- test/core/enumerable/test_collect.rb
 - test/core/enumerable/test_commonality.rb
+- test/core/enumerable/test_compact_map.rb
 - test/core/enumerable/test_count.rb
 - test/core/enumerable/test_defer.rb
 - test/core/enumerable/test_each_by.rb
@@ -573,6 +576,7 @@ files:
 - test/core/enumerable/test_group_by.rb
 - test/core/enumerable/test_inject.rb
 - test/core/enumerable/test_map_detect.rb
+- test/core/enumerable/test_map_with_index.rb
 - test/core/enumerable/test_mash.rb
 - test/core/enumerable/test_modulate.rb
 - test/core/enumerable/test_none.rb
@@ -701,6 +705,7 @@ files:
 - test/core/string/test_each_char.rb
 - test/core/string/test_each_word.rb
 - test/core/string/test_end_with.rb
+- test/core/string/test_expand_tabs.rb
 - test/core/string/test_fold.rb
 - test/core/string/test_indent.rb
 - test/core/string/test_interpolate.rb
@@ -779,7 +784,6 @@ files:
 - test/more/test_ostruct.rb
 - test/more/test_partial.rb
 - test/more/test_random.rb
-- test/more/test_recorder.rb
 - test/more/test_shellwords.rb
 - test/more/test_succ.rb
 - test/more/test_thread.rb
@@ -860,8 +864,8 @@ test_files:
 - test/core/dir/test_parent.rb
 - test/core/dir/test_recurse.rb
 - test/core/enumerable/test_cluster_by.rb
-- test/core/enumerable/test_collect.rb
 - test/core/enumerable/test_commonality.rb
+- test/core/enumerable/test_compact_map.rb
 - test/core/enumerable/test_count.rb
 - test/core/enumerable/test_defer.rb
 - test/core/enumerable/test_each_by.rb
@@ -872,6 +876,7 @@ test_files:
 - test/core/enumerable/test_group_by.rb
 - test/core/enumerable/test_inject.rb
 - test/core/enumerable/test_map_detect.rb
+- test/core/enumerable/test_map_with_index.rb
 - test/core/enumerable/test_mash.rb
 - test/core/enumerable/test_modulate.rb
 - test/core/enumerable/test_none.rb
@@ -1000,6 +1005,7 @@ test_files:
 - test/core/string/test_each_char.rb
 - test/core/string/test_each_word.rb
 - test/core/string/test_end_with.rb
+- test/core/string/test_expand_tabs.rb
 - test/core/string/test_fold.rb
 - test/core/string/test_indent.rb
 - test/core/string/test_interpolate.rb
@@ -1078,7 +1084,6 @@ test_files:
 - test/more/test_ostruct.rb
 - test/more/test_partial.rb
 - test/more/test_random.rb
-- test/more/test_recorder.rb
 - test/more/test_shellwords.rb
 - test/more/test_succ.rb
 - test/more/test_thread.rb

data/lib/core/facets/integer/length.rb

@@ -1,16 +0,0 @@
-#
-# Calculate the number of digits in an integer.
-#
-# 1.length   #=> 1
-# 10.length  #=> 2
-# 100.length #=> 3
-#
-# CREDIT: Victor H. Goff III
-
-class Integer
-  # Returns the length of an integer as an integer.
-  def length
-    to_s.length
-  end
-end
-

data/test/more/test_recorder.rb

@@ -1,30 +0,0 @@
-# Test facets/recorder.rb
-
-require 'facets/recorder.rb'
-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