facets 1.7.30 → 1.7.38

data/VERSION

@@ -1 +1 @@
-1.7.30 beta (2006-08-23)
+1.7.38 (2006-08-31)

data/doc/CHANGELOG

@@ -1,3 +1,20 @@
+  * [removed] hash/each.rb, this variation of Hash#each is too "dangerous" in practice
+  * [update] module/self/op_add.rb: fixed inclusion order
+  * annotation.rb, return annotations of self when key is :self [updated]
+  * module/self/op_add.rb and op_sub.rb - traits like features [added]
+  * minor improvemtns to module/clone_using and integrate
+  * command.rb: minor change to docs [update]
+  * openobject.rb (added NilClass#to_openobject) [update]
+  * enumerable/each_slice.rb [replace]
+    Ruby already has #each_slice if you require 'enumerator'. And for 1.9,
+    I believe, this will be present automatically. So Facets' each_slice 
+    has been replaced with a simple redirection to require 'enumerator'.
+    Ruby's version is slightly different in that it won't check arity if
+    a slice count is not given. For this, use enumerable/each_by.
+  * array/delete_at.rb [removed]
+    Ruby's Array class already has a #delete_at method,
+    although this is another method at odds with Hash.
+    Use #delete_values_at instead.
   * moved File.bitbucket to File.null (but bitbucket was so "fun"! ;)
   * added nilclass/to_path
   * added kernel/load_local
@@ -17,7 +34,6 @@
   * added Dir.bitbucket
   * update to array/op_fetch to include op_store
   * updated docs and util tasks
-  * ice
   * minor changes
   * added filesystem.rb
   * taskable should now work at the toplevel too

data/lib/facet/enumerable/each_slice.rb

@@ -0,0 +1 @@
+require 'facets/core/enumerable/each_slice.rb'

data/lib/facet/module/inject.rb

@@ -0,0 +1 @@
+require 'facets/core/module/inject.rb'

data/lib/facet/module/self/op_add.rb

@@ -0,0 +1 @@
+require 'facets/core/module/self/op_add.rb'

data/lib/facet/module/self/op_sub.rb

@@ -0,0 +1 @@
+require 'facets/core/module/self/op_sub.rb'

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

@@ -0,0 +1,119 @@
+require 'enumerator'
+
+=begin
+
+module Enumerable
+
+  # Iterate through slices. If slicing _step_ is not
+  # given, the the arity if the block is used.
+  #
+  #   x = []
+  #   [1,2,3,4].each_slice(2){ |a,b| x << [a,b] }
+  #   x  #=> [ [1,2], [3,4] ]
+  #
+  #   x = []
+  #   [1,2,3,4,5,6].each_slice(3){ |a| x << a }
+  #   x  #=> [ [1,2,3], [4,5,6] ]
+  #
+  def each_slice(step=nil, &yld)
+    if step
+      cnt = step
+      n = length / cnt
+      n += 1 if length % cnt > 0
+      n.times { |i|
+        yld.call(*self.slice(i*cnt,cnt))
+      }
+      return cnt
+    else
+      cnt = yld.arity.abs
+      n = length / cnt
+      n += 1 if length % cnt > 0
+      n.times { |i|
+        yld.call(*self.slice(i*cnt,cnt))
+      }
+      return cnt
+    end
+  end
+
+  alias_method( :each_by, :each_slice )
+
+end
+
+
+class Array
+
+  # Iterates over +n+ elements at a time. If +n+ is
+  # not given then the arity of the block determines the
+  # slicing quantity.
+  #
+  #   [1, 2, 3, 4].each_slice(2){ |a,b| ... }
+  #
+  # This is a specialized version Enumerable#each_slice
+  # but optimized specifically for Array.
+  def each_slice(n=nil, &yld)
+    n = yld.arity.abs unless n
+    i=0
+    while i < self.length
+      yld.call(*self.slice(i,n))
+      i+=n
+    end
+  end
+
+  alias_method( :each_by, :each_slice )
+
+end
+
+=end
+
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+=begin test
+
+  require 'test/unit'
+
+  class TCEnumerable < Test::Unit::TestCase
+
+    def test_01
+      x = []
+      [1,2,3,4].each_slice(2){ |a,b| x << [a,b] }
+      o = [[1,2],[3,4]]
+      assert_equal( o, x )
+    end
+
+    def test_02
+      x = []
+      [1,2,3,4,5,6,7,8].each_slice(4){ |*a| x << a }
+      o = [[[1,2,3,4]],[[5,6,7,8]]]
+      assert_equal( o, x )
+    end
+
+    def test_03
+      x = []
+      [1,2,3,4,5,6].each_slice(3){ |a| x << a }
+      o = [[1,2,3],[4,5,6]]
+      assert_equal( o, x )
+    end
+
+    def test_04
+      a = [1,2,3,4,5,6]
+      r = []
+      a.each_slice(2){ |x,y| r << [x,y] }
+      assert_equal( [[1,2],[3,4],[5,6]], r )
+    end
+
+    def test_05
+      a = [1,2,3,4,5,6]
+      r = []
+      a.each_slice(3){ |e| r << e }
+      assert_equal( [[1,2,3],[4,5,6]], r )
+    end
+
+  end
+
+=end

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

@@ -5,8 +5,8 @@ class Module
   # of the receiving module renamed.
   def clone_renaming( pairs )
     mod = self.dup
-    pairs.each_pair { |to_sym, from_sym|
-      mod.class_eval {
+    pairs.each_pair{ |to_sym, from_sym|
+      mod.class_eval{
         alias_method( to_sym, from_sym )
         undef_method( from_sym )
       }
@@ -19,17 +19,17 @@ class Module
   def clone_removing( *meths )
     mod = self.dup
     methods_to_remove = meths
-    methods_to_remove.each { |m|  mod.class_eval { remove_method m }  }
+    methods_to_remove.each{ |m|  mod.class_eval{ remove_method m }  }
     return mod
   end
 
   # Returns an anonymous module with only the specified methods
   # of the receiving module intact.
-  def clone_using( *meths )
-    meths = meths.collect { |m| m.to_s }
-    methods_to_remove = (self.instance_methods - meths)
+  def clone_using( *methods )
+    methods.collect!{ |m| m.to_s }
+    methods_to_remove = instance_methods - methods
     mod = self.dup
-    mod.class_eval { methods_to_remove.each { |m| undef_method m } }
+    mod.class_eval{ methods_to_remove.each{ |m| undef_method m } }
     return mod
   end
 

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

@@ -0,0 +1,8 @@
+
+class Module
+
+  def inject( base, &block )
+    base.module_eval &block
+  end
+
+end

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

@@ -8,8 +8,8 @@ require 'facet/module/nodef'
 require 'facet/module/wrap'
 
 # Using integrate is just like using include except the
-# module included is a reconstruction of the one give
-# via commands given in a block.
+# module included is a reconstruction of the one given
+# altered by the commands given in the block.
 #
 # Convenient commands available are: #rename, #redef,
 # #remove, #nodef and #wrap. But any module method

data/lib/facets/core/module/self/op_add.rb

@@ -0,0 +1,81 @@
+
+class Module
+
+  def +( other )
+    mod1 = other.clone
+    mod2 = clone
+
+    mod1.module_eval{
+      include mod2
+    }
+
+    #methods = other.instance_methods(false)
+    #methods.each{ |name|
+    #  method = other.instance_method(name)
+    #  mod.module_eval {
+    #    define_method( name, &method )
+    #  }
+    #}
+  
+    mod1
+  end
+
+
+  def -( other )
+    mod = clone
+
+    case other
+    when Array
+      subtract = instance_methods & other.collect{|m| m.to_s}
+    when Module
+      subtract = instance_methods & other.instance_methods(false)
+    when String, Symbol
+      subtract = instance_methods & [ other.to_s ]
+    end
+
+    mod.module_eval do
+      subtract.each{|x| remove_method x }
+    end
+
+    mod
+  end
+
+end 
+
+
+=begin test
+
+  class TraitsTest < Test::Unit::TestCase
+
+    module A
+      def x; "x"; end
+      def z; "zA"; end
+    end
+
+    module B
+      def y; "y"; end
+      def z; "zB"; end
+    end
+
+    Q = A + B
+    R = A - B
+
+    def test_add
+      assert( Q )
+      Q.extend Q
+      assert_equal(  "x", Q.x )
+      assert_equal(  "y", Q.y )
+      assert_equal( "zB", Q.z )
+    end
+
+    def test_minus
+      assert(R)
+      R.extend R
+      assert_equal( "x", R.x )
+      assert_raises( NoMethodError ){ R.z }
+    end
+
+  end
+
+=end
+

data/lib/facets/core/module/self/op_sub.rb

@@ -0,0 +1,3 @@
+# stub
+require 'facets/core/module/self/op_add.rb'
+

data/lib/facets/more/annotation.rb

@@ -193,7 +193,7 @@ class Module
   def ann( name=nil, *options )
     return annotations unless name
     return name.each{|k,v| ann k,*v} if Hash === name
-    return annotations[name] if options.empty?
+    return annotations[(name == :self ? self : name)] if options.empty?
     opt = {}
     opt.update options.pop if Hash === options.last
     opt[:class] = options.pop if Class === options.last

data/lib/facets/more/command.rb

@@ -119,7 +119,7 @@ class Console::Command
     alias_method :start, :execute
   end
 
-  # Do not let this pass through on to
+  # Do not let this pass through to
   # any included module.
 
   def initialize ; end

data/lib/facets/more/openobject.rb

@@ -181,6 +181,14 @@ end
 
 # Core Extensions
 
+class NilClass
+  # Nil converts to an empty OpenObject.
+
+  def to_openobject
+    OpenObject.new
+  end
+end
+
 class Hash
   # Convert a Hash into an OpenObject.
 

data/test/lib/facets/core/array/test_at_rand.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/at_rand.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_delete_unless.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/delete_unless.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_delete_values.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/delete_values.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_delete_values_at.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/delete_values_at.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_first.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/first.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_head.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/head.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_last_index.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/last_index.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_merge.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/merge.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_mid.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/mid.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_middle.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/middle.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_op_fetch.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/op_fetch.rb
 #
-# Extracted Wed Aug 23 18:22:53 EDT 2006
+# Extracted Thu Aug 31 11:31:53 EDT 2006
 # Unit Tools Reap Test Extractor
 #