facets 2.2.0 → 2.2.1

data/CHANGES

@@ -1,5 +1,9 @@
 = Facets Change History
 
+== 2.2.1 / 2007-12-22
+
+* Got rid of methods subdir. All method redirects are in core/.
+
 == 2.2.0 / 2007-12-13
 
 * A lot of rdoc updates to core extensions --as promised ;)

data/NOTES

@@ -1,4 +1,10 @@
-Facets 2.2.0 has been released!
+Facets 2.2.1 has been released.
+
+This release get rid of the underlying methods subdir.
+All method redirects are now in core, to ensure
+there are no more name clashes.
+
+As of 2.2.0:
 
 This release provides improved rdocs and prepares facets for
 use with RUby 1.9. It also adds Matthew Harris' duration.rb

data/lib/core/facets/array.rb

@@ -1,12 +1,12 @@
-require 'facets/array/rotate.rb'
 require 'facets/array/conjoin.rb'
-require 'facets/array/merge.rb'
-require 'facets/array/select.rb'
-require 'facets/array/splice.rb'
 require 'facets/array/delete.rb'
+require 'facets/array/indexable.rb'  # mixin
+require 'facets/array/merge.rb'
 require 'facets/array/only.rb'
 require 'facets/array/pad.rb'
+require 'facets/array/rotate.rb'
+require 'facets/array/select.rb'
+require 'facets/array/splice.rb'
+require 'facets/array/stackable.rb'  # mixin
 
-require 'facets/array/stackable.rb'
-require 'facets/array/indexable.rb'
 

data/lib/core/facets/binding.rb

@@ -1,6 +1,7 @@
 require 'facets/binding/eval.rb'
+
+require 'facets/binding/caller.rb'
 require 'facets/binding/defined.rb'
+require 'facets/binding/here.rb'  # routes to kernel
 require 'facets/binding/self.rb'
-require 'facets/binding/here.rb'  # technically should be in kernel.
-require 'facets/binding/cflow.rb'
 require 'facets/binding/vars.rb'

data/lib/core/facets/binding/__DIR__.rb

@@ -0,0 +1 @@
+require 'facets/binding/caller.rb'

data/lib/core/facets/binding/__FILE__.rb

@@ -0,0 +1 @@
+require 'facets/binding/caller.rb'

data/lib/core/facets/binding/__LINE__.rb

@@ -0,0 +1 @@
+require 'facets/binding/caller.rb'

data/lib/core/facets/binding/__callee__.rb

@@ -0,0 +1 @@
+require 'facets/binding/caller.rb'

data/lib/core/facets/binding/__method__.rb

@@ -0,0 +1 @@
+require 'facets/binding/caller.rb'

data/lib/core/facets/binding/call_stack.rb

@@ -0,0 +1 @@
+require 'facets/binding/caller.rb'

data/lib/core/facets/binding/called.rb

@@ -0,0 +1 @@
+require 'facets/binding/caller.rb'

data/lib/core/facets/binding/{cflow.rb → caller.rb}

@@ -10,6 +10,18 @@ require 'facets/kernel/callstack'
 #
 class Binding
 
+  # Returns the call stack, same format as Kernel#caller()
+
+  def caller( skip=0 )
+    eval("caller(#{skip})")
+  end
+
+  # Returns the call stack, in array format.
+
+  def call_stack(level=1)
+    eval( "call_stack( #{level} )" )
+  end
+
   # Returns line number.
 
   def __LINE__
@@ -28,28 +40,19 @@ class Binding
     eval("File.dirname(__FILE__)")
   end
 
-  # Returns the call stack, in array format.
-
-  def call_stack(level=1)
-    eval( "call_stack( #{level} )" )
-  end
-
   # Retreive the current running method.
   #
   #   def tester; p called; end
   #   tester  #=> :tester
   #
 
