facets 2.8.1 → 2.8.2

data/lib/core/facets/array.rb

@@ -1,6 +1,7 @@
-dir, base = *File.split(__FILE__)
-base = base.chomp('.rb')
-Dir[File.join(dir, base, '*')].each do |lib|
+path = __FILE__.chomp('.rb')
+base = File.basename(path)
+Dir[File.join(path, '*.rb')].each do |lib|
+  #require lib # why is this so much slower?
   require "facets/#{base}/#{File.basename(lib)}"
 end
 

data/lib/core/facets/array/product.rb

@@ -27,14 +27,5 @@ class Array
 
   end
 
-  # Operator alias for cross-product.
-  #
-  #   a = [1,2] ** [4,5]
-  #   a  #=> [[1, 4],[1, 5],[2, 4],[2, 5]]
-  #
-  # CREDIT: Trans
-
-  alias_method :**, :product
-
 end
 

data/lib/core/facets/array/uniq_by.rb

@@ -0,0 +1,18 @@
+require 'facets/enumerable/uniq_by'
+
+class Array
+
+  # Like #uniq, but determines uniqueness based on a given block.
+  #
+  #   (-5..5).to_a.uniq_by {|i| i*i }
+  #
+  # produces
+  #
+  #   [-5, -4, -3, -2, -1, 0]
+  #
+  def uniq_by! #:yield:
+    h = {}; replace(inject([]){|a,x| h[yield(x)] ||= a << x})
+  end
+
+end
+

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

@@ -4,43 +4,39 @@ require 'facets/binding/callstack'
 class Binding
 
   # Returns the call stack, same format as Kernel#caller()
+  #
   def caller( skip=0 )
     eval("caller(#{skip})")
   end
 
-  # Returns line number.
+  # Return the line number on which the binding was created.
+  #
   def __LINE__
-    eval("__LINE__")
+    Kernel.eval("__LINE__", self)
   end
 
-  # Returns file name.
+  # Returns file name in which the binding was created.
+  #
   def __FILE__
-    eval("__FILE__")
+    Kernel.eval("__FILE__", self)
   end
 
-  # Return the directory of the file.
-  def __DIR__
-    eval("File.dirname(__FILE__)")
+  # Return the directory of the file in which the binding was created.
+  #
+  def __DIR__  
+    File.dirname(self.__FILE__)
   end
 
   # Retreive the current running method.
   #
-  #   def tester; p called; end
-  #   tester  #=> :tester
-  #
   def __callee__
-    eval('__callee__')
+    Kernel.eval("__callee__", self)
   end
 
-  # There is a lot of debate on what to call this.
-  # +method_name+ differs from #called only by the fact
-  # that it returns a string, rather then a symbol.
-  #
-  #   def tester; p methodname; end
-  #   tester  #=> "tester"
+  # Retreive the current running method.
   #
   def __method__
-    eval('__method__')
+    Kernel.eval("__method__", self)
   end
 
 end

data/lib/core/facets/boolean.rb

@@ -24,61 +24,8 @@
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE.
 
-#
-class String
-
-  # Interpret common affirmative string meanings as true,
-  # otherwise false. Balnk sapce and case are ignored.
-  # The following strings that will return true:
-  #
-  #   <tt>true</tt>,<tt>yes</tt>,<tt>on</tt>,<tt>t</tt>,<tt>1</tt>,<tt>y</tt>,<tt>==</tt>
-  #
-  # Examples:
-  #
-  #   "true".to_b   #=> true
-  #   "yes".to_b    #=> true
-  #   "no".to_b     #=> false
-  #   "123".to_b    #=> false
-  #
-  def to_b
-    case self.downcase.strip
-    when 'true', 'yes', 'on', 't', '1', 'y', '=='
-      return true
-    when 'nil', 'null'
-      return nil
-    else
-      return false
-    end
-  end
-
-end
-
-
-class Array
-
-  # Boolean conversion for not empty?
-  def to_b
-    ! self.empty?
-  end
-
-end
-
-
-class Numeric
-
-  # Provides a boolean interpretation of self.
-  # If self == 0 then false else true.
-  #
-  #   0.to_b    #=> false
-  #   1.to_b    #=> true
-  #   2.3.to_b  #=> true
-  #
-  def to_b
-    self == 0 ? false : true
-  end
-
-end
-
+require 'facets/kernel/true'
+require 'facets/kernel/false'
 
 module Kernel
 
@@ -95,28 +42,6 @@ module Kernel
     self ? true : false
   end
 
-  # Returns true is an object is class TrueClass,
-  # otherwise false.
-  #
-  #   true.true?   #=> true
-  #   false.true?  #=> false
-  #   nil.true?    #=> false
-  #
-  def true?
-    (true == self)
-  end
-
-  # Returns true is an object is class FalseClass,
-  # otherwise false.
-  #
-  #   true.false?   #=> false
-  #   false.false?  #=> true
-  #   nil.false?    #=> false
-  #
-  def false?
-    (false == self)
-  end
-
   # Returns true is an object is class TrueClass
   # or FalseClass, otherwise false.
   #
@@ -133,24 +58,96 @@ end
 
 class Object
   def to_bool
-    return true
+    true
   end
 end
 
+
 class TrueClass
   def to_bool
     self
   end
 end
 
