facets 2.6.0 → 2.7.0

data/lib/more/facets/recorder.rb

@@ -77,10 +77,9 @@ class Recorder
 
   # Privatize all kernel methods.
 
-  private(*instance_methods)
+  instance_methods.each{ |m| private(m) unless /^__/ =~ m.to_s }
 
   #
-
   def initialize( msg=nil )
     @msg = msg
   end

data/meta/loadpath

@@ -1,3 +1,2 @@
 lib/core
-lib/lore
 lib/more

data/meta/sitemap

@@ -0,0 +1,4 @@
+---
+site     : .
+#doc/rdoc : rdoc
+#doc/yard : yard

data/meta/version

@@ -1 +1 @@
-2.6.0
+2.7.0

data/test/core/enumerable/test_count.rb

@@ -16,7 +16,7 @@ class TC_Enumerable_Count < Test::Unit::TestCase
 
   def test_count_03
     e = { 'a' => 2, 'a' => 2, 'b' => 1 }
-    assert_equal( 1, e.count('a',2) )
+    assert_equal(1, e.count(['a',2]))
   end
 
 end

data/test/{more/test_filter.rb → core/enumerable/test_defer.rb}

@@ -1,7 +1,8 @@
-require 'facets/filter'
+require 'facets/enumerable/defer'
+require 'facets/enumerable/take'
 require 'test/unit'
 
-class TC_Enumerator_Filter < Test::Unit::TestCase
+class TC_Enumerable_Defer < Test::Unit::TestCase
 
   SOURCE = (1..1/0.0)   # infinite Enumerable object
 
@@ -17,71 +18,72 @@ class TC_Enumerator_Filter < Test::Unit::TestCase
     assert_equal [1, 1, 2, 3, 5, 8, 13, 21, 34, 55], fib.take(10)
   end
   
-  def test_filter_without_block
-    a = SOURCE.filter
-    assert_equal Enumerator::Filter, a.class
+  def test_defer_without_block
+    a = SOURCE.defer
+    assert_equal Denumerator, a.class
     assert_equal [1,2,3,4,5], a.take(5).to_a
   end
 
-  def test_filter_with_block
-    a = SOURCE.filter { |out,i| out << i*2 }
-    assert_equal Enumerator::Filter, a.class
+  def test_defer_with_block
+    a = SOURCE.defer { |out,i| out << i*2 }
+    assert_equal Denumerator, a.class
     assert_equal [2,4,6,8,10], a.take(5).to_a
   end
 
   def test_each
     res = []
-    (1..5).filter.each { |i| res << i }
+    (1..5).defer.each { |i| res << i }
     assert_equal [1,2,3,4,5], res
   end
 
   def test_return
-    res = (1..5).filter.inject({}) { |h,v| h[v] = v*2; h }
+    res = (1..5).defer.inject({}) { |h,v| h[v] = v*2; h }
     assert_equal({1=>2,2=>4,3=>6,4=>8,5=>10}, res)
-    res = (1..5).filter.inject({}) { |h,v| h[v] = v*2; break h if v>=3; h }
+    res = (1..5).defer.inject({}) { |h,v| h[v] = v*2; break h if v>=3; h }
     assert_equal({1=>2,2=>4,3=>6}, res)
   end
 
   def test_other_enumerable
-    a = SOURCE.filter
+    a = SOURCE.defer
     assert_equal 5, a.take(5).max
     assert_equal 2, a.map { |i| i*2 }.take(5).min
     assert_equal [5,4,3,2,1], a.take(5).sort_by { |x| -x }
   end
 
-  def test_filter_filter
-    a = SOURCE.filter.filter { |out,i| out << i*2 }
+  def test_defer_defer
+    a = SOURCE.defer.defer { |out,i| out << i*2 }
     assert_equal [2,4,6,8,10], a.take(5).to_a
   end
 
