lib/zena/foxy_parser.rb in zena-0.16.8 vs lib/zena/foxy_parser.rb in zena-0.16.9

@@ -128,15 +128,17 @@
       @table = table_name
       @column_names = Node.connection.columns(table).map {|c| c.name }
       @elements = {}
       @options  = opts
     end
+    
+    def sites
+      @sites ||= Dir["#{Zena::ROOT}/test/sites/*", "#{RAILS_ROOT}/bricks/**/sites/*"].map {|s| File.directory?(s) ? File.basename(s) : nil}.compact.uniq
+    end
 
     def run
-
-      Dir.foreach("#{Zena::ROOT}/test/sites") do |site|
-        next if site =~ /^\./
+      sites.each do |site|
         @site = site
         parse_fixtures
         after_parse
       end
       @file.close if @file
@@ -782,11 +784,10 @@
       super
       @zip_counter = opts[:nodes].zip_counter
     end
 
     def run
-      Dir.foreach("#{Zena::ROOT}/test/sites") do |site|
-        next if site =~ /^\./ || !File.directory?(File.join("#{Zena::ROOT}/test/sites",site))
+      sites.each do |site|
         out ""
         out "#{site}:"
         out_pair('site_id', Zena::FoxyParser::multi_site_id(site))
         out_pair('zip', @zip_counter[site])
       end