facets 1.4.5 → 1.7.0

data/lib/facets/more/dictionary.rb

@@ -74,6 +74,9 @@ class Dictionary < Hash
 
   class << self
 
+    #--
+    # TODO is this needed? Doesn't the super class do this?
+    #++
     def []( *args )
       hsh = new
       if Hash === args[0]
@@ -94,7 +97,7 @@ class Dictionary < Hash
 
     # Alternate to #new which creates a dictionary sorted by key.
     #
-    #   d = Dictionary.key_new
+    #   d = Dictionary.alpha
     #   d["z"] = 1
     #   d["y"] = 2
     #   d["x"] = 3
@@ -103,27 +106,9 @@ class Dictionary < Hash
     # This is equivalent to:
     #
     #   Dictionary.new.order_by { |key,value| key }
-    #
-    # An alias #alpha is also provided.
-    def key_new( *args, &block )
-      new(*args, &block).order_by{ |k,v| k }
-    end
-    alias_method :alpha, :key_new
 
-    # Alternate constructor which sorts by value.
-    #
-    #   d = Dictionary.value_new
-    #   d["z"] = 1
-    #   d["y"] = 2
-    #   d["x"] = 3
-    #   d  #=> {"x"=>3,"y"=>2,"z"=>2}
-    #
-    # This is equivalent to:
-    #
-    #   Dictionary.new.order_by { |key,value| value }
-    #
-    def value_new( *args, &block )
-      new(*args, &block).order_by{ |k,v| v }
+    def alpha( *args, &block )
+      new( *args, &block ).by_key
     end
 
     # Alternate to #new which auto-creates sub-dictionaries as needed.
@@ -131,15 +116,23 @@ class Dictionary < Hash
     #   d = Dictionary.auto
     #   d["a"]["b"]["c"] = "abc"  #=> { "a"=>{"b"=>{"c"=>"abc"}}}
     #
-    def auto( *args )
-      leet = lambda { |hsh, key| hsh[key] = new( &leet ) }
-      new(*args, &leet)
-    end
+    #def auto( *args )
+    #  AutoDictionary.new(*args)
+    #  #leet = lambda { |hsh, key| hsh[key] = new( &leet ) }
+    #  #new(*args, &leet)
+    #end
 
-    def key_auto
-      leet = lambda { |hsh, key| hsh[key] = new( &leet ) }
-      new(*args, &leet).order_by{ |k,v| k }
-    end
+    # Alternate to #new which auto-creates sub-dictionaries as needed.
+    #
+    #   d = Dictionary.autokey
+    #   d["a"]["b"]["c"] = "abc"  #=> { "a"=>{"b"=>{"c"=>"abc"}}}
+    #
+    #def auto_alpha(*args)
+    #  auto(*args).order_by{ |k,v| k }
+    #  #AutoDictionary.new(*args).order_by{ |k,v| k }
+    #  #leet = lambda { |hsh, key| hsh[key] = new( &leet ) }
+    #  #new(*args, &leet).order_by{ |k,v| k }
+    #end
 
   end
 
@@ -156,12 +149,54 @@ class Dictionary < Hash
     @order
   end
 
+  # Keep dictionary sorted by sepcifiec sort order.
+
   def order_by( &block )
     @order_by = block
     order
     self
   end
 
+  # Keep dictionary sorted by key.
+  #
+  #   d = Dictionary.new.by_key
+  #   d["z"] = 1
+  #   d["y"] = 2
+  #   d["x"] = 3
+  #   d  #=> {"x"=>3,"y"=>2,"z"=>2}
+  #
+  # This is equivalent to:
+  #
+  #   Dictionary.new.order_by { |key,value| key }
+  #
+  # The initializer Dictionary#alpha also provides this.
+
+  def by_key
+    @order_by = lambda { |k,v| k }
+    order
+    self
+  end
+
+  # Keep dictionary sorted by value.
+  #
+  #   d = Dictionary.by_value
+  #   d["z"] = 1
+  #   d["y"] = 2
+  #   d["x"] = 3
+  #   d  #=> {"x"=>3,"y"=>2,"z"=>2}
+  #
+  # This is equivalent to:
+  #
+  #   Dictionary.new.order_by { |key,value| value }
+
+  def by_value
+    @order_by = lambda { |k,v| v }
+    order
+    self
+  end
+
+  #
+
   def reorder
     if @order_by
       assoc = @order.collect{ |k| [k,self[k]] }.sort_by( &@order_by )