-  def called
+  def __callee__
     name = /\`([^\']+)\'/.match(caller(1).first)[1]
     return name.to_sym
   end
 
-  # Returns the call stack, same format as Kernel#caller()
-
-  def caller( skip=0 )
-    eval("caller(#{skip})")
-  end
+  # Backward compatability.
+  alias_method :called, :__callee__
 
   # There is a lot of debate on what to call this.
   # +method_name+ differs from #called only by the fact
@@ -57,11 +60,13 @@ class Binding
   #
   #   def tester; p methodname; end
   #   tester  #=> "tester"
-  #
 
-  def methodname
+  def __method__
     name = /\`([^\']+)\'/.match(caller(1).first)[1]
     return name
   end
 
+  # Backward compatability.
+  alias_method :methodname, :__method__
+
 end

data/lib/core/facets/binding/here.rb

@@ -1,9 +1 @@
-module Kernel
-  # A shorthand pronoun for binding().
-  #
-  #   a = 3
-  #   b = here
-  #   eval( "a", b )  #=> 3
-  #
-  alias_method :here, :binding
-end
+require 'facets/kernel/here'

data/lib/core/facets/binding/methodname.rb

@@ -0,0 +1 @@
+require 'facets/binding/caller.rb'

data/lib/core/facets/binding/self.rb

@@ -1,3 +1,5 @@
+require 'facets/binding/eval'
+
 class Binding
 
   # Returns self of the binding context.

data/lib/core/facets/class.rb

@@ -1,2 +1,6 @@
+require 'facets/class/cattr.rb'
+require 'facets/class/class_load.rb'
+require 'facets/class/class_require.rb'
 require 'facets/class/descendents.rb'
 require 'facets/class/initializer.rb'
+require 'facets/class/remove_descendents.rb'

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

@@ -0,0 +1,19 @@
+require 'facets/class/descendents'
+
+class Class
+
+  # Remove descendents. This simple deletes the constant
+  # associated to the descendents name.
+
+  def remove_descendents
+    self.descendents.each do |subclass|
+      Object.send(:remove_const, subclass.name) rescue nil
+    end
+    ObjectSpace.garbage_collect
+  end
+
+  # Obvious alias for remove_descendents.
+
+  alias_method :remove_subclasses, :remove_descendents
+
+end

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

@@ -0,0 +1 @@
+require 'facets/class/remove_descendents.rb'

data/lib/core/facets/comparable/cmp.rb

@@ -64,7 +64,7 @@ class Numeric
   #
   #   CREDIT Trans
 
-  def distance( other )
+  def distance(other)
     self - other
   end
 

data/lib/core/facets/conversion.rb

@@ -135,16 +135,6 @@ end
 
 class Hash
 
-  # Like Array#join but specialized to Hash.
-  #
-  #   CREDIT: Mauricio Fernandez
-
-  def join(pair_divider='', elem_divider='')
-    s = []
-    each_pair { |k,v| s << "#{k}#{pair_divider}#{v}" }
-    s.join(elem_divider)
-  end
-
   # Return a rehashing of _self_.
   #
   #   {"a"=>1,"b"=>2}.to_h  #=> {"b"=>2,"a"=>1}

data/lib/core/facets/dir.rb

@@ -1,2 +1,4 @@
 require 'facets/dir/multiglob.rb'
+require 'facets/dir/parent.rb'
+require 'facets/dir/recurse.rb'
 require 'facets/dir/traverse.rb'

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

@@ -0,0 +1 @@
+require 'facets/dir/recurse.rb'

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

@@ -0,0 +1,12 @@
+class Dir
+
+  # Is a path parental to another?
+  #
+  #   TODO: Needs improvement.
+  #   TODO: Instance version?
+
+  def self.parent?(parent_path, child_path)
+    %r|^#{Regexp.escape(parent_path)}| =~ child_path
+  end
+
+end

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

@@ -0,0 +1,28 @@
+class Dir
+
+  # Recursively scan a directory and pass each file
+  # to the given block.
+  #
+  #   CREDIT: George Moschovitis
+
+  def self.recurse(path='.', &block)
+    list = []
+    stoplist = ['.', '..']
+    Dir.foreach(path) do |f|
+      next if stoplist.include?(f)
+      filename = path + '/' + f
+      list << filename
+      block.call(filename) if block
+      if FileTest.directory?(filename) and not FileTest.symlink?(filename)
+        list.concat( Dir.recurse(filename, &block) )
+      end
+    end
+    list
+  end
+
+  class << self
+    # Alias for Dir#recurse.
+    alias_method :ls_r, :recurse
+  end
+
+end

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

@@ -1,23 +1,6 @@
-# TODO:
-#   - Make instance method versions.
-
 class Dir
 
-  # Is a path parental to another?
-  #
-  #   TODO: Needs improvement.
-
-  def self.ancestor?(parent_path, child_path)
-    %r|^#{Regexp.escape(parent_path)}| =~ child_path
-  end
-
-  # Is a path parental to another?
-  #
-  #   TODO: Needs improvement.
-
-  def self.parent?(parent_path, child_path)
-    %r|^#{Regexp.escape(parent_path)}| =~ child_path
-  end
+  # TODO: Make instance method versions ?
 
   # Ascend a directory path.
   #
@@ -70,29 +53,4 @@ class Dir
     end
   end
 
-  # Recursively scan a directory and pass each file
-  # to the given block.
-  #
-  #   CREDIT: George Moschovitis
-
-  def self.ls_r(path='.', &block)
-    list = []
-    stoplist = ['.', '..']
-    Dir.foreach(path) do |f|
-      next if stoplist.include?(f)
-      filename = path + '/' + f
-      list << filename
-      block.call(filename) if block
-      if FileTest.directory?(filename) and not FileTest.symlink?(filename)
-        list.concat( Dir.recurse(filename, &block) )
-      end
-    end
-    list
-  end
-
-  class << self
-    # Alias for Dir#ls_r
-    alias_method :recurse, :ls_r
-  end
-
 end

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

@@ -59,49 +59,4 @@ module Enumerable
     Enumerable.cartesian_product(self, enum)
   end
 
-  # Expected to be an enumeration of arrays. This method
-  # iterates through combinations of each in position.
-  #
-  #   a = [ [0,1], [2,3] ]
-  #   a.each_combo { |c| p c }
-  #
-  # produces
-  #
-  #   [0, 2]
-  #   [0, 3]
-  #   [1, 2]
-  #   [1, 3]
-  #
-  #   CREDIT: Trans
-
-  def each_combo
-    a = collect{ |x|
-      x.respond_to?(:to_a) ? x.to_a : 0..x
-    }
-
-    if a.size == 1
-      r = a.shift
-      r.each{ |n|
-        yield n
-      }
-    else
-      r = a.shift
-      r.each{ |n|
-        a.each_combo{ |s|
-          yield [n, *s]
-        }
-      }
-    end
-  end
-
-  # As with each_combo but returns combos collected in an array.
-  #
-  #   CREDIT: Trans
-
-  def combos
-    a = []
-    each_combo{ |c| a << c }
-    a
-  end
-
 end