-  def test_filter_chain
-    a = SOURCE.filter { |out,i| out.yield(i) if i % 2 == 0 }.
-               filter { |out,i| out.yield(i + 100) }
+  def test_defer_chain
+    a = SOURCE.defer { |out,i| out.yield(i) if i % 2 == 0 }.
+               defer { |out,i| out.yield(i + 100) }
     assert_equal [102,104,106,108,110], a.take(5).to_a
   end
 
   def test_select_map
-    a = SOURCE.filter.select { |i| i % 2 == 0 }.map { |i| i + 100 }
+    a = SOURCE.defer.select { |i| i % 2 == 0 }.map { |i| i + 100 }
     assert_equal [102,104,106,108,110], a.take(5).to_a
   end
 
   def test_find_all_collect
-    a = SOURCE.filter.find_all { |i| i % 2 == 0 }.collect { |i| i + 100 }
+    a = SOURCE.defer.find_all { |i| i % 2 == 0 }.collect { |i| i + 100 }
     assert_equal [102,104,106,108,110], a.take(5).to_a
   end
 
   def test_reject
-    a = SOURCE.filter.reject { |i| i % 3 == 0 }
+    a = SOURCE.defer.reject { |i| i % 3 == 0 }
     assert_equal [1,2,4,5,7], a.take(5).to_a
   end
 
   def test_skip_take
-    a = SOURCE.filter.skip(20).take(5)
+    a = SOURCE.defer.skip(20).take(5)
     assert_equal [21,22,23,24,25], a.to_a
   end
 
   #def test_each_cons
-  #  a = SOURCE.filter
+  #  a = SOURCE.defer
   #  assert_equal [[1,2,3],[2,3,4],[3,4,5],[4,5,6]], a.each_cons(3).take(4)
   #end
 end
+

data/test/{more/test_elementor.rb → core/enumerable/test_every.rb}

@@ -1,20 +1,7 @@
-# Test facets/elementor.rb.
-
-require 'facets/elementor.rb'
+require 'facets/enumerable/every'
 require 'test/unit'
 
-class TCElementor < Test::Unit::TestCase
-
-  def test_to_elem
-    e = [1,2,3].to_elem
-    assert_equal( [4,5,6], e + 3 )
-    assert_equal( [0,1,2], e - 1 )
-  end
-
-  def test_to_elem_str
-    e = [1,2,3].to_elem
-    assert_equal( ['1','2','3'], e.to_s )
-  end
+class TCEvery < Test::Unit::TestCase
 
   def test_every
     a = [1,2,3]

data/test/core/enumerable/test_ewise.rb

@@ -0,0 +1,23 @@
+require 'facets/enumerable/ewise'
+require 'test/unit'
+
+class TestElementWise < Test::Unit::TestCase
+
+  #def test_elementwise
+  #  a = [1,2,3]
+  #  b = [4,5]
+  #  assert_equal( [4,5,6], a.elementwise + 3 )
+  #  assert_equal( [5,7], a.elementwise + b )
+  #  assert_equal( [[5,7],[3,4,5]], a.elementwise.+(b,2) )
+  #  assert_equal( [[5,7],[4,5,6]], a.elementwise.+(b,3) )
+  #end
+
+  def test_ewise
+    a = [1,2,3]
+    assert_equal( [4,5,6], a.ewise + 3 )
+    assert_equal( [5,7], a.ewise + [4,5] )
+    assert_equal( [[5,7],[3,4,5]], a.ewise.+([4,5],2) )
+    assert_equal( [[5,7],[4,5,6]], a.ewise.+([4,5],3) )
+  end
+
+end

data/test/core/enumerable/test_per.rb

@@ -0,0 +1,18 @@
+require 'facets/enumerable/per'
+require 'test/unit'
+
+class TCPer < Test::Unit::TestCase
+
+  def test_per
+    e = [1,2,3].per.map
+    assert_equal( [4,5,6], e + 3 )
+    assert_equal( [0,1,2], e - 1 )
+  end
+
+  def test_per_again
+    e = [1,2,3].per.map
+    assert_equal( ['1','2','3'], e.to_s )
+  end
+
+end
+

