facets 2.0.2 → 2.0.3

data/lib/more/facets/namespace.rb

@@ -34,7 +34,7 @@
 
 
 require 'facets/functor'
-#require 'facets/module/name' # was identify, for what?
+require 'facets/module/name' # for Module#basename
 
 
 #

data/lib/more/facets/ostruct.rb

@@ -32,6 +32,42 @@ require 'ostruct'
 
 class OpenStruct
 
+  #
+  # Allows the initialization of an OpenStruct with a block:
+  #
+  #   person = OpenStruct.new do |p|
+  #     p.name    = 'John Smith'
+  #     p.gender  = :M
+  #     p.age     = 71
+  #   end 
+  #
+  # You can still provide a hash for initialization purposes, and even combine
+  # the two approaches if you wish.
+  #
+  #   person = OpenStruct.new(:name => 'John Smith', :age => 31) do |p|
+  #     p.gender = :M 
+  #   end
+  #
+  #   CREDIT Noah Gibbs
+  #   CREDIT Gavin Sinclair
+
+  def initialize(hash=nil) # :yield: self
+    @table = {}
+    if hash
+      for k,v in hash
+        @table[k.to_sym] = v
+        new_ostruct_member(k)
+      end
+    end
+    yield self if block_given?
+  end
+
+  #
+  def each(&blk)
+    @table.each(&blk)
+  end
+
+  #
   def to_h
     @table
   end
@@ -88,8 +124,8 @@ class OpenStruct
   #   o.a  #=> 2
   #
   def ostruct_update(other)
-    hash = other.to_hash  #to_h ?
-    for k,v in hash
+    #other = other.to_hash  #to_h ?
+    for k,v in other
       @table[k.to_sym] = v
     end
     self
@@ -119,9 +155,9 @@ class OpenStruct
   #   o.ostruct_update { :a => 2 }
   #   o.a  #=> 2
   #
-  def __update__( other )
-    hash = other.to_h
-    for k,v in hash
+  def __update__(other)
+    #other = other.to_hash #to_h?
+    for k,v in other
       @table[k.to_sym] = v
     end
     self
@@ -133,9 +169,9 @@ class OpenStruct
   #   o.ostruct_merge { :a => 2 }
   #   o.a  #=> 2
   #
-  def __merge__( other )
+  def __merge__(other)
     o = dup
-    o.__update__( other )
+    o.__update__(other)
     o
   end
 end
@@ -176,14 +212,14 @@ class Hash
   #     o = h.to_ostruct_recurse( { h['a'] => h['a'] } )
   #     o.a['b']  #=> 1
   #
-  def to_ostruct_recurse( exclude={} )
+  def to_ostruct_recurse(exclude={})
     return exclude[self] if exclude.key?( self )
     o = exclude[self] = OpenStruct.new
     h = self.dup
     each_pair do |k,v|
-      h[k] = v.to_ostruct_recurse( exclude ) if v.respond_to?( :to_ostruct_recurse )
+      h[k] = v.to_ostruct_recurse( exclude ) if v.respond_to?(:to_ostruct_recurse)
     end
-    o.__update__( h )
+    o.__update__(h)
   end
 
 end

data/lib/more/facets/overload.rb

@@ -98,54 +98,3 @@ class Module
   end
 
 end
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin test
-
-require 'test/unit'
-
-class TCOverload < Test::Unit::TestCase
-
-  class X
-
-    def x
-      "hello"
-    end
-
-    overload :x, Integer do |i|
-      i
-    end
-
-    overload :x, String, String do |s1, s2|
-      [s1, s2]
-    end
-
-  end
-
-  def setup
-    @x = X.new
-  end
-
-  def test_x
-    assert_equal( "hello", @x.x )
-  end
-
-  def test_i
-    assert_equal( 1, @x.x(1) )
-  end
-
-  def test_s
-    assert_equal( ["a","b"], @x.x("a","b") )
-  end
-
-end
-
-=end
-

data/lib/more/facets/paramix.rb

@@ -146,100 +146,3 @@ class Module
   end
 
 end
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin test
-
-  require 'test/unit'
-  require 'facets/kernel/metaid'
-
-  class TC01 < Test::Unit::TestCase
-
-    module M
-      def f
-        M(:p)
-      end
-      def self.included_with_parameters( base, parms )
-        base.class_eval do
-          define_method :check do
-            parms
-          end
-        end
-      end
-    end
-
-    class C
-      include M, :p => "check"
-    end
-
-    class D
-      include M, :p => "steak"
-    end
-
-    def test_01_001
-      c = C.new
-      assert_equal( "check", c.M(:p) )
-      assert_equal( "check", c.f )
-    end
-
-    def test_01_002
-      d = D.new
-      assert_equal( "steak", d.M(:p) )
-      assert_equal( "steak", d.f )
-    end
-
-    def test_01_003
-      assert_equal( {M=>{:p => "check"}}, C.mixin_parameters )
-      assert_equal( {M=>{:p => "steak"}}, D.mixin_parameters )
-    end
-
-    def test_01_004
-      c = C.new
-      assert_equal( {:p => "check"}, c.check )
-      d = D.new
-      assert_equal( {:p => "steak"}, d.check )
-    end
-
-  end
-
-
-  class TC02 < Test::Unit::TestCase
-
-    module M
-      def f
-        M(:p)
-      end
-    end
-
-    class C
-      extend M, :p => "mosh"
-    end
-
-    class D
-      extend M, :p => "many"
-    end
-
-    def test_02_001
-      assert_equal( "mosh", C.f )
-    end
-
-    def test_02_002
-      assert_equal( "many", D.f )
-    end
-
-    def test_02_003
-      assert_equal( {M=>{:p => "mosh"}}, C.eigenclass.mixin_parameters )
-      assert_equal( {M=>{:p => "many"}}, D.eigenclass.mixin_parameters )
-    end
-
-  end
-
-=end

data/lib/more/facets/pp_s.rb

@@ -0,0 +1,30 @@
+# TODO How useful is this really? Or, can it go in with something else?
+
+require 'pp'
+require 'stringio'
+
+module Kernel
+
+  # Returns a pretty-printed string of the object.  Requires libraries +pp+ and
+  # +stringio+ from the Ruby standard library.
+  #
+  # The following code pretty-prints an object (much like +p+ plain-prints an
+  # object):
+  #
+  #   pp object
+  #
+  # The following code captures the pretty-printing in +str+ instead of
+  # sending it to +STDOUT+.
+  #
+  #   str = object.pp_s 
+  #
+  #   CREDIT Noah Gibbs
+  #   CREDIT Gavin Sinclair
+
+  def pp_s
+    pps = StringIO.new
+    PP.pp(self, pps)
+    pps.string
+  end
+
+end

data/lib/more/facets/progressbar.rb

@@ -25,7 +25,7 @@
 #
 # == Usage
 #
-#   pbar = ConsoleProgressBar.new( "Demo", 100 )
+#   pbar = Console::ProgressBar.new( "Demo", 100 )
 #   100.times { pbar.inc }
 #   pbar.finish
 #
@@ -72,7 +72,7 @@ class Console::ProgressBar
     convert_bytes(@current)
   end
 
-  def format_time (t)
+  def format_time(t)
     t = t.to_i
     sec = t % 60
     min  = (t / 60) % 60
@@ -147,7 +147,7 @@ class Console::ProgressBar
   end
 
   def show
-    arguments = @format_arguments.map {|method| send(method) }
+    arguments = @format_arguments.map{|method| send(method)}
     line = sprintf(@format, *arguments)
 
     width = get_width
@@ -178,22 +178,26 @@ class Console::ProgressBar
 
   public
   def file_transfer_mode
-    @format_arguments = [:title, :percentage, :bar, :stat_for_file_transfer]  
+    @format_arguments = [:title, :percentage, :bar, :stat_for_file_transfer]
   end
 
-  def bar_mark= (mark)
+  def title=(str)
+    @title = str
+  end
+
+  def bar_mark=(mark)
     @bar_mark = String(mark)[0..0]
   end
 
-  def total_overflow= (boolv)
+  def total_overflow=(boolv)
     @total_overflow = boolv ? true : false
   end
 
-  def format= (format)
+  def format=(format)
     @format = format
   end
 
-  def format_arguments= (arguments)
+  def format_arguments=(arguments)
     @format_arguments = arguments
   end
 
@@ -203,12 +207,16 @@ class Console::ProgressBar
     show_progress
   end
 
+  def flush
+    @out.flush
+  end
+
   def halt
     @is_finished = true
     show_progress
   end
 
-  def set (count)
+  def set(count)
     if count < 0
       raise "invalid count less than zero: #{count}"
     elsif count > @total
@@ -223,7 +231,7 @@ class Console::ProgressBar
     @previous = @current
   end
 
-  def inc (step = 1)
+  def inc(step = 1)
     @current += step
     @current = @total if @current > @total
     show_progress

data/lib/more/facets/prototype.rb

@@ -53,7 +53,7 @@ class Prototype
   end
 
   def trait(obj)
-    traist << obj.new
+    traits << obj.new
   end
 
   def method_missing(s, *a, &b)
@@ -87,42 +87,3 @@ module Kernel
   end
 
 end
-
-
-
-=begin test
-
-  require 'test/unit'
-
-  class TestPrototypeKernel < Test::Unit::TestCase
-
-    def test_new
-      q = nil
-      s = "Testing"
-      assert_nothing_raised { q = s.new }
-      assert_equal( s, q )
-      assert_not_equal( s.object_id, q.object_id )
-    end
-  end
-
-  class TestPrototype < Test::Unit::TestCase
-
-    def setup
-      @person = prototype do
-        @name = ''
-        @age = 0
-        @announce = fn { |x| "#{x}, #{name} is #{age}" }
-      end
-
-      @person.name = 'Tom'
-      @person.age = 35
-    end
-
-    def test_simple_case
-      assert_equal( "Peter, Tom is 35", @person.announce['Peter'])
-    end
-
-  end
-
-=end
-

data/lib/more/facets/random.rb

@@ -28,6 +28,7 @@
 #   - Thomas Sawyer
 
 require 'facets/hash/new' # for zipnew
+require 'facets/string/scan' # for shatter
 
 module Kernel
 

data/lib/more/facets/rbsystem.rb

@@ -33,7 +33,10 @@
 #
 #   - Thomas Sawyer
 #   - Minero Aoki
-
+#
+# TODO:
+#
+#   - Consider renaming module to "Ruby" ?
 
 require 'rbconfig'