facets 2.6.0 → 2.7.0

data/lib/more/facets/enumerablepass.rb

@@ -1,217 +1,3 @@
-# = EnumerablePass
-#
-# This is a simple reimplementation of the core Enumerable module
-# to allow the methods to take and pass-on arbitrary arguments to the
-# underlying #each call. This library uses Enumerator and scans
-# Enumerable so it can alwasy stay in sync.
-#
-# NOTE Any Enumerable method with a negative arity cannot do pass arguments
-# due to ambiguity in the argument count. So the methods #inject and #zip
-# do NOT work this way, but simply work as they do in Enumerable.
-# The method #find (and #detect) though has been made to work by removing
-# its rarely used optional parameter and providing instead an optional
-# keyword parameter (:ifnone => ...). Please keep these difference in mind.
-#
-#   class T
-#     include EnumerablePass
-#     def initialize(arr)
-#       @arr = arr
-#     end
-#     def each(n)
-#       arr.each{ |e| yield(e+n) }
-#     end
-#   end
-#
-#   t = T.new([1,2,3])
-#   t.collect(4)
-#   #=> [5,6,7]
-#
-# == Authors
-#
-# * Thomas Sawyer
-#
-# == Copying
-#
-# Copyright (c) 2004 Thomas Sawyer
-#
-# 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.
-
-require 'enumerator'
-
-# = EnumerablePass
-#
-# This is a simple reimplementation of the core Enumerable module
-# to allow the methods to take and pass-on arbitrary arguments to the
-# underlying #each call. This library uses Enumerator and scans
-# Enumerable so it can alwasy stay in sync.
-#
-# NOTE Any Enumerable method with a negative arity cannot do pass arguments
-# due to ambiguity in the argument count. So the methods #inject and #zip
-# do NOT work this way, but simply work as they do in Enumerable.
-# The method #find (and #detect) though has been made to work by removing
-# its rarely used optional parameter and providing instead an optional
-# keyword parameter (:ifnone => ...). Please keep these difference in mind.
-#
-#   class T
-#     include EnumerablePass
-#     def initialize(arr)
-#       @arr = arr
-#     end
-#     def each(n)
-#       arr.each{ |e| yield(e+n) }
-#     end
-#   end
-#
-#   t = T.new([1,2,3])
-#   t.collect(4)
-#   #=> [5,6,7]
-#
-module EnumerablePass
-
-  def self.wrap_enumerable_method( methodname )
-
-    m = methodname
-    meth = Enumerable.instance_method(m)
-    arity = meth.arity
-
-    case arity <=> 0
-    when 0
-      class_eval %{
-        def #{m}( *args, &yld )
-          enum_for(:each, *args).#{m}( &yld )
-        end
-      }
-    when 1
-      class_eval %{
-        def #{m}( *args, &yld )
-          args, each_args = args[0...#{arity}], args[#{arity}..-1]
-          enum_for(:each, *each_args).#{m}( *args, &yld )
-        end
-      }
-    else
-      class_eval %{
-        def #{m}( *args, &yld )
-          enum_for(:each).#{m}( *args, &yld )
-        end
-      }
-    end
-  end
-
-  Enumerable.instance_methods(false).each do |m|
-    wrap_enumerable_method( m )
-  end
-
-  # Make exception for #find (a negative arity method) to accept
-  # keyword argument.
-  #
-  #   ObjectSpace.find(Class, :ifnone=>lambda{1}) { |e| ... }
-  #   ObjectSpace.find(Class, :ifnone=>lambda{1}) { |e| ... }
-  #
-  def find(*args, &yld)  # future use **keys ?
-    if Hash === args.last and args.last.key?(:ifnone)
-      ifnone = args.last.delete(:ifnone)
-      args.pop if args.last.empty?
-      enum_for(:each, *args).find( ifnone, &yld )
-    else
-      enum_for(:each, *args).find( &yld )
-    end
-  end
-  alias_method :detect, :find
-
-end
-
-
-=begin  OLD CODE
-module EnumerableArgs
-
-  def collect(*args)  # :yield:
-    a = []
-    each(*args){ |n| a << yield(n) }
-    a
-  end
-  alias_method( :map, :collect )
-
-  def detect(*args)  # :yield:
-    each(*args){ |n| return n if yield(n) }
-    nil
-  end
-  alias_method( :find, :detect )
-
-  def each_with_index(*args)
-    i=0
-    each(*args){ |*n| n << i; yield(*n); i+=1 }
-    self
-  end
-
-  def to_a(*args)
-    a = []
-    each(*args){ |n| a << n }
-    a
-  end
-  alias_method( :entries, :to_a )
-
-  # An additional method not part of standard Enumerable.
-  # The regular version of this method can be found in Facets,
-  # but it is a bit more advanced then this one.
-  # At some point they need to be put into sync.
-  def each_slice(*args, &yld)
-    a = []; s = []
-    ar = yld.arity.abs
-    each(*args){ |n|
-      s << n
-      if s.length >= ar
-        yld.call(*s)
-        s = []
-      end
-    }
-    a
-  end
-  alias_method( :each_by, :each_slice )
-
-  def select(*args)  # :yield:
-    a = []
-    each(*args){ |n| a << n if yield(n) }
-    a
-  end
-  alias_method( :find_all, :select )
-
-  def grep(pattern, *args)
-    a = []
-    each(*args){ |n| a << (block_given? ? yield(n) : n) if pattern === n }
-    a
-  end
-
-  def include?(anObj, *args)
-    each(*args){ |n| return true if anObj == n }
-    false
-  end
-  alias_method( :member?, :include? )
-
-  def max(*args)
-    to_a(*args).max
-  end
-
-  def min(*args)
-    to_a(*args).min
-  end
-
-  def reject(*args)
-    a = []
-    each(*args){ |n| a << n if ! yield(n) }
-    a
-  end
-
-  def sort(*args)
-    # TODO
-  end
-
-end
-=end
+warn "EnumerablePass is no longer supported. Please 'gem install enumargs' instead."
+EnumerablePass = Enumerable::Arguments
 

data/lib/more/facets/enumerator.rb

@@ -0,0 +1,62 @@
+begin
+  require 'enumerator' #if RUBY_VERSION < 1.9
+  # for Ruby 1.8 -> 1.9 transition
+  Enumerator = Enumerable::Enumerator unless defined? ::Enumerator
+rescue LoadError # Ruby 1.9 already has it built-in.
+end
+
+class Enumerator
+
+  alias :old_initialize :initialize
+
+  # Provides the ruby-1.9 block form of Enumerator, where you can write:
+  #
+  #    obj = Enumerator.new do |yielder|
+  #       .. do stuff
+  #       yielder.yield data      # or: yielder << data
+  #       .. etc
+  #    end
+  #
+  # When obj.each is called, the block is run once. It should call
+  # yielder.yield with each item it wishes to generate.
+  #
+  # Example:
+  #
+  #   fib = Enumerator.new { |y|
+  #     a = b = 1
+  #     loop {   
+  #       y << a
+  #       a, b = b, a + b
+  #     }
+  #   }  
+  #
+  #   assert_equal [1, 1, 2, 3, 5, 8, 13, 21, 34, 55], fib.take(10)
+                                                
+  def initialize(*args, &block)
+    if block_given?
+      @body = block
+      old_initialize(self, :_start)
+    else
+      old_initialize(*args)
+    end
+  end
+
+  def _start(*args,&receiver) #:nodoc:
+    @body.call(Yielder.new(receiver), *args)
+  end
+
+  # Wrapper to allow yielder.yield(output) or yielder << output
+  # in the same way as ruby-1.9
+
+  class Yielder #:nodoc:
+    def initialize(proc)
+      @proc = proc
+    end
+    def yield(*args)
+      @proc[*args]
+    end
+    alias :<< :yield
+  end
+
+end
+

data/lib/more/facets/{equatable.rb → equitable.rb}

@@ -1,4 +1,4 @@
-# = Equatable
+# = Equitable
 #
 # This mixin provides methods of equality based
 # on a single #identity method which must return
@@ -6,9 +6,9 @@
 #
 # It also provides a "shortcut" for creating the
 # #identity method based on given accessors and returns
-# the Equatable module for inclusion.
+# the Equitable module for inclusion.
 #
-#   include Equatable(:a, :b)
+#   include Equitable(:a, :b)
 #
 # is equivalent to including a module containing:
 #
@@ -42,7 +42,7 @@
 # FOR A PARTICULAR PURPOSE.
 
 
-# = Equatable
+# = Equitable
 #
 # This mixin provides methods of equality based
 # on a single #identity method which must return
@@ -50,9 +50,9 @@
 #
 # It also provides a "shortcut" for creating the
 # #identity method based on given accessors and returns
-# the Equatable module for inclusion.
+# the Equitable module for inclusion.
 #
-#   include Equatable(:a, :b)
+#   include Equitable(:a, :b)
 #
 # is equivalent to including a module containing:
 #
@@ -68,7 +68,7 @@
 #     self.a.hash ^ self.b.hash
 #   end
 #
-module Equatable
+module Equitable
 
   def self.identify(base, *accessors)
     base.send(:define_method, :identity){ accessors }
@@ -93,9 +93,9 @@ class Module
 
   # This function provided a "shortcut" for creating the
   # #identity method based on given accessors and returns
-  # the Equatable module for inclusion.
+  # the Equitable module for inclusion.
   #
-  #  include Equatable(:a, :b)
+  #  include Equitable(:a, :b)
   #
   # is equivalent to including a module containing:
   #
@@ -112,8 +112,8 @@ class Module
   #   end
   #
 
-  def Equatable(*accessors)
-    Equatable.identify(self, *accessors)
+  def Equitable(*accessors)
+    Equitable.identify(self, *accessors)
   end
 
 end

data/lib/more/facets/expirable.rb

@@ -1,26 +1,21 @@
-# = Expirable
+# Expirable
 #
-# Generic expirability mixin.
-#
-# == Authors
-#
-# * George Moschovitis
-#
-# == Copying
-#
-#   Copyright (c) 2004 George Moschovitis
+# Copyright (c) 2004 George Moschovitis
 #
-#   Ruby License
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-#   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.  See the
+# GNU Lesser General Public License for more details.
 #
-#   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.
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
-# = Expirable
-#
 # Generic expirability mixin.
 #
 module Expirable
@@ -57,26 +52,3 @@ module Expirable
 
 end
 
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-# TODO
-
-=begin #test
-
-  require 'test/unit'
-
-  class TC_Expirable < Test::Unit::TestCase
-
-    def test_01
-    end
-
-  end
-
-=end

data/lib/more/facets/hook.rb

@@ -1,3 +1,4 @@
+require 'facets/kernel/instance_exec'
 
 # TODO: hooks should be an inheritor
 #
@@ -24,7 +25,7 @@ module Hook
       def #{name}(*args)
         self.class.hooks[:#{name}].each do |blk|
           if Proc === blk
-            blk.call(:#{name}, *args)
+            instance_exec(:#{name}, *args, &blk)
           else
             __send__(blk, :#{name}, *args)
           end
@@ -35,31 +36,3 @@ module Hook
 
 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
-