facets 1.8.0 → 1.8.8

data/PROJECT

@@ -30,20 +30,20 @@ changelog: doc/HISTORY.txt
 
 distribute: [ -doc/rdoc, -test/lib ]
 
-package: [ tar.gz, gem ]
+package: [ gem, tgz ]
 
 rdoc:
   template : jamis
   options  : ['--all', '--inline-source']
 
 mail:
-  mailto   : transfire@gmail.com  #ruby-talk@ruby-lang.org
-  from     : transfire@gmail.com
+  mail_to  : transfire@gmail.com  #ruby-talk@ruby-lang.org
+  mail_from : transfire@gmail.com
   domain   : facets.rubyforge.org
   server   : smtp.gmail.com
   port     : 25 #587
   account  : transfire@gmail.com
-  login    : login  #cram_md5 #plain
+  login_type : login  #cram_md5 #plain
   secure   : true
 
 announce_memo : 'doc/LATEST'

data/Rakefile

@@ -1,15 +1,18 @@
 #!/usr/bin/env ruby
-#######################
-# Rakefile for Facets #
-#######################
-require 'project/project'
-project = Project.load
+
+# Facets Rakefile
+
+require '4rake/4rake'
+
+
+#require 'project/project'
+#project = Project.load
 
 #
 # Redirect, extact tests and run tests
 #
 
-task :prepare => [ :redirect, :extest, :test ]
+#task :prepare => [ :redirect, :extest, :test ]
 
 #
 # Generate facet/ redirection files
@@ -47,20 +50,21 @@ end
 # Extract tests
 #
 
-desc "ectract units tests"
-task :extest do
-  project.extract(:files=>'lib/facets/**/*.rb')
-end
+#desc "ectract units tests"
+#task :extest do
+#  project.extract(:files=>'lib/facets/**/*.rb')
+#end
 
 #
 # Run tests
 #
 
-desc "run tests"
-task :test do
-  project.test
-end
+#desc "run tests"
+#task :test do
+#  project.test
+#end
 
+=begin
 #
 # Generate API documentation
 #
@@ -92,6 +96,7 @@ task :rdoc_more do
     output: doc/rdoc/more
   END
 end
+=end
 
 #
 # List core methods

data/VERSION

@@ -1 +1 @@
-1.8.0 alpha (2007-01-24)
+1.8.8 rc (2007-01-30)

data/lib/facet/enumerable/cart.rb

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

data/lib/facet/enumerable/cartesian_product.rb

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

data/lib/facet/enumerable/self/cart.rb

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

data/lib/facet/enumerable/self/cartesian_product.rb

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

data/lib/facets.rb

@@ -67,7 +67,8 @@ require 'facets/core/time/to_time'
 require 'facets/core/module/is'
 require 'facets/core/kernel/fn'
 require 'facets/core/kernel/here'
-require 'facets/core/kernel/own' # better name?
+# TODO need a singleton method !!!
+#require 'facets/core/kernel/own' # better name?
 
 # Convenience
 require 'facets/core/array/to_h'

data/lib/facets/core/dir/self/multiglob_sum.rb

@@ -1,3 +1,5 @@
+require 'facets/core/dir/self/multiglob_recurse'
+
 # Summation glob. This is like multiglob but handles pattern
 # prefixes '+' and '-'. If the +files+ pattern list does not
 # start with a '+' or '-' entry, then the base is not included.

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

