facets 2.4.2 → 2.4.3

data/lib/core/facets/kernel.rb

@@ -1,31 +1,45 @@
+require 'facets/kernel/__class__.rb'
 require 'facets/kernel/__dir__.rb'
 require 'facets/kernel/__get__.rb'
 require 'facets/kernel/__set__.rb'
 require 'facets/kernel/as.rb'
+require 'facets/kernel/ask.rb'
+require 'facets/kernel/attr_singleton.rb'
 require 'facets/kernel/complete.rb'
 require 'facets/kernel/constant.rb'
 require 'facets/kernel/d.rb'
 require 'facets/kernel/deep_copy.rb'
+require 'facets/kernel/demo.rb'
 require 'facets/kernel/ergo.rb'
 require 'facets/kernel/here.rb'
+require 'facets/kernel/in.rb'
+require 'facets/kernel/instance.rb'
 require 'facets/kernel/instance_assign.rb' # DEPRECATE
 require 'facets/kernel/instance_class.rb'
 require 'facets/kernel/instance_send.rb'
-require 'facets/kernel/load.rb'
+require 'facets/kernel/instance_variables.rb'
+require 'facets/kernel/maybe.rb'
 require 'facets/kernel/not_nil.rb'
 require 'facets/kernel/object_class.rb'
 require 'facets/kernel/object_hexid.rb'
 require 'facets/kernel/object_send.rb'
 require 'facets/kernel/p.rb'
 require 'facets/kernel/populate.rb'
+require 'facets/kernel/require_all.rb'
+require 'facets/kernel/require_local.rb'
 require 'facets/kernel/resc.rb'
 require 'facets/kernel/respond.rb'
+require 'facets/kernel/returning.rb'
 require 'facets/kernel/silence.rb'
 require 'facets/kernel/singleton_class.rb'
 require 'facets/kernel/suppress.rb'
 require 'facets/kernel/tap.rb'
+require 'facets/kernel/try.rb'
+require 'facets/kernel/val.rb'
 require 'facets/kernel/with.rb'
 
+# for 1.9
 require 'facets/kernel/__callee__.rb'
 require 'facets/kernel/__method__.rb'
+require 'facets/kernel/instance_exec.rb'
 

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

@@ -0,0 +1,21 @@
+module Kernel
+
+  # Require a pattern of files. This make is easy
+  # to require an entire directory, for instance.
+  #
+  #   require_all 'facets/time/*'
+  #
+  def require_all(pat)
+    $LOAD_PATH.each do |path|
+      fs = Dir[File.join(path,pat)]
+      unless fs.empty?
+        fs.each { |f|
+          Kernel.require( f ) unless File.directory?( f )
+        }
+        break;
+      end
+    end
+  end
+
+end
+

data/lib/core/facets/kernel/{load.rb → require_local.rb}

@@ -1,15 +1,5 @@
 module Kernel
 
-  # Load file from same dir as calling script.
-  #
-  #   load_local 'templib'
-  #
-  def load_local(fname, safe=nil)
-    #fdir = File.expand_path( File.dirname( caller[0] ) )
-    fdir = File.dirname( caller[0] )
-    load( File.join( fdir, fname ), safe )
-  end
-
   # Require file from same dir as calling script.
   #
   #   require_local 'templib'
@@ -20,21 +10,14 @@ module Kernel
     require( File.join( fdir, fname ) )
   end
 
-  # Require a pattern of files. This make is easy
-  # to require an entire directory, for instance.
+  # Load file from same dir as calling script.
   #
-  #   require_all 'facets/time/*'
+  #   load_local 'templib'
   #
-  def require_all(pat)
-    $LOAD_PATH.each do |path|
-      fs = Dir[File.join(path,pat)]
-      unless fs.empty?
-        fs.each { |f|
-          Kernel.require( f ) unless File.directory?( f )
-        }
-        break;
-      end
-    end
+  def load_local(fname, safe=nil)
+    #fdir = File.expand_path( File.dirname( caller[0] ) )
+    fdir = File.dirname( caller[0] )
+    load( File.join( fdir, fname ), safe )
   end
 
 end

data/lib/core/facets/module.rb

@@ -1,20 +1,24 @@
-#require 'facets/module/abstract.rb'
+require 'facets/module/abstract.rb'
 require 'facets/module/alias.rb'
 require 'facets/module/ancestor.rb'
 require 'facets/module/basename.rb'
 require 'facets/module/can.rb'
 require 'facets/module/class.rb'
