facets 2.1.0 → 2.1.1

data/lib/core/facets/array/indexable.rb

@@ -28,6 +28,42 @@ class Array
   #  p a           #=> [1,2,3]
   #
   alias_method :last!, :pop
+
+  # Iteration object.
+
+  class It
+    attr_reader :index, :value, :prior, :after
+    def initialize(array)
+      @array = array
+      @index = 0
+      @value = array[0]
+      @prior = []
+      @after = array[1..-1]
+    end
+    def first? ; @index == 0 ; end
+    def last?  ; @index == @array.length ; end
+    private
+    def next_iteration
+      @index += 1
+      @prior << @value
+      @value = @after.shift
+    end
+  end
+
+  # Iterate over each element of array using an iteration object.
+
+  def each_iteration
+    if block_given?
+      it = It.new(self)
+      each do |e|
+        yield(it)
+        it.send(:next_iteration)
+      end
+    else
+      return Enumerable::Enumerator.new(self, :each_iteration)
+    end
+  end
+
 end
 
 

data/lib/core/facets/kernel.rb

@@ -5,6 +5,7 @@ require 'facets/kernel/val.rb'
 require 'facets/kernel/metaid.rb'
 require 'facets/kernel/instance.rb'
 require 'facets/kernel/tap.rb'
+require 'facets/kernel/ergo.rb'
 require 'facets/kernel/object.rb'
 require 'facets/kernel/withattr.rb'
 require 'facets/kernel/deepcopy.rb'
@@ -17,3 +18,4 @@ require 'facets/kernel/ask.rb'
 require 'facets/kernel/respond.rb'
 require 'facets/kernel/silence.rb'
 require 'facets/kernel/report.rb'
+

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

@@ -0,0 +1,40 @@
+require 'facets/functor'
+
+module Kernel
+
+  # Yield self -or- return self.
+  #
+  #   "a".ergo.upcase #=> "A"
+  #   nil.ergo.foobar #=> nil
+  #
+  #   "a".ergo{ |o| o.upcase } #=> "A"
+  #   nil.ergo{ |o| o.foobar } #=> nil
+  #
+  # This is like #tap, but tap yields self -and- returns self.
+  #
+  # CREDIT Daniel DeLorme
+
+  def ergo &b
+    if block_given?
+      b.arity == 1 ? yield(self) : instance_eval(&b)
+    else
+      self
+    end
+  end
+
+end
+
+class NilClass
+
+  # Compliments Kernel#ergo.
+  #
+  #   "a".ergo{ |o| o.upcase } #=> "A"
+  #   nil.ergo{ |o| o.bar } #=> nil
+  #
+  # CREDIT Daniel DeLorme
+
+  def ergo
+    @_ergo ||= Functor.new{ nil }
+    @_ergo unless block_given?
+  end
+end

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

@@ -15,13 +15,11 @@
 #
 module Kernel
 
-  # Yield self and return self.
+  # Yield self -and- return self.
 
-  def tap &b
-    if b.arity == 1
-      yield self
-    else
-      instance_eval(&b)
+  def tap(&b)
+    if block_given?
+      b.arity == 1 ? yield(self) : instance_eval(&b)
     end
     self
   end

data/lib/core/facets/nilclass.rb

@@ -1,2 +1 @@
 require 'facets/nilclass/status.rb'
-require 'facets/nilclass/ergo.rb'

data/lib/core/facets/string/case.rb

@@ -18,37 +18,45 @@
 #
 class String
 
-  # CREDIT Phil Tomson
+  # Title case.
+
+  def titlecase
+    gsub(/\b\w/){$&.upcase}
+  end
 
   # Return true if the string is capitalized, otherwise false.
   #
   #   "THIS".capitalized?  #=> true
   #   "This".capitalized?  #=> true
   #   "this".capitalized?  #=> false
+  #
+  # CREDIT: Phil Tomson
 
   def capitalized?
     self =~ /^[A-Z]/
   end
 
-  # CREDIT Phil Tomson
 
   # Return true if the string is lowercase (downcase), otherwise false.
   #
   #   "THIS".downcase?  #=> false
   #   "This".downcase?  #=> false
   #   "this".downcase?  #=> true
+  #
+  # CREDIT Phil Tomson
 
   def downcase?
     downcase == self
   end
 
-  # CREDIT Phil Tomson
 
   # Is the string upcase/uppercase?
   #
   #   "THIS".upcase?  #=> true
   #   "This".upcase?  #=> false
   #   "this".upcase?  #=> false
+  #
+  # CREDIT Phil Tomson
 
   def upcase?
     self.upcase == self
