facets 1.2.1 → 1.3.0

data/lib/facets/core/file/self/read_binary.rb

@@ -0,0 +1,8 @@
+
+# Read in a file as binary data.
+
+def File.read_binary(fname)
+  open(fname, 'rb') {|f|
+    return f.read
+  }
+end

data/lib/facets/core/file/self/read_list.rb

@@ -25,18 +25,21 @@ end
 
   require 'test/unit'
 
-  # FIND TEST DIRECTORY
-  paths = File.expand_path(File.dirname(__FILE__)).split('/')
-  paths.size.downto(1) do |i|
-    f = (paths.slice(0..i)+['test']).join('/')
-    $TESTDIR = File.join(f,'FIXTURE') if File.directory?(f)
+  # mock behavior for file access
+
+  class File
+    def self.mock_read( content )
+      @content = content
+    end
+    def self.read( fpath )
+      @content
+    end
   end
-  raise unless $TESTDIR
 
   class TC_READ_LIST < Test::Unit::TestCase
 
     def test_read_list
-      f = File.join( $TESTDIR, 'read_list_file' )
+      f = File.mock_read("A\nB\nC")
       s = File.read_list( f )
       r = ['A','B','C']
       assert_equal( r, s )
@@ -45,3 +48,4 @@ end
   end
 
 =end
+

data/lib/facets/core/file/self/write.rb

@@ -0,0 +1,8 @@
+
+# Write a file.
+
+def File.write( file, str )
+  File.open( file, 'w+' ) { |f|
+    f << str
+  }
+end

data/lib/facets/core/fileutils/wc.rb

@@ -71,17 +71,12 @@ end
 #   | |  __/\__ \ |_
 #   |_|\___||___/\__|
 #
-=begin test
 
-  require 'test/unit'
+# TODO This test needs a Mock File.
 
-  # FIND TEST DIRECTORY
-  paths = File.expand_path(File.dirname(__FILE__)).split('/')
-  paths.size.downto(1) do |i|
-    f = (paths.slice(0..i)+['test']).join('/')
-    $TESTDIR = File.join(f,'FIXTURE') if File.directory?(f)
-  end
-  raise unless $TESTDIR
+=begin #no test yet
+
+  require 'test/unit'
 
   class TC_FileUtils_WC < Test::Unit::TestCase
 

data/lib/facets/core/fileutils/which.rb

@@ -67,19 +67,14 @@ end
 #   | |  __/\__ \ |_
 #   |_|\___||___/\__|
 #
-=begin test
+
+# TODO This test needs a mock File.
+
+=begin #no test yet
 
   require 'test/unit'
   require 'rbconfig'
 
-  # FIND TEST DIRECTORY
-  paths = File.expand_path(File.dirname(__FILE__)).split('/')
-  paths.size.downto(1) do |i|
-    f = (paths.slice(0..i)+['test']).join('/')
-    $TESTDIR = File.join(f,'FIXTURE') if File.directory?(f)
-  end
-  raise unless $TESTDIR
-
   class TC_FileUtils_Which < Test::Unit::TestCase
     include Config
 

data/lib/facets/core/kernel.rb

@@ -1,5 +1,6 @@
 require 'facets/core/kernel/__DIR__'
 require 'facets/core/kernel/__class__'
+require 'facets/core/kernel/__self__'
 require 'facets/core/kernel/adhoc'
 require 'facets/core/kernel/as'
 require 'facets/core/kernel/assign_from'
@@ -23,7 +24,6 @@ require 'facets/core/kernel/generate_method_name'
 require 'facets/core/kernel/get_by_id'
 require 'facets/core/kernel/here'
 require 'facets/core/kernel/in'
-require 'facets/core/kernel/instance'
 require 'facets/core/kernel/instance_assign'
 require 'facets/core/kernel/instvar'
 require 'facets/core/kernel/is'
@@ -32,6 +32,7 @@ require 'facets/core/kernel/me'
 require 'facets/core/kernel/metaclass'
 require 'facets/core/kernel/method'
 require 'facets/core/kernel/method_name'
+require 'facets/core/kernel/methodname'
 require 'facets/core/kernel/methods'
 require 'facets/core/kernel/nack'
 require 'facets/core/kernel/new'

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

@@ -0,0 +1,32 @@
+
+require 'facets/more/functor.rb'
+
+module Kernel #class Object
+
+  # Returns a Functor that allows one to call any
+  # Kernel or Object method bound to self, making it
+  # possible to bypass overrides of Kernel and Object
+  # methods.
+  #
+  #   class A
+  #     def object_id ; "OBTUSE" ; end
+  #   end
+  #
+  #   c = C.new
+  #   c.object_id             #=> "OBTUSE"
+  #   c.__self__.object_id    #=> 6664875832
+  #
+  #--
+  # Might this be better named as 'object' or '__object__'?
+  # Should this method actually be private?
+  #++
+
+  def __self__
+    @__self__ ||= Functor.new do |meth, *args|  # &blk|
+      Object.instance_method(meth).bind(self).call(*args) # ,&blk)
+    end
+  end
+
+  #alias_method :self, :__self__
+
+end

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

@@ -31,7 +31,7 @@ module Kernel
     end
   end
 
-=begin
+=begin :nodoc:
   def as( role, &blk )
     unless role.is_a?(Class)
       role = self.class.const_get( role )

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

@@ -26,8 +26,7 @@ class Object
   #
   def assign_from(obj, *fields)
     force = false
-    case fields.last
-    when true, false, nil
+    case fields.last when true, false, nil
       force = fields.pop
     end
 
@@ -49,7 +48,8 @@ class Object
         instance_variable_set( var, obj.instance_variable_get(var) )
       end
     end
-    return
+
+    return self
   end
 
 end

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

@@ -44,6 +44,8 @@ class Object
     harg.each do |k,v|
       instance_assign( k, v )
     end
+
+    return self
   end
 
 end

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

@@ -1,3 +1,4 @@
+
 module Kernel
 
   private
@@ -5,9 +6,9 @@ module Kernel
   # Retreive the current running method name.
   #
   # There is a lot of debate on what to call this.
-  # #methname returns a symbol, not a string.
+  # #me returns a symbol, not a string.
   #
-  #   def tester; methname; end
+  #   def tester; me; end
   #   tester  #=> :tester
   #
   def me

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

@@ -1,49 +1,2 @@
-
-module Kernel
-
-  private
-
-  # Retreive the current running method.
-  # There is a lot of debate on what to call this.
-  # #method_name differs from #called only by the fact
-  # that it returns a string, rather then a symbol.
-  #
-  #   def tester; method_name; end
-  #   tester  #=> "tester"
-  #
-  def methodname
-    name = /\`([^\']+)\'/.match(caller(1).first)[1]
-    return name
-  end
-
-  # depricate?
-  alias_method :method_name, :methodname
-
-end
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-=begin test
-
-  require 'test/unit'
-
-  class TCKernel < Test::Unit::TestCase
-
-    def test_method_name
-      # For some reason this was returning a string
-      # even when aliased to #called. Why?
-      # Well, I couldn't seem to fix it, so I just
-      # accepted it as fact and made +method_name+ 
-      # purposefully work that way.
-      assert_equal( "test_method_name", method_name )
-    end
-
-  end
-
-=end
+# stub
+require 'facets/core/kernel/methodname.rb'

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

@@ -0,0 +1,49 @@
+
+module Kernel
+
+  private
+
+  # Retreive the current running method.
+  # There is a lot of debate on what to call this.
+  # #method_name differs from #called only by the fact
+  # that it returns a string, rather then a symbol.
+  #
+  #   def tester; method_name; end
+  #   tester  #=> "tester"
+  #
+  def methodname
+    name = /\`([^\']+)\'/.match(caller(1).first)[1]
+    return name
+  end
+
+  # depricate?
+  alias_method :method_name, :methodname
+
+end
+
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+=begin test
+
+  require 'test/unit'
+
+  class TCKernel < Test::Unit::TestCase
+
+    def test_method_name
+      # For some reason this was returning a string
+      # even when aliased to #called. Why?
+      # Well, I couldn't seem to fix it, so I just
+      # accepted it as fact and made +method_name+ 
+      # purposefully work that way.
+      assert_equal( "test_method_name", method_name )
+    end
+
+  end
+
+=end

data/lib/facets/core/module.rb

@@ -2,14 +2,12 @@ require 'facets/core/module/abstract'
 require 'facets/core/module/alias_module_function'
 require 'facets/core/module/ancestor'
 require 'facets/core/module/attr'
+require 'facets/core/module/attr_query'
 require 'facets/core/module/attr_setter'
 require 'facets/core/module/attr_tester'
+require 'facets/core/module/attr_validator'
 require 'facets/core/module/basename'
 require 'facets/core/module/by_name'
-require 'facets/core/module/cattr'
-require 'facets/core/module/cattr_accessor'
-require 'facets/core/module/cattr_reader'
-require 'facets/core/module/cattr_writer'
 require 'facets/core/module/clone_removing'
 require 'facets/core/module/clone_renaming'
 require 'facets/core/module/clone_using'
@@ -17,10 +15,16 @@ require 'facets/core/module/dirname'
 require 'facets/core/module/equate_on'
 require 'facets/core/module/generate_instance_method_name'
 require 'facets/core/module/include_as'
+require 'facets/core/module/inherit'
 require 'facets/core/module/initializer'
 require 'facets/core/module/instance_methods'
 require 'facets/core/module/integrate'
 require 'facets/core/module/is'
+require 'facets/core/module/let'
+require 'facets/core/module/mattr'
+require 'facets/core/module/mattr_accessor'
+require 'facets/core/module/mattr_reader'
+require 'facets/core/module/mattr_writer'
 require 'facets/core/module/memoize'
 require 'facets/core/module/modspace'
 require 'facets/core/module/namespace'
@@ -36,6 +40,7 @@ require 'facets/core/module/rename_method'
 require 'facets/core/module/revisal'
 require 'facets/core/module/shadow_all'
 require 'facets/core/module/shadow_method'
+require 'facets/core/module/singleton_to_module'
 require 'facets/core/module/sort_on'
 require 'facets/core/module/undef'
 require 'facets/core/module/wrap'

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

@@ -0,0 +1,56 @@
+require 'facet/kernel/nack'
+
+class Module
+
+  # Create an tester attribute. This creates two methods for
+  # each given variable name. One is used to test
+  # the attribute and the other is used to set or toggle it.
+  #
+  #   attr_switch :a
+  #
+  # is equivalent to
+  #
+  #   def a?
+  #     @a ? true : @a
+  #   end
+  #
+  #   def a!(switch=nack)
+  #     if switch == nack
+  #       @a = ! @a
+  #     else
+  #       @a = @a ? switch : @a
+  #       self
+  #     end
+  #   end
+  #
+  def attr_tester(*args)
+    make = {}
+    args.each { |a|
+      make["#{a}?".to_sym] = %{ def #{a}?; @#{a} ? true : @#{a}; end }
+      make["#{a}!".to_sym] = %{
+        def #{a}!(switch=nack)
+          if switch==nack
+            @#{a} = !@#{a}
+          else
+            @#{a} = @#{a} ? switch : @#{a}
+            self
+          end
+        end
+      }
+    }
+    module_eval make.values.join("\n")
+
+    return make.keys
+  end
+
+end
+
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+# TODO

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

@@ -0,0 +1,18 @@
+
+class Module
+
+  # Like attr_writer, but the writer method validates the 
+  # setting against the given block.
+
+  def attr_validator(*symbols, &validator)
+    symbols.each do |symbol|
+      define_method "#{symbol}=" do |val|
+        unless validator.call(val)
+          raise ArgumentError, "Invalid value provided for #{symbol}"
+        end
+        instance_variable_set("@#{symbol}", val)
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,70 @@
+
+
+require 'facets/core/module/singleton_to_module'
+
+class Module
+
+  def inherit( mod )
+    smod = mod.singleton_to_module
+    #smethods -= ['included'] if Class === self
+    extend smod
+    include mod
+    nil
+  end
+
+end
+
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+
+=begin test
+
+  require 'test/unit'
+
+  class TCinherit < Test::Unit::TestCase
+
+    module Foo
+      def self.x ; 10 ; end
+      def y ; 20 ; end
+    end
+
+    module Bar
+      inherit Foo
+    end
+
+    class X
+      inherit Bar
+    end
+
+    # test
+
+    def test_001
+      assert_equal( 10, X.x )
+    end
+
+    def test_002
+      x = X.new
+      assert_equal( 20, x.y )
+    end
+
+    # These won't work; this solution in non-dynamic.
+
+    #def test_004
+    #  def Foo.g ; 30 ; end
+    #  assert_equal( 30, Bar.g )
+    #end
+
+    #def test_005
+    #  #def Foo.g ; 30 ; end
+    #  assert_equal( 30, X.g )
+    #end
+
+  end
+
+=end