-#require 'facets/module/clone.rb'
 require 'facets/module/conflict.rb'
 require 'facets/module/include_function_module.rb'
 require 'facets/module/instance_methods.rb'
 require 'facets/module/is.rb'
+require 'facets/module/methodize.rb'
 require 'facets/module/modspace.rb'
-#require 'facets/module/module_load.rb'
+require 'facets/module/module_load.rb'
 require 'facets/module/nesting.rb'
 require 'facets/module/op.rb'
 require 'facets/module/pathize.rb'
 require 'facets/module/prepend.rb'
+require 'facets/module/redefine_method'
+require 'facets/module/redirect_method'
+require 'facets/module/rename_method'
 require 'facets/module/revise.rb'
 require 'facets/module/spacename.rb'
+require 'facets/module/wrap_method.rb'
 

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

@@ -0,0 +1,2 @@
+require 'facets/module/revise'
+

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

@@ -0,0 +1,14 @@
+require 'facets/string/methodize'
+
+class Module
+
+  # Translate a module name to a suitable method name.
+  #
+  #   My::CoolClass.methodize => "my__cool_class"
+  #
+  def methodize
+    name.methodize
+  end
+
+end
+

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

@@ -1,3 +1,5 @@
+require 'facets/string/pathize'
+
 class Module
 
   # Converts a class name to a unix path
@@ -5,14 +7,15 @@ class Module
   # Examples
   #   CoolClass.pathize       #=> "cool_class"
   #   My::CoolClass.pathize   #=> "my/cool_class"
-
+  #
   def pathize
-    to_s.
-      gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
+    name.pathize
+    #to_s.
+    #  gsub(/::/, '/').
+    #  gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    #  gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    #  tr("-", "_").
+    #  downcase
   end
 
 end

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

@@ -0,0 +1,35 @@
+class Module
+
+  private
+
+  # Creates a new method for a pre-existing method.
+  #
+  # If _aka_ is given, then the method being redefined will
+  # first be aliased to this name.
+  #
+  #   class Greeter
+  #     def hello ; "Hello" ; end
+  #   end
+  #
+  #   Greeter.new.hello   #=> "Hello"
+  #
+  #   class Greeter
+  #     redefine_method( :hello, :hi ) do
+  #       hi + ", friend!"
+  #     end
+  #   end
+  #
+  #   Greeter.new.hello   #=> "Hello, friend!"
+  #
+  #  CREDIT: Trans
+
+  def redefine_method(sym, aka=nil, &blk)
+    raise ArgumentError, "method does not exist" unless method_defined?( sym )
+    alias_method( aka, sym ) if aka
+    undef_method( sym )
+    define_method( sym, &blk )
+  end
+
+  alias_method :redef, :redefine_method
+
+end

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

@@ -0,0 +1,45 @@
+class Module
+
+  private
+
+  # Redirect methods to other methods. This simply
+  # defines methods by the name of a hash key which
+  # calls the method with the name of the hash's value.
+  #
+  #   class Example
+  #     redirect_method :hi => :hello, :hey => :hello
+  #     def hello(name)
+  #       puts "Hello, #{name}."
+  #     end
+  #   end
+  #
+  #   e = Example.new
+  #   e.hello("Bob")    #=> "Hello, Bob."
+  #   e.hi("Bob")       #=> "Hello, Bob."
+  #   e.hey("Bob")      #=> "Hello, Bob."
+  #
+  # The above class definition is equivalent to:
+  #
+  #   class Example
+  #     def hi(*args)
+  #       hello(*args)
+  #     end
+  #     def hey(*args)
+  #       hello(*args)
+  #     end
+  #     def hello
+  #       puts "Hello"
+  #     end
+  #   end
+  #
+  # CREDIT: Trans
+
+  def redirect_method( method_hash )
+    method_hash.each do |targ,adv|
+      define_method(targ) { |*args| send(adv,*args) }
+    end
+  end
+
+  alias_method :redirect, :redirect_method
+
+end

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

@@ -0,0 +1,20 @@
+class Module
+
+  private
+
+  # Aliases a method and undefines the original.
+  #
+  #   rename_method( :to_method, :from_method  )
+  #
+  #  CREDIT: Trans
+
+  def rename_method( to_sym, from_sym )
+    raise ArgumentError, "method #{from_sym} does not exist" unless method_defined?( from_sym )
+    alias_method( to_sym, from_sym )
+    undef_method( from_sym )
+  end
+
+  alias_method :rename,   :rename_method
+
+end
+

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

