facets 2.1.2 → 2.1.3

data/lib/core/facets.rb

@@ -1 +1 @@
-require 'facets/main.rb'
+require 'facets/facets.rb'

data/lib/core/facets/conversion.rb

@@ -41,7 +41,12 @@ class Array
       #each{ |e| h[e.first] = e.slice(1..-1) }
       each{ |k,*v| h[k] = v }
     else
-      h = Hash[*(self.flatten)]
+      #h = Hash[*flatten(1)] # TODO Use in 1.9 instead.
+      ary = []
+      each do |a|
+        Array===a ? ary.concat(a) : ary << a
+      end
+      h = Hash[*ary]
     end
     h
   end

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

@@ -1,20 +1,4 @@
-# TITLE:
-#
-#   Enumerable Collate
-#
-# DESCRIPTION:
-#
-#   Collate is a Hash collection method.
-#
-# AUTHORS:
-#
-#   CREDIT 7ransVent
-#
-# NOTES:
-#
-#   NOTE Hash#collate! is only useful for Hash. It is not generally
-#        applicable to Enumerable.
-#++
+require 'enumerator'
 
 module Enumerable
 
@@ -22,23 +6,25 @@ module Enumerable
   # is expected to return two values: the key and the value for the new hash.
   #
   #   numbers  = (1..3)
-  #   squares  = numbers.graph { |n| [n, n*n] }   # { 1=>1, 2=>4, 3=>9 }
-  #   sq_roots = numbers.graph { |n| [n*n, n] }   # { 1=>1, 4=>2, 9=>3 }
+  #   squares  = numbers.collate { |n| [n, n*n] }   # { 1=>1, 2=>4, 3=>9 }
+  #   sq_roots = numbers.collate { |n| [n*n, n] }   # { 1=>1, 4=>2, 9=>3 }
+  #
+  # CREDIT: Trans
+  # CREDIT: Andrew Dudzik (adudzik)
 
   def collate(&yld)
     if yld
-      inject({}) do |h,kv|
-        nk, nv = *yld[*kv].to_a.flatten
+      inject({}) do |h, *kv| # Used to be inject({}) do |h,kv|
+        r = *yld[*kv]        # The *-op works differnt from to_a on single element hash!!!
+        nk, nv = *r          # Used to be nk, nv = *yld[*kv].to_a.flatten
         h[nk] = nv
         h
       end
     else
-      Hash[*self.to_a.flatten]
+      Enumerator.new(self,:collate)  # Used to be Hash[*self.to_a] or Hash[*self.to_a.flatten]
     end
   end
 
-  # Alias for #collate (THIS WILL BE DEPRECATED)
-
   alias :graph :collate
 
   # Returns a new hash built by iterating through each key,value
@@ -55,6 +41,9 @@ end
 class Hash
 
   # In place version of #collate.
+  #
+  #   NOTE Hash#collate! is only useful for Hash. It is not generally
+  #        applicable to Enumerable.
 
   def collate!(&yld)
     replace(collate(&yld))

data/lib/methods/facets/facets/require_core.rb

@@ -1 +1 @@
-require 'facets/main.rb'
+require 'facets/facets.rb'

data/lib/more/facets/advice.rb

@@ -1,8 +1,35 @@
+# = TITLE:
+#
+#   Advice
+#
+# = SUMMARY:
+#
+#   Add before, after and around advice in dynamic fashion.
+#
+# = COPYRIGHT:
+#
+#   Copyright (c) 2007 Thomas Sawyer
+#
+# = LICENSE:
+#
+#   Ruby License
+#
+#   This module is free software. You may use, modify, and/or redistribute this
+#   software under the same terms as Ruby.
+#
+#   This program is distributed in the hope that it will be useful, but WITHOUT
+#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#   FOR A PARTICULAR PURPOSE.
+#
+# = AUTHORS:
+#
+#   - TransAspect
+
 require 'facets/1stclassmethod'
 require 'facets/unboundmethod/arguments'
 #require 'facets/binding'
 
