facets 1.7.46 → 1.8.0

data/lib/facets/core/module/new.rb

@@ -0,0 +1,37 @@
+
+class Module
+
+  # Never you a class agian! ;)
+
+  def new(*args,&blk)
+    mod = self
+    klass = Class.new{include mod}
+    klass.new(*args,&blk)
+  end
+
+end
+
+
+
+=begin test
+
+  require 'test/unit'
+
+  class TestModuleNew < Test::Unit::TestCase
+
+    module M
+      attr_reader :a
+      def initialize( a )
+        @a = a
+      end
+    end
+
+    def test_01
+      m = M.new( 1 )
+      assert_equal( 1, m.a )
+    end
+
+  end
+
+=end
+

data/lib/facets/core/module/prepend.rb

@@ -0,0 +1,63 @@
+
+class Module
+
+  # Prepend an +aspect+ module to a module.
+  #
+  #   module X
+  #     def x; "x"; end
+  #   end
+  #
+  #   module U
+  #     def x; '{' + super + '}'; end
+  #   end
+  #
+  #   X.prepend U
+  #
+  #   X.x  # => "{x}"
+
+  def prepend( aspect )
+    aspect.send(:include, self)
+    extend aspect
+  end
+
+end
+
+class Class
+
+  # Prepend an +aspect+ module to a class.
+  #
+  # class Firetruck
+  #   def put_out_fire(option)
+  #     "Put out #{option}"
+  #   end
+  # end
+  #
+  # module FastFiretruck
+  #   def put_out_fire(option)
+  #     super("very #{option}!")
+  #   end
+  # end
+  #
+  # Firetruck.prepend(FastFiretruck)
+  #
+  # ft = Firetruck.new
+  # ft.put_out_fire('fast') #=> "Put out very fast!"
+
+  def prepend( aspect )
+    _new      = method(:new)
+    _allocate = method(:allocate)
+    (class << self; self; end).class_eval do
+      define_method(:new) do |*args|
+        o = _new.call(*args)
+        o.extend aspect
+        o
+      end
+      define_method(:allocate) do |*args|
+        o = _allocate.call(*args)
+        o.extend aspect
+        o
+      end
+    end
+  end
+
+end

data/lib/facets/core/module/self/op_add.rb

@@ -1,6 +1,8 @@
 
 class Module
 
+  #
+
   def +( other )
     mod1 = other.clone
     mod2 = clone
@@ -20,6 +22,7 @@ class Module
     mod1
   end
 
+  #
 
   def -( other )
     mod = clone
@@ -40,9 +43,22 @@ class Module
     mod
   end
 
+  # Rename methods.
+
+  def *( rename_map )
+    module_eval do
+      rename_map.each do |from, to|
+        alias_method( to, from )
+        remove_method from
+      end
+    end
+    self
+  end
+
 end 
 
 
+
 =begin test
 
   class TraitsTest < Test::Unit::TestCase

data/lib/facets/core/ostruct.rb

@@ -1,7 +1,9 @@
-require 'facets/core/ostruct/__merge__'
-require 'facets/core/ostruct/__table__'
-require 'facets/core/ostruct/__update__'
-require 'facets/core/ostruct/instance'
+# LOG  2006-11-04 trans  Deprecate #instance in favor of #instance_delegate.
+
+#require 'facets/core/ostruct/__table__'
+#require 'facets/core/ostruct/__update__'
+#require 'facets/core/ostruct/__merge__'
+require 'facets/core/ostruct/instance_delegate'
 require 'facets/core/ostruct/op_fetch'
 require 'facets/core/ostruct/op_store'
 require 'facets/core/ostruct/to_h'

data/lib/facets/core/ostruct/__merge__.rb

@@ -1,52 +1,5 @@
-
-require 'ostruct'
-require 'facet/ostruct/__update__'
-
-class OpenStruct
-
-  # Merge hash data creating a new OpenStruct object.
-  #
-  #   o = OpenStruct.new
-  #   o.ostruct_merge { :a => 2 }
-  #   o.a  #=> 2
-  #
-  def __merge__( other )
-    o = dup
-    o.__update__( other )
-    o
-  end
-
-end
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
+# = __merge__.rb
 #
-=begin test
+# Stub for facet/ostruct/__update__.
 
-  require 'test/unit'
-
-  class TC_OpenStruct < Test::Unit::TestCase
-
-    def test_merge_1
-      o = OpenStruct.new( { :a => 1 } )
-      h = { :b => 2 }
-      q = o.__merge__( h )
-      assert_equal( 1, q.a )
-      assert_equal( 2, q.b )
-    end
-
-    def test_merge_2
-      o1 = OpenStruct.new( { :a => 1 } )
-      o2 = OpenStruct.new( { :b => 2 } )
-      q = o1.__merge__( o2 )
-      assert_equal( 1, q.a )
-      assert_equal( 2, q.b )
-    end
-
-  end
-
-=end
+require 'facet/ostruct/__update__'

data/lib/facets/core/ostruct/__table__.rb

@@ -1,17 +1,10 @@
+warn 'use #instance_delegate for future version'
 
 class OpenStruct
+
   # Provides public access to the inner table.
   def __table__
     @table
   end
-end
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-# TODO
 
+end

data/lib/facets/core/ostruct/__update__.rb

@@ -1,3 +1,4 @@
+warn 'use #instance_delegate for future version'
 
 require 'ostruct'
 require 'facets/core/hash/to_h'
@@ -19,6 +20,18 @@ class OpenStruct
     self
   end
 
+  # Merge hash data creating a new OpenStruct object.
+  #
+  #   o = OpenStruct.new
+  #   o.ostruct_merge { :a => 2 }
+  #   o.a  #=> 2
+  #
+  def __merge__( other )
+    o = dup
+    o.__update__( other )
+    o
+  end
+
 end
 
 
@@ -41,6 +54,22 @@ end
       assert_equal( 2, o.b )
     end
 
+    def test_merge_1
+      o = OpenStruct.new( { :a => 1 } )
+      h = { :b => 2 }
+      q = o.__merge__( h )
+      assert_equal( 1, q.a )
+      assert_equal( 2, q.b )
+    end
+
+    def test_merge_2
+      o1 = OpenStruct.new( { :a => 1 } )
+      o2 = OpenStruct.new( { :b => 2 } )
+      q = o1.__merge__( o2 )
+      assert_equal( 1, q.a )
+      assert_equal( 2, q.b )
+    end
+
   end
 
 =end

data/lib/facets/core/ostruct/instance_delegate.rb

@@ -0,0 +1,58 @@
+# = instance_delegate.rb
+#
+# == Acknowledgements
+#
+# * Robert J. Berger <rberger AT ibd.com>
+# Thanks for reporting issues that this method resolved.
+
+require 'ostruct'
+
+class OpenStruct
+
+  # Provides access to an OpenStruct's inner table.
+  #
+  #   o = OpenStruct.new
+  #   o.a = 1
+  #   o.b = 2
+  #   o.instance_delegate.each { |k, v| puts "#{k} #{v}" }
+  #
+  # produces
+  #
+  #   a 1
+  #   b 2
+  #
+
+  def instance_delegate
+    @table
+  end
+
+end
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+=begin test
+
+  class TestOpenStruct < Test::Unit::TestCase
+
+    def setup
+      @o = OpenStruct.new(:q => 1)
+    end
+
+    def test_store
+      @o.instance_delegate.store(:a,1)
+      assert_equal( 1, @o.a )
+    end
+
+    def test_update
+      @o.instance_delegate.update(:a=>1)
+      assert_equal( 1, @o.a )
+    end
+
+  end
+
+=end

data/lib/facets/core/ostruct/op_fetch.rb

@@ -15,6 +15,18 @@ class OpenStruct
     @table[key]
   end
 
+  # Set a value in the OpenStruct by key, like a Hash.
+  #
+  #   o = OpenStruct.new
+  #   o['t'] = 4
+  #   o.t  #=> 4 
+  #
+  def []=(key,val)
+    raise TypeError, "can't modify frozen #{self.class}", caller(1) if self.frozen?
+    key = key.to_sym unless key.is_a?(Symbol)
+    @table[key]=val
+  end
+
 end
 
 
@@ -35,6 +47,12 @@ end
       assert_equal( 1, o[:a] )
     end
 
+    def test_op_store
+      o = OpenStruct.new( { :a => 1 } )
+      assert_nothing_raised { o[:b] = 2 }
+      assert_equal( 2, o.b )
+    end
+
   end
 
 =end

data/lib/facets/core/ostruct/op_store.rb

@@ -1,42 +1,5 @@
-
-require 'ostruct'
-
-class OpenStruct
-
-  # Set a value in the OpenStruct by key, like a Hash.
-  #
-  #   o = OpenStruct.new
-  #   o['t'] = 4
-  #   o.t  #=> 4 
-  #
-  def []=(key,val)
-    raise TypeError, "can't modify frozen #{self.class}", caller(1) if self.frozen?
-    key = key.to_sym unless key.is_a?(Symbol)
-    @table[key]=val
-  end
-
-end
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
+# = op_store.rb
 #
-=begin test
-
-  require 'test/unit'
-
-  class TCOpenStruct < Test::Unit::TestCase
-
-    def test_op_store
-      o = OpenStruct.new( { :a => 1 } )
-      assert_nothing_raised { o[:b] = 2 }
-      assert_equal( 2, o.b )
-    end
-
-  end
+# Stub for facets/core/ostruct/op_store.
 
-=end
+require 'facets/core/ostruct/op_store'

data/lib/facets/core/proc/bind.rb

@@ -0,0 +1,35 @@
+# CHANGE 2006-12-27 trans
+# * Deprecated use of TemporaryMethods module
+
+require 'thread'
+
+class Proc
+
+  # Bind a proc to an object. Returns a Method.
+  #
+  # The block's #to_s method (same as #inspect) is
+  # used for the temporary method label defined in
+  # the Object class.
+
+  def bind(object=nil)
+    object ||= eval("self", self)
+    block = self
+    store = Object
+    begin
+      old, Thread.critical = Thread.critical, true
+      #n=0; n+=1 while store.method_defined?(name="_bind_#{n}")
+      name="_bind_#{block}"
+      store.module_eval do
+        define_method name, &block
+      end
+      return object.method(name)
+    ensure
+      store.module_eval do
+        remove_method name #rescue nil
+        #undef_method name #rescue nil
+      end
+      Thread.critical = old
+    end
+  end
+
+end