facets 1.3.3 → 1.4.0

data/lib/facets/core/enumerable/self/cross.rb

@@ -15,18 +15,23 @@ module Enumerable
   #    Enumerable.cross([1,2], [3,4])
   #    #=> [[1, 3], [1, 4], [2, 3], [2, 4]]
   #
+  #--
+  # TODO Make a more efficient version just for Array (?)
+  #++
   def self.cross(*enums, &block)
+
     raise if enums.empty?
     gens = enums.map{|e| Generator.new(e)}
     return [] if gens.any? {|g| g.end?}
+
     sz = gens.size
     res = []
     tuple = Array.new(sz)
 
     loop do
       # fill tuple
-      (0 ... sz).each { |i| 
-        tuple[i] = gens[i].current 
+      (0 ... sz).each { |i|
+        tuple[i] = gens[i].current
       }
       if block.nil?
         res << tuple.dup
@@ -36,7 +41,7 @@ module Enumerable
 
       # step forward
       gens[-1].next
-      (sz-1).downto(0) { |i|
+      (sz-1).downto(0) do |i|
         if gens[i].end?
           if i > 0
             gens[i].rewind
@@ -45,8 +50,9 @@ module Enumerable
             return res
           end
         end
-      }
-    end
+      end
+    end #loop
+
   end
 
 end

data/lib/facets/core/hash/to_proc.rb

@@ -0,0 +1,34 @@
+
+class Hash
+
+  # Constructs a Proc object from a hash such
+  # that the parameter of the Proc is assigned
+  # the hash keys as attributes.
+  #
+  #   h = { :a => 1 }
+  #   p = h.to_proc
+  #   o = OpenStruct.new
+  #   p.call(o)
+  #   o.a  #=> 1
+  #
+
+  def to_proc
+    lambda do |o|
+      self.each do |k,v|
+        ke = "#{k}="
+        o.__send__(ke, v)
+      end
+    end
+  end
+
+  def to_proc_with_reponse
+    lambda do |o|
+      self.each do |k,v|
+        ke = "#{k}="
+        o.__send__(ke, v) if respond_to?(ke)
+      end
+    end
+  end
+
+end
+

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

@@ -6,13 +6,18 @@ class Hash
   # return a 2-element array of the form +[key, value]+.
   #
   #   h = { "A"=>"A", "B"=>"B" }
-  #   h.traverse { |k,v| [k.downcase, v] }
-  #   h  #=> { "a"=>"A", "b"=>"B" }
+  #   g = h.traverse { |k,v| [k.downcase, v] }
+  #   g  #=> { "a"=>"A", "b"=>"B" }
   #
+  #--
+  # TODO Testing value to see if it is a Hash also catches subclasses of Hash.
+  #      This is probably not the right thing to do and should catch Hashes only (?)
+  #++
   def traverse(&b)
     inject({}) do |h,(k,v)|
+      v = ( Hash === v ? v.traverse(&b) : v )
       nk, nv = b[k,v]
-      h[nk] = ( Hash === v ? v.traverse(&b) : nv )
+      h[nk] = nv #( Hash === v ? v.traverse(base,&b) : nv )
       h
     end
   end
@@ -24,8 +29,8 @@ class Hash
   #   h.traverse! { |k,v| [k.downcase, v] }
   #   h  #=> { "a"=>"A", "b"=>"B" }
   #
-  def traverse!( &yld )
-    self.replace( self.traverse( &yld ) )
+  def traverse!(&b)
+    self.replace( self.traverse(&b) )
   end
 
 end

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

@@ -1,5 +1,5 @@
 
-class Object
+module Kernel
 
   # Defines core method __class__ as an alias of class.
   # This allows you to use #class as your own method, without

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

@@ -0,0 +1,5 @@
+
+module Kernal
+  alias_method :__set__, :instance_variable_set
+  alias_method :__get__, :instance_variable_get
+end

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

@@ -0,0 +1,2 @@
+# stump
+require 'facets/core/kernel/__get__.rb'

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

@@ -1,6 +1,6 @@
 require 'facet/kernel/assign_with'
 
-class Object
+module Kernel
 
   # Set instance vars using another object.
   #

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

@@ -1,7 +1,7 @@
 require 'facet/kernel/instance_assign'
 require 'facet/kernel/assign_from'
 
-class Object
+module Kernel
 
   # Set setter methods and/or vars using a hash (or assoc array).
   # #assign_with is a meta-programming method, which allows you to
@@ -18,9 +18,17 @@ class Object
   # Note that while the global variable is strictly unnecessary,
   # it works for completeness sake.
   #
-  # NOTE This proabably should be called instance_assign_with given
-  # it's nature. We'll consider that in the future.
+  #--
+  # TODO This proabably should be called instance_assign_with given
+  # it's nature. Maybe consider that in the future.
   #
+  # TODO Maybe assign_with should only handle instance vars, like
+  # assign from does. Then another method could do what this now does.
+  # Say instance_assign could be extended to handle a hash.
+  #
+  # TODO Make a little more flexiable to allow any hash-like object.
+  #++
+
   def assign_with(*args)
     harg = args.last.is_a?(Hash) ? args.pop : {}
 

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

@@ -2,7 +2,7 @@
 # As suggested by Ara T. Howard
 #++
 
-class Object
+module Kernel
 
   # Returns true is an object is class TrueClass,
   # otherwise false.

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

@@ -0,0 +1,31 @@
+
+module Kernel
+
+  # Object#cache is essentially like Module#memoize except
+  # it can also be used on singleton/eigen methods.
+  # OTOH, memoize's implementation is arguably better for it's
+  # use of #bind instead of #alias. Eventually the two implmenations
+  # will be reconciled with a single implmentation.
+
+  def cache m = nil
+    if m
+      (Module === self ? self : (class << self; self; end)).module_eval <<-code
+        alias_method '__#{ m }__', '#{ m }'
+        def #{ m }(*__a__,&__b__)
+          c = cache['#{ m }']
+          k = [__a__,__b__]
+          if c.has_key? k
+            c[k]
+          else
+            c[k] = __#{ m }__(*__a__,&__b__)
+          end
+        end
+      code
+    end
+    @cache ||= Hash::new{|h,k| h[k]={}}
+  end
+
+end
+
+
+

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

@@ -1,5 +1,7 @@
 module Kernel
+
   module_function
+
   # For debugging and showing examples. Currently this
   # takes an argument of a string in a block.
   #
@@ -17,9 +19,11 @@ module Kernel
   # Is there a way to do this without the eval string in block?
   # Preferably just a block and no string.
   #++
+
   def demo(out=$stdout,&block)
     out << sprintf("%-25s#=>  %s\n", expr = block.call, eval(expr, block.binding).inspect)
   end
+
 end
 
 

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

@@ -2,6 +2,7 @@
 module Kernel
 
   module_function
+
   def get_by_id( id )
     ObjectSpace._id2ref( id )
   end

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

@@ -1,5 +1,5 @@
 
-class Object
+module Kernel
 
   # Is self included in other?
   #

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

@@ -1,8 +1,9 @@
 
-class Object
+module Kernel
 
   # Universal assignment. This is a meta-programming
   # method, which allows you to assign any type of variable.
+
   def instance_assign( name, value )
     k = name.to_s
     v = value
@@ -12,12 +13,10 @@ class Object
       instance_eval %Q{ #{k} = v }
     when '@'
       instance_variable_set( k, v )
-      #@__atttributes__ |= k
     else
       return __send__( "#{k}=", v ) if respond_to?("#{k}=")
       # No accessor? What to do? Assume instance var, or error? ...
       self.instance_variable_set( "@#{k}", v )
-      #@__atttributes__ |= "@#{k}"
     end
     return value
   end

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

@@ -27,7 +27,8 @@
 #   Which do you prefer?
 #++
 
-class Object
+module Kernel
+
   # Easy access to method as objects, and they retain state!
   #
   #   def hello
@@ -38,14 +39,31 @@ class Object
   def method!(s)
     ( @__methods__ ||= {} )[s] ||= method(s)
   end
+
 end
 
-# not needed
-#class Module
-#  def instance_method!(s)
-#    ( @__instance_methods__ ||= {} )[s] ||= instance_method(s)
-#  end
-#end
+
+class Module
+
+  # Easy access to method as objects, and they retain state!
+  #
+  #   module K
+  #     def hello
+  #       puts "Hello World!"
+  #     end
+  #   end
+  #   p K.instance_method!(:hello)   #=> <UnboundMethod: #hello>
+  #
+  # CAUTION! This will not work exactly right until class variable
+  # lookup is fixed. Presently it is limited to the scope of the
+  # current module/class.
+
+  def instance_method!(s)
+    #( @@__instance_methods__ ||= {} )[s] ||= instance_method(s)  # TODO when fixed
+    ( @__instance_methods__ ||= {} )[s] ||= instance_method(s)
+  end
+
+end
 
 
 

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

@@ -1,6 +1,6 @@
 require 'facet/module/instance_methods'
 
-class Object
+module Kernel
 
   # Returns a list of methods according to symbol(s) given.
   #

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

@@ -1,5 +1,5 @@
 
-class Object
+module Kernel
 
   # Synonymous with #clone, this is an interesting
   # method in that it promotes prototype-based Ruby.

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

@@ -1,5 +1,5 @@
 
-class Object
+module Kernel
 
   # Defines object_classas an alias of class.
   # This is an alternative to __class__, akin to

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

@@ -1,5 +1,5 @@
 
-class Object
+module Kernel
 
   # Returns the object id as a string in hexideciaml,
   # which is how Ruby reports them with inspect.

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

@@ -1,5 +1,5 @@
 
-class Object
+module Kernel
 
   # Easy access to an object's "special" class,
   # otherwise known as it's metaclass or singleton class.

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

@@ -1,3 +1,4 @@
+
 module Kernel
 
   private

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

@@ -1,13 +1,15 @@
-require 'facet/kernel/op_esc'
+require 'facets/core/kernel/op_esc'
 
 module Kernel
 
+  private
+
   # Require a file with puncuation marks escaped using NANOESC table.
   #
   #   require_esc '[].rb'
   #
   # in actuality requires the file 'op_fetch.rb'.
-  private
+
   def require_esc( fpath )
     fdir, fname = File.split(fpath)
     ename = op_esc( fname )

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

@@ -1,6 +1,7 @@
 require 'facet/kernel/require_esc'
 
 module Kernel
+
   private
 
   # Just like #require_esc excapt that
@@ -15,6 +16,7 @@ module Kernel
   def require_facet( fpath )
     require_esc( "facet/#{fpath}" )
   end
+
 end
 
 

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

@@ -2,6 +2,7 @@
 module Kernel
 
   private
+
   # Require file from same dir as calling script.
   #
   #   require_local 'templib'

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

@@ -0,0 +1,14 @@
+
+module Kernel
+
+  # Like #respond_to? but returns the result of the call if
+  # it does respond.
+  #
+  # (This is used to be called #respond_with_value.)
+
+  def respond(sym, *args)
+    return nil if not respond_to?(sym, *args)
+    send(sym, *args)
+  end
+
+end

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

@@ -1,5 +1,5 @@
 
-class Object
+module Kernel
 
   # Call parent class/module methods once bound to self.
 

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

@@ -1,2 +1,2 @@
 # stub
-require 'facet/kernel/silently'
+require 'facets/core/kernel/silently'

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

@@ -2,8 +2,10 @@
 module Kernel
 
   # Access to an object's "special" class, otherwise
-  # known as it's metaclass or singleton class.
+  # known as it's eigenclass or metaclass or own, etc.
   #
+  # One day these names must be reconciled!
+
   def singleton
     (class << self; self; end)
   end