-
+#
 class Method
   attr_accessor :advised
 

data/lib/more/facets/aop.rb

@@ -176,14 +176,7 @@ class Class
 end
 
 
-
-
-
-#
-# Basic Test
-#
-
-if $0 == __FILE__
+=begin demo
 
   class X
     def x; "x"; end
@@ -209,4 +202,4 @@ if $0 == __FILE__
   print '"y" == '        ; p x1.y
   print '"<{x}>" == '    ; p x1.q
 
-end
+=end

data/log/history.rd

@@ -1,5 +1,10 @@
 = Facets Revision History
 
+== 2.1.3 / 2007-11-28
+
+* Fixed minor oddity in Enumerable/collate.
+* Fixed major issue with 2.1.2 where it would not core facets correctly.
+
 == 2.1.2 / 2007-11-22
 
 * Dir::multiglob no longer handels -/+ modifiers. Use FileList instead.

data/meta/MANIFEST

@@ -68,6 +68,7 @@ lib/core/facets/enumerable.rb
 lib/core/facets/exception
 lib/core/facets/exception/detail.rb
 lib/core/facets/exception.rb
+lib/core/facets/facets.rb
 lib/core/facets/file
 lib/core/facets/file/read.rb
 lib/core/facets/file/topath.rb
@@ -126,7 +127,6 @@ lib/core/facets/kernel/tap.rb
 lib/core/facets/kernel/val.rb
 lib/core/facets/kernel/withattr.rb
 lib/core/facets/kernel.rb
-lib/core/facets/main.rb
 lib/core/facets/matchdata
 lib/core/facets/matchdata/matchset.rb
 lib/core/facets/matchdata.rb
@@ -751,10 +751,10 @@ log/history.rd
 log/todo.rd
 meta
 meta/MANIFEST
+meta/ROLLRC
 meta/google_ad.html
 meta/icli.yaml
 meta/project.yaml
-meta/rollrc
 task
 task/changes
 task/clean
@@ -784,8 +784,6 @@ task/test/loadtest
 task/test/pairs
 task/test/syntax
 test
-test/lib
-test/lib/rq.rb
 test/unit
 test/unit/array
 test/unit/array/test_delete.rb

data/meta/{rollrc → ROLLRC}

@@ -1,4 +1,4 @@
-facets 2.1.2 stable 2007-11-22
+facets 2.1.3 stable 2007-11-29 facets.rb
 lib/core/facets
 lib/more/facets
 lib/methods/facets

data/task/release

@@ -3,9 +3,7 @@
 # release packages
 
 main :release do
-  fname = Dir.glob('meta/*.roll').first
-  pname = File.basename(fname).chomp('.roll')
-  name, version = *pname.split('-')
+  name, version = rollrc.name, rollrc.version
 
   icli "rubyforge release --version=#{version}"
 end

data/task/test/general

@@ -2,7 +2,7 @@
 
 # Run unit tests
 
-live = ARGV.delete('--live')
+live = commandline.flag?('--live')
 
 unless live
   $LOAD_PATH.unshift(File.expand_path('lib/methods'))
@@ -11,7 +11,7 @@ unless live
 end
 
 main :test do
-  if find = argv[0]
+  if find = commandline[0]
     unless file?(find)
       find = File.join(find, '**', 'test_*.rb')
     end

data/task/test/loadtest

@@ -12,7 +12,7 @@ main :syntax do
   scripts.each do |s|
     next unless File.file?(s)
     #if not system "ruby -c -Ibin:lib:test #{s} &> /dev/null" then
-    if r = system "ruby -I#{libpath} #{s} > /dev/null"
+    if system("ruby -I#{libpath} #{s} > /dev/null")
       puts "#{s} [PASS]" #if verbose?
     else
       puts "Load Issue: #{s}"

data/test/unit/enumerable/test_collate.rb