@@ -1,3 +1,8 @@
+require 'facets/module/redirect_method'
+require 'facets/module/redefine_method'
+require 'facets/module/rename_method'
+require 'facets/module/wrap_method'
+
 class Module
 
   # Return a new module based on another.
@@ -50,119 +55,8 @@ class Module
     include m
   end
 
-  private
-
-  # Creates a new method for a pre-existing method.
-  #
-  # If _aka_ is given, then the method being redefined will
-  # first be aliased to this name.
-  #
-  #   class Greeter
-  #     def hello ; "Hello" ; end
-  #   end
-  #
-  #   Greeter.new.hello   #=> "Hello"
-  #
-  #   class Greeter
-  #     redefine_method( :hello, :hi ) do
-  #       hi + ", friend!"
-  #     end
-  #   end
-  #
-  #   Greeter.new.hello   #=> "Hello, friend!"
-  #
-  #   CREDIT: Trans
-
-  def redefine_method(sym, aka=nil, &blk)
-    raise ArgumentError, "method does not exist" unless method_defined?( sym )
-    alias_method( aka, sym ) if aka
-    undef_method( sym )
-    define_method( sym, &blk )
-  end
-
-  # Redirect methods to other methods. This simply
-  # defines methods by the name of a hash key which
-  # calls the method with the name of the hash's value.
-  #
-  #   class Example
-  #     redirect_method :hi => :hello, :hey => :hello
-  #     def hello(name)
-  #       puts "Hello, #{name}."
-  #     end
-  #   end
-  #
-  #   e = Example.new
-  #   e.hello("Bob")    #=> "Hello, Bob."
-  #   e.hi("Bob")       #=> "Hello, Bob."
-  #   e.hey("Bob")      #=> "Hello, Bob."
-  #
-  # The above class definition is equivalent to:
-  #
-  #   class Example
-  #     def hi(*args)
-  #       hello(*args)
-  #     end
-  #     def hey(*args)
-  #       hello(*args)
-  #     end
-  #     def hello
-  #       puts "Hello"
-  #     end
-  #   end
-  #
-  #   CREDIT: Trans
-
-  def redirect_method( method_hash )
-    method_hash.each do |targ,adv|
-      define_method(targ) { |*args| send(adv,*args) }
-    end
-  end
-
-  # Aliases a method and undefines the original.
-  #
-  #   rename_method( :to_method, :from_method  )
-  #
-  #   CREDIT: Trans
-
-  def rename_method( to_sym, from_sym )
-    raise ArgumentError, "method #{from_sym} does not exist" unless method_defined?( from_sym )
-    alias_method( to_sym, from_sym )
-    undef_method( from_sym )
-  end
-
-  # TODO: Are these aliases really desitrable?
-
-  alias_method :remove,   :remove_method
-  alias_method :nodef,    :undef_method
-  alias_method :redef,    :redefine_method
-  alias_method :redirect, :redirect_method
-  alias_method :rename,   :rename_method
-
-  # Don't think we should bother making this private.
-  # That sort of defeats some of the AOP usefulness of this.
-  public
-
-  # Creates a new method wrapping the previous of
-  # the same name. Reference to the old method
-  # is passed into the new definition block
-  # as the first parameter.
-  #
-  #   wrap_method( sym ) { |old_meth, *args|
-  #     old_meth.call
-  #     ...
-  #   }
-  #
-  # Keep in mind that this can not be used to wrap methods
-  # that take a block.
-  #
-  #   CREDIT: Trans
-
-  def wrap_method( sym, &blk )
-    old = instance_method(sym)
-    define_method(sym) { |*args| blk.call(old.bind(self), *args) }
-  end
-
-  alias_method :wrap, :wrap_method
+  alias_method :remove, :remove_method
+  alias_method :nodef,  :undef_method
 
 end
 

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

@@ -0,0 +1,28 @@
+class Module
+
+  #private  # (we'll leave this one public for AOP-like uses).
+
+  # Creates a new method wrapping the previous of
+  # the same name. Reference to the old method
+  # is passed into the new definition block
+  # as the first parameter.
+  #
+  #   wrap_method( sym ) { |old_meth, *args|
+  #     old_meth.call
+  #     ...
+  #   }
+  #
+  # Keep in mind that this can not be used to wrap methods
+  # that take a block.
+  #
+  #   CREDIT: Trans
+
+  def wrap_method( sym, &blk )
+    old = instance_method(sym)
+    define_method(sym) { |*args| blk.call(old.bind(self), *args) }
+  end
+
+  alias_method :wrap, :wrap_method
+
+end
+