+
 class FalseClass
   def to_bool
     self
   end
 end
 
+
 class NilClass
   def to_bool
     false
   end
 end
+
+
+class String
+
+  # Interpret common affirmative string meanings as true,
+  # otherwise nil or false. Blank space and case are ignored.
+  # The following strings that will return true:
+  #
+  #   true
+  #   yes
+  #   on
+  #   t
+  #   1
+  #   y
+  #   ==
+  #
+  # The following strings will return nil:
+  #
+  #   nil
+  #   null
+  #
+  # All other strings return false.
+  #
+  # Examples:
+  #
+  #   "true".to_b   #=> true
+  #   "yes".to_b    #=> true
+  #   "no".to_b     #=> false
+  #   "123".to_b    #=> false
+  #
+  def to_b
+    case self.downcase.strip
+    when 'true', 'yes', 'on', 't', '1', 'y', '=='
+      return true
+    when 'nil', 'null'
+      return nil
+    else
+      return false
+    end
+  end
+
+end
+
+
+class Array
+
+  # Boolean conversion for not empty?
+  def to_b
+    ! self.empty?
+  end
+
+end
+
+
+class Numeric
+
+  # Provides a boolean interpretation of self.
+  # If self == 0 then false else true.
+  #
+  #   0.to_b    #=> false
+  #   1.to_b    #=> true
+  #   2.3.to_b  #=> true
+  #
+  def to_b
+    self == 0 ? false : true
+  end
+
+end
+

data/lib/core/facets/denumerable.rb

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

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

@@ -15,7 +15,7 @@ class Dir
   #   /
   #
   # CREDIT: Daniel Berger, Jeffrey Schwab
-
+  #
   # TODO: make it work with windows too
   # use FileTest.root?
 
@@ -57,3 +57,4 @@ class Dir
   end
 
 end
+

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

@@ -0,0 +1,12 @@
+class Array
+
+  # Simplify an array by flattening it then compacting it.
+  #
+  #   [1,[2,nil,[3]],nil,4].collapse  #=> [1,2,3,4]
+  #
+  def collapse
+    flatten.compact
+  end
+
+end
+

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..3).compact_map do |n|
+  #   [1,2,3].compact_map do |n|
   #     n < 1 ? nil : n
   #   end
   #
@@ -12,22 +12,26 @@ module Enumerable
   #   [2,3]
   #
   # CREDIT: Trans
+  #
+  # DEPRECATE: This method should probably be removed b/c #purge
+  # does almost the same thing and enum.map{}.compact works too.
 
-  def compact_map(trash=nil, &block)
+  def compact_map(&block)
     y = []
     if block_given?
       each do |*a|
         r = yield(*a)
-        y << r unless trash == r
+        y << r unless r.nil?
       end
     else
       each do |r|
-        y << r unless trash == r
+        y << r unless r.nil?
       end
     end
     y
   end
 
+  #
   alias_method :compact_collect, :compact_map
 
 end

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

@@ -31,13 +31,13 @@ module Enumerable
     if block_given?
       Denumerator.new do |output|
         each do |*input|
-          yield output, *input
+          yield(output, *input)
         end
       end
     else
       Denumerator.new do |output|
         each do |*input|
-          output.yield *input
+          output.yield(*input)
         end
       end
     end
@@ -45,6 +45,7 @@ module Enumerable
 
 end
 
+
 =begin
   
   TODO: (Programming Challenge) Dynamically create this in a single

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

@@ -0,0 +1,38 @@
+module Enumerable
+
+  unless method_defined?(:each_with_object)
+
+    # A variation of #inject that saves one from having to
+    # return the aggregate/memo argument.
+    #
+    # Say we want to count characters in a string. Using
+    # the #each_with_object method we have:
+    #
+    #    string.each_with_object(Hash.new(0)) do |c, h|
+    #      h[c] += 1
+    #    end
+    #
+    # versus using #inject which would be:
+    #
+    #    string.inject(Hash.new(0)) do |h, c|
+    #      h[c] +=1
+    #      h
+    #    end
+    #
+    # Notice that the order of the block parameters is reversed.
+    #
+    # This method used be called #injecting and had the same
+    # parameter order as #inject, but Ruby 1.9 has adopted this
+    # method, so we support it instead.
+
+    def each_with_object(memo) #:yield:
+      each do |element|
+        yield(element, memo)
+      end
+      memo
+    end
+
+  end
+
+end
+

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

@@ -8,25 +8,25 @@ module Enumerable
   #   r = [1,2,3].every + 3  #=> [4,5,6]
   #
   def every
-    @_every ||= per(:map)
+    per(:map)
   end
 
   # In place version of #every.
   #
   def every!
     raise NoMethodError unless respond_to?(:map!)
-    @_every_inplace ||= per(:map!)
+    per(:map!)
   end
 
   #def every
-  #  @_every ||= Functor.new do |op,*args|
+  #  Functor.new do |op,*args|
   #    map{ |a| a.send(op,*args) }
   #  end
   #end
 
   #def every!
   #  raise NoMethodError unless respond_to?(:map!)
-  #  @_every_inplace ||= Functor.new do |op,*args|
+  #  Functor.new do |op,*args|
   #    map!{ |a| a.send(op,*args) }
   #  end
   #end