@@ -1,55 +1,51 @@
-  #  _____         _
-  # |_   _|__  ___| |_
-  #   | |/ _ \/ __| __|
-  #   | |  __/\__ \ |
-  #   |_|\___||___/\__|
-  #
-  # for lib/facets/enumerable/collate.rb
-  #
-  # Extracted Mon Sep 03 16:23:07 -0700 2007
-  # w/ Test Extraction Ratchet
-  #
-
- require 'facets/enumerable/collate.rb'
-
-
-
-  require 'test/unit'
-
-  class TestEnumerableCollate < Test::Unit::TestCase
-
-    def test_collate_01
-      a = { :a => 1, :b => 2, :c => 3 }
-      e = { :a => 2, :b => 3, :c => 4 }
-      assert_equal( e, a.collate{ |k,v| { k => v+1 } } )
-    end
-
-    def test_collate_02
-      numbers  = (1..3)
-      squares  = numbers.collate{ |n| [n, n*n] }
-      assert_equal( {1=>1, 2=>4, 3=>9}, squares )
-    end
-
-    def test_collate_03
-      numbers  = (1..3)
-      sq_roots = numbers.collate{ |n| [n*n, n] }
-      assert_equal( {1=>1, 4=>2, 9=>3}, sq_roots )
-    end
-
-    def test_collate_01!
-      a = { :a => 1, :b => 2, :c => 3 }
-      e = { :a => 2, :b => 3, :c => 4 }
-      a.collate!{ |k,v| { k => v+1 } }
-      assert_equal( e, a )
-    end
-
-    def test_collate_02!
-      h  = {:a=>1,:b=>2,:c=>3}
-      h.collate!{ |k,v| [v, v*v] }
-      assert_equal( {1=>1, 2=>4, 3=>9}, h )
-    end
+# Test facets/enumerable/collate.rb
 
+require 'facets/enumerable/collate.rb'
+require 'test/unit'
+
+class TestEnumerableCollate < Test::Unit::TestCase
+
+  def test_collate_hash_return
+    a = { :a => 1, :b => 2, :c => 3 }
+    e = { :a => 2, :b => 3, :c => 4 }
+    assert_equal( e, a.collate{ |k,v| {k => v+1} } )
+  end
+
+  def test_collate_hash_of_array
+    a = { :a => [1,2], :b => [2,3], :c => [3,4] }
+    e = { :a => 2, :b => 6, :c => 12 }
+    assert_equal( e, a.collate{ |k,v| [k, v[0]*v[1] ] } )
+  end
+
+  def test_collate_array_of_array
+    a = [ [1,2], [2,3], [3,4] ]
+    e = { [1,2] => 2, [2,3] => 6, [3,4] => 12 }
+    assert_equal( e, a.collate{ |a| [a, a[0]*a[1] ] } )
   end
 
+  def test_collate_squares
+    numbers  = (1..3)
+    squares  = numbers.collate{ |n| [n, n*n] }
+    assert_equal( {1=>1, 2=>4, 3=>9}, squares )
+  end
+
+  def test_collate_roots
+    numbers  = (1..3)
+    sq_roots = numbers.collate{ |n| [n*n, n] }
+    assert_equal( {1=>1, 4=>2, 9=>3}, sq_roots )
+  end
 
+  def test_collate_inplace!
+    a = { :a => 1, :b => 2, :c => 3 }
+    e = { :a => 2, :b => 3, :c => 4 }
+    a.collate!{ |k,v| { k => v+1 } }
+    assert_equal( e, a )
+  end
+
+  def test_collate_inplace_again!
+    h  = {:a=>1,:b=>2,:c=>3}
+    h.collate!{ |k,v| [v, v*v] }
+    assert_equal( {1=>1, 2=>4, 3=>9}, h )
+  end
 
+end

data/test/unit/test_advice.rb

@@ -1,3 +1,5 @@
+# Test for facets/advice.rb
+
 require 'test/unit'
 require 'facets/advice'
 

data/test/unit/test_annotations.rb

@@ -1,3 +1,5 @@
+# Test for facets/annotations.rb
+
 require 'test/unit'
 require 'facets/annotations'
 

data/test/unit/test_arguments.rb

