facets 1.4.1 → 1.4.2

data/lib/facets/more/inheritor.rb

@@ -19,7 +19,7 @@
 # Copyright:: Copyright (c) 2006 Thomas Sawyer
 # License::   Ruby License
 
-require 'facets/more/classinherit'
+require 'facets/core/module/class_extension'
 
 # = Inheritor
 #
@@ -53,11 +53,14 @@ class Object
 
   # Create an inheritor "class attribute".
   def inheritor( key, obj, op=nil )
+
+    # inhertiance operator
     op = op ? op.to_sym : :add
 
+    # inheritor store a this level
     instance_variable_set("@#{key}", obj)
 
-    base = self
+    #base = self
     deflambda = lambda do
 
       define_method( key ) do
@@ -85,7 +88,8 @@ class Object
     elsif is_a?(Class)
       (class << self; self; end).class_eval &deflambda
     elsif is_a?(Module)
-      class_inherit &deflambda
+      #class_inherit &deflambda
+      extend class_extension( &deflambda )
     else # other Object
       (class << self; self; end).class_eval &deflambda
     end

data/lib/facets/more/tuple.rb

@@ -87,7 +87,12 @@ class ::Tuple
   end
 
   attr_accessor :default
-  attr_accessor :divider
+
+  def divider( set=nil )
+    return @divider unless set
+    @divider = set
+    self
+  end
 
 protected
 
@@ -142,9 +147,17 @@ public
   end
 
   def pop() Tuple.new( to_a.pop ) end
+
   def push( obj ) Tuple.new( to_a.push(obj) ) end
+
+  # Pulls a value off the beginning of a tuple.
+  # This method is otherwsie known as #shift.
   def pull() Tuple.new( to_a.shift ) end
+
+  # Stands for "Put On Top". This method is the opposite of #pull and is 
+  # otherwise known as #unshift.
   def pot( obj ) Tuple.new( to_a.unshift(obj) ) end
+
   alias_method :unshift, :pot
   alias_method :shift, :pull
 
@@ -195,25 +208,44 @@ public
       new( args )
     end
 
+    # Translates a string in the form on a set of numerical and/or
+    # alphanumerical characters separated by non-word characters (eg \W+)
+    # into a Tuple. The values of the tuple will be converted to integers
+    # if they are purely numerical.
+    #
+    #   Tuple.cast_from_string('1.2.3a')  #=> [1,2,"3a"]
     #
+    # It you would like to control the interpretation of each value
+    # as it is added to the tuple you can supply a block.
+    #
+    #   Tuple.cast_from_string('1.2.3a'){ |v| v.upcase }  #=> ["1","2","3A"]
+    #
+    # This method is called by String#to_t.
 
     def cast_from_string( str, &yld )
-      args = str.to_s.split(/\W/)
-      div = /\W/.match( str.to_s )[0]
+      args = str.to_s.split(/\W+/)
+      div = /\W+/.match( str.to_s )[0]
       if block_given?
         args = args.collect{ |a| yld[a] }
+      else
+        args = args.collect { |i| /^[0-9]+$/ =~ i ? i.to_i : i }
       end
-      t = self.new( args )
-      t.divider = div
-      t
+      self.new( args ).divider( div )
     end
 
+    #
+
     def cast_from_array( arr )
       self.new( arr )
     end
 
     # Parses a constraint returning the operation as a lambda.
 
+    def constraint_to_lambda( constraint, &yld )
+      op, val = *parse_constraint( constraint, &yld )
+      lambda { |t| t.send(op, val) }
+    end
+
     def parse_constraint( constraint, &yld )
       constraint = constraint.strip
       re = %r{^(=~|~>|<=|>=|==|=|<|>)?\s*(\d+(:?[-.]\d+)*)$}
@@ -232,11 +264,6 @@ public
       return op, val
     end
 
-    def constraint_to_lambda( constraint, &yld )
-      op, val = *parse_constraint( constraint, &yld )
-      lambda { |t| t.send(op, val) }
-    end
-
   end
 
 end
@@ -246,6 +273,20 @@ end
 
 class ::String
 
+  # Translates a string in the form on a set of numerical and/or
+  # alphanumerical characters separated by non-word characters (eg \W+)
+  # into a Tuple. The values of the tuple will be converted to integers
+  # if they are purely numerical.
+  #
+  #   '1.2.3a'.to_t  #=> [1,2,"3a"]
+  #
+  # It you would like to control the interpretation of each value
+  # as it is added to the tuple you can supply a block.
+  #
+  #   '1.2.3a'.to_t { |v| v.upcase }  #=> ["1","2","3A"]
+  #
+  # This method calls Tuple.cast_from_string.
+
   def to_t( &yld )
     Tuple.cast_from_string( self, &yld )
   end
@@ -308,11 +349,18 @@ end
     def test_05
       t1 = "1.2.3".to_t
       assert( Tuple === t1 )
-      t2 = Tuple['1','2','3']
+      t2 = Tuple[1,2,3]
       assert( t1.object_id == t2.object_id )
     end
 
+    def test_06
+      t1 = "1.2.3a".to_t
+      assert( Tuple === t1 )
+      t2 = Tuple[1,2,'3a']
+      assert_equal( t2, t1 )
+      assert( t2.object_id == t1.object_id )
+    end
+
   end
 
 =end
-

data/lib/facets/more/typecast.rb

@@ -15,6 +15,14 @@
 #
 # * Jonas Pfenniger
 #
+# == Changelog
+#
+# 06.06.2006 - 3v1l d4y
+#
+#  * Removed transformation options.
+#  * Removed StringIO typecast. It is not required by default.
+#  * Added TypeCastException for better error reporting while coding.
+#
 # == Developer Notes
 #
 #   TODO Consider how this might fit in with method signitures, overloading,
@@ -22,6 +30,7 @@
 #
 #   TODO Look to implement to_int, to_mailtext, to_r, to_rfc822text and to_str.
 
+
 # Author::    Jonas Pfenniger
 # Copyright:: Copyright (c) 2004 Jonas Pfenniger
 # License::   Ruby License
@@ -89,81 +98,96 @@ require 'facet/string/modulize'
 #   TypeCastException
 #
 
+class TypeCastException < Exception; end
+
+#
+
 class Object
 
+  # class TypeCastException < Exception; end
+
   # Cast an object to another
   #
   #    1234.cast_to(String)  => "1234"
   #
-  def cast_to(klass, options={})
-    # TODO check for a to_{klass.name} here?
-    klass.cast_from(self, options)
+  def cast_to(klass)
+    klass.cast_from(self)
   end
 
   # Cast on object from another
   #
   #   String.cast_from(1234) => "1234"
   #
-  def cast_from(object, options={})
-    method_to = "cast_to_#{self.name.methodize}".to_sym
-    if object.respond_to?( method_to )
-      retval = object.send(method_to, options)
-      return retval unless retval == nil
+  def cast_from(object)
+    method_to = "to_#{self.name.methodize}".to_sym
+    if object.respond_to? method_to
+      retval = object.send(method_to)
+      return retval
     end
 
-    method_from = "cast_from_#{object.class.name.methodize}".to_sym
-    if respond_to?( method_from )
-      retval = send(method_from, object, options)
-      return retval unless retval == nil
+    method_from = "from_#{object.class.name.methodize}".to_sym
+    if respond_to? method_from
+      retval = send(method_from, object)
+      return retval
     end
+
+    raise TypeCastException, "TypeCasting from #{object.class.name} to #{self.name} not supported"
   end
 end
 
+# Extend the ruby core
+
 class Array
   class << self
-    def cast_from(object, options={})
-      retval = super
-      return retval unless retval == nil
+    def cast_from(object)
+      return super
+    rescue TypeCastException
       return object.to_a if object.respond_to? :to_a
+      raise
     end
   end
 end
 
 class Float
   class << self
-    def cast_from(object, options={})
-      retval = super
-      return retval unless retval == nil
+    def cast_from(object)
+      return super
+    rescue TypeCastException
       return object.to_f if object.respond_to? :to_f
+      raise
     end
   end
 end
 
 class Integer
   class << self
-    def cast_from(object, options={})
-      retval = super
-      return retval unless retval == nil
+    def cast_from(object)
+      return super
+    rescue TypeCastException
       return object.to_i if object.respond_to? :to_i
+      raise
     end
   end
 end
 
 class String
   class << self
