Function autoloading now works as requested in #214.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1482 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 46 insertions, 3 deletions

diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index a9f7ff1da..9292e43f5 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -1,4 +1,5 @@
 # Grr
+require 'puppet/autoload'
 require 'puppet/parser/scope'
 
 module Puppet::Parser
@@ -6,10 +7,14 @@ module Functions
     # A module for managing parser functions.  Each specified function
     # becomes an instance method on the Scope class.
 
+    class << self
+        include Puppet::Util
+    end
+
     # Create a new function type.
     def self.newfunction(name, ftype = :statement, &block)
         @functions ||= {}
-        name = name.intern if name.is_a? String
+        name = symbolize(name)
 
         if @functions.include? name
             raise Puppet::DevError, "Function %s already defined" % name
@@ -35,7 +40,18 @@ module Functions
 
     # Determine if a given name is a function
     def self.function(name)
-        name = name.intern if name.is_a? String
+        name = symbolize(name)
+
+        unless defined? @autoloader
+            @autoloader = Puppet::Autoload.new(self,
+                "puppet/parser/functions",
+                :wrap => false
+            )
+        end
+
+        unless @functions.include? name
+            @autoloader.load(name)
+        end
 
         if @functions.include? name
             return @functions[name][:name]
@@ -46,7 +62,7 @@ module Functions
 
     # Determine if a given function returns a value or not.
     def self.rvalue?(name)
-        name = name.intern if name.is_a? String
+        name = symbolize(name)
 
         if @functions.include? name
             case @functions[name][:type]
diff --git a/test/language/functions.rb b/test/language/functions.rb
index d931470fc..97ddbca00 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -240,6 +240,33 @@ class TestLangFunctions < Test::Unit::TestCase
 
         assert(parsedate != newdate, "Parse date did not change")
     end
+
+    def test_autoloading_functions
+        assert_equal(false, Puppet::Parser::Functions.function(:autofunc),
+            "Got told autofunc already exists")
+
+        dir = tempfile()
+        $: << dir
+        newpath = File.join(dir, "puppet", "parser", "functions")
+        FileUtils.mkdir_p(newpath)
+
+        File.open(File.join(newpath, "autofunc.rb"), "w") { |f|
+            f.puts %{
+                Puppet::Parser::Functions.newfunction(:autofunc, :rvalue) do |vals|
+                    Puppet.wanring vals.inspect
+                end
+            }
+        }
+
+        obj = nil
+        assert_nothing_raised {
+            obj = Puppet::Parser::Functions.function(:autofunc)
+        }
+
+        assert(obj, "Did not autoload function")
+        assert(Puppet::Parser::Scope.method_defined?(:function_autofunc),
+            "Did not set function correctly")
+    end
 end
 
 # $Id$