facets 1.2.0 → 1.2.1

data/lib/facets/more/crypt.rb

@@ -35,12 +35,16 @@ module Crypt
     salt ||= generate_salt(8)
 
     case algo
-      when :md5, :sha1, :rmd160
-        require "digest/#{algo}"
+      when :md5
+        require "digest/md5"
+      when :sha1
+        require "digest/sha1"
+      when :rmd160
+        require "digest/rmd160"
       when :sha256, :sha384, :sha512
         require "digest/sha2"
-      else
-        raise(ArgumentError, "unknown algorithm")
+    else
+      raise(ArgumentError, "unknown algorithm")
     end
     digest_class = Digest.const_get(algo.to_s.upcase)
 

data/lib/facets/more/elementor.rb

@@ -0,0 +1,104 @@
+
+require 'facets/more/basicobject'
+
+# Elementor is an Array which applies calls elementwise.
+# Depending on the mode the call will return a
+# new elementor, the same elementor, a new array,
+# or the orignal array transformed.
+
+class Elementor < BasicObject
+
+  def initialize( an_array, mode=nil )
+    @array = an_array
+    @mode = mode
+  end
+
+  def to_a ; @array ; end
+  def to_ary ; @array ; end
+
+  def each( *args, &block )
+    @array.each( *args, &block )
+  end
+
+  def method_missing( sym, *args, &block )
+    case @mode
+      when :array
+        @array.collect { |e| e.send( sym, *args, &block ) }
+      when :inplace_array
+        @array.collect! { |e| e.send( sym, *args, &block ) }
+        @array
+      when :inplace
+        c = @array.collect { |e| e.send( sym, *args, &block ) }
+        @array.replace( c )
+        self
+      else
+        c = @array.collect { |e| e.send( sym, *args, &block ) }
+        self.__class__.new( c )
+    end
+  end
+
+end
+
+
+class Array
+
+  def to_elementor
+    Elementor.new( self )
+  end
+
+  def to_elementor!
+    Elementor.new( self, :inplace )
+  end
+
+  def every
+    Elementor.new( self, :array )
+  end
+
+  def every!
+    Elementor.new( self, :inplace_array )
+  end
+
+end
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+=begin test
+
+  #require 'test/unit'
+
+  class TCElementor < Test::Unit::TestCase
+
+    def test_to_elementor
+      e = [1,2,3].to_elementor
+      assert_equal( [4,5,6], e + 3 )
+      assert_equal( [0,1,2], e - 1 )
+      assert_equal( ['1','2','3'], e.to_s )
+    end
+
+    def test_to_elementor!
+      e = [1,2,3].to_elementor!
+      e + 3
+      assert_equal( [4,5,6], e )
+    end
+
+    def test_every
+      a = [1,2,3]
+      assert_equal( [4,5,6], a.every + 3 )
+      assert_equal( [0,1,2], a.every - 1 )
+      assert_equal( ['1','2','3'], a.every.to_s )
+    end
+
+    def test_every!
+      a = [1,2,3]
+      a.every! + 3
+      assert_equal( [4,5,6], a )
+    end
+
+  end
+
+=end

data/lib/facets/more/expirable.rb

@@ -60,6 +60,11 @@ module Expirable
     end
   end
 
+  # Update the expiration period. Override in your application.
+  
+  def touch!
+  end  
+
 end
 
 

data/lib/facets/more/nilcomparable.rb

@@ -22,16 +22,63 @@
 
 #:title: NilComparable
 #
-# NilComparable does two things. First it makes nil comparable, such that
+# This microframework simply makes nil comparable, such that
 # all things (except itself) are greater than it.
 #
-# Secondly it provides a module called NilComparable to include into any
-# other class to allow it to compare itself to NilClass as the greater
-# of the two.
-#
 # == Usage
 #
