facets 1.2.0 → 1.2.1

data/CHANGELOG

@@ -1,13 +1,14 @@
 = Facets Change Log
 
-== 1.1.0
-* Calibre is it's own project. THAT'S FINAL!
+== 1.2.1
+* kernel/meta has been renamed to kernel/instance
+
+== 1.2.0
 * Added zimba.tm's string/modulize, pathize and methodize.
 * Added some Gem methods, self/active?, self/gemspec, self/gempath.
 
 == 1.0.3
 * A last ditch attempt to keep facets and calibre as one project.
-* Last Ditch is the key term here -- it has failed.
 
 == 1.0.2
 * Added _why's Array modulo.

data/ProjectInfo

@@ -2,8 +2,8 @@
 
 TITLE    : Facets
 NAME     : facets
-VERSION  : '1.2.0'
-DATE     : '2006-03-10'
+VERSION  : '1.2.1'
+DATE     : '2006-03-29'
 STATUS   : Beta/Stable
 
 AUTHOR   : Thomas Sawyer
@@ -36,6 +36,9 @@ RUBYFORGE:
   PROJECT: 'facets'
   USERNAME: transami
 
+TESTEXT:
+  files: 'lib/facets/**/*.rb'
+
 RDOC:
   - dir: web/doc/api/core
     template: jamis

data/conf/facets/noauto

@@ -8,26 +8,26 @@
 array/op_fetch.rb
 array/op_store.rb
 binding/self/of_caller.rb
-date/*
-fileutils/*
 hash/op_fetch.rb
 hash/op_store.rb
 object/new.rb
-ostruct/*
-logger/*
+numeric/succ.rb
+numeric/pred.rb
 string/succ.rb
 string/unpack.rb
-
-# The following will probably be certified as full-able soon.
-
-# deprecated?
-#module/attr.rb
+module/attr.rb   # b/c it always makes a writer
 #module/attr_reader.rb
 #module/attr_writer.rb
 #module/attr_accessor.rb
 
-numeric/succ.rb
-numeric/pred.rb
+# These classes are not automatically loaded by Ruby 
+# (i.e. they are part of the standard lib, not core)
+
+date/*
+fileutils/*
+ostruct/*
+logger/*
+gem/*
 
 # Files not included with the full feature set b/c they are potentially
 # unsafe b/c they change Ruby's default behavior in a nonconvential

data/lib/facet/aspects.rb

@@ -0,0 +1 @@
+require 'facets/more/aspects.rb'

data/lib/facet/float/round_off.rb

@@ -0,0 +1 @@
+require 'facets/core/float/round_off.rb'

data/lib/facet/kernel/instance.rb

@@ -0,0 +1 @@
+require 'facets/core/kernel/instance.rb'

data/lib/facet/kernel/pp_exception.rb

@@ -0,0 +1 @@
+require 'facets/core/kernel/pp_exception.rb'

data/lib/facet/module/cattr.rb

@@ -0,0 +1 @@
+require 'facets/core/module/cattr.rb'

data/lib/facet/module/on_included.rb

@@ -0,0 +1 @@
+require 'facets/core/module/on_included.rb'

data/lib/facet/nilclass/blank.rb

@@ -0,0 +1 @@
+require 'facets/core/nilclass/blank.rb'

data/lib/facet/numeric/approx.rb

@@ -0,0 +1 @@
+require 'facets/core/numeric/approx.rb'

data/lib/facet/ostruct/instance.rb

@@ -0,0 +1 @@
+require 'facets/core/ostruct/instance.rb'

data/lib/facets.rb

@@ -60,7 +60,6 @@ $: << File.join( File.dirname(__FILE__), 'facets/more' )
 # Elementary
 require 'facets/core/comparable/cmp'
 require 'facets/core/string/cmp'
-require 'facets/core/nilclass/to_f'
 require 'facets/core/nilclass/to_h'
 require 'facets/core/binding/eval'
 require 'facets/core/binding/self'

data/lib/facets/core/enumerable/every.rb

@@ -1,9 +1,5 @@
 
-begin
-  require 'calibre/functor'
-rescue LoadError
-  require 'facets/support/functor'
-end
+require 'facets/more/functor'
 
 module Enumerable
 

data/lib/facets/core/float.rb

@@ -1,3 +1,4 @@
 require 'facets/core/float/approx'
 require 'facets/core/float/round_at'
+require 'facets/core/float/round_off'
 require 'facets/core/float/round_to'

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

@@ -1,42 +1,2 @@
-require 'facet/float/round_to'
-
-class Float
-  # 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.round_to(n) == x.to_f.round_to(n)
-  end
-end
-
-class Numeric
-  # To properly support Float#approx?,
-  # Numeric must also be augmented.
-  def approx?(*args)
-    self.to_f.approx?(*args)
-  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) )
-    end
-
-  end
-
-=end
+# stub
+require 'facets/core/numeric/approx.rb'

data/lib/facets/core/float/round_at.rb

@@ -1,6 +1,7 @@
 
+require 'facets/core/float/round_off'
+
 class Float
-  alias_method :round_off, :round
 
   # Rounds to the given decimal position.
   #

data/lib/facets/core/float/round_off.rb

@@ -0,0 +1,8 @@
+
+class Float
+
+  # Float#round_off is simple an alias for Float#round.
+
+  alias_method :round_off, :round
+
+end

data/lib/facets/core/float/round_to.rb

@@ -1,6 +1,7 @@
 
+require 'facets/core/float/round_off'
+
 class Float
-  alias_method :round_off, :round
 
   # Rounds to the nearest _n_th degree.
   #

data/lib/facets/core/gem.rb

@@ -1,3 +0,0 @@
-require 'facets/core/gem/self/active'
-require 'facets/core/gem/self/gempath'
-require 'facets/core/gem/self/gemspec'

data/lib/facets/core/hash/inverse.rb

@@ -43,7 +43,9 @@ end
     def test_each_with_key
       h1 = { :a=>1, :b=>2, :c=>2 }
       h2 = h1.inverse
-      assert_equal( {1=>:a, 2=>[:b,:c]}, h2 )
+      assert_equal( :a, h2[1] )
+      assert( h2[2].include?(:b) )
+      assert( h2[2].include?(:c) )
     end
 
   end

data/lib/facets/core/inflect.rb

@@ -47,6 +47,9 @@ require 'facet/string/humanize'
 
 require 'facet/string/basename'
 require 'facet/string/demodulize'
+require 'facet/string/modulize'
+require 'facet/string/methodize'
+require 'facet/string/pathize'
 
 require 'facet/string/upcase'
 require 'facet/string/downcase'

data/lib/facets/core/kernel.rb

@@ -1,6 +1,5 @@
 require 'facets/core/kernel/__DIR__'
 require 'facets/core/kernel/__class__'
-require 'facets/core/kernel/__meta__'
 require 'facets/core/kernel/adhoc'
 require 'facets/core/kernel/as'
 require 'facets/core/kernel/assign_from'
@@ -24,12 +23,12 @@ 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'
 require 'facets/core/kernel/maybe'
 require 'facets/core/kernel/me'
-require 'facets/core/kernel/meta'
 require 'facets/core/kernel/metaclass'
 require 'facets/core/kernel/method'
 require 'facets/core/kernel/method_name'
@@ -41,6 +40,7 @@ require 'facets/core/kernel/object_hexid'
 require 'facets/core/kernel/op_esc'
 require 'facets/core/kernel/own'
 require 'facets/core/kernel/p'
+require 'facets/core/kernel/pp_exception'
 require 'facets/core/kernel/require_all'
 require 'facets/core/kernel/require_esc'
 require 'facets/core/kernel/require_facet'

data/lib/facets/core/kernel/{__meta__.rb → instance.rb}

@@ -1,8 +1,5 @@
-begin
-  require 'calibre/functor'
-rescue LoadError
-  require 'facet/functor'
-end
+
+require 'facet/functor'
 
 class Object
 
@@ -15,14 +12,18 @@ class Object
   #
   #   c = C.new
   #   c.object_id             #=> "OBTUSE"
-  #   c.__meta__.object_id    #=> 6664875832
+  #   c.instance.object_id    #=> 6664875832
   #
-  def __meta__
-    @__meta__ ||= Functor.new do |meth, *args|  # &blk|
+  #--
+  # Might this be better named as 'object'?
+  #++
+
+  def instance
+    @__instance__ ||= Functor.new do |meth, *args|  # &blk|
       Kernel.instance_method(meth).bind(self).call(*args) # ,&blk)
     end
   end
 
-  alias_method :meta, :__meta__  # should this even be available?
+  alias_method :__instance__, :instance
 
 end

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

@@ -0,0 +1,17 @@
+
+module Kernel
+
+  # Pretty prints an exception/error object
+  # usefull for helpfull debug messages
+  #
+  # Input:
+  # The Exception/StandardError object
+  #
+  # Output:
+  # the pretty printed string
+  
+  def pp_exception(ex)
+    return %{#{ex.message}\n  #{ex.backtrace.join("\n  ")}\n  LOGGED FROM: #{caller[0]}}
+  end
+
+end

data/lib/facets/core/module.rb

@@ -6,6 +6,7 @@ require 'facets/core/module/attr_setter'
 require 'facets/core/module/attr_tester'
 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'
@@ -24,6 +25,7 @@ require 'facets/core/module/memoize'
 require 'facets/core/module/modspace'
 require 'facets/core/module/namespace'
 require 'facets/core/module/nesting'
+require 'facets/core/module/on_included'
 require 'facets/core/module/redef'
 require 'facets/core/module/redefine_method'
 require 'facets/core/module/redirect'

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

@@ -1,9 +1,12 @@
 
 class Module
 
-  # These a school of thought that says an attribute
+  # There's a school of thought that says an attribute
   # show always have a reader and a writer.
   #
+  #--
+  # NOAUTO
+  #++
   def attr(*args)
     args.pop unless args.last.is_a?(Symbol) or args.last.is_a?(String)
     attr_accessor *args

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

@@ -10,8 +10,19 @@ class Module
   #   Demo.name       #=> Example::Demo
   #   Demo.basename   #=> Demo
   #
+  # For anonymous modules this will provide a basename
+  # based on Module#inspect.
+  #
+  #   m = Module.new
+  #   m.inspect       #=> "#<Module:0xb7bb0434>"
+  #   m.basename      #=> "Module_0xb7bb0434"
+  #
   def basename
-    self.name.gsub(/^.*::/, '')
+    if self.name
+      self.name.gsub(/^.*::/, '')
+    else
+      self.inspect.gsub('#<','').gsub('>','').sub(':', '_')
+    end
   end
 
 end

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

@@ -0,0 +1,180 @@
+#--
+# Original credit goes to DHH.
+#++
+
+class Module
+
+  # Creates a class-variable attribute that can
+  # be accessed both on an instance and class level.
+
+  def cattr( *syms )
+    writer = false
+    syms.reject! do |s|
+      case s
+      when TrueClass
+        writer = true
+      when FalseClass, NilClass
+        true
+      else
+        false
+      end
+    end
+    if writer
+      cattr_accessor( *syms )
+    else
+      cattr_reader( *syms )
+    end
+  end
+
+  alias_method :mattr, :cattr
+
+  # 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|
+p 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
+
+  alias_method :mattr_reader, :cattr_reader
+
+  # 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
+
+  alias_method :mattr_writer, :cattr_writer
+
+  # 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
+
+  alias_method :mattr_accessor, :cattr_accessor
+
+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
+      assert_nothing_raised {
+        MockObject.class_eval { cattr :a }
+      }
+      t = MockObject.new
+      assert_equal( 10, t.a )
+    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