fix for dryml.rdoctest

dryml/Rakefile

@@ -2,22 +2,17 @@ require 'rake'
 require 'rake/rdoctask'
 require 'rake/testtask'
 
-$:.unshift File.expand_path('../lib', __FILE__)
-$:.unshift File.expand_path('../../hobo_support/lib', __FILE__)
-require 'dryml' # to get VERSION
-
 RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
 RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
 
-desc "Default Task"
-task :default => [ :test ]
-
 # --- Testing --- #
 
-desc "Run all tests"
-task :test do |t|
-  files=Dir['test/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
-  exit(1) if !system("#{RUBYDOCTEST} #{files}")
+namespace "test" do
+  desc "Run the doctests"
+  task :doctest do |t|
+    files=Dir['test/**/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
+    exit(1) if !system("#{RUBYDOCTEST} #{files}")
+  end
 end
 
 # --- RDOC --- #

dryml/lib/dryml.rb

@@ -200,15 +200,14 @@ def render(template_src, locals={}, template_path=nil, included_taglibs=[], view
     this = locals.delete(:this) || nil
 
     renderer_class = Dryml::Template.build_cache[template_path]._?.environment ||
-      Dryml.make_renderer_class(template_src, template_path, locals.keys)
+      make_renderer_class(template_src, template_path, locals.keys)
     renderer_class.new(view).render_page(this, locals)
   end
 
 private
 
   def taglibs_for(controller_name)
-    ([CORE_TAGLIB] +
-    [APPLICATION_TAGLIB] +
+    ([APPLICATION_TAGLIB] +
     application_taglibs() +
     [subsite_taglib(controller_name)] +
     (controller_name.camelize+"Controller").constantize.try.included_taglibs||[]).compact
@@ -270,7 +269,7 @@ def compile_renderer_class(renderer_class, template_src, template_path, locals,
     # the sum of all the names we've seen so far - eventually we'll be ready for all of 'em
     all_local_names = renderer_class.compiled_local_names | locals
 
-    template.compile(all_local_names, taglibs)
+    template.compile(all_local_names, [CORE_TAGLIB]+taglibs)
   end
 
 

dryml/test/dryml.rdoctest

@@ -7,7 +7,7 @@
         >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../dryml/lib')
         >> require 'hobo_support'
         >> require 'dryml'
-        >> require 'dryml/template_handler'
+        >> require 'dryml/railtie/template_handler'
 
 {.hidden}