@@ -61,45 +69,3 @@ class String
   alias_method :uppercase?, :upcase?
 end
 
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-=begin test
-
-  require 'test/unit'
-
-  #class String
-  #  include Compare
-  #end
-
-  class TestStringCase < Test::Unit::TestCase
-
-    def test_capitalized?
-      assert( 'Abc'.capitalized? )
-    end
-
-    def test_downcase?
-      assert( 'abc'.downcase? )
-    end
-
-    def test_lowercase?
-      assert( 'abc'.lowercase? )
-    end
-
-    def test_upcase?
-      assert( 'ABC'.upcase? )
-    end
-
-    def test_uppercase?
-      assert( 'ABC'.uppercase? )
-    end
-
-  end
-
-=end
-

data/lib/methods/facets/array/each_iteration.rb

@@ -0,0 +1 @@
+require 'facets/array/indexable.rb'

data/lib/methods/facets/nilclass/ergo.rb

@@ -0,0 +1 @@
+require 'facets/kernel/ergo.rb'

data/lib/methods/facets/string/titlecase.rb

@@ -0,0 +1 @@
+require 'facets/string/case.rb'

data/lib/more/facets/command.rb

@@ -108,6 +108,7 @@ module Console
       pre = cargs.preoptions
       cmd, argv  = *cargs.subcommand
       args, opts = *argv
+
       if is_a?(UniversalOptions)
         new(pre, opts).call(cmd, args, opts)
       else
@@ -145,6 +146,7 @@ module Console
     #
 
     def initialize(*options)
+      @master_options = {}
       initialize_options(*options)
     end
 
@@ -155,12 +157,13 @@ module Console
       begin
         opt, val = nil, nil
         options.each do |opt, val|
+          opt = opt.gsub('-','_')
           send("#{opt}=", val)
         end
       rescue NoMethodError
         option_missing(opt, val)
       end
-      @master_options = options
+      @master_options.update(options)
     end
 
     public
@@ -212,8 +215,15 @@ module Console
 
   class Command
 
+    def self.option_arity(arity_hash=nil)
+      if arity_hash
+        (@option_arity ||= {}).merge!(arity_hash)
+      end
+      @option_arity
+    end
+
     def self.start(line=nil)
-      cargs = Console::Argument.new(line || ARGV)
+      cargs = Console::Argument.new(line || ARGV, option_arity)
       pre = cargs.preoptions
       args, opts = *cargs.parameters
       new(args, opts).call

data/lib/more/facets/logger.rb

@@ -24,37 +24,175 @@
 # AUTHORS:
 #
 #   - George Moschovitis
+#   - TransLogathon
 
-
-require 'logger'
+require "logger"
+require "time"
+require "facets/ansicode"
 
 # = Logger
 #
 # Extended variation of Ruby's standard Logger library.
+# Mainly for compatibility purposes (with what?)
+#
+#   log = Logger.new
+#
+#   log.setup_format do |severity, timestamp, progname, msg|
+#     Logger::SIMPLE_FORMAT % [severity, msg]
+#   end
+#
+# === Convention
+#
+# When using debug level logger messages always append 'if $DBG'
+# at the end. This hack is needed because Ruby does not support
+# lazy evaluation (lisp macros).
 #
+# TODO What's all this about then?
+
 class Logger
+  # Some available logging formats.
+  SIMPLE_FORMAT = "%5s: %s\n"
+  DETAILED_FORMAT = "%s %5s: %s\n"
+
+  # Why these names ?
+  alias_method :devel, :debug
+  alias_method :fine, :debug
+
+  # Prints a trace message to DEBUGLOG (at debug level).  
+  # Useful for emitting the value of variables, etc.  Use 
+  # like this:
+  #
+  #   x = y = 5
+  #   trace 'x'        # -> 'x = 5'
+  #   trace 'x ** y'   # -> 'x ** y = 3125'
+  #
+  # If you have a more complicated value, like an array of 
+  # hashes, then you'll probably want to use an alternative 
+  # output format.  For instance:
+  #
+  #   trace 'value', :yaml
+  #
+  # Valid output format values (the _style_ parameter) are:
+  #
+  #   :p :inspect
+  #   :pp                     (pretty-print, using 'pp' library)
+  #   :s :to_s
+  #   :y :yaml :to_yaml       (using the 'yaml' library')
+  #
+  # The default is <tt>:p</tt>.
+  #
+  # CREDITS:
+  #
+  # This code comes straight from the dev-utils Gem.
+  # Author: Gavin Sinclair <gsinclair@soyabean.com.au>
+
+  def trace(expr, style=:p)
+    unless expr.respond_to? :to_str
+      warn "trace: Can't evaluate the given value: #{caller.first}"
+    else
+      raise "FACETS: binding/or_caller is no longer possible"
+      require "facets/core/binding/self/of_caller"
+
+      Binding.of_caller do |b|
+        value = b.eval(expr.to_str)
+        formatter = TRACE_STYLES[style] || :inspect
+        case formatter
+        when :pp then require 'pp'
+        when :y, :yaml, :to_yaml then require 'yaml'
+        end
+        value_s = value.send(formatter)
+        message = "#{expr} = #{value_s}"
+        lines = message.split(/\n/)
+        indent = "   "
+        debug(lines.shift)
+        lines.each do |line|
+          debug(indent + line)
+        end
+      end
+    end
+  end
 
