dyoder-autocode 1.0.0 → 1.0.1

data/lib/autocode.rb

@@ -30,12 +30,38 @@ module AutoCode
         :loaded => []
       }
       
-      # Adds an auto_create block for the given key using the given exemplar if provided
+      def auto_constructor( key = true, &block)
+        @autocode[:constructors][ AutoCode.normalize( key ) ] << block
+      end
+      
       def auto_create( key = true, options = {}, &block )
-        @autocode[:constructors][ AutoCode.normalize( key ) ] << lambda do | cname |
-          exemplar = ( options[:exemplar] || Module.new ).clone
-          exemplar.module_eval( &block ) if block
-          const_set( cname, exemplar ) and true
+        auto_constructor( key ) do | cname |
+          exemplar = options[:exemplar] || Module.new
+          new_constant = exemplar.clone
+          new_constant.send(:include, AutoCode)
+          new_constant.module_eval( &block ) if block
+          const_set( cname, new_constant )
+        end
+      end
+      
+      # Convenience method for auto_creating classes.
+      def auto_create_class( key = true, parent = Object, &block )
+        auto_constructor( key ) do | cname |
+          parent = const_get(parent) unless parent.is_a? Class
+          new_constant = Class.new( parent )
+          new_constant.send(:include, AutoCode)
+          new_constant.module_eval( &block ) if block
+          const_set( cname, new_constant )
+        end
+      end
+
+      # Convenience method for auto_creating modules.
+      def auto_create_module( key = true, &block )
+        auto_constructor( key ) do | cname |
+          new_constant = Module.new
+          new_constant.send(:include, AutoCode)
+          new_constant.module_eval( &block ) if block
+          const_set( cname, new_constant )
         end
       end
 
@@ -53,20 +79,15 @@ module AutoCode
 
       # Adds an arbitrary initializer block for the given key
       def auto_eval( key, &block )
-        @autocode[:initializers][ AutoCode.normalize( key ) ] << lambda do | mod |
-          mod.module_eval( &block )
+        if key.is_a?( Symbol) && const_defined?( AutoCode.normalize( key ) )
+          const_get( key ).module_eval &block
+        else
+          @autocode[:initializers][ AutoCode.normalize( key ) ] << lambda do | mod |
+            mod.module_eval( &block )
+          end
         end
       end
 
-      # Convenience method for auto_create.
-      def auto_create_class( key = true, superclass = Object, &block )
-        auto_create( key,{ :exemplar => Class.new( superclass ) }, &block )
-      end
-
-      # Convenience method for auto_create.
-      def auto_create_module( key = true, &block )
-        auto_create( key,{ :exemplar => Module.new }, &block )
-      end
 
       # Returns the list of constants that would be reloaded upon a call to reload.
       def reloadable ; @autocode[:loaded] ; end

data/test/auto_create.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helpers.rb')
+require "#{File.dirname(__FILE__)}/helpers"
 
 describe "auto_create" do
 
@@ -7,18 +7,19 @@ describe "auto_create" do
     module A
       include AutoCode
       auto_create_module :B do
-        include AutoCode
-        auto_create_class
+        auto_create_class :C
+        auto_create_class true, :C
       end
     end
   end
   
-  specify "allows you to create and initialize a given const name" do
+  specify "allows you create and initialize a given const name" do
     A::B.class.should == Module
   end
   
-  specify "allows you to create and initialize const using a wildcard" do
+  specify "allows you create and initialize const using a wildcard" do
     A::B::C.class.should === Class
+    A::B::D.superclass.should == A::B::C
   end
   
   specify "raises a NameError if a const doesn't match" do

data/test/auto_eval.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helpers.rb')
+require "#{File.dirname(__FILE__)}/helpers"
 
 describe "auto_eval" do
 
@@ -27,5 +27,6 @@ describe "auto_eval" do
   specify "allows you to define nested auto_eval declarations" do
     A::B::C::D.should == true
   end
+  
 
 end

data/test/auto_load.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helpers.rb')
+require "#{File.dirname(__FILE__)}/helpers"
 require 'extensions/io'
 
 

data/test/helpers.rb

@@ -12,4 +12,6 @@ Bacon::Context.instance_eval do
   alias_method :specify, :it
 end
 
-require "#{File.dirname(__FILE__)}/../lib/autocode"
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+
+require 'autocode'

data/test/least_surprise.rb

@@ -0,0 +1,61 @@
+require "#{File.dirname(__FILE__)}/helpers"
+
+describe "An auto_created module" do
+
+  before do
+    Object.instance_eval { remove_const(:A) if const_defined?(:A) }
+    module A
+      module Foo; end
+      include AutoCode
+      auto_create_class :B do
+        def kobold
+          "koboldy"
+        end
+      end
+    end
+  end
+  
+  it "automatically includes AutoCode" do
+    A::B.included_modules.should.include AutoCode
+  end
+  
+  it "can be initialized by later auto_eval declarations" do
+    A.auto_eval(:B) { def smurf; "smurfy" ; end }
+    A::B.new.kobold.should == "koboldy"
+    A::B.new.smurf.should == "smurfy"
+  end
+  
+  it "can be referenced in auto_* declarations without getting born" do
+    A.auto_create_class :C, :B
+    A.const_defined?(:B).should == false
+    A::C.new.kobold.should == "koboldy"
+  end
+  
+end
+
+describe "auto_eval" do
+  
+  it "does a module_eval for constants that are already defined" do
+    A.auto_eval :Foo do
+      def self.yell; "Brick!" ; end
+    end
+    A::Foo.yell.should == "Brick!"
+  end
+  
+end
+
+
+from_waves = lambda do
+  app.auto_create_module( :Views ) do
+    include AutoCode
+    auto_create_class :Default, Waves::Views::Base
+    auto_load :Default, :directories => [ :views ]
+    auto_create_class true, :Default
+    auto_load true, :directories => [ :views ]
+  end
+  app.auto_eval :Views do
+    auto_eval :Default do
+      include ViewMethods
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dyoder-autocode
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Dan Yoder
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-09 00:00:00 -07:00
+date: 2009-01-08 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,9 @@ files:
 - test/auto_create.rb
 - test/auto_eval.rb
 - test/auto_load.rb
+- test/auto_module.rb
 - test/helpers.rb
+- test/least_surprise.rb
 - test/normalize.rb
 has_rdoc: true
 homepage: http://dev.zeraweb.com/