-    def cast_from(object, options={})
-      retval = super
-      return retval unless retval == nil
+    def cast_from(object)
+      return super
+    rescue TypeCastException
       return object.to_s if object.respond_to? :to_s
+      raise
     end
   end
 end
 
 class Symbol
   class << self
-    def cast_from(object, options={})
-      super
+    def cast_from(object)
+      return super
+    rescue TypeCastException
       return object.to_sym if object.respond_to? :to_sym
+      raise
     end
   end
 end
@@ -175,7 +199,7 @@ class Class
 
     # "string".cast_to Class         #=> String
 
-    def cast_from_string(string, options={})
+    def from_string(string)
       string = string.to_s.modulize
       base   = string.sub!(/^::/, '') ? Object : (self.kind_of?(Module) ? self : self.class )
       klass  = string.split(/::/).inject(base){ |mod, name| mod.const_get(name) }
@@ -185,47 +209,21 @@ class Class
       nil
     end
 
-    alias_method :cast_from_symbol, :cast_from_string
+    alias_method :from_symbol, :from_string
 
   end
 end
 
 class Time
   class << self
-
-    #
-    def cast_from_string(string, options={})
+    def from_string(string, options={})
       parse(string)
     rescue
       nil
     end
-
   end
 end
 
-class StringIO
-  class << self
-
-    # options :
-    #   :mode => see StringIO.new
-    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
-
-
 
 #  _____         _
 # |_   _|__  ___| |_
@@ -241,12 +239,12 @@ end
     attr_accessor :my_var
     def initialize(my_var); @my_var = my_var; end
 
-    def cast_to_string(options={})
+    def to_string(options={})
       @my_var
     end
 
     class << self
-      def cast_from_string(string, options={})
+      def from_string(string, options={})
         self.new( string )
       end
     end
@@ -280,7 +278,10 @@ end
     end
 
     def test_no_converter
-      assert_equal( nil,  "sdfjljsldfjslk".cast_to( ::Regexp  ))
+      "sfddsf".cast_to( ::Regexp )
+      assert(1+1==3, 'should not get here')
+    rescue TypeCastException => ex
+      assert_equal(TypeCastException, ex.class)
     end
   end
 

data/note/CHANGELOG

@@ -9,6 +9,19 @@
 * Added task.rb, which provides a Rake interface compatible task
   system, but that can be used in any code.
 * Improved Hash#traverse (it now does all traversing before yielding).
+* kernel/me, kernel/methodname and kernel/method_name have all been
+  deprecated in favor of the 1.9 standard kernel/__method__ and
+  kernel/__callee__.
+* Console::Application is deprecated and is no longer an alias for
+  Console::Command.
+* Console::Command also now supports run-on flags (eg. -xvzf).
+* More's classinherit.rb has been removed, and classmethods.rb will be
+  too in  another version or two. You should transition all uses of
+  these to core/module/class_extension.rb.
+* Updated tuple.rb so that when a string is converted to a Tuple (#to_t)
+  the values wll be made integers if they are composed of only numbers.
+  If you need all strings you can use a block since the block bypasses
+  this auto coercement, eg. to_t{ |v| v }.
 
 == 1.3.1
 * Deprecated string/to_arr, and slightly adjusted string#to_a.

data/test/lib/facets/core/array/test_at_rand.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/at_rand.rb
 #
-# Extracted Tue Jun 06 09:30:19 EDT 2006
+# Extracted Tue Jun 20 15:12:26 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_delete_unless.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/delete_unless.rb
 #
-# Extracted Tue Jun 06 09:30:19 EDT 2006
+# Extracted Tue Jun 20 15:12:26 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_delete_values.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/delete_values.rb
 #
-# Extracted Tue Jun 06 09:30:19 EDT 2006
+# Extracted Tue Jun 20 15:12:26 EDT 2006
 # Unit Tools Reap Test Extractor
 #
 

data/test/lib/facets/core/array/test_delete_values_at.rb

@@ -6,7 +6,7 @@
 #
 # for lib/facets/core/array/delete_values_at.rb
 #
-# Extracted Tue Jun 06 09:30:19 EDT 2006
+# Extracted Tue Jun 20 15:12:26 EDT 2006
 # Unit Tools Reap Test Extractor
 #