-  private
+  TRACE_STYLES = {}  # :nodoc:
+  TRACE_STYLES.update(
+    :pp => :pp_s, :s => :to_s, :p => :inspect,
+    :y => :to_yaml, :yaml => :to_yaml,
+    :inspect => :inspect, :to_yaml => :to_yaml
+  )
 
-  # Dictate the way in which this logger should format the messages
-  # it displays. This method requires a block. The block should return
-  # formatted strings given severity, timestamp, msg, progname.
+  # Dictate the way in which this logger should format the 
+  # messages it displays. This method requires a block. The 
+  # block should return formatted strings given severity, 
+  # timestamp, msg, progname.
   #
-  # Useless example:
+  # === Example
   #
   # logger = Logger.new
-  # logger.format do |severity, timestamp, msg, progname|
+  # logger.setup_format do |severity, timestamp, msg, progname|
   #   "#{progname}@#{timestamp} - #{severity}::#{msg}"
   # end
-  #
-  def format(&format_proc)
-    raise 'block expected' unless format_proc
+
+  def setup_format(&format_proc)
+    raise "Formating block needed" unless format_proc
     @format_proc = format_proc
   end
 
-  # hackish use of *args, give me some love
-  def format_message(*args)
-    @format_proc ? @format_proc.call(*args) : super(*args)
+private
+
+  attr_accessor :format_proc
+
+  alias_method :format_message_without_proc, :format_message # :nodoc:
+
+  def format_message(*args) # :nodoc:
+    @format_proc ? @format_proc.call(*args) : format_message_without_proc(*args)
   end
 
 end
+
+
+module Console
+
+  class  Logger < ::Logger
+
+    attr_accessor :style
+
+    def style
+      @style ||= Style.new
+    end
+
+    def info(str)
+      return if level > Logger::INFO
+      self << style.info(str)
+      super
+      self << Console::ANSICode.clear
+    end
+
+    def warn(str)
+      self << style.warn(str)
+      super
+      self << Console::ANSICode.clear
+    end
+
+    def error(str)
+      return if level > Logger::ERROR
+      self << style.error(str)
+      super
+      self << Console::ANSICode.clear
+    end
+
+    def debug(str)
+      self << style.debug(str)
+      super
+      self << Console::ANSICode.clear
+    end
+
+    # Logger Style
+
+    class Style
+      def info(str)  ; ANSICode.green ; end
+      def warn(str)  ; ANSICode.cyan ; end
+      def error(str) ; ANSICode.bold + ANSICode.red ; end
+      def debug(str) ; '' ; end
+    end
+
+  end
+end

data/lib/more/facets/validation.rb

@@ -0,0 +1,445 @@
+require 'facets/class/cattr'
+require 'facets/module/on_included'
+require 'facets/inheritor'
+require 'facets/settings'
+
+module Glue 
+
+# Implements a meta-language for validating managed
+# objects. Typically used in Validator objects but can be
+# included in managed objects too.
+#
+# Additional og-related validation macros can be found
+# in lib/og/validation.
+#
+# The following validation macros are available:
+#
+#  * validate_value
+#  * validate_confirmation
+#  * validate_format
+#  * validate_length
+#  * validate_inclusion
+#
+# Og/Database specific validation methods are added in the
+# file og/validation.rb
+#
+# === Example
+#
+# class User
+#    attr_accessor :name, String 
+#    attr_accessor :level, Fixnum
+#
+#    validate_length :name, :range => 2..6 
+#    validate_unique :name, :msg => :name_allready_exists 
+#    validate_format :name, :format => /[a-z]*/, :msg => 'invalid format', :on => :create 
+#  end
+#
+#  class CustomUserValidator 
+#    include Validation
+#    validate_length :name, :range => 2..6, :msg_short => :name_too_short, :msg_long => :name_too_long 
+#  end
+#
+#  user = @request.fill(User.new)
+#  user.level = 15
+#
+#  unless user.valid?
+#    user.save
+#  else
+#    p user.errors[:name]
+#  end
+#
+#  unless user.save
+#    p user.errors.on(:name)
+#  end
+#
+#  unless errors = CustomUserValidator.errors(user)
+#    user.save
+#  else
+#    p errors[:name]
+#  end
+#--
+# TODO: all validation methods should imply validate_value.
+#++
+
+module Validation
+
+  # The postfix attached to confirmation attributes.
+    
+  setting :confirmation_postfix, :default => '_confirmation', :doc => 'The postfix attached to confirmation attributes.'
+
+  # Encapsulates a list of validation errors.
+  
+  class Errors
+    attr_accessor :errors 
+
+    setting :no_value, :default => 'No value provided'
+    setting :no_confirmation, :default => 'Invalid confirmation'
+    setting :invalid_format, :default => 'Invalid format'
+    setting :too_short, :default => 'Too short, must be more than %d characters long'
+    setting :too_long, :default => 'Too long, must be less than %d characters long'
+    setting :invalid_length, :default => 'Must be %d characters long'
+    setting :no_inclusion, :default => 'The value is invalid'
+    setting :no_numeric, :default => 'The value must be numeric'
+    setting :not_unique, :default => 'The value is already used'
+    
+    def initialize(errors = {})
+      @errors = errors
+    end
+
+    def add(attr, message)
+      (@errors[attr] ||= []) << message
+    end
+
+    def on(attr)
+      @errors[attr]
+    end
+    alias_method :[], :on
+  
+    # Yields each attribute and associated message.
+    
+    def each
+      @errors.each_key do |attr| 
+        @errors[attr].each { |msg| yield attr, msg }
+      end
+    end
+
+    def size
+      @errors.size
+    end
+    alias_method :count, :size
+
+    def empty?
+      @errors.empty?
+    end
+
+    def clear
+      @errors.clear
+    end
+
+    def to_a
+      @errors.inject([]) { |a, kv| a << kv }
+    end
+    
+    def join(glue)
+      @errors.to_a.join(glue)
+    end
+  end
+
+  # A Key is used to uniquely identify a validation rule.
+  
+  class Key
+    attr_reader :validation
+    attr_reader :field
+
+    def initialize(validation, field)
+      @validation, @field = validation.to_s, field.to_s
+    end
+
+    def hash
+      "#{@validation}-#{@field}".hash
+    end
+
+    def ==(other)
+      self.validation == other.validation and self.field == other.field
+    end
+  end
+    
+  # If the validate method returns true, this
+  # attributes holds the errors found.
+  
+  attr_accessor :errors
+
+  # Call the #validate method for this object.
+  # If validation errors are found, sets the
+  # @errors attribute to the Errors object and 
+  # returns true.
+  
+  def valid?
+    validate
+    @errors.empty?
+  end
+    
+  # Evaluate the class and see if it is valid.
+  # Can accept any parameter for 'on' event,
+  # and defaults to :save
+
+  def validate(on = :save)
+    @errors = Errors.new
+
+    return if self.class.validations.length == 0
+
+    for event, block in self.class.validations
+      block.call(self) if event == on.to_sym
+    end
+  end
+
+  on_included %{
+    base.module_eval do
+      inheritor(:validations, [], :+) unless @validations
+      # THINK: investigate carefuly!
+      def self.included(cbase)
+        super
+        cbase.send :include, Glue::Validation
+      end
+    end
+    base.extend(ClassMethods)
+  }
+
+  # Implements the Validation meta-language.
+  
+  module ClassMethods 
+    # Validates that the attributes have a values, ie they are
+    # neither nil or empty.
+    #
+    # === Example
+    #
+    # validate_value :param, :msg => 'No confirmation'
+    
+    def validate_value(*params)
+      c = parse_config(params, :msg => Glue::Validation::Errors.no_value, :on => :save)
+
+      params.each do |field|
+        define_validation(:value, field, c[:on]) do |obj|
+          value = obj.send(field)
+          obj.errors.add(field, c[:msg]) if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
+      end
+    end
+=begin
+    # Validates the confirmation of +String+ attributes.
+    #
+    # === Example
+    #
+    # validate_confirmation :password, :msg => 'No confirmation'
+    
+    def validate_confirmation(*params)
+      c = parse_config(params,
+        :msg => Glue::Validation::Errors.no_confirmation, 
+        :postfix => Glue::Validation.confirmation_postfix,
+        :on => :save 
+      )
+
+      params.each do |field|
+        confirm_name = field.to_s + c[:postfix]
+        attr_accessor confirm_name.to_sym
+
+        define_validation(:confirmation, field, c[:on]) do |obj|
+          value = obj.send(field)
+          obj.errors.add(field, c[:msg]) if value.nil? or obj.send(confirm_name) != value
+        end
+      end
+    end
+=end
+    # Validates the format of +String+ attributes.
+    # WARNING: regexp options are ignored.
+    #
+    # === Example
+    # 
+    # validate_format :name, :format => /$A*/, :msg => 'My error', :on => :create
+    #--
+    # FIXME: how to get the Regexp options?
+    #++
+
+    def validate_format(*params)
+      c = parse_config(params,
+        :format => nil, 
+        :msg_no_value => Glue::Validation::Errors.no_value,
+        :msg => Glue::Validation::Errors.invalid_format, 
+        :on => :save 
+      )
+
+      unless c[:format].is_a?(Regexp)
+        raise ArgumentError, "A regular expression must be supplied as the :format option for validate_format."
+      end
+
+      params.each do |field|
+        define_validation(:format, field, c[:on]) do |obj|
+          value = obj.send(field)
+          obj.errors.add(field, c[:msg]) if value.to_s !~ c[:format]
+        end
+      end                                                
+    end
+    
+    # Validates the length of +String+ attributes.
+    #
+    # === Example
+    # 
+    # validate_length :name, :max => 30, :msg => 'Too long'
+    # validate_length :name, :min => 2, :msg => 'Too sort'
+    # validate_length :name, :range => 2..30
+    # validate_length :name, :length => 15, :msg => 'Name should be %d chars long'
+    
+    LENGTHS = [:min, :max, :range, :length].freeze
+    
+    def validate_length(*params)
+      c = parse_config(params,
+#       :lengths => {:min => nil, :max => nil, :range => nil, :length => nil},
+        :min => nil, :max => nil, :range => nil, :length => nil,
+        :msg => nil, 
+        :msg_no_value => Glue::Validation::Errors.no_value,
+        :msg_short => Glue::Validation::Errors.too_short,
+        :msg_long => Glue::Validation::Errors.too_long,
+        :msg_invalid => Glue::Validation::Errors.invalid_length,
+        :on => :save 
+      )
+
+      length_params = c.reject {|k,v| !LENGTHS.include?(k) || v.nil? }
+      valid_count = length_params.reject{|k,v| v.nil?}.length
+      
+      if valid_count == 0
+        raise ArgumentError, 'One of :min, :max, :range, or :length must be provided!'
+      elsif valid_count > 1
+        raise ArgumentError, 'You can only use one of :min, :max, :range, or :length options!'
+      end
+
+      operation, required = length_params.keys[0], length_params.values[0]
+     
+      params.each do |field|
+        define_validation(:length, field, c[:on]) do |obj|
+          msg = c[:msg]
+          value = obj.send(field)
+          if value.nil?
+            obj.errors.add(field, c[:msg_no_value])
+          else 
+            case operation
+            when :min
+              msg ||= c[:msg_short]
+              obj.errors.add(field, msg % required) if value.length < required
+            when :max
+              msg ||= c[:msg_long]
+              obj.errors.add(field, msg % required) if value.length > required
+            when :range
+              min, max = required.first, required.last
+              if value.length < min
+                msg ||= c[:msg_short]
+                obj.errors.add(field, msg % min)
+              end
+              if value.length > max
+                msg ||= c[:msg_long]
+                obj.errors.add(field, msg % min)
+              end
+            when :length
+              msg ||= c[:msg_invalid]
+              obj.errors.add(field, msg % required) if value.length != required
+            end
+          end
+        end
+      end
+    end
+    
+    # Validates that the attributes are included in 
+    # an enumeration.
+    #
+    # === Example
+    #
+    # validate_inclusion :sex, :in => %w{ Male Female }, :msg => 'huh??'
+    # validate_inclusion :age, :in => 5..99 
+
+    def validate_inclusion(*params)
+      c = parse_config(params,
+        :in => nil, 
+        :msg => Glue::Validation::Errors.no_inclusion, 
+        :allow_nil => false,
+        :on => :save 
+      )
+
+      unless c[:in].respond_to?('include?')
+        raise(ArgumentError, 'An object that responds to #include? must be supplied as the :in option')
+      end
+
+      params.each do |field|
+        define_validation(:inclusion, field, c[:on]) do |obj|
+          value = obj.send(field)
+          unless (c[:allow_nil] && value.nil?) or c[:in].include?(value)
+            obj.errors.add(field, c[:msg])
+          end
+        end
+      end                                                
+    end
+
+    # Validates that the attributes have numeric values.
+    #
+    # [+:integer+]
+    #    Only accept integers
+    #
+    #  [+:msg]
+    #    Custom message
+    #
+    #  [+:on:]
+    #    When to validate
+    #    
+    # === Example
+    #
+    # validate_numeric :age, :msg => 'Must be an integer'
+
+    def validate_numeric(*params)
+      c = parse_config(params, 
+        :integer => false,
+        :msg => Glue::Validation::Errors.no_numeric, 
+        :on => :save 
+      )
+
+      params.each do |field|
+        define_validation(:numeric, field, c[:on]) do |obj|
+          value = obj.send(field).to_s
+          if c[:integer] 
+            unless value =~ /^[\+\-]*\d+$/
+              obj.errors.add(field, c[:msg])
+            end
+          else
+            begin
+              Float(value)
+            rescue ArgumentError, TypeError
+              obj.errors.add(field, c[:msg])
+            end
+          end
+        end
+      end
+    end
+    alias_method :validate_numericality, :validate_numeric
+
+  protected
+
+    # Parse the configuration for a validation by comparing
+    # the default options with the user-specified options,
+    # and returning the results.
+
+    def parse_config(params, defaults = {})
+      defaults.update(params.pop) if params.last.is_a?(Hash)
+      defaults
+    end
+
+    # Define a validation for this class on the specified event.
+    # Specify the on event for when this validation should be
+    # checked.
+    #
+    # An extra check is performed to avoid multiple validations.
+    #
+    # This example creates a validation for the 'save' event,
+    # and will add an error to the record if the 'name' property
+    # of the validating object is nil.
+    #
+    # === Example
+    #
+    # field = :name
+    #
+    # define_validation(:value, field, :save) do |object|
+    #   object.errors.add(field, "You must set a value for #{field}") if object.send(field).nil?
+    # end
+    
+    def define_validation(val, field, on = :save, &block)
+      vk = Validation::Key.new(val, field)
+      unless validations.find { |v| v[2] == vk }
+        validations! << [on, block, vk]
+      end
+    end
+    
+  end
+
+end
+
+end
+
+class Module # :nodoc: all
+  include Glue::Validation::ClassMethods
+end

data/log/history.txt

@@ -1,5 +1,10 @@
 = Facets Revision History
 
+== 2.1.1 / 2007-11-16
+
+* Fixed bug in command.rb that clobber options.
+* Added kernel/ergo.rb.
+
 == 2.1.0 / 2007-11-10
 
 * Major Changes

data/meta/manifest.txt

@@ -107,6 +107,7 @@ lib/core/facets/kernel/callstack.rb
 lib/core/facets/kernel/constant.rb
 lib/core/facets/kernel/deepcopy.rb
 lib/core/facets/kernel/dir.rb
+lib/core/facets/kernel/ergo.rb
 lib/core/facets/kernel/instance.rb
 lib/core/facets/kernel/metaid.rb
 lib/core/facets/kernel/object.rb
@@ -139,7 +140,6 @@ lib/core/facets/module/require.rb
 lib/core/facets/module/traits.rb
 lib/core/facets/module.rb
 lib/core/facets/nilclass
-lib/core/facets/nilclass/ergo.rb
 lib/core/facets/nilclass/status.rb
 lib/core/facets/nilclass.rb
 lib/core/facets/numeric
@@ -202,6 +202,7 @@ lib/methods/facets/array/contains.rb
 lib/methods/facets/array/delete_unless.rb
 lib/methods/facets/array/delete_values.rb
 lib/methods/facets/array/delete_values_at.rb