data/test/core/enumerable/test_take.rb

@@ -0,0 +1,13 @@
+require 'facets/enumerable/take'
+require 'test/unit'
+
+class TC_Enumerable_Defer < Test::Unit::TestCase
+
+  SOURCE = (1..1/0.0)   # infinite Enumerable object
+
+  def test_finite
+    assert_equal [1,2,3,4,5], SOURCE.take(5)
+  end
+
+end
+

data/test/core/kernel/test_deepcopy.rb

@@ -1,7 +1,7 @@
 require 'facets/kernel/deep_copy.rb'
 require 'test/unit'
 
-class TestKernelCopy < Test::Unit::TestCase
+class TestKernelDeepCopy < Test::Unit::TestCase
 
   # fixtures for copy / deep_copy
   class A

data/test/{more/test_1stclassmethod.rb → core/kernel/test_method.rb}

@@ -1,8 +1,7 @@
+require 'facets/kernel/method'
 require 'test/unit'
-require 'facets/1stclassmethod'
 
-
-class Test1stClassMethod < Test::Unit::TestCase
+class TestKernelMethod < Test::Unit::TestCase
 
   class TestWith
     def foo ; end
@@ -14,8 +13,4 @@ class Test1stClassMethod < Test::Unit::TestCase
     assert_not_equal( t.method(:foo).__id__, t.method(:foo).__id__ )
   end
 
-  def test_this
-    assert_equal( this, method(:test_this) )
-  end
-
 end

data/test/core/kernel/test_tap.rb

@@ -5,7 +5,7 @@ class TestKernelTap < Test::Unit::TestCase
 
   def test_tap
     x = "foo"
-    r = ("foobar".tap{ gsub!(/bar/, '') })
+    r = ("foobar".tap{ |x| x.gsub!(/bar/, '') })
     assert_equal(x, r)
   end
 

data/test/core/proc/test_curry.rb

@@ -21,5 +21,16 @@ class TestProcCurry < Test::Unit::TestCase
     assert_equal( 9, c[2][3] )
   end
 
+  def test_inclass_scope
+    # first test the lambda
+    org = lambda{ |y, x| x + " " + y }
+    foo = org.curry['yeah']
+    assert_equal('boo yeah', foo['boo'])
+    # now test it as a method definition
+    baz = Class.new
+    baz.__send__(:define_method, 'foo', foo)
+    assert_equal('boo yeah',baz.new.foo('boo'))
+  end
+
 end
 

data/test/core/string/test_bytes.rb

@@ -5,7 +5,7 @@ class TC_String_Bytes < Test::Unit::TestCase
 
   def test_bytes
     s = "abc"
-    assert_equal( s.unpack('C*'), s.bytes )
+    assert_equal( s.unpack('C*'), s.bytes.to_a )
   end
 
 end

data/test/core/string/test_camelcase.rb

@@ -1,11 +1,15 @@
-require 'facets/string/camelcase.rb'
+require 'facets/string/camelcase'
 require 'test/unit'
 
 class StringCamelCaseTest < Test::Unit::TestCase
 
+  def test_camelcase
+    assert_equal("camelCase", "Camel_case".camelcase(false))
+  end
+
   def test_camelcase_converts_underscore_to_captialized
-    assert_equal( "AbcXyz", "abc_xyz".camelcase  )
-    assert_equal( "AbcXyz", "abc____xyz".camelcase  )
+    assert_equal( "abcXyz", "abc_xyz".camelcase  )
+    assert_equal( "abcXyz", "abc____xyz".camelcase  )
   end
 
   #def test_camelcase_converts_spaces_to_captialized
@@ -15,6 +19,11 @@ class StringCamelCaseTest < Test::Unit::TestCase
   #  assert_equal( "AbcXyz", "abc\nxyz".camelcase )
   #end
 
