builder.rb in webby-0.8.1

- old
+ new

@@ -1,6 +1,6 @@
-# $Id: builder.rb 167 2008-02-24 00:59:54Z tim_pease $
+# $Id: builder.rb 192 2008-03-08 16:27:29Z tim_pease $
 
 require 'find'
 require 'fileutils'
 require 'erb'
 
@@ -86,11 +86,10 @@
       @log.info "creating #{output_dir}"
       FileUtils.mkdir output_dir
     end
 
     load_files if opts[:load_files]
-    loop_check
 
     Resources.pages.each do |page|
       next unless page.dirty? or opts[:rebuild]
 
       @log.info "creating #{page.destination}"
@@ -124,30 +123,9 @@
     ::Find.find(layout_dir, content_dir) do |path|
       next unless test ?f, path
       next if path =~ ::Webby.exclude
       Resources.new path
     end
-  end
-
-  # Loop over all the layout resources looking for circular reference -- a
-  # layout that eventually refers back to itself. These are bad. Raise an
-  # error if one is detected.
-  #
-  def loop_check
-    layouts = Resources.layouts
-
-    layouts.each do |lyt|
-      stack = []
-      while lyt
-        if stack.include? lyt.filename
-          stack << lyt.filename
-          raise Error,
-                "loop detected in layout references: #{stack.join(' > ')}"
-        end
-        stack << lyt.filename
-        lyt = layouts.find :filename => lyt.layout
-      end  # while
-    end  # each
   end
 
   %w(output_dir layout_dir content_dir).each do |key|
     self.class_eval <<-CODE
       def #{key}( ) ::Webby.site.#{key} end