+lib/methods/facets/array/each_iteration.rb
 lib/methods/facets/array/first.rb
 lib/methods/facets/array/join_sentence.rb
 lib/methods/facets/array/last.rb
@@ -521,6 +522,7 @@ lib/methods/facets/module/revisal.rb
 lib/methods/facets/module/wrap.rb
 lib/methods/facets/module/wrap_method.rb
 lib/methods/facets/nilclass
+lib/methods/facets/nilclass/ergo.rb
 lib/methods/facets/nilclass/to_bool.rb
 lib/methods/facets/nilclass/to_f.rb
 lib/methods/facets/nilclass/to_h.rb
@@ -601,6 +603,7 @@ lib/methods/facets/string/succ.rb
 lib/methods/facets/string/tab.rb
 lib/methods/facets/string/taballto.rb
 lib/methods/facets/string/tabto.rb
+lib/methods/facets/string/titlecase.rb
 lib/methods/facets/string/to_b.rb
 lib/methods/facets/string/to_const.rb
 lib/methods/facets/string/to_date.rb
@@ -729,11 +732,11 @@ lib/more/facets/syncarray.rb
 lib/more/facets/synchash.rb
 lib/more/facets/timer.rb
 lib/more/facets/times.rb
-lib/more/facets/tracepoint.rb
 lib/more/facets/tuple.rb
 lib/more/facets/typecast.rb
 lib/more/facets/uninheritable.rb
 lib/more/facets/uploadutils.rb
+lib/more/facets/validation.rb
 lib/more/facets/version.rb
 lib/more/facets/yaml.rb
 lib/more/facets/ziputils.rb
@@ -743,7 +746,7 @@ log/history.txt
 log/release.txt
 log/todo.txt
 meta
-meta/facets-2.1.0.roll
+meta/facets-2.1.1.roll
 meta/google_ad.html
 meta/icli.yaml
 meta/manifest.txt
@@ -768,6 +771,8 @@ task/release
 task/special
 task/special/quickopts
 task/stats
+task/svn
+task/svn/tag
 task/syntax
 task/test
 task/testeach

data/task/methods

@@ -16,6 +16,8 @@ require 'facets/module/require'
 
 config  = configuration['methods']
 
+p config
+
 source  = config['source']  # from where
 output  = config['output']  # to where
 ignore  = config['ignore']  # classes/modules to ignore