+  def test_camelcase_true_converts_underscore_to_captialized
+    assert_equal( "AbcXyz", "abc_xyz".camelcase(true) )
+    assert_equal( "AbcXyz", "abc____xyz".camelcase(true) )
+  end
+
   def test_camelcase_false_converts_underscore_to_captialized
     assert_equal( "abcXyz", "abc_xyz".camelcase(false) )
     assert_equal( "abcXyz", "abc____xyz".camelcase(false) )
@@ -28,9 +37,9 @@ class StringCamelCaseTest < Test::Unit::TestCase
   #end
 
   def test_camelcase_converts_paths_to_module_names
-    assert_equal( 'ThisIsIt', 'this_is_it'.camelcase )
-    assert_equal( 'MyModule::MyClass',   'my_module/my_class'.camelcase    )
-    assert_equal( '::MyModule::MyClass', '/my_module/my_class'.camelcase   )
+    assert_equal( 'ThisIsIt', 'this_is_it'.camelcase(true) )
+    assert_equal( 'MyModule::MyClass',   'my_module/my_class'.camelcase(true) )
+    assert_equal( '::MyModule::MyClass', '/my_module/my_class'.camelcase(true) )
   end
 
   #def test_camelcase_converts_methods_to_module_names
@@ -38,5 +47,13 @@ class StringCamelCaseTest < Test::Unit::TestCase
   #  assert_equal( '::MyModule::MyClass', '__my_module__my_class'.camelcase )
   #end
 
+  def test_lower_camelcase
+    assert_equal( "abcXyz", "abc_xyz".lower_camelcase  )
+  end
+
+  def test_upper_camelcase
+    assert_equal( "AbcXyz", "abc_xyz".upper_camelcase  )
+  end
+
 end
 

data/test/core/string/test_lines.rb

@@ -4,7 +4,7 @@ require 'test/unit'
 class TC_String_Lines < Test::Unit::TestCase
 
   def test_lines
-    assert_equal( ['a','b','c'], "a\nb\nc".lines )
+    assert_equal( ["a","b",'c'], "a\nb\nc".lines.to_a )
   end
 
 end

data/test/core/string/test_unfold.rb

@@ -0,0 +1,14 @@
+require 'test/unit'
+require 'facets/string/unfold'
+
+class TC_String_Unfold < Test::Unit::TestCase
+
+  def test_unfold
+    str = "This is a test of\nparagraph folding."
+    res = str.unfold
+    exp = "This is a test of paragraph folding."
+    assert_equal(exp, res)
+  end
+
+end
+

data/test/more/{test_class_extension.rb → test_class_extend.rb}

@@ -1,6 +1,6 @@
 # Test facets/class_extension.rb.
 
-require 'facets/class_extension.rb'
+require 'facets/class_extend'
 require 'test/unit'
 
 class TC_ClassExtension < Test::Unit::TestCase
@@ -8,11 +8,11 @@ class TC_ClassExtension < Test::Unit::TestCase
   # fixture
 
   module N
-    class_extension do
+    class_extend do
       def n ; 43 ; end
       def s ; self ; end
     end
-    extend class_extension
+    #extend class_extend # NOTE: No longer needed!
   end
 
   class X
@@ -22,7 +22,7 @@ class TC_ClassExtension < Test::Unit::TestCase
 
   module K
     include N
-    class_extension do
+    class_extend do
       def n ; super + 1 ; end
     end
   end
@@ -35,7 +35,7 @@ class TC_ClassExtension < Test::Unit::TestCase
 
   def test_01
     assert_equal( 43, N.n )
-    assert_equal(  N,  N.s )
+    assert_equal(  N, N.s )
   end
   def test_02
     assert_equal( 43, X.n )
@@ -45,7 +45,7 @@ class TC_ClassExtension < Test::Unit::TestCase
     assert_equal( 11, X.new.n )
   end
   def test_04
-    assert_equal( 43, K.n )  #notic the difference!
+    assert_equal( 44, K.n )  # notice the difference!
     assert_equal(  K, K.s )
   end
   def test_05