@@ -333,7 +368,6 @@ class Dictionary < Hash
 end
 
 
-
 #  _____         _
 # |_   _|__  ___| |_
 #   | |/ _ \/ __| __|

data/lib/facets/more/downloader.rb

@@ -39,10 +39,13 @@ require 'facets/more/progressbar'
 
 class Downloader
 
-  #class DownloadError < StandardError ; end
-  class Checksum < StandardError ; end
+  #class DownloadError < StandardError #:nodoc:
+  #end
 
-  class Mirror
+  class Checksum < StandardError #:nodoc:
+  end
+
+  class Mirror #:nodoc:
     def initialize( url, region=nil )
       @url = url
       @region = region

data/lib/facets/more/elementor.rb

@@ -19,7 +19,7 @@
 # Copyright:: Copyright (c) 2006 Thomas Sawyer
 # License::   Ruby License
 
-require 'facets/more/basicobject'
+require 'facets/core/kernel/object_class'
 
 # = Elementor
 #
@@ -28,34 +28,40 @@ require 'facets/more/basicobject'
 # new elementor, the same elementor, a new array,
 # or the orignal array transformed.
 
-class Elementor < BasicObject
+class Elementor
+
+  private :to_s #*( instance_methods - [ 'object_class' ] )
 
   def initialize( an_array, mode=nil )
     @array = an_array
     @mode = mode
   end
 
-  def to_a ; @array ; end
-  def to_ary ; @array ; end
+  def to_a ; p @array ; @array ; end
+  def to_ary ; p @array; @array ; end
 
   def each( *args, &block )
     @array.each( *args, &block )
   end
 
+  def ==( other )
+    @array == other.to_ary
+  end
+
   def method_missing( sym, *args, &block )
