mixin 0.7.0 → 0.7.1

data/lib/metable.rb

@@ -45,10 +45,7 @@ require 'mixin'
 # * define_singleton_method <em>(aliased as define_class_method, define_public_class_method, define_public_singleton_method)</em>
 # * define_private_singleton_method <em>(aliased as define_private_class_method)</em>
 # * define_protected_singleton_method <em>(aliased as define_protected_class_method)</em>
-# * enclosed_attr
-# * private_enclosure
-# * protected_enclosure
-# * public_enclosure
+# * lazy_attr
 #
 module Metable
   include Metable::InstanceMethods

data/lib/metable/class_methods.rb

@@ -44,54 +44,40 @@ module Metable
     alias define_private_class_method define_private_singleton_method
 
 
-    # Defines an instance method for _name_ which becomes an enclosure around
-    # a given object. The enclosed object is the result of the given block,
-    # which is evaluated within the context of the invoking instance object
-    # using +instance_eval+ at the time in which the enclosure method is first
-    # invoked on that instance. The _access_ argument can be a symbol or string
-    # representing the access level for the enclosure method (public, private,
-    # or protected). The default access level is +private+.
+    # Defines an instance method for _name_ which evaluates the _thunk_ the
+    # first time it is invoked on a given instance and returns the resulting
+    # object, and then returns that same object on each subsequent call. The
+    # _thunk_ block is evaluated within the context of the invoking instance
+    # object using +instance_eval+.
+    #
+    # The _access_ argument can be a symbol or string representing the access
+    # level for the defined method (public, private, or protected). The default
+    # access level is +private+.
     #
     #   class Foo
     #     include Metable
-    #     enclosed_attr(:time_of_enclosure, :public) { Time.now }
+    #     lazy_attr(:time_of_evaluation, :public) { Time.now }
     #   end
     #
     #   foo = Foo.new
     #   sleep 7
-    #   Time.now               -> Fri Sep 05 16:20:00 -0700 2008
-    #   foo.time_of_enclosure  -> Fri Sep 05 16:20:00 -0700 2008
+    #   Time.now                -> Fri Sep 05 16:20:00 -0700 2008
+    #   foo.time_of_evaluation  -> Fri Sep 05 16:20:00 -0700 2008
     #   sleep 86407
-    #   foo.time_of_enclosure  -> Fri Sep 05 16:20:00 -0700 2008
-    #   foo.instance_variables -> []
+    #   foo.time_of_evaluation  -> Fri Sep 05 16:20:00 -0700 2008
+    #   foo.instance_variables  -> []
     #
-    def enclosed_attr(name, access = :private, &block) # :doc:
+    def lazy_attr(name, access = :private, &thunk) # :doc:
       define_method name do
-        ea = instance_eval &block
-        eigen_eval { define_method(name) { ea } && __send__(access, name) }
-        ea
+        result = instance_eval &thunk
+        eigen_eval do
+          method_defined?(name) && undef_method(name)
+          define_method(name) { result } && __send__(access, name)
+        end
+        result
       end
       __send__ access, name
     end
 
-
-    # Equivalent to calling "<tt>enclosed_attr _name_, :public, <em>&block</em></tt>"
-    # on each _name_ in turn.
-    def public_enclosure(*names, &block) # :doc:
-      names.each { |name| enclosed_attr name, :public, &block }
-    end
-
-    # Equivalent to calling "<tt>enclosed_attr _name_, :private, <em>&block</em></tt>"
-    # on each _name_ in turn.
-    def private_enclosure(*names, &block) # :doc:
-      names.each { |name| enclosed_attr name, :private, &block }
-    end
-
-    # Equivalent to calling "<tt>enclosed_attr _name_, :protected, <em>&block</em></tt>"
-    # on each _name_ in turn.
-    def protected_enclosure(*names, &block) # :doc:
-      names.each { |name| enclosed_attr name, :protected, &block }
-    end
-
   end
 end

data/lib/mixin.rb

@@ -23,8 +23,8 @@ module Mixin
   end
 
 
-  enclosed_attr(:__class_mixin__) { SingletonMixin.new }
-  enclosed_attr(:__module_mixin__) { ModuleMixin.new(self) }
+  lazy_attr(:__class_mixin__) { SingletonMixin.new }
+  lazy_attr(:__module_mixin__) { ModuleMixin.new(self) }
 
 
   # Extends the given modules to the classes that subsequently include the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mixin
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Hersch Stevenson (xian)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 -07:00
+date: 2008-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: []