dyoder-autocode 0.9.5 → 0.9.6

data/lib/autocode.rb

@@ -1,134 +1,135 @@
 module Autocode
-  
+
   def self.extended( mod )
     included(mod)
   end
-	
-	def self.included( mod )
-
-		old = mod.method( :const_missing )
-		mod.metaclass.class_eval do
-		  
-		  def autocreate( key, exemplar, &block )
-			  keys = case key
-		    when true, Symbol then [key]
-			  when Array then key
-			  end
-			  
-			  @exemplars ||= Hash.new
-			  @init_blocks ||= Hash.new { |h,k| h[k] = [] }
-			  keys.each do |k|
-			   	@exemplars[k] = exemplar
+
+  def self.included( mod )
+
+    old = mod.method( :const_missing )
+    mod.metaclass.class_eval do
+
+      def autocreate( key, exemplar, &block )
+        keys = case key
+        when true, Symbol then [key]
+        when Array then key
+        end
+
+        @exemplars ||= Hash.new
+        @init_blocks ||= Hash.new { |h,k| h[k] = [] }
+        keys.each do |k|
+          @exemplars[k] = exemplar
           @init_blocks[k] << block
-			  end
-
-				return self
-			end
-			
-			def autocreate_class( key = true, superclass = nil )
-			  autocreate key, Class.new( superclass )
-			end
-			
-			def autocreate_module( key = true )
-			  autocreate key, Module.new
-			end
-			
-			def autoinit( key, &block )
-  		  # See whether we're dealing with a namespaced constant,
-  		  # The match groupings for,  e.g. "X::Y::Z", would be
-  		  # ["X::Y", "Z"]
-  		  match = key.to_s.match(/^(.*)::([\w\d_]+)$/)
-  		  if match
-  		    namespace, cname = match[1,2]
-  		    const = module_eval(namespace)
-    			const.module_eval do
-      		  @init_blocks ||= Hash.new { |h,k| h[k] = [] }
-    			  @init_blocks[cname.to_sym] << block
-    			end
-  			else
-    			@init_blocks[key] << block
-  			end
-  			return self
-  		end
-		  
-		  def autoload(key = true, options = {})
-		    snake_case = lambda {|name| name.gsub(/([a-z\d])([A-Z])/){"#{$1}_#{$2}"}.tr("-", "_").downcase }
-		    # look for load_files in either a specified directory, or in the directory
-		    # with the snakecase name of the enclosing module
-		    directories = [options[:directories] || snake_case.call(self.name.match( /^.*::([\w\d_]+)$/)[1])].flatten
+        end
+
+        return self
+      end
+
+      def autocreate_class( key = true, superclass = Class )
+        autocreate key, Class.new( superclass )
+      end
+
+      def autocreate_module( key = true )
+        autocreate key, Module.new
+      end
+
+      def autoinit( key, &block )
+        # See whether we're dealing with a namespaced constant,
+        # The match groupings for,  e.g. "X::Y::Z", would be
+        # ["X::Y", "Z"]
+        match = key.to_s.match(/^(.*)::([\w\d_]+)$/)
+        if match
+          namespace, cname = match[1,2]
+          const = module_eval(namespace)
+          const.module_eval do
+            @init_blocks ||= Hash.new { |h,k| h[k] = [] }
+            @init_blocks[cname.to_sym] << block
+          end
+        else
+          @init_blocks[key] << block
+        end
+        return self
+      end
+
+      def autoload(key = true, options = {})
+        snake_case = lambda {|name| name.gsub(/([a-z\d])([A-Z])/){"#{$1}_#{$2}"}.tr("-", "_").downcase }
+        # look for load_files in either a specified directory, or in the directory
+        # with the snakecase name of the enclosing module
+        directories = [options[:directories] || snake_case.call(self.name.match( /^.*::([\w\d_]+)$/)[1])].flatten
         # create a lambda that looks for a file to load
         file_finder = lambda do |cname|
           filename = snake_case.call(cname.to_s << ".rb")
           path = directories.map { |dir| File.join(dir.to_s, filename) }.find { |path| File.exist?( path ) }
         end
         # if no exemplar is given, assume Module.new
-			  @load_files ||= Hash.new
+        @load_files ||= Hash.new
         @load_files[key] = [file_finder, options[:exemplar] || Module.new]
-				return self
-		  end
-		  
-		  def autoload_class(key = true, superclass = nil, options = {})
-		    options[:exemplar] = Class.new(superclass)
-		    autoload key, options
-		  end
-		  
-		  def autoload_module(key = true, options = {})
-		    options[:exemplar] = Module.new
-		    autoload key, options
-		  end
-
-			# Returns the list of constants that would be reloaded upon a call to reload.
-			def reloadable( *names ) 
-				( @reloadable ||= [] ).concat(names)
-				return self
-			end
-			
-			# Reloads all the constants that were loaded via autocode. Technically, all reload 
-			# is doing is undefining them (by calling +remove_const+ on each in turn); they won't get 
-			# reloaded until they are referenced.
-			def reload
-				@reloadable.each { |name| remove_const( name ) } if @reloadable
-				@reloadable = nil
-				return self
-			end		  
-			
+        return self
+      end
+
+      def autoload_class(key = true, superclass = Class, options = {})
+        options[:exemplar] = Class.new(superclass)
+        autoload key, options
+      end
+
+      def autoload_module(key = true, options = {})
+        options[:exemplar] = Module.new
+        autoload key, options
+      end
+
+      # Returns the list of constants that would be reloaded upon a call to reload.
+      def reloadable( *names )
+        ( @reloadable ||= [] ).concat(names)
+        return self
+      end
+
+      # Reloads all the constants that were loaded via autocode. Technically, all reload
+      # is doing is undefining them (by calling +remove_const+ on each in turn); they won't get
+      # reloaded until they are referenced.
+      def reload
+        @reloadable.each { |name| remove_const( name ) } if @reloadable
+        @reloadable = nil
+        return self
+      end
+
       # Unloads all the constants that were loaded and removes all auto* definitions.
-			def unload
-				reload
+      def unload
+        reload
         @exemplars = @init_blocks = @load_files = nil
-				return self
-			end
-			
-			private		
-		  
-		  define_method :const_missing do | cname | #:nodoc:
+        return self
+      end
+
+      private
+
+      define_method :const_missing do | cname | #:nodoc:
         cname = cname.to_sym
         @exemplars ||= Hash.new
         @init_blocks ||= Hash.new { |h,k| h[k] = [] }
-			  @load_files ||= Hash.new
+        @load_files ||= Hash.new
         exemplar = @exemplars[cname] || @exemplars[true]
         blocks = @init_blocks[cname]
         blocks = @init_blocks[true] + blocks if @exemplars[cname].nil? && @init_blocks[true]
         load_file_finder, load_class = @load_files[cname] || @load_files[true]
-        
-			  if load_file_finder && filename = load_file_finder.call(cname)
-			    object = load_class.clone
-				elsif exemplar 
-					object = exemplar.clone
-		    else
-		      return old.call(cname)
-	      end
-			  			    
-				(@reloadable ||= []) << cname; 
-				const_set( cname, object )
-         
+
+        if load_file_finder && filename = load_file_finder.call(cname)
+          object = load_class.clone
+        elsif exemplar
+          object = exemplar.clone
+        else
+          return old.call(cname)
+        end
+
+        (@reloadable ||= []) << cname;
+        const_set( cname, object )
+
         blocks.each do |block|
           object.module_eval( &block) if block
         end
+        
         load(filename) if filename
-				return object
-			end
-					  
-	  end
+        
+        return object
+      end
+    end
   end
 end

data/test/autocreate.rb

@@ -40,4 +40,21 @@ describe "A module where autocreate has been called" do
     Duffel.unload
   end
   
+  it "should be possible to include autocode" do
+    module Waves
+      include Autocode
+      autocreate(:TestLib, Module.new) do
+        include Autocode
+        autocreate_class
+        autoload_class
+      end
+    end
+    Waves::TestLib::TheOneAndOnlyClass.help().should == "class help"
+    Waves::TestLib::AnyThing.name.should == "Waves::TestLib::AnyThing"
+    lambda { Waves::TestLib::TheOneAndOnlyModule }.should.raise TypeError
+    Waves::TestLib::ThePretender.name.should == "Waves::TestLib::ThePretender"
+    lambda { Waves::TestLib::ThePretender.help() }.should.raise NoMethodError
+    Waves.unload
+  end
+  
 end

data/test/autoinit.rb

@@ -12,11 +12,11 @@ describe "thingy" do
       autoinit(:Whatsit) do
         def self.in_scope; true; end
       end
-          
+      
       autoinit('Whatsit::Critter') do
         def self.outside_scope; true; end
         def instance; true; end
-        # this definition overrides the one in the file
+        # this definition is overridden by the one in the file
         def self.gizmo; 2; end
       end
       
@@ -54,6 +54,5 @@ describe "thingy" do
   it "should run autoinit blocks before the file loading" do
      Thingy::Whatsit::Critter.gizmo.should == 1
   end
-  
-  
+
 end

data/test/autoload.rb

@@ -6,28 +6,14 @@ describe "A module where autoload has been called" do
     module Thingy
       module Mabob
         extend Autocode
-        autoload_class true, Class, :directories => [File.join(File.dirname(__FILE__), "test_lib")]
+        autoload_class :DooDad, Class, :directories => [File.join(File.dirname(__FILE__), "test_lib")]
         autoload_module :Humbug, :directories => [File.join(File.dirname(__FILE__), "test_lib")]
       end
     end
-    module Waves
-      module TestLib
-        extend Autocode
-        autoload true, :exemplar => Module.new
-      end
-    end
-    module Whatever
-      module TestLib
-        extend Autocode
-        autoload
-      end
-    end
   end
   
   after do
     Thingy::Mabob.unload
-    Waves::TestLib.unload
-    Whatever::TestLib.unload
   end
 
   it "should autoload where files match" do  
@@ -36,6 +22,7 @@ describe "A module where autoload has been called" do
   end
   
   it "should not autoload where it matches a file but is out of scope" do
+    lambda { Thingy::Mabob::Answer42ItIs }.should.raise NameError
     lambda { Thingy::Whatsit::Critter }.should.raise NameError
   end
   
@@ -43,12 +30,57 @@ describe "A module where autoload has been called" do
     lambda { Thingy::Mabob::MooCow }.should.raise NameError
   end
   
-  it "should autoload using default directories" do
-    Waves::TestLib::TheHelperModule.should.respond_to :help
+  it "should autoload using super class" do
+    module Waves
+      module TestLib
+        extend Autocode
+        autoload_class true, Thingy::Mabob::DooDad
+      end
+    end
+    Waves::TestLib::TheClass42Gang.party?.should == true
+    Waves::TestLib::TheClass42Gang.gizmo.should == 1
+    Waves::TestLib.unload
   end
 
-  it "should allow default options" do
-    Whatever::TestLib::TheOneAndOnly.should.respond_to :help
+  it "should autoload using defaults" do
+    module Waves
+      module TestLib
+        extend Autocode
+        autoload
+      end
+    end    
+    Waves::TestLib::TheOneAndOnlyModule.help().should == "module help"
+    lambda { Waves::TestLib::TheOneAndOnlyClass }.should.raise TypeError
+    Waves::TestLib::ThePretender.name.should == "Waves::TestLib::ThePretender"
+    lambda { Waves::TestLib::ThePretender.help() }.should.raise NoMethodError
+    Waves::TestLib.unload
   end
   
+  it "should autoload class using defaults" do
+    module Waves
+      module TestLib
+        extend Autocode
+        autoload_class
+      end
+    end
+    Waves::TestLib::TheOneAndOnlyClass.help().should == "class help"
+    lambda { Waves::TestLib::TheOneAndOnlyModule }.should.raise TypeError
+    Waves::TestLib::ThePretender.name.should == "Waves::TestLib::ThePretender"
+    lambda { Waves::TestLib::ThePretender.help() }.should.raise NoMethodError
+    Waves::TestLib.unload
+  end
+
+  it "should autoload module using defaults" do
+    module Waves
+      module TestLib
+        extend Autocode
+        autoload_module
+      end
+    end
+    Waves::TestLib::TheOneAndOnlyModule.help().should == "module help"
+    lambda { Waves::TestLib::TheOneAndOnlyClass }.should.raise TypeError
+    Waves::TestLib::ThePretender.name.should == "Waves::TestLib::ThePretender"
+    lambda { Waves::TestLib::ThePretender.help() }.should.raise NoMethodError
+    Waves::TestLib.unload
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dyoder-autocode
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Dan Yoder