data/task/svn/tag

@@ -0,0 +1,22 @@
+#!/usr/bin/env ratch
+
+# Tag the current version.
+
+main :svn_tag do
+
+  roll = glob('meta/*.roll')[0]
+  pkgn = File.basename(roll).chomp('.roll')
+  indx = pkgn.rindex('-')
+  name = pkgn[0...indx]
+  vers = pkgn[indx+1..-1]
+
+  developername = ENV['RUBYFORGE_USERNAME']
+
+  from = "svn+ssh://#{developername}@rubyforge.org/var/svn/facets/trunk"
+  twrd = "svn+ssh://#{developername}@rubyforge.org/var/svn/facets/tags/#{vers}"
+  mesg = "TAG #{vers}"
+
+  svn "copy #{from} #{twrd} -m '#{mesg}'"
+
+end
+

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.4.6
 specification_version: 2
 name: facets
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
-date: 2007-11-10 00:00:00 -05:00
-summary: Premium Core Extensions and Standard Additions
+  version: 2.1.1
+date: 2007-11-16 00:00:00 -05:00
+summary: ""
 require_paths: 
 - lib/methods
 - lib/more
@@ -147,6 +147,7 @@ files:
 - lib/core/facets/kernel/constant.rb
 - lib/core/facets/kernel/deepcopy.rb
 - lib/core/facets/kernel/dir.rb
+- lib/core/facets/kernel/ergo.rb
 - lib/core/facets/kernel/instance.rb
 - lib/core/facets/kernel/metaid.rb
 - lib/core/facets/kernel/object.rb
@@ -179,7 +180,6 @@ files:
 - lib/core/facets/module/traits.rb
 - lib/core/facets/module.rb
 - lib/core/facets/nilclass
-- lib/core/facets/nilclass/ergo.rb
 - lib/core/facets/nilclass/status.rb
 - lib/core/facets/nilclass.rb
 - lib/core/facets/numeric
@@ -242,6 +242,7 @@ files:
 - lib/methods/facets/array/delete_unless.rb
 - lib/methods/facets/array/delete_values.rb
 - lib/methods/facets/array/delete_values_at.rb
+- lib/methods/facets/array/each_iteration.rb
 - lib/methods/facets/array/first.rb
 - lib/methods/facets/array/join_sentence.rb
 - lib/methods/facets/array/last.rb
@@ -561,6 +562,7 @@ files:
 - lib/methods/facets/module/wrap.rb
 - lib/methods/facets/module/wrap_method.rb
 - lib/methods/facets/nilclass
+- lib/methods/facets/nilclass/ergo.rb
 - lib/methods/facets/nilclass/to_bool.rb
 - lib/methods/facets/nilclass/to_f.rb
 - lib/methods/facets/nilclass/to_h.rb
@@ -641,6 +643,7 @@ files:
 - lib/methods/facets/string/tab.rb
 - lib/methods/facets/string/taballto.rb
 - lib/methods/facets/string/tabto.rb
+- lib/methods/facets/string/titlecase.rb
 - lib/methods/facets/string/to_b.rb
 - lib/methods/facets/string/to_const.rb
 - lib/methods/facets/string/to_date.rb
@@ -769,11 +772,11 @@ files:
 - lib/more/facets/synchash.rb
 - lib/more/facets/timer.rb
 - lib/more/facets/times.rb
-- lib/more/facets/tracepoint.rb
 - lib/more/facets/tuple.rb
 - lib/more/facets/typecast.rb
 - lib/more/facets/uninheritable.rb
 - lib/more/facets/uploadutils.rb
+- lib/more/facets/validation.rb
 - lib/more/facets/version.rb
 - lib/more/facets/yaml.rb
 - lib/more/facets/ziputils.rb
@@ -783,7 +786,7 @@ files:
 - log/release.txt
 - log/todo.txt
 - meta
-- meta/facets-2.1.0.roll
+- meta/facets-2.1.1.roll
 - meta/google_ad.html
 - meta/icli.yaml
 - meta/manifest.txt
@@ -808,6 +811,8 @@ files:
 - task/special
 - task/special/quickopts
 - task/stats
+- task/svn
+- task/svn/tag
 - task/syntax
 - task/test
 - task/testeach

data/lib/core/facets/nilclass/ergo.rb

@@ -1,13 +0,0 @@
-require 'facets/functor'
-
-class NilClass
-
-  # CREDIT Daniel DeLorme
-
-  #
-  def ergo
-    @blackhole ||= Functor.new{ nil }
-    @blackhole unless block_given?
-  end
-end 
-

data/lib/more/facets/tracepoint.rb

