facets 1.2.0 → 1.2.1

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

@@ -1,141 +1,2 @@
-#--
-# Credit goes to DHH.
-#++
-
-class Module
-
-  # Creates a class-variable attr_reader that can
-  # be accessed both on an instance and class level.
-  #
-  #   class MyClass
-  #     @@a = 10
-  #     cattr_reader :a
-  #   end
-  #
-  #   MyClass.a           #=> 10
-  #   MyClass.new.a       #=> 10
-  #
-  def cattr_reader(*syms)
-    hsyms = ( syms.last.is_a?(Hash) ? syms.pop : {} )
-    hsyms.update( Hash[*(syms.zip([nil]*syms.size).flatten)] )
-    hsyms.each_pair do |sym, val|
-      class_eval <<-EOS
-        if ! defined? @@#{sym}
-          @@#{sym} = val
-        end
-        def self.#{sym}
-          @@#{sym}
-        end
-        def #{sym}
-          self.class.#{sym}
-        end
-      EOS
-    end
-    return hsyms.keys
-  end
-
-  # Creates a class-variable attr_writer that can
-  # be accessed both on an instance and class level.
-  #
-  #   class MyClass
-  #     cattr_writer :a
-  #     def a
-  #       @@a
-  #     end
-  #   end
-  #
-  #   MyClass.a = 10
-  #   MyClass.a            #=> 10
-  #   MyClass.new.a = 29
-  #   MyClass.a            #=> 29
-  #
-  def cattr_writer(*syms)
-    hsyms = ( syms.last.is_a?(Hash) ? syms.pop : {} )
-    hsyms.update( Hash[*(syms.zip([nil]*syms.size).flatten)] )
-    hsyms.each_pair do |sym, val|
-      class_eval <<-EOS
-        if ! defined? @@#{sym}
-          @@#{sym} = val
-        end
-        def self.#{sym}=(obj)
-          @@#{sym} = obj
-        end
-        def #{sym}=(obj)
-          self.class.#{sym}=(obj)
-        end
-      EOS
-    end
-    return hsyms.keys
-  end
-
-  # Creates a class-variable attr_accessor that can
-  # be accessed both on an instance and class level.
-  #
-  #   class MyClass
-  #     cattr_accessor :a
-  #   end
-  #
-  #   MyClass.a = 10
-  #   MyClass.a           #=> 10
-  #   mc = MyClass.new
-  #   mc.a                #=> 10
-  #
-  def cattr_accessor(*syms)
-    m = []
-    m.concat( cattr_reader(*syms) )
-    m.concat( cattr_writer(*syms) )
-    m
-  end
-
-end
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-=begin test
-
-  require 'test/unit'
-
-  class TCModule < Test::Unit::TestCase
-
-    class MockObject
-      def initialize
-        @@a = 10
-      end
-      def b ; @@b ; end
-    end
-
-    def test_cattr_reader
-      assert_nothing_raised {
-        MockObject.class_eval { cattr_reader :a }
-      }
-      t = MockObject.new
-      assert_equal( 10, t.a )
-    end
-
-    def test_cattr_writer
-      assert_nothing_raised {
-        MockObject.class_eval { cattr_writer :b }
-      }
-      t = MockObject.new
-      t.b = 5
-      assert_equal( 5, t.b )
-    end
-
-    def test_cattr_accessor
-      assert_nothing_raised {
-        MockObject.class_eval { cattr_accessor :c }
-      }
-      t = MockObject.new
-      t.c = 50
-      assert_equal( 50, t.c )
-    end
-
-  end
-
-=end
+# stub
+require 'facets/core/module/cattr.rb'

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

@@ -1,2 +1,2 @@
 # stub
-require 'facet/module/cattr_accessor'
+require 'facet/module/cattr.rb'

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

@@ -1,2 +1,2 @@
 # stub
-require 'facet/module/cattr_accessor'
+require 'facet/module/cattr.rb'

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

@@ -0,0 +1,48 @@
+# George Moschovitis <gm@navel.gr>
+
+class Module
+
+  # A useful macro for dynamic modules.
+  #--
+  # FIXME: quick and easy implementation, should
+  # come up with something better. The name 
+  # sucks too.
+  #++
+  def on_included(code)
+    tag = caller[0].split(' ').first.split(/\/|\\/).last.gsub(/:|\.|\(|\)/, '_')
+    old = "__included_#{tag}"
+    module_eval %{
+      class << self
+        alias_method :#{old}, :included
+        def included(base)
+          #{old}(base)
+          #{code}
+        end
+      end
+    }
+  end
+end
+
+=begin Testing
+
+module M
+  on_included %{
+    puts 'hello'
+  }
+end
+
+module Q
+  on_included %{
+    puts 'world'
+  }
+  on_included %{
+    puts 'it works'
+  }
+end
+
+class C 
+  include M
+  include Q
+end
+
+=end

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

@@ -1,5 +1,9 @@
 class Module
-  private
+
+  # Don't think we should bother making this private.
+  # That sort of defeats some of the AOP usefulness of this.
+  #private
+
   # Creates a new method wrapping the previous of
   # the same name. Reference to the old method
   # is passed into the new definition block
@@ -12,13 +16,14 @@ class Module
   #
   # Keep in mind that this can not be used to wrap methods
   # that take a block.
-  #
+
   def wrap_method( sym, &blk )
     raise ArgumentError, "method does not exist" unless method_defined?( sym )
     old = instance_method(sym)
     undef_method(sym)
     define_method(sym) { |*args| blk.call(old.bind(self), *args) }
   end
+
 end
 
 

data/lib/facets/core/nilclass.rb

@@ -1,7 +1,7 @@
+require 'facets/core/nilclass/blank'
 require 'facets/core/nilclass/empty'
 require 'facets/core/nilclass/include'
 require 'facets/core/nilclass/length'
 require 'facets/core/nilclass/op_fetch'
 require 'facets/core/nilclass/size'
-require 'facets/core/nilclass/to_f'
 require 'facets/core/nilclass/to_h'

data/lib/facets/core/nilclass/{to_f.rb → blank.rb}

@@ -1,16 +1,16 @@
 
 class NilClass
 
-  # Returns zero float, similar to #to_i.
+  # Allows <tt>nil</tt> to respond to #blank? method.
+  # Alwasy returns <tt>true</tt>.
   #
-  #  nil.to_f   #=> 0.0
+  #  nil.blank?   #=> true
   #
-  def to_f; 0.0; end
+  def blank? ; true ; end
 
 end
 
 
-
 #  _____         _
 # |_   _|__  ___| |_
 #   | |/ _ \/ __| __|
@@ -23,8 +23,8 @@ end
 
   class TCNilClass < Test::Unit::TestCase
 
-    def test_to_f
-      assert_equal( 0.0, nil.to_f )
+    def test_blank?
+      assert( nil.blank? )
     end
 
   end

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

@@ -0,0 +1,11 @@
+
+class NilClass
+
+  # Any comparison against nil with return -1,
+  # except for nil itself which returns 0.
+
+  def <=>( other )
+    other.nil? 0 : -1
+  end
+
+end

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

@@ -0,0 +1,5 @@
+
+class NilClass
+  def succ; nil; end
+end
+

data/lib/facets/core/numeric.rb

@@ -1,3 +1,4 @@
+require 'facets/core/numeric/approx'
 require 'facets/core/numeric/ceil_multiple'
 require 'facets/core/numeric/distance'
 require 'facets/core/numeric/pred'

data/lib/facets/core/numeric/approx.rb

@@ -0,0 +1,34 @@
+
+class Numeric
+  # Determines if another number is approximately equal
+  # within a given _n_th degree. Defaults to 100ths
+  # if the degree is not specified.
+  def approx?( x, n=0.01 )
+    return(self == x) if n == 0
+    (self - x).abs <= n
+  end
+end
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+=begin test
+
+  require 'test/unit'
+
+  class TCFloat < Test::Unit::TestCase
+
+    def test_approx?
+      f = 10.006
+      assert( f.approx?(10.01) )
+      assert( f.approx?(10, 0.1) )
+      assert( 100.4.approx?(100.6, 1) )
+    end
+
+  end
+
+=end

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

@@ -1,7 +1,7 @@
 
 require 'ostruct'
-require 'facet/hash/to_h'
-require 'facet/ostruct/to_h'
+require 'facets/core/hash/to_h'
+require 'facets/core/ostruct/to_h'
 
 class OpenStruct
 

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

@@ -0,0 +1,37 @@
+
+require 'facet/core/kernel/instance'
+
+class OpenStruct
+
+  # Intercepts some methods to apply to the inner table
+  # rather then be defined as part of the open members.
+  # As with Kernel#instance all other methods are passed
+  # on to the Kernel binding.
+  #
+  #   o = OpenStruct.new
+  #   o.a = 1
+  #   o.b = 2
+  #   o.instance.each { |k, v| puts "#{k} #{v}" }
+  #
+  # produces
+  # 
+  #   a 1
+  #   b 2   
+  #
+  # Methods supported:
+  #   store, fetch, merge, update, each, key?
+  #
+
+  def instance
+    Functor.new { |op, *args|
+      case op
+      when  :[], :[]=, :store, :fetch, :merge, :update,
+            :each, :key?
+        @table.send(op,*args)
+      else
+        super(op,*args)  # send(op,*args)
+      end
+    }
+  end
+
+end

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

@@ -6,7 +6,7 @@ class String
   #
   # See : String#methodize, String#pathize
   #
-  #   "my_module__my_path".modulize  #=> MyModule::MyPath
+  #   "my_module__my_path".modulize  #=> "MyModule::MyPath"
   #
   # TODO :
   #

data/lib/facets/more/consoleapp.rb

@@ -23,6 +23,8 @@
 #
 #++
 
+module Console ; end
+
 #:title: Console Application
 #
 # Console::Application provides a clean and easy way
@@ -65,13 +67,14 @@
 #   JUMP! JUMP! JUMP!
 #
 
-module Console ; end
-
 class Console::Application
 
   def go
+
     i = 0; args = ARGV.dup
+
     while i < ARGV.size
+      # options
       if md = %r{^[-]}.match( ARGV[i] )
         opt = ARGV[i].gsub('-','_')
         if self.respond_to?( opt )
@@ -93,29 +96,37 @@ class Console::Application
       i += 1
     end
 
-    # non-secondary command type
+    # Non-secondary command type of application
+
     if self.respond_to?(:main)
-      main(*args)
-      exit 0
-    end
+      main( *args )
+      #exit 0
+
+    # secondary command type of application
 
-    # secondary command type
-    if args.first
+    elsif not args.empty?
       if self.respond_to?( args.first )
         __send__( *args )
       else
-        #begin
-          method_missing( *args )
-        #rescue NoMethodError
-        #  $stderr << "unknown command #{args.join(' ')}\n"
-        #  exit -1
-        #end
+        if self.private_methods.include?( "no_command_error" )
+          no_command_error( *args )
+        else
+          $stderr << "Non-applicable command #{args.join(' ')}\n"
+          exit -1
+        end
       end
+
     elsif self.respond_to?( :default )
       default(*args)
+
     else
-      $stderr << "nothing to do\n"
-      exit -1
+      if self.private_methods.include?( "no_action_error" )
+        no_action_error( *args )
+      else
+        $stderr << "Nothing to do.\n"
+        exit -1
+      end
+
     end
 
   end #def go