@@ -0,0 +1,119 @@
+#--
+# Cross product adapted from code by Michael Neuman.
+#++
+
+require 'generator'
+
+module Enumerable
+
+  class << self
+
+    # Provides the cross-product of two or more Enumerables.
+    # This is the class-level method. The instance method
+    # calls on this.
+    #
+    #   Enumerable.cross([1,2], [4], ["apple", "banana"])
+    #   #=> [[1, 4, "apple"], [1, 4, "banana"], [2, 4, "apple"], [2, 4, "banana"]]
+    #
+    #   Enumerable.cross([1,2], [3,4])
+    #   #=> [[1, 3], [1, 4], [2, 3], [2, 4]]
+    #
+    #--
+    # TODO Make a more efficient version just for Array (?)
+    #++
+
+    def cartesian_product(*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
+        }
+        if block.nil?
+          res << tuple.dup
+        else
+          block.call(tuple.dup)
+        end
+
+        # step forward
+        gens[-1].next
+        (sz-1).downto(0) do |i|
+          if gens[i].end?
+            if i > 0
+              gens[i].rewind
+              gens[i-1].next
+            else
+              return res
+            end
+          end
+        end
+      end #loop
+    end
+
+    alias :cart, :cartesian_product
+  end
+
+
+  # The instance level version of <tt>Enumerable::cartesian_product</tt>.
+  #
+  #   a = []
+  #   [1,2].cart([4,5]){|elem| a << elem }
+  #   a  #=> [[1, 4],[1, 5],[2, 4],[2, 5]]
+  #
+  #--
+  # TODO Make a more efficient version just for Array (?)
+  #++
+
+  def cart(*enums, &block)
+    Enumerable.cart(self, *enums, &block)
+  end
+
+  alias :cart, :cartesian_product
+end
+
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+=begin test
+
+  require 'test/unit'
+
+  class TCEnumerableClass < Test::Unit::TestCase
+
+    def test_cross
+      i = [[1,2], [3,4]]
+      o = [[1, 3], [1, 4], [2, 3], [2, 4]]
+      assert_equal( o, Enumerable.cart(*i) )
+      i = [[1,2], [4], ["apple", "banana"]]
+      o = [[1, 4, "apple"], [1, 4, "banana"], [2, 4, "apple"], [2, 4, "banana"]]
+      assert_equal( o, Enumerable.cart(*i) )
+    end
+
+  end
+
+
+  class TCEnumerable < Test::Unit::TestCase
+
+    def test_cross
+      a = [1,2,3].cart([4,5,6])
+      assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )
+      a = []
+      [1,2,3].cart([4,5,6]) {|elem| a << elem }
+      assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )
+    end
+
+  end
+
+=end

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

@@ -0,0 +1,8 @@
+# = cartesian_product.rb
+#
+# Stub for <tt>cart.rb</tt>.
+# 
+# CREDIT Thomas Halfner (for the name correction from cross.rb)
+
+require 'facets/core/enumerable/cart.rb'
+

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

@@ -0,0 +1,120 @@
+# CREDIT Michael Neuman# 
+# CREDIT Thomas Halfner (name correction from cross.rb)
+# 
+# Cross product adapted from code by Michael Neuman.
+ 
+require 'generator'
+
+module Enumerable
+
+  class << self
+
+    # Provides the cross-product of two or more Enumerables.
+    # This is the class-level method. The instance method
+    # calls on this.
+    #
+    #   Enumerable.cross([1,2], [4], ["apple", "banana"])
+    #   #=> [[1, 4, "apple"], [1, 4, "banana"], [2, 4, "apple"], [2, 4, "banana"]]
+    #
+    #   Enumerable.cross([1,2], [3,4])
+    #   #=> [[1, 3], [1, 4], [2, 3], [2, 4]]
+    #
+    #--
+    # TODO Make a more efficient version just for Array (?)
+    #++
+
+    def cartesian_product(*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
+        }
+        if block.nil?
+          res << tuple.dup
+        else
+          block.call(tuple.dup)
+        end
+
+        # step forward
+        gens[-1].next
+        (sz-1).downto(0) do |i|
+          if gens[i].end?
+            if i > 0
+              gens[i].rewind
+              gens[i-1].next
+            else
+              return res
+            end
+          end
+        end
+      end #loop
+    end
+
+    alias :cart, :cartesian_product
+  end
+
+
+  # The instance level version of <tt>Enumerable::cartesian_product</tt>.
+  #
+  #   a = []
+  #   [1,2].cart([4,5]){|elem| a << elem }
+  #   a  #=> [[1, 4],[1, 5],[2, 4],[2, 5]]
+  #
+  #--
+  # TODO Make a more efficient version just for Array (?)
+  #++
+
+  def cart(*enums, &block)
+    Enumerable.cart(self, *enums, &block)
+  end
+
+  alias :cart, :cartesian_product
+end
+
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+=begin test
+
+  require 'test/unit'
+
+  class TCEnumerableClass < Test::Unit::TestCase
+
+    def test_cross
+      i = [[1,2], [3,4]]
+      o = [[1, 3], [1, 4], [2, 3], [2, 4]]
+      assert_equal( o, Enumerable.cart(*i) )
+      i = [[1,2], [4], ["apple", "banana"]]
+      o = [[1, 4, "apple"], [1, 4, "banana"], [2, 4, "apple"], [2, 4, "banana"]]
+      assert_equal( o, Enumerable.cart(*i) )
+    end
+
+  end
+
+
+  class TCEnumerable < Test::Unit::TestCase
+
+    def test_cross
+      a = [1,2,3].cart([4,5,6])
+      assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )
+      a = []
+      [1,2,3].cart([4,5,6]) {|elem| a << elem }
+      assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )
+    end
+
+  end
+
+=end

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

