configurable.rb in express_templates-0.3.0

- old
+ new

@@ -26,11 +26,10 @@
             include InstanceMethods
 
             # Stores arguments for later processing, eg., compile time
             def initialize(*args)
               @args = args.dup
-              @config = {}
               _process_args!(args)
               super(*args)
             end
           end
         end
@@ -55,21 +54,21 @@
         end
 
         module InstanceMethods
 
           def config
-            @config
+            @config ||= {}
           end
 
           alias :my :config
 
           def expand_locals
             {my: config}
           end
 
           # Override Templating#lookup to pass locals
-          def lookup(fragment_name)
-            self.class.send(:_lookup, fragment_name, expand_locals)
+          def lookup(fragment_name, options = {})
+            super(fragment_name, options.merge(expand_locals))
           end
 
 
           private
 