facets 2.0.2 → 2.0.3

data/lib/core/facets/hash.rb

@@ -12,3 +12,5 @@ require 'facets/hash/weave.rb'
 require 'facets/hash/new.rb'
 require 'facets/hash/inverse.rb'
 require 'facets/hash/traverse.rb'
+require 'facets/hash/select.rb'
+

data/lib/core/facets/hash/select.rb

@@ -0,0 +1,14 @@
+class Hash
+
+  # In-place version of Hash#select.  The opposite of the built-in
+  # Hash#reject!.
+  #
+  #   CREDIT Noah Gibbs
+  #   CREDIT Gavin Sinclair
+
+  def select!
+    reject! { |k,v| not yield(k,v) }
+  end
+
+end
+

data/lib/core/facets/integer/multiples.rb

@@ -1,32 +1,26 @@
-# = FILE
-#
-#   interger/multiple.rb
-#
-# = DESCRIPTION
-#
-#   Multiple related extensions for Integer.
-#
-# = AUTHORS
-#
-#   CREDIT Thomas Sawyer
-
-
 class Integer
 
-  # Is an integer odd?
+  # Returns true if this integer is odd, false otherwise.
   #
-  #   2.odd?  #=> false
-  #   3.odd?  #=> true
+  #   2.odd?            #=> false
+  #   3.odd?            #=> true
   #
+  #   -99.odd?          # -> true
+  #   -98.odd?          # -> false
+  #
+  #   CREDIT Gavin Sinclair
+
   def odd?
     self % 2 == 1
   end
 
-  # Is an integer even?
+  # Returns true if this integer is even, false otherwise.
   #
   #   2.even?  #=> true
   #   3.even?  #=> false
   #
+  #   CREDIT Gavin Sinclair
+
   def even?
     self % 2 == 0
   end
@@ -36,47 +30,10 @@ class Integer
   #   7.multiple?(2)  #=> false
   #   8.multiple?(2)  #=> true
   #
+
   def multiple?(number)
     self % number == 0
   end
 
 end
 
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-=begin test
-
-  require 'test/unit'
-
-  class TCInteger < Test::Unit::TestCase
-
-    def test_odd?
-      assert( ! 0.odd? )
-      assert(   1.odd? )
-      assert( ! 2.odd? )
-      assert(   3.odd? )
-    end
-
-    def test_even?
-      assert(   0.even? )
-      assert( ! 1.even? )
-      assert(   2.even? )
-      assert( ! 3.even? )
-    end
-
-    def test_multiple?
-      assert( ! 1.multiple?(2) )
-      assert(   2.multiple?(2) )
-      assert( ! 5.multiple?(3) )
-      assert(   6.multiple?(3) )
-    end
-
-  end
-
-=end

data/lib/core/facets/kernel/val.rb

@@ -10,6 +10,20 @@ module Kernel
     true
   end
 
+  # The opposite of #nil?.
+  #
+  #   "hello".not_nil?     # -> true
+  #   nil.not_nil?         # -> false
+  #
+  #   CREDIT Gavin Sinclair
+
+  def not_nil?
+    not nil?
+  end
+
+  # TODO Do not need two of these.
+  #alias_method :non_nil?, :not_nil?
+
   # Is self included in other?
   #
   #   5.in?(0..10)       #=> true

data/lib/core/facets/module/alias.rb

@@ -13,6 +13,11 @@
 # AUTHORS:
 #
 #   CREDIT Thomas Saywer
+#
+# LOG:
+#
+#   - 2007.10.31  trans
+#     Made #alias_method_chain compatible with current ActiveSupport version.
 
 class Module
 
@@ -36,9 +41,9 @@ class Module
   #   self.y = 2
   #   x #=> 2
 
-  def alias_accessor( name, target )
-    alias_method( name, target )
-    alias_method( "#{name}=", "#{target}=" )
+  def alias_accessor(name, target)
+    alias_method(name, target)
+    alias_method("#{name}=", "#{target}=")
   end
 
   # Alias a module function so that the alias is also
@@ -83,18 +88,32 @@ class Module
   # is equivalent to
   #
   #   alias_method :foo_without_feature?, :foo?
-  #   alias_method :foo?, :foo_without_feature?
+  #   alias_method :foo?, :foo_with_feature?
   #
   # so you can safely chain foo, foo?, and foo! with the same feature.
-  #--
-  # Credit goes to bitsweat and Rails.
+  #
+  #   CREDIT Bitsweat and Rails Team.
   #++
+
   def alias_method_chain(target, feature)
     # Strip out punctuation on predicates or bang methods since
     # e.g. target?_without_feature is not a valid method name.
-    aliased_target, punctuation = target.to_s.sub(/([?!])$/, ''), $1
-    alias_method "#{aliased_target}_without_#{feature}#{punctuation}", target
-    alias_method target, "#{aliased_target}_with_#{feature}#{punctuation}"
+    aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
+    yield(aliased_target, punctuation) if block_given?
+
+    with_method, without_method = "#{aliased_target}_with_#{feature}#{punctuation}", "#{aliased_target}_without_#{feature}#{punctuation}"
+
+    alias_method without_method, target
+    alias_method target, with_method
+
+    case
+      when public_method_defined?(without_method)
+        public target
+      when protected_method_defined?(without_method)
+        protected target
+      when private_method_defined?(without_method)
+        private target
+    end
   end
 
 end

data/lib/core/facets/module/methods.rb

@@ -13,4 +13,22 @@ class Module
     private_instance_methods(all)
   end
 
+  # Query whether an instance method is defined for the module.
+  #
+  #   CREDIT Noah Gibbs
+  #   CREDIT Gavin Sinclair
+
+  def instance_method_defined?(_method)
+    instance_methods(true).find { |m| m == _method.to_s }
+  end
+
+  # Query whether a normal (singleton) method is defined for the module.
+  #
+  #   CREDIT Noah Gibbs
+  #   CREDIT Gavin Sinclair
+
+  def module_method_defined?(_method)
+    singleton_methods(true).find { |m| m == _method.to_s }
+  end
+
 end

data/lib/core/facets/module/traits.rb

@@ -4,107 +4,102 @@
 #
 # SUMMARY:
 #
-#   Module extensions for modifying a module.
+#   Module extensions for modifying a module a al traits.
 #
 # CREDITS:
 #
 #   - Thomas Sawyer
+#   - Robert Dober
+#
+# NOTES:
+#   - In the old version of traits.rb we cloned modules and
+#     altered their copies. Eg.
+#       def +(other)
+#         mod1 = other.clone
+#         mod2 = clone
+#         mod1.module_eval{ include mod2 }
+#       end
+#     Later it was realized that this thwarted the main
+#     benefit that Ruby's concept of modules has over
+#     traditional traits, inheritance.
+#
 
 #
 class Module
 
   # Combine modules.
 
-  def +( other )
-    mod1 = other.clone
-    mod2 = clone
-    mod1.module_eval{ include mod2 }
-    #methods = other.instance_methods(false)
-    #methods.each{ |name|
-    #  method = other.instance_method(name)
-    #  mod.module_eval {
-    #    define_method( name, &method )
-    #  }
-    #}
-    return mod1
+  def +(other)
+    base = self
+    Module.new do
+      include base
+      include other
+    end
   end
 
   # Subtract modules.
-
-  def -( other )
-    mod = clone
-
+  #--
+  # TODO Should this use all instance_methods, not just public?
+  #++
+  def -(other)
     case other
     when Array
-      subtract = instance_methods & other.collect{|m| m.to_s}
+      subtract = instance_methods(true) & other.collect{|m| m.to_s}
     when Module
-      subtract = instance_methods & other.instance_methods(false)
+      subtract = instance_methods(true) & other.instance_methods(true)  # false?
     when String, Symbol
-      subtract = instance_methods & [ other.to_s ]
+      subtract = instance_methods(true) & [other.to_s]
     end
-
-    mod.module_eval do
-      subtract.each{|x| remove_method x }
+    base = self
+    Module.new do
+      include base
+      subtract.each{ |x| undef_method x }
     end
-
-    mod
   end
 
   # Rename methods.
 
-  def *( rename_map )
-    module_eval do
+  def *(rename_map)
+    base = self
+    Module.new do
+      include base
       rename_map.each do |from, to|
-        alias_method( to, from )
-        remove_method from
+        alias_method to, from
+        undef_method from
       end
     end
-    self
   end
 
-end
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-=begin test
-
-  require 'test/unit'
-
-  class TestModuleTraits < Test::Unit::TestCase
-
-    module A
-      def x; "x"; end
-      def z; "zA"; end
-    end
-
-    module B
-      def y; "y"; end
-      def z; "zB"; end
-    end
+  # Detect conflicts.
+  #--
+  # TODO All instance methods, or just public?
+  #++
+  def conflict?(other)
+    c = []
+    c += (public_instance_methods(true) & other.public_instance_methods(true))
+    c += (private_instance_methods(true) & other.private_instance_methods(true))
+    c += (protected_instance_methods(true) & other.protected_instance_methods(true))
+    c.empty ? false : c
+  end
 
-    Q = A + B
-    R = A - B
+  #def conflict?(other)
+  #  c = instance_methods & other.instance_methods
+  #  c.empty ? false : c
+  #end
 
-    def test_add
-      assert( Q )
-      Q.extend Q
-      assert_equal(  "x", Q.x )
-      assert_equal(  "y", Q.y )
-      assert_equal( "zB", Q.z )
-    end
+  def public_conflict?(other)
+    c = public_instance_methods(true) & other.public_instance_methods(true)
+    c.empty ? false : c
+  end
 
-    def test_minus
-      assert(R)
-      R.extend R
-      assert_equal( "x", R.x )
-      assert_raises( NoMethodError ){ R.z }
-    end
+  def private_conflict?(other)
+    c = private_instance_methods(true) & other.private_instance_methods(true)
+    c.empty ? false : c
+  end
 
+  def protected_conflict?(other)
+    c = protected_instance_methods(true) & other.protected_instance_methods(true)
+    c.empty ? false : c
   end
 
-=end
+end

data/lib/core/facets/proc/compose.rb

@@ -1,16 +1,16 @@
 class Proc
 
-  # CREDIT Dave
-
   # Returns a new proc that is the functional
-  # compostion of two procs, in order.
+  # composition of two procs, in order.
   #
-  #  a = lambda { |x| x + 4 }
-  #  b = lambda { |y| y / 2 }
+  #   a = lambda { |x| x + 4 }
+  #   b = lambda { |y| y / 2 }
   #
-  #  a.compose(b).call(4)  #=> 6
-  #  b.compose(a).call(4)  #=> 4
+  #   a.compose(b).call(4)  #=> 6
+  #   b.compose(a).call(4)  #=> 4
   #
+  # CREDIT Dave
+
   def compose(g)
     raise ArgumentError, "arity count mismatch" unless arity == g.arity
     lambda{ |*a| self[ *g[*a] ] }
@@ -18,12 +18,14 @@ class Proc
 
   # Operator for Proc#compose and Integer#times_collect/of.
   #
-  #  a = lambda { |x| x + 4 }
-  #  b = lambda { |y| y / 2 }
+  #   a = lambda { |x| x + 4 }
+  #   b = lambda { |y| y / 2 }
   #
-  #  (a * b).call(4)  #=> 6
-  #  (b * a).call(4)  #=> 4
+  #   (a * b).call(4)  #=> 6
+  #   (b * a).call(4)  #=> 4
   #
+  # CREDIT Dave
+
   def *(x)
     if Integer===x
       # collect times
@@ -34,9 +36,10 @@ class Proc
     end
   end
 
+  # Use a Proc as an observable.
+  #
   # CREDIT Tim Pease
 
-  # Use a Proc as an observable.
   alias_method :update, :call
 
 end