+    c = @array.collect { |e| e.send( 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 )
+    when :array
+      c
+    when :inplace_array
+      @array.replace( c )
+      #@array.collect! { |e| e.send( sym, *args, &block ) }
+      @array
+    when :inplace
+      @array.replace( c )
+      self
+    else
+      object_class.new( c )
     end
   end
 
@@ -99,6 +105,10 @@ end
       e = [1,2,3].to_elementor
       assert_equal( [4,5,6], e + 3 )
       assert_equal( [0,1,2], e - 1 )
+    end
+
+    def test_to_elementor_str
+      e = [1,2,3].to_elementor
       assert_equal( ['1','2','3'], e.to_s )
     end
 

data/lib/facets/more/eventhook.rb

@@ -0,0 +1,113 @@
+######################################
+# WARNING! Highly expiremental code! #
+######################################
+# = eventhook.rb
+#
+# == 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.
+#
+# == Authors and Contributors
+#
+# * Thomas Sawyer
+#
+
+# =  Exception-based Event Hooks
+#
+# Provides an Event Hooks system designed on top of
+# Ruby's built-in Exception system.
+#
+# == Example
+#
+#   def dothis2
+#     puts 'pre'
+#     hook :quitit
+#     puts 'post'
+#   end
+#
+#   def tryit2
+#     begin
+#       puts "BEFORE"
+#       dothis2
+#       puts "AFTER"
+#     rescue EventHook
+#       event :quitit do
+#         puts "HERE"
+#       end
+#     end
+#   end
+#
+#   tryit2
+#
+
+class EventHook < Exception
+  attr_reader :name, :cc
+  def initialize(name, cc)
+    @name = name
+    @cc = cc
+  end
+  def call
+    @cc.call
+  end
+end
+
+module Kernel
+  def hook(sym)
+    callcc{ |c| raise EventHook.new(sym, c) }
+  end
+  def event(sym)
+    if $!.name == sym
+      yield
+      $!.call
+    end
+  end
+end
+
+
+#
+# Test
+#
+
+=begin
+
+  require 'test/unit'
+
+  class TestEventHook < Test::Unit::TestCase
+
+    class T
+      attr_reader :a
+      def dothis
+        @a << '{'
+        hook :here
+        @a << '}'
+      end
+      def tryit
+        @a = ''
+        begin
+          @a << "["
+          dothis
+          @a << "]"
+        rescue EventHook
+          event :here do
+            @a << "HERE"
+          end
+        end
+      end
+    end
+
+    def test_run
+      t = T.new
+      t.tryit
+      assert_equal('[{HERE}]', t.a)
+    end
+
+  end
+
+=end

data/lib/facets/more/filelist.rb

@@ -30,6 +30,12 @@
 # == Authors and Contributors
 #
 # * Jim Weirich
+#
+# == Developer Notes
+#
+#   TODO Should the exclusions really be the default?
+#        Maybe have #exclude_typical instead.
+#
 
 # Author::    Jim Weirich
 # Copyright:: Copyright (c) 2002 Jim Weirich
@@ -399,6 +405,7 @@ class FileList
   DEFAULT_IGNORE_PATTERNS = [
     /(^|[\/\\])CVS([\/\\]|$)/,
     /(^|[\/\\])\.svn([\/\\]|$)/,
+    /(^|[\/\\])_darcs([\/\\]|$)/,
     /\.bak$/,
     /~$/,
     /(^|[\/\\])core$/
@@ -422,6 +429,7 @@ class FileList
     # default patterns will ignore files
     # * containing "CVS" in the file path
     # * containing ".svn" in the file path
+    # * containing "_darcs" in the file path
     # * ending with ".bak"
     # * ending with "~"
     # * named "core"

data/lib/facets/more/functor.rb

@@ -19,8 +19,9 @@
 # Copyright:: Copyright (c) 2006 Thomas Sawyer
 # License::   Ruby License
 
+require 'facets/core/kernel/as'
+require 'facets/core/kernel/object_class'
 require 'facets/core/binding/self'
-require 'facets/more/basicobject'
 
 # = Functor
 #
@@ -40,28 +41,44 @@ require 'facets/more/basicobject'
 #   f * 3  #=> 9
 #
 
-class Functor < BasicObject
+class Functor
 
-  def initialize(*targets, &function)
+  # Privatize a few Kernel methods that are most likely to clash,
+  # but arn't essential here.
+
+  private :class, :clone, :display, :type, :method, :to_a, :to_s
+
+  # Functor is created with a block whose first argument is always
+  # the operator-method the functor will recieve. You can pass thru
+  # additional arguments along with the operator.
+
+  def initialize(*passthru, &function)
     @self     = function.binding.self
-    @targets  = targets
+    @passthru = passthru
     @function = function
   end
 
+  # Any acton against the functor is processesd by the function.
+
   def method_missing(op, *args, &blk)
     if block_given?
-      @function.call(op, *(@targets + args), &blk)
+      @function.call(op, *(@passthru + args), &blk)
     else
-      @function.call(op, *(@targets + args))
+      @function.call(op, *(@passthru + args))
     end
   end
 
-  # TODO use __xxx__ notation?
+  # Returns the binding context in which the Functor was defined.
+
+  def self; @self; end
+
+  # Returns the Proc passed to the initializer.
+
+  def functor_function ; @function ; end
+
+  # Returns the passthru objects passed to the initializer.
 
-  def instance_self     ; @self     ; end
-  def instance_targets  ; @targets  ; end
-  def instance_objects  ; @objects  ; end  # deprecate?
-  def instance_function ; @function ; end
+  def functor_passthru ; @passthru ; end
 
 end
 

data/lib/facets/more/hashbuilder.rb

@@ -19,15 +19,19 @@
 # Copyright:: Copyright (c) 2006 Thomas Sawyer
 # License::   Ruby License
 
-require 'facets/more/basicobject.rb'
-
 # = Hash Builder
 #
 # Build a hash programmatically.
 #
 # Build a hash from missing method calls.
 
-class HashBuilder < BasicObject
+class HashBuilder
+
+  # Privatize a few Kernel methods that are most likely to clash,
+  # but arn't essential here. TODO Maybe more in this context?
+
+  private :class, :clone, :display, :type, :method, :to_a, :to_s
+  #private *instace_methods
 
   def self.build( blockstr=nil, &block )
     self.new.build( blockstr, &block ).to_h