@@ -0,0 +1,8 @@
+# = cartesian_product.rb
+#
+# Stub for <tt>cart.rb</tt>.
+# 
+# CREDIT Thomas Halfner (for the name correction from cross.rb)
+
+require 'facets/core/enumerable/self/cart.rb'
+

data/lib/facets/core/string/singular.rb

@@ -53,7 +53,7 @@ class String
   inflection_rule 'ch'           , ''     , 'es'        # search, switch
   inflection_rule 'ss'           , ''     , 'es'        # process, address
   inflection_rule 'sh'           , ''     , 'es'        # dish, wish
-  inflection_rule 'qu'           , 'y'    , 'ies'       # query, ability, agency
+  #inflection_rule 'qu'           , 'y'    , 'ies'       # query, ability, agency
   inflection_rule 'hive'         , ''     , 's'         # archive, hive
   inflection_rule 'sis'          , ''     , 'ses'       # basis, diagnosis
   inflection_rule 't'            , 'um'   , 'a'         # datum, medium, forum
@@ -75,12 +75,12 @@ class String
   inflection_rule 'test'         , 'is'   , 'es'        # testis
   inflection_rule 'l'            , 'f'    , 'ves'       # half halves
   inflection_rule ''             , 'fe'   , 'ves'       # safe, wife
-  inflection_rule 'a'            , 'y'    , 's'         # query, ability, agency
-  inflection_rule 'e'            , 'y'    , 's'         # query, ability, agency
-  inflection_rule 'i'            , 'y'    , 's'         # query, ability, agency
-  inflection_rule 'o'            , 'y'    , 's'         # query, ability, agency
-  inflection_rule 'u'            , 'y'    , 's'         # query, ability, agency
-  inflection_rule ''             , 'y'    , 'ies'       # query, ability, agency
+  inflection_rule 'a'            , 'y'    , 'ys'        # TODO Combine as a|e|i|o|u
+  inflection_rule 'e'            , 'y'    , 'ys'        # 
+  inflection_rule 'i'            , 'y'    , 'ys'        # 
+  inflection_rule 'o'            , 'y'    , 'ys'        # 
+  inflection_rule 'u'            , 'y'    , 'ys'        # 
+  inflection_rule ''             , 'y'    , 'ies'       # 
   inflection_rule ''             , ''     , 's'         # --catch all--
 
   # Convert an English word from plurel to singular.

data/lib/facets/more/ann.rb

@@ -21,7 +21,7 @@
 # method defined, like how +desc+ annotates a rake +task+.
 #
 # TODO The ann(x).name notation is kind of nice. Would like to add that
-# back-in if reasonable. Basically this require heritage to be an OpenHash
+# back-in if reasonable. Basically this require heritage to be an OpenObject
 # rather than just a hash.
 #
 # == Authors & Contributors
@@ -33,7 +33,7 @@
 # License::   Ruby License
 
 require 'facets/core/hash/to_h'
-require 'facets/core/hash/symbolize_keys'
+require 'facets/core/hash/rekey'
 require 'facets/core/hash/op_add'
 
 # = Annotation
@@ -106,7 +106,7 @@ class Module
     if Hash === keys
       ref = ref.to_sym
       annotations[ref] ||= {}
-      annotations[ref].update(keys.symbolize_keys)
+      annotations[ref].update(keys.rekey)
     else
       key = keys.to_sym
       heritage(ref)[key]
@@ -118,7 +118,8 @@ class Module
   # in the class or module's ancestors.
 
   def ann!( ref, keys_or_class=nil, keys=nil )
-    return heritage(ref) unless keys_or_class or keys
+    #return heritage(ref) unless keys_or_class or keys
+    return annotations[ref] unless keys_or_class or keys
 
     if Class === keys_or_class
       keys ||= {}
@@ -130,7 +131,7 @@ class Module
     if Hash === keys
       ref = ref.to_sym
       annotations[ref] ||= {}
-      annotations[ref].update(keys.symbolize_keys)
+      annotations[ref].update(keys.rekey)
     else
       key = keys.to_sym
       annotations[ref][key] = heritage(ref)[key].dup