-#   TODO
+# The main effect is this.
+#
+#   nil <=> any_object  #=> -1
+#
+# To enable a class to compare against nil (reverse of the above),
+# simply prepend a nil comparsion into the #<=> method of that class.
+# For example:
+#
+#   class Foo
+#
+#     def initialize( value )
+#       @value = value
+#     end
+#
+#     def <=>( other )
+#       return 1 if other.nil?  # nil comparison
+#       @value <=> other
+#     end
+#
+#   end
+#  
+# To do so for a pre-existing class with a pre-existing #<=> method, you'll 
+# need to obveride the method. As an example let's make Numeric comparable to nil.
+#
+#   class Numeric
+#
+#     alias_method :compare_without_nil, :<=>
+#     def <=>( other )
+#       return 1 if other.nil?
+#       compare_without_nil( other )
+#     end
+#
+#   end
+#
+# Or more conveniently:
+#
+#   require 'facet/module/wrap_method'
+#
+#   Numeric.wrap_method(:<=>) do |prev, other|
+#     return 1 if other.nil?
+#     prev.call( other )
+#   end
+#
+# == Note
+#
+#   NilCompariable _was_ a module that could automatically make
+#   a class comparable to nil. But it only worked if the #<=> was
+#   previous defined, which isn't ideal. Since it is easy enough
+#   to use the above examples, we decided to deprecate the module
+#   and leave this as an explicit task for the end-programmer.
+#   Changing this behavior for built-in classes is not something
+#   to be done lightly anyway.
 #
 # == Author(s)
 #
@@ -39,40 +86,50 @@
 # * Thomas Sawyer
 #
 
-module NilComparable
-
-  def self.included( mod )
-
-    mod.class_eval %{
+class NilClass
 
-      if method_defined?( :<=> )
-        alias_method :compare_without_nil, :<=>
-      else
-        def compare_without_nil( other )
-          raise TypeError, "Cannot compare \#{self.inspect} to \#{other.inspect}"
-        end
-      end
+  include Comparable
 
-      def <=>( other )
-        return 1 if other.nil?
-        compare_without_nil( other )
-      end
+  def <=>(x)
+    x.nil? ? 0 : -1
+  end
 
-    }
+  alias_method( :cmp, :<=> )
 
-  end
+  def succ; nil; end
 
 end
 
 
-class NilClass
-  include Comparable
-  def <=>(x)
-    x.nil? ? 0 : -1
-  end
-  alias_method( :cmp, :<=> )
-end
+# DEPRECATED
+#
+# module NilComparable
+# 
+#   def self.included( mod )
+# 
+#     mod.class_eval %{
+# 
+#       if method_defined?( :<=> )
+#         alias_method :compare_without_nil, :<=>
+#       else
+#         def compare_without_nil( other )
+#           raise TypeError, "Cannot compare \#{self.inspect} to \#{other.inspect}"
+#         end
+#       end
+# 
+#       def <=>( other )
+#         return 1 if other.nil?
+#         compare_without_nil( other )
+#       end
+# 
+#     }
+# 
+#   end
+# 
+# end
 
+# DEPRECATED
+#
 # # Calling this method for a given class allows instances
 # # of a class to be compared to nil using <=>.
 # # Adapted from code by Paul Brannan (Ruby License)

data/lib/facets/more/overload.rb

@@ -27,7 +27,7 @@ class Module
       end
 
       define_method( name ) do |*args|
-        ovr = self.class.method_overloads[:"#{name}"]
+        ovr = self.class.method_overloads["#{name}".to_sym]
         sig = args.collect{ |a| a.class }
         hit = nil
         faces = ovr.keys.sort { |a,b| b.size <=> a.size }

data/lib/facets/more/typecast.rb

@@ -86,6 +86,7 @@
 #
 
 require 'facet/string/methodize'
+require 'facet/string/modulize'
 
 class Object
 
@@ -169,11 +170,11 @@ end
 
 # Extensions
 
-require 'facet/string/modulize'
 class Class
   class << self
 
-    # "string".cast_to Class         #=> String 
+    # "string".cast_to Class         #=> String
+
     def cast_from_string(string, options={})
       string = string.to_s.modulize
       base   = string.sub!(/^::/, '') ? Object : (self.kind_of?(Module) ? self : self.class )