@@ -1,194 +0,0 @@
-# TITLE:
-#
-#  TracePoint
-#
-# SUMMARY:
-#
-#   A TracePoint is a Binding with the addition event information.
-#   And it's a better way to use set_trace_func.
-#
-# COPYRIGHT:
-#
-#   Copyright (c) 2005 Thomas Sawyer
-#
-# LICENSE:
-#
-#   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.
-#
-# AUTHORS:
-#
-#   - Thomas Sawyer
-
-
-require 'facets/binding'
-
-
-# = CodePoint
-#
-# This is the same as a Binding. Not really needed, but I like consistency :)
-
-CodePoint = Binding
-
-# = TracePoint
-#
-# A TracePoint is a Binding with the addition of event information.
-# Among other things, it functions very well as the join-point for
-# Event-based AOP.
-#
-# == Usage
-#
-#   TracePoint.trace { |tp|
-#     puts "#{tp.self.class}\t#{tp.called}\t#{tp.event}\t#{tp.return?}\t#{tp.back == tp.bind}"
-#   }
-#
-#   1 + 1
-#
-# produces
-#
-#   Class   trace   return     true    false
-#   Object          line       false   false
-#   Fixnum  +       c-call     false   false
-#   Fixnum  +       c-return   false   false
-#
-# == Notes
-#
-# You can't subclass Binding, so we delegate (which is better anyway).
-
-class TracePoint  #< Codepoint
-
-  # -- class ---------------------
-  class << self
-
-    @@active = false
-
-    def active ; @@active ; end
-
-    def active=(x)
-      @@active = x ? true : false
-      unless @@active
-        set_trace_func nil
-      end
-    end
-
-    # Trace execution using a TracePoint.
-    def trace # :yield:
-      if active
-        bb_stack = []
-        set_trace_func proc{ |e, f, l, m, b, k|
-          #(p e, f, l, m, b, k, @@bb_stack; puts "---") if $DEBUG
-          if ['call','c-call','class'].include?(e)
-            bb_stack << b
-          elsif ['return','c-return','end'].include?(e)
-            bb = bb_stack.pop
-          end
-          b = bb if ! b    # this sucks!
-          tp = TracePoint.new(e,m,b,bb)
-          yield(tp)
-        }
-      end
-    end
-
-  end #class
-
-  # -- instance -------------------
-
-  attr_accessor :event, :binding, :back_binding
-
-  # Until Ruby has a built-in way to get the name of the calling method
-  # that information must be passed into the TracePoint.
-  def initialize( event, method, bind, back_binding=bind )
-    @event = event
-    @method = method
-    @binding = bind
-    @back_binding = back_binding
-  end
-
-  # shorthand for binding
-  def bind ; @binding ; end
-
-  # shorthand for back_binding
-  def back ; @back_binding ; end
-
-  # Delegates "self" to the binding which
-  # in turn delegates the binding object.
-  def self ; @binding.self ; end
-
-  # Returns the name of the event's method.
-  # This could delegate to the binding if Ruby had
-  # an internal way to retrieve the current method name.
-  def callee ; @method ; end
-  #def method ; @method ; end            # TODO Conflict with Kernel#method?
-  alias_method( :called, :callee )       # TODO deprecate
-  alias_method( :method_name, :called )  # TODO deprecate
-
-  # delegate to binding
-  #def method_missing(meth, *args, &blk)
-  #  @binding.send(meth, *args, &blk)
-  #end
-
-  ### methods for working with events
-
-  EVENT_MAP = {
-    :all     => ['call', 'c-call', 'return', 'c-return', 'line', 'class', 'end', 'raise'],
-    :before  => ['call', 'c-call'],
-    :after   => ['return', 'c-return'],
-    :call    => ['call'],
-    :return  => ['return'],
-    :ccall   => ['c-call'],
-    :creturn => ['c-return'],
-    :line    => ['line'],
-    :class   => ['class'],
-    :end     => ['end'],
-    :raise   => ['raise']
-  }
-  def event_map(e) ; EVENT_MAP[e] ; end
-
-  # Is the trace point defined or undefined?
-  def event? ; !! @event ; end
-  def eventless? ; ! @event ; end
-
-  # For use in case conditions
-  def ===(e)
-    EVENT_MAP[e].include?(@event)
-  end
-
-  # Creates an <event>? method for each of the above event mappings.
-  EVENT_MAP.each_pair { |m,v|
-    define_method( "#{m}?" ){ v.include?(@event) }
-  }
-
-end
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-# TODO
-
-=begin #test
-
-  # Note: TracePoint will probably prove tricky to test, since
-  # manipulating set_trace_func tends to wreak havoc on errors,
-  # the call stack, and so on.
-
-  TracePoint.active = true
-
-  TracePoint.trace { |tp|
-    puts "#{tp.self.class}\t#{tp.called}\t#{tp.event}\t#{tp.return?}\t#{tp.back == tp.bind}"
-  }
-
-  1 + 1
-
-=end