@@ -1,71 +1,55 @@
-  #  _____         _
-  # |_   _|__  ___| |_
-  #   | |/ _ \/ __| __|
-  #   | |  __/\__ \ |
-  #   |_|\___||___/\__|
-  #
-  # for lib/facets/arguments.rb
-  #
-  # Extracted Mon Sep 03 16:23:08 -0700 2007
-  # w/ Test Extraction Ratchet
-  #
+# Test for facets/arguments.rb.
 
- require 'facets/arguments.rb'
+require 'test/unit'
+require 'facets/arguments.rb'
 
+class TestArguments < Test::Unit::TestCase
 
+  include Console
 
-  require 'test/unit'
-
-  class TestArguments < Test::Unit::TestCase
-
-    include Console
-
-    def test_parameters
-      line = "-x baz --foo=8 bar"
-      cargs = Arguments.new(line)
-      args, keys = cargs.parameters
-      assert_equal(['baz','bar'], args)
-      assert_equal({'foo'=>'8','x'=>true}, keys)
-    end
-
-    def test_parameters_with_arity
-      line = "-g a -x b -x c"
-      cargs = Arguments.new(line, :g=>1, :x=>1)
-      args, keys = cargs.parameters
-      assert_equal({'g'=>'a','x'=>['b','c']}, keys)
-      assert_equal([], args)
-    end
-
-    def test_flags
-      line = "-x baz --foo=8 bar"
-      cargs = Arguments.new(line)
-      flags = cargs.flags
-      assert_equal(['x'], flags)
-    end
-
-    def test_repeat
-      line = "-x baz --foo=1 --foo=2 bar"
-      cargs = Arguments.new(line)
-      args, keys = cargs.parameters
-      assert_equal(['baz','bar'], args)
-      assert_equal({'x'=>true,'foo'=>['1','2']}, keys)
-    end
+  def test_parameters
+    line = "-x baz --foo=8 bar"
+    cargs = Arguments.new(line)
+    args, keys = cargs.parameters
+    assert_equal(['baz','bar'], args)
+    assert_equal({'foo'=>'8','x'=>true}, keys)
+  end
 
-    def test_preoptions
-      line = "-x --foo=7 baz -y bar"
-      cargs = Arguments.new(line)
-      flags = cargs.preoptions
-      assert_equal({'x'=>true,'foo'=>'7'}, flags)
-    end
+  def test_parameters_with_arity
+    line = "-g a -x b -x c"
+    cargs = Arguments.new(line, :g=>1, :x=>1)
+    args, keys = cargs.parameters
+    assert_equal({'g'=>'a','x'=>['b','c']}, keys)
+    assert_equal([], args)
+  end
 
-    def test_with_arity
-      line = "-q baz --aq 5 bar"
-      cargs = Arguments.new(line,'aq'=>1)
-      words, flags = cargs.parameters
-      assert_equal(['baz','bar'],words)
-      assert_equal({'q'=>true,'aq'=>'5'},flags)
-    end
+  def test_flags
+    line = "-x baz --foo=8 bar"
+    cargs = Arguments.new(line)
+    flags = cargs.flags
+    assert_equal(['x'], flags)
   end
 
+  def test_repeat
+    line = "-x baz --foo=1 --foo=2 bar"
+    cargs = Arguments.new(line)
+    args, keys = cargs.parameters
+    assert_equal(['baz','bar'], args)
+    assert_equal({'x'=>true,'foo'=>['1','2']}, keys)
+  end
 
+  def test_preoptions
+    line = "-x --foo=7 baz -y bar"
+    cargs = Arguments.new(line)
+    flags = cargs.preoptions
+    assert_equal({'x'=>true,'foo'=>'7'}, flags)
+  end
 
+  def test_with_arity
+    line = "-q baz --aq 5 bar"
+    cargs = Arguments.new(line,'aq'=>1)
+    words, flags = cargs.parameters
+    assert_equal(['baz','bar'],words)
+    assert_equal({'q'=>true,'aq'=>'5'},flags)
+  end
+end