@@ -185,17 +186,22 @@ class Class
     end
 
     # :logger__error.cast_to Class   #=> Logger::Error
+
     alias :cast_from_symbol :cast_from_string
+
   end
 end
 
 class Time
   class << self
+
+    #
     def cast_from_string(string, options={})
       parse(string)
     rescue
       nil
     end
+
   end
 end
 
@@ -207,14 +213,17 @@ class StringIO
     def cast_from_string(string, options={})
       new(string,options[:mode])
     end
+
   end
 end
 
 module URI
   class << self
+
     def cast_from_string(string, options={})
       URI.parse(string)
     end
+
   end
 end
 
@@ -273,7 +282,7 @@ end
     end
 
     def test_no_converter
-      assert_equal( nil,  "sdfjljsldfjslk".cast_to( DateTime  ))
+      assert_equal( nil,  "sdfjljsldfjslk".cast_to( ::Regexp  ))
     end
   end
 

data/test/lib/{facet → facets/core}/array/test_at_rand.rb

@@ -4,13 +4,13 @@
 #   | |  __/\__ \ |_
 #   |_|\___||___/\__|
 #
-# for lib/facet/array/at_rand.rb
+# for lib/facets/core/array/at_rand.rb
 #
-# Extracted Mon Mar 13 13:24:07 UTC 2006
+# Extracted Fri Mar 24 23:42:50 UTC 2006
 # Unit Tools Reap Test Extractor
 #
 
-require 'facet/array/at_rand.rb'
+require 'facets/core/array/at_rand.rb'
 
 
   require 'test/unit'

data/test/lib/{facet → facets/core}/array/test_delete_unless.rb

@@ -4,13 +4,13 @@
 #   | |  __/\__ \ |_
 #   |_|\___||___/\__|
 #
-# for lib/facet/array/delete_unless.rb
+# for lib/facets/core/array/delete_unless.rb
 #
-# Extracted Mon Mar 13 13:24:07 UTC 2006
+# Extracted Fri Mar 24 23:42:50 UTC 2006
 # Unit Tools Reap Test Extractor
 #
 
-require 'facet/array/delete_unless.rb'
+require 'facets/core/array/delete_unless.rb'
 
 
   require 'test/unit'

data/test/lib/{facet → facets/core}/array/test_delete_values.rb

@@ -4,13 +4,13 @@
 #   | |  __/\__ \ |_
 #   |_|\___||___/\__|
 #
-# for lib/facet/array/delete_values.rb
+# for lib/facets/core/array/delete_values.rb
 #
-# Extracted Mon Mar 13 13:24:07 UTC 2006
+# Extracted Fri Mar 24 23:42:50 UTC 2006
 # Unit Tools Reap Test Extractor
 #
 
-require 'facet/array/delete_values.rb'
+require 'facets/core/array/delete_values.rb'
 
 
   require 'test/unit'

data/test/lib/{facet → facets/core}/array/test_delete_values_at.rb

@@ -4,13 +4,13 @@
 #   | |  __/\__ \ |_
 #   |_|\___||___/\__|
 #
-# for lib/facet/array/delete_values_at.rb
+# for lib/facets/core/array/delete_values_at.rb
 #
-# Extracted Mon Mar 13 13:24:07 UTC 2006
+# Extracted Fri Mar 24 23:42:50 UTC 2006
 # Unit Tools Reap Test Extractor
 #
 
-require 'facet/array/delete_values_at.rb'
+require 'facets/core/array/delete_values_at.rb'
 
 
   require 'test/unit'

data/test/lib/{facet → facets/core}/array/test_first.rb

@@ -4,13 +4,13 @@
 #   | |  __/\__ \ |_
 #   |_|\___||___/\__|
 #
-# for lib/facet/array/first.rb
+# for lib/facets/core/array/first.rb
 #
-# Extracted Mon Mar 13 13:24:07 UTC 2006
+# Extracted Fri Mar 24 23:42:50 UTC 2006
 # Unit Tools Reap Test Extractor
 #
 
-require 'facet/array/first.rb'
+require 'facets/core/array/first.rb'
 
 
   require 'test/unit'