facets 2.5.0 → 2.5.1

data/lib/more/facets/dictionary.rb

@@ -239,7 +239,6 @@ class Dictionary
   end
 
   #
-
   def reorder
     if @order_by
       assoc = @order.collect{ |k| [k,@hash[k]] }.sort_by(&@order_by)
@@ -352,9 +351,16 @@ class Dictionary
     self == hsh2 ? nil : hsh2
   end
 
-  def replace( hsh2 )
-    @order = hsh2.order
-    @hash = hsh2.hash
+  def replace(hsh2)
+    case hsh2
+    when Hash
+      @order = hsh2.keys
+      @hash  = hsh2
+    else
+      @order = hsh2.order
+      @hash  = hsh2.hash
+    end
+    reorder
   end
 
   def shift

data/lib/more/facets/hook.rb

@@ -0,0 +1,65 @@
+
+# TODO: hooks should be an inheritor
+#
+module Hook
+
+  def self.append_features(base)
+    base.extend self
+  end
+
+  def hooks
+    @hooks ||= Hash.new{ |h,k| h[k] = [] }
+  end
+
+  def hook(name)
+    name = name.to_sym
+
+    (class << self; self; end).class_eval %{
+      def #{name}(meth=nil, &blk)
+        hooks[:#{name}] << (meth || blk)
+      end
+    }
+
+    module_eval %{
+      def #{name}(*args)
+        self.class.hooks[:#{name}].each do |blk|
+          if Proc === blk
+            blk.call(:#{name}, *args)
+          else
+            __send__(blk, :#{name}, *args)
+          end
+        end
+      end
+    }
+  end
+
+end
+
+
+#=begin demo
+
+  class X
+    include Hook
+
+    hook :signal
+
+    def boom(event, message)
+      puts "Kaboom!"
+    end
+
+    signal do |event, message|
+      puts "1", event, message
+    end
+
+    signal do |event, message|
+      puts "2", event, message
+    end
+
+    signal :boom
+
+  end
+
+  X.new.signal("hi")
+
+#=end
+

data/lib/more/facets/paramix.rb

@@ -44,19 +44,19 @@ require 'facets/module/modspace'
 #   end
 #
 #   class MyClass
-#     include Mixin[:name => 'Ruby']
+#     include MyMixin[:name => 'Ruby']
 #   end
 #
 #   m = MyClass.new
-#   m.hello -> 'Hello from Ruby!'
+#   m.hello   #=> 'Hello from Ruby!'
 #
 # You can view the full set of parameters via the #mixin_parameters
 # class method, which returns a hash keyed on the included modules.
 #
-#   MyClass.mixin_parameters         #=> {MyMixin=>{:name=>'Ruby'}}
+#   MyClass.mixin_parameters           #=> {MyMixin=>{:name=>'Ruby'}}
 #   MyClass.mixin_parameters[MyMixin]  #=> {:name=>'ruby'}
 #
-# The include Praamix is equivalent to:
+# The include Paramix is equivalent to:
 #
 #   def [](parameters)
 #     Paramix.new(self, parameters)
@@ -65,7 +65,7 @@ require 'facets/module/modspace'
 # Paramix.new can also take a block that injects code into the class
 # or module including the parametric mixin. This is useful as an
 # alternative to using the #included callback for creating dynamic
-# mixins.. For example:
+# mixins. For example:
 #
 #   def self.[](parameters)
 #     Paramix.new(self, parameters) do

data/meta/abstract

@@ -0,0 +1,13 @@
+Facets is the single largest collection of core extension methods
+and standard class additions available for the Ruby programming
+language.
+
+Premium Core Extensions and Standard Additions.
+Facets is a large collection of core extension methods
+and standard additions for the Ruby programming language.
+The core extensions are unique by virtue of thier atomicity.
+Methods are stored in small, tightly related collections,
+allowing for highly granular control of requirements.
+The modules include a variety of useful classes, mixins
+and microframeworks, from the Functor to a complete
+Annotations system.

data/meta/authors

@@ -0,0 +1 @@
+Thomas Sawyer <transfire@gmail.com>

data/meta/contact

@@ -0,0 +1 @@
+facets-universal@rubyforge.org

data/meta/contributors

@@ -0,0 +1,48 @@
+Trans <transfire@gmail.com>
+Matthew Harris
+Noah Gibbs
+Thibaut Barrère
+Daniel J. Berger
+Paul Brannan
+Mikael Brockman
+Jamis Buck
+Renald Buter
+Shashank Date
+Robert Feldt
+Mauricio Fernandez
+Florian Frank
+Hal Fulton
+Noah Gibbs
+Michael Granger
+Florian Gross
+Sean O'Halpin
+Matthew Harris
+David Heinemeier Hansson
+Thomas-Ivo Heinen
+Dave Hoover
+Ara T. Howard
+MenTaLguY
+Mohammad Khan
+Richard Laugesen
+Derek Lewis
+Jan Molic
+George Moschovitis
+Michael Neumann
+Tim Pease
+Jonas Pfenniger
+Ryan Platte
+Oliver Renaud
+Tyler Rick
+Christoph Rippel
+Daniel Schierbeck
+Louis J Scoras
+Gavin Sinclair
+Tilo Sloboda
+Phil Tomson
+Peter Vanbroekhoven
+Jim Weirich
+Jeff Wood
+Erik Veenstra
+Austin Ziegler
+Why The Lucky Stiff
+

data/meta/created

@@ -0,0 +1 @@
+2004-12-16

data/meta/homepage

@@ -0,0 +1 @@
+http://facets.rubyforge.org

data/meta/license

@@ -0,0 +1 @@
+Ruby

data/meta/loadpath

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

data/meta/releases

@@ -0,0 +1,14 @@
+facets 2.4.4 stable (2008-09-01)
+facets 2.4.3 stable (2008-08-14)
+facets 2.4.2 stable (2008-08-12)
+facets 2.4.1 stable (2008-04-03)
+facets 2.4.0 stable (2008-03-24)
+facets 2.3.0 stable (2008-02-01)
+facets 2.2.1 stable (2007-12-22)
+facets 2.2.0 stable (2007-12-13)
+facets 2.1.3 stable (2007-11-28)
+facets 2.1.2 stable (2007-11-22)
+facets 2.1.1 stable (2007-11-16)
+facets 2.1.0 stable (2007-11-10)
+facets 2.0.5 stable (2007-11-07)
+

data/meta/slogan

@@ -0,0 +1 @@
+ALL YOUR BASE ARE BELONG TO RUBY!

data/meta/summary

@@ -0,0 +1 @@
+Premium Core Extensions and Standard Additions

data/task/test.rake

@@ -1,40 +1,79 @@
 #!/usr/bin/env ruby
 
-desc "run unit tests"
-
 task 'test' do
-  run_tests
+  prepare_tests_all
+end
+
+desc "run all unit tests"
+task 'test:all' do
+  prepare_tests_all
+end
+
+desc "run core unit tests"
+task 'test:core' do
+  prepare_tests_core
+end
+ 
+desc "run lore unit tests"
+task 'test:lore' do
+  prepare_tests_lore
 end
+ 
+desc "run more unit tests"
+task 'test:more' do
+  prepare_tests_more
+end
+
+desc "run all unit tests with ActiveSupport loaded"
+task 'test:all:activesupport' => [:include_activesupport, 'test:all']
 
-desc "run unit tests with ActiveSupport loaded"
+desc "run core unit tests with ActiveSupport loaded"
+task 'test:core:activesupport' => [:include_activesupport, 'test:core']
 
-task 'test:activesupport' do
+desc "run lore unit tests with ActiveSupport loaded"
+task 'test:lore:activesupport' => [:include_activesupport, 'test:lore']
+
+desc "run more unit tests with ActiveSupport loaded"
+task 'test:more:activesupport' => [:include_activesupport, 'test:more']
+
+task 'include_activesupport' do
   require 'activesupport'
-  run_tests
 end
 
-def run_tests
-  live = ENV['live']
 
+def add_loadpath(*paths)
+  live = ENV['live']
+ 
   unless live
-    $LOAD_PATH.unshift(File.expand_path('lib/core'))
-    $LOAD_PATH.unshift(File.expand_path('lib/lore'))
-    $LOAD_PATH.unshift(File.expand_path('lib/more'))
+    # $LOAD_PATH.unshift(File.expand_path('lib/core'))
+    # $LOAD_PATH.unshift(File.expand_path('lib/lore'))
+    # $LOAD_PATH.unshift(File.expand_path('lib/more'))
+    paths.each do |path|
+      $LOAD_PATH.unshift(File.expand_path(path))
+    end
   end
-
+ 
   puts "RUBY VERSION: #{RUBY_VERSION}"
-  puts "LOAD PATH:\n" + $LOAD_PATH.join("\n")
-
+  puts "LOAD PATH:\n" + $LOAD_PATH.join("\n")  
+end
+ 
+def get_tests(which="{c,l,m}ore")
   if find = ARGV[1..-1].select{|e| e !~ /(^[-]|[=])/ }[0]
     unless FileTest.file?(find)
-      find = File.join(find, '**', 'test_*.rb')
+      #find = File.join(find, '**', 'test_*.rb')
+      find = ['test/test_*.rb']
+      find << File.join(find, which, '**', 'test_*.rb')
     end
   else
-    find = 'test/**/test_*.rb'
+    #find = 'test/**/test_*.rb'
+    find = ['test/test_*.rb']
+    find << "test/#{which}/**/test_*.rb"
   end
+  
+  Dir.glob(find)
+end
 
-  files = Dir.glob(find)
-
+def run_tests(files)
   files.each do |file|
     next if File.directory?(file)
     begin
@@ -45,3 +84,62 @@ def run_tests
     end
   end
 end
+
+def prepare_tests_all
+  add_loadpath('lib/core','lib/lore','lib/more')
+  files = get_tests
+  run_tests(files)
+end
+
+def prepare_tests_core
+  add_loadpath('lib/core')
+  files = get_tests('core')
+  run_tests(files)
+end
+
+def prepare_tests_lore
+  add_loadpath('lib/lore')
+  files = get_tests('lore')
+  run_tests(files)
+end
+
+def prepare_tests_more
+  add_loadpath('lib/more')
+  files = get_tests('more')
+  run_tests(files)
+end
+
+
+#def run_tests
+#  live = ENV['live']
+#
+#  unless live
+#    $LOAD_PATH.unshift(File.expand_path('lib/core'))
+#    $LOAD_PATH.unshift(File.expand_path('lib/lore'))
+#    $LOAD_PATH.unshift(File.expand_path('lib/more'))
+#  end
+#
+#  puts "RUBY VERSION: #{RUBY_VERSION}"
+#  puts "LOAD PATH:\n" + $LOAD_PATH.join("\n")
+#
+#  if find = ARGV[1..-1].select{|e| e !~ /(^[-]|[=])/ }[0]
+#    unless FileTest.file?(find)
+#      find = File.join(find, '**', 'test_*.rb')
+#    end
+#  else
+#    find = 'test/**/test_*.rb'
+#  end
+#
+#  files = Dir.glob(find)
+#
+#  files.each do |file|
+#    next if File.directory?(file)
+#    begin
+#      puts "Loading: #{file}" if $DEBUG
+#      load(file)
+#    rescue LoadError
+#      puts "Error loading: #{file}"
+#    end
+#  end
+#end
+

data/test/core/array/test_product.rb

@@ -35,12 +35,6 @@ class TC_Array_Product < Test::Unit::TestCase
     assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )
   end
 
-  def test_product_03
-    a = []
-    [1,2,3].product([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
-
   #     def test_op_mod
   #       a = [:A,:B,:C]
   #       assert_equal( a[1], a/1 )

data/test/core/binding/test_local_variables.rb

@@ -10,9 +10,15 @@ class TC_Binding_Local_Variables < Test::Unit::TestCase
     @bind = binding
   end
 
-  def test_local_variables
-    assert_equal( ["a","b","x"], @bind.local_variables )
-  end
+  unless RUBY_VERSION > "1.9"
+      def test_local_variables
+        assert_equal( ["a","b","x"], @bind.local_variables )
+      end
+    else
+      def test_local_variables
+        assert_equal( [:a,:b,:x], @bind.local_variables )
+      end
+    end
 
 end
 

data/test/core/enumerable/test_split.rb

@@ -0,0 +1,19 @@
+require 'test/unit'
+require 'facets/enumerable/split'
+
+class Test_Enumerable_Split < Test::Unit::TestCase
+
+  def test_empty
+    assert_equal( [], [].split('a') )
+  end
+
+  def test_same
+    assert_equal( [], ['a'].split('a') )
+  end
+
+  def test_split
+    assert_equal( [['a'], ['c']], ['a','b','c'].split('b') )
+  end
+
+end
+

data/test/core/module/test_conflict.rb

@@ -11,9 +11,14 @@ class Test_Module_Conflict < Test::Unit::TestCase
     def q; "qy"; end
   end
 
-  def test_conflict?
-    assert_equal( ["q"], X.conflict?(Y) )
+  if RUBY_VERSION < '1.9'
+    def test_conflict?
+      assert_equal( ["q"], X.conflict?(Y) )
+    end
+  else
+    def test_conflict?
+      assert_equal( [:q], X.conflict?(Y) )
+    end
   end
-
 end