prototype 0.2.0 → 0.3.0

data/README

@@ -64,7 +64,7 @@ SAMPLES
 
   ~ > ruby samples/b.rb
 
-    #<#<Class:0xb7595348>:0xb7595438 @conn_string="localhost:4242", @port=4242, @host="localhost">
+    #<#<Class:0xb7593c54>:0xb759322c @conn_string="localhost:4242", @port=4242, @host="localhost">
     "localhost"
     4242
     "localhost:4242"
@@ -108,7 +108,7 @@ SAMPLES
     "42"
     "42"
     42.0
-    samples/c.rb:24: undefined method `method3' for #<#<Class:0xb7595860>:0xb75953c4> (NoMethodError)
+    samples/c.rb:24: undefined method `method3' for #<#<Class:0xb7595790>:0xb7595420> (NoMethodError)
 
 
   <========< samples/d.rb >========>
@@ -221,3 +221,41 @@ SAMPLES
 
     42
 
+
+  <========< samples/i.rb >========>
+
+  ~ > cat samples/i.rb
+
+    require 'prototype'
+    
+    o = Object.new
+    
+    o.prototyping do
+      @a = 42
+      attr 'a'
+    end
+    p o.a
+    
+    o = prototype do
+      @a = 42
+      attr 'a'
+    end
+    p o.a
+    
+    o.prototyping do
+      @b = 42
+      attr 'b'
+    end
+    p o.b
+    o.prototyping do
+      @b = 42.0
+    end
+    p o.b
+
+  ~ > ruby samples/i.rb
+
+    42
+    42
+    42
+    42.0
+

data/lib/{prototype-0.2.0.rb → prototype-0.3.0.rb}

@@ -26,7 +26,7 @@ end
 #
 
 class Prototype
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
   module Prototypical
     module ClassMethods
@@ -35,7 +35,14 @@ class Prototype
           table = {}
           define_method('__prototype_table__'){ table }
         }
-        __prototype_table__
+        __prototype_table__    # does not recurse!
+      end
+
+      def __prototype_table_inject__ other
+        __prototype_table__.each do |ivar, value|
+          other.instance_variable_set ivar, value
+        end
+        __prototype_table__.clear
       end
 
       def __prototype_eval__ &b
@@ -112,17 +119,17 @@ class Prototype
         super
       end
 
-      def __prototype_init__
-        self.class.__prototype_table__.each do |ivar, value|
-          defined = instance_eval "defined? #{ ivar }"
-          unless defined
+      def __prototype_init__ c = self.class
+        c.__prototype_table__.each do |ivar, value|
+          #defined = instance_eval "defined? #{ ivar }"
+          #unless defined
             instance_variable_set ivar, value
-          end
+          #end
 
           a = ivar[%r/\w+/]
           defined = respond_to? a 
           unless defined
-            self.class.module_eval{ attribute a => value }
+            self.class.module_eval{ attribute a }
           end
         end
       end
@@ -168,10 +175,26 @@ class Prototype
 
     alias_method "exnihilo", "new"
     alias_method "ex_nihilo", "new"
+
+    def prototyping obj, *a, &b
+      c =
+        class << obj 
+          self
+        end
+      parent = c.class
+      c.extend Prototypical unless Prototypical === c
+      c.__prototype_table__.update parent.__prototype_table__ if
+        parent.respond_to? '__prototype_table__'
+      c.__prototype_prototype__ &b
+      obj.__prototype_init__ c
+      obj
+    end
   end
 end
 
 class Object
   def Prototype(*a, &b) Prototype.new *a, &b end
   def prototype(*a, &b) Prototype.new *a, &b end
+  def Prototyping(*a, &b) Prototype.prototyping self, *a, &b end
+  def prototyping(*a, &b) Prototype.prototyping self, *a, &b end
 end

data/lib/prototype.rb

@@ -26,7 +26,7 @@ end
 #
 
 class Prototype
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
   module Prototypical
     module ClassMethods
@@ -35,7 +35,14 @@ class Prototype
           table = {}
           define_method('__prototype_table__'){ table }
         }
-        __prototype_table__
+        __prototype_table__    # does not recurse!
+      end
+
+      def __prototype_table_inject__ other
+        __prototype_table__.each do |ivar, value|
+          other.instance_variable_set ivar, value
+        end
+        __prototype_table__.clear
       end
 
       def __prototype_eval__ &b
@@ -112,17 +119,17 @@ class Prototype
         super
       end
 
-      def __prototype_init__
-        self.class.__prototype_table__.each do |ivar, value|
-          defined = instance_eval "defined? #{ ivar }"
-          unless defined
+      def __prototype_init__ c = self.class
+        c.__prototype_table__.each do |ivar, value|
+          #defined = instance_eval "defined? #{ ivar }"
+          #unless defined
             instance_variable_set ivar, value
-          end
+          #end
 
           a = ivar[%r/\w+/]
           defined = respond_to? a 
           unless defined
-            self.class.module_eval{ attribute a => value }
+            self.class.module_eval{ attribute a }
           end
         end
       end
@@ -168,10 +175,26 @@ class Prototype
 
     alias_method "exnihilo", "new"
     alias_method "ex_nihilo", "new"
+
+    def prototyping obj, *a, &b
+      c =
+        class << obj 
+          self
+        end
+      parent = c.class
+      c.extend Prototypical unless Prototypical === c
+      c.__prototype_table__.update parent.__prototype_table__ if
+        parent.respond_to? '__prototype_table__'
+      c.__prototype_prototype__ &b
+      obj.__prototype_init__ c
+      obj
+    end
   end
 end
 
 class Object
   def Prototype(*a, &b) Prototype.new *a, &b end
   def prototype(*a, &b) Prototype.new *a, &b end
+  def Prototyping(*a, &b) Prototype.prototyping self, *a, &b end
+  def prototyping(*a, &b) Prototype.prototyping self, *a, &b end
 end

data/samples/i.rb

@@ -0,0 +1,25 @@
+require 'prototype'
+
+o = Object.new
+
+o.prototyping do
+  @a = 42
+  attr 'a'
+end
+p o.a
+
+o = prototype do
+  @a = 42
+  attr 'a'
+end
+p o.a
+
+o.prototyping do
+  @b = 42
+  attr 'b'
+end
+p o.b
+o.prototyping do
+  @b = 42.0
+end
+p o.b

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: prototype
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-07-13 00:00:00.000000 -06:00
+  version: 0.3.0
+date: 2006-08-30 00:00:00.000000 -06:00
 summary: prototype
 require_paths: 
   - lib
@@ -36,9 +36,8 @@ files:
   - README
   - README.tmpl
   - gen_readme.rb
-  - prototype-0.2.0.gem
   - lib/prototype.rb
-  - lib/prototype-0.2.0.rb
+  - lib/prototype-0.3.0.rb
   - samples/c.rb
   - samples/a.rb
   - samples/b.rb
@@ -47,6 +46,7 @@ files:
   - samples/f.rb
   - samples/g.rb
   - samples/h.rb
+  - samples/i.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []