zena 0.16.9 → 1.0.0.beta1

data/lib/zena/deploy/awstats.conf.rhtml

@@ -48,7 +48,7 @@
 # If there is several log files from load balancing servers :
 # Example: "/pathtotools/logresolvemerge.pl *.log |"
 #
-LogFile="<%= config[:sites_root] %>/<%= config[:host] %>/log/apache2.access.log"
+LogFile="/var/www/zena/<%= host %>/log/apache2.access.log"
 
 
 # Enter the log file type you want to analyze.
@@ -150,7 +150,7 @@ LogSeparator=" "
 # Example: "ftp.domain.com"
 # Example: "domain.com"
 #
-SiteDomain="<%= config[:host] %>"
+SiteDomain="<%= host %>"
 
 
 # Enter here all other possible domain names, addresses or virtual host
@@ -165,7 +165,7 @@ SiteDomain="<%= config[:host] %>"
 # Note: You can also use @/mypath/myfile if list of aliases are in a file.
 # Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]"
 #
-HostAliases="localhost 127.0.0.1 <%= config[:host] %> stats.<%= config[:host] %>"
+HostAliases="localhost 127.0.0.1 <%= host %> stats.<%= host %>"
 
 
 # If you want to have hosts reported by name instead of ip address, AWStats
@@ -200,7 +200,7 @@ DNSLookup=2
 # Example: "C:/awstats_data_dir"
 # Default: "."          (means same directory as awstats.pl)
 #
-DirData="<%= config[:sites_root] %>/<%= config[:host] %>/log/awstats"
+DirData="/var/www/zena/<%= host %>/log/awstats"
 
 
 # Relative or absolute web URL of your awstats cgi-bin directory.

data/lib/zena/deploy/httpd.rhtml

@@ -3,8 +3,7 @@
 
 NameVirtualHost *
 <% if config[:app_type] == :passenger  %>
-LoadModule upload_progress_module /usr/lib/apache2/modules/mod_upload_progress.so
-PassengerDefaultUser www-data
+LoadModule upload_progress_module <%= config[:app_root] %>/vendor/apache2_upload_progress/mod_upload_progress.so
 <% elsif config[:app_type] == :mongrel %>
 <Proxy *>
   Order allow,deny

data/lib/zena/deploy/stats.vhost.rhtml

@@ -1,19 +1,19 @@
-# zena awstats vhost for <%= config[:host] %>
+# zena awstats vhost for <%= host %>
 # automatically generated file
 
 <VirtualHost *>
-  ServerName stats.<%= config[:host] %>
+  ServerName stats.<%= host %>
 
   DocumentRoot /usr/share/doc/awstats/examples
-  ErrorLog     <%= config[:sites_root] %>/<%= config[:host] %>/log/apache2.error.log
-  CustomLog    <%= config[:sites_root] %>/<%= config[:host] %>/log/apache2.access.log combined
+  ErrorLog     /var/www/zena/<%= host %>/log/apache2.error.log
+  CustomLog    /var/www/zena/<%= host %>/log/apache2.access.log combined
 
   <location />
-    SetEnv AWSTATS_FORCE_CONFIG <%= config[:host] %>
+    SetEnv AWSTATS_FORCE_CONFIG <%= host %>
 
     AuthType Basic
-    AuthName "<%= config[:host] %> stats"
-    AuthUserFile <%= config[:sites_root] %>/<%= config[:host] %>/log/.awstatspw
+    AuthName "<%= host %> stats"
+    AuthUserFile /var/www/zena/<%= host %>/log/.awstatspw
     Require valid-user
   </location>
 

data/lib/zena/deploy/vhost.rhtml

@@ -66,7 +66,7 @@
 	RewriteCond %{REQUEST_FILENAME} !-f
   RewriteRule ^/(.*)$ balancer://<%= config[:balancer] %>%{REQUEST_URI} [P,QSA,L]
 <% elsif config[:app_type] == :passenger %>
-  PassengerAppRoot <%= config[:app_root] %>
+  PassengerAppRoot <% config[:app_root] %>
 
   <Location />
     # enable tracking uploads in /

data/lib/zena/deploy/vhost_www.rhtml

@@ -1,10 +1,10 @@
-# zena apache2 vhost for <%= config[:host] %>
+# zena apache2 vhost for <%= host %>
 # automatically generated file
 
 <VirtualHost *>
-  ServerName www.<%= config[:host] %>
+  ServerName www.<%= host %>
 
   RewriteEngine On
-  RewriteCond %{HTTP_HOST} ^www\.<%= config[:host] %>$ [NC]
-  RewriteRule ^(.*)$ http://<%= config[:host] %>$1 [R=301,L]
+  RewriteCond %{HTTP_HOST} ^www\.<%= host %>$ [NC]
+  RewriteRule ^(.*)$ http://<%= host %>$1 [R=301,L]
 </VirtualHost>

data/lib/zena/foxy_parser.rb

@@ -1,83 +1,6 @@
-require 'active_record/fixtures'
+require 'zena/loader/yaml_loader'
 
 module Zena
-  # mass yaml loader for ActiveRecord (a single file can contain different classes)
-  module Loader
-    class YamlLoader < ActiveRecord::Base
-      class << self
-        def set_table(tbl)
-          set_table_name tbl
-          reset_column_information
-        end
-
-        def create_or_update(opts)
-          h = {}
-          opts.each_pair do |k,v|
-            if :type == k
-              h['_type_'] = v
-            else
-              h[k.to_s] = v
-            end
-          end
-
-          if h['id'] && obj = find_by_id(h['id'])
-            res = []
-            h.each do |k,v|
-              res << "`#{k}` = #{v ? v.inspect : 'NULL'}"
-            end
-            connection.execute "UPDATE #{table_name}  SET #{res.join(', ')} WHERE id = #{h['id']}"
-          else
-            keys   = []
-            values = []
-            h.each do |k,v|
-              keys   << "`#{k}`"
-              values << (v ? v.inspect : 'NULL')
-            end
-            connection.execute "INSERT INTO #{table_name} (#{keys.join(', ')}) VALUES (#{values.join(', ')})"
-          end
-        end
-      end
-
-      def site_id=(i)
-        self[:site_id] = i
-      end
-
-      def _type_=(t)
-        self.type = t
-      end
-    end
-
-    # Is this used ?
-    def self.load_file(filepath)
-      raise Exception.new("Invalid filepath for loader (#{filepath})") unless ((filepath =~ /.+\.yml$/) && File.exist?(filepath))
-      base_objects = {}
-      YAML::load_documents( File.open( filepath ) ) do |doc|
-        doc.each do |elem|
-          list = elem[1].map do |l|
-            hash = {}
-            l.each_pair do |k, v|
-              hash[k.to_sym] = v
-            end
-            hash
-          end
-          tbl = elem[0].to_sym
-          if base_objects[tbl]
-            base_objects[tbl] += list
-          else
-            base_objects[tbl] = list
-          end
-        end
-      end
-
-      base_objects.each_pair do |tbl, list|
-        YamlLoader.set_table(tbl.to_s)
-        list.each do |record|
-          YamlLoader.create_or_update(record)
-        end
-      end
-    end
-  end
-
   class FoxyParser
     attr_reader :column_names, :table, :elements, :site, :name, :defaults
     @@parser_for_table = {}
@@ -122,6 +45,32 @@ module Zena
       def parses(table_name)
         @@parser_for_table[table_name.to_s] = self
       end
+
+      def dump_fixtures(index_tables)
+        index_tables.each do |table_name|
+          klass = Class.new(ActiveRecord::Base)
+          klass.set_table_name table_name
+
+          File.open(path_for_table(table_name), 'wb') do |file|
+            file.puts records_to_yaml(klass.all)
+          end
+        end
+      end
+
+      def records_to_yaml(records)
+        Hash[*records.map do |rec|
+          id = Fixtures.identify(rec.attributes.values * '_')
+          [id, rec.attributes]
+        end.flatten].to_yaml
+      end
+
+      def path_for_table(table)
+        "#{RAILS_ROOT}/test/fixtures/#{table}.yml"
+      end
+    end
+
+    def path_for_table(table)
+      self.class.path_for_table(table)
     end
 
     def initialize(table_name, opts={})
@@ -130,13 +79,11 @@ module Zena
       @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
-      sites.each do |site|
+      base = "#{Zena::ROOT}/test/sites"
+      Dir.foreach(base) do |site|
+        next if (site =~ /^\./) || !File.directory?(File.join(base, site))
         @site = site
         parse_fixtures
         after_parse
@@ -152,9 +99,8 @@ module Zena
       def get_content(site, table)
         fixtures_paths  = {'zena' => File.join("#{Zena::ROOT}/test/sites",site,"#{table}.yml")}
         fixtures_bricks = ['zena']
-        Bricks.foreach_brick do |brick_path|
-          brick_name = brick_path.split('/').last
-          fixtures_paths[brick_name] = File.join(brick_path,'test','sites',site,"#{table}.yml")
+        Bricks.foreach_brick do |brick_name|
+          fixtures_paths[brick_name] = File.join(Bricks.fixtures_path_for(brick_name), site, "#{table}.yml")
           fixtures_bricks << brick_name
         end
 
@@ -171,47 +117,33 @@ module Zena
         end
 
         return nil if content == []
-        content.join("\n") + "\n"
+        all_content = content.join("\n") + "\n"
+
+        ::ERB.new(content.join("\n") + "\n", nil, '-').result
       end
 
       def parse_fixtures
         return unless content = get_content(site, table)
 
-        # build simple hash to set/get defaults and other special values
-        @elements[site] = elements = YAML::load(content.gsub(/<%.*?%>/m,''))
+        # Load hash to set/get defaults and transform special values
+        @elements[site] = elements = YAML::load(content)
 
         # set defaults
         set_defaults
 
-        definitions = []
-        name = nil
-
+        between_obj = true
         # Parse all content
         content.split("\n").each do |l|
           if l =~ /^([\w\.]+):/
-            last_name = name
-            name = $1
-            # purge text in between fixtures
-            if last_name
-              parse_definitions(last_name, definitions)
-            else
-              # purge text in between fixtures
-              definitions.each do |d|
-                out d
-              end
-            end
-            definitions = []
-          else
-            definitions << l
-          end
-        end
-
-        if name
-          parse_definitions(name, definitions)
-        else
-          # purge text in between fixtures
-          definitions.each do |d|
-            out d
+            # new object
+            write_definitions($1, elements[$1])
+            between_obj = false
+          elsif l == ''
+            # end of object
+            between_obj = true
+            out l
+          elsif between_obj
+            out l
           end
         end
 
@@ -230,46 +162,39 @@ module Zena
 
         @defaults['site_id'] = Zena::FoxyParser::multi_site_id(site) if column_names.include?('site_id')
 
-        elements.each do |n,v|
-          unless v
-            v = elements[n] = {}
+        elements.each do |name, attributes|
+          unless attributes
+            attributes = elements[name] = {}
           end
-          v[:header_keys] ||= []
+          attributes[:header_keys] ||= []
           column_names.each do |k|
             if k =~ /^(\w+)_id/
               k = $1
             end
-            if !v.has_key?(k) && @defaults.has_key?(k)
-              v[:header_keys] << k # so we know what to write out
-              v[k] = @defaults[k]
+            if !attributes.has_key?(k) && @defaults.has_key?(k)
+              attributes[:header_keys] << k # so we know what to write out
+              attributes[k] = @defaults[k]
             end
           end
-          if column_names.include?('name') && !v.has_key?('name')
-            v['name'] = n
-            v[:header_keys] << 'name'
+
+          if column_names.include?('name') && !attributes.has_key?('name')
+            attributes['name'] = name
+            attributes[:header_keys] << 'name'
           end
         end
       end
 
-      def parse_definitions(name, definitions)
+      def write_definitions(name, definitions)
         return if name == 'DEFAULTS'
         @name = name
+        @inserted_keys = []
 
-        header_keys = elements[name][:header_keys]
         insert_headers
 
-        definitions.each do |l|
-          if l =~ /^\s+([\w\_]+):\s*([^\s].*)$/
-            k, v = $1, $2
-            v = nil if v =~ /^\s*$/
-            if !header_keys.include?(k)
-              out_pair(k,v)
-            end
-          else
-            out l
-          end
+        definitions.each do |key, value|
+          next if key == :header_keys
+          out_pair(key, value)
         end
-
       end
 
       def insert_headers
@@ -309,7 +234,7 @@ module Zena
       def out(res)
         unless @file
           # only open the file if we have things to write in it
-          @file = File.open("#{RAILS_ROOT}/test/fixtures/#{table}.yml", 'wb')
+          @file = File.open(path_for_table(table), 'wb')
           @file.puts "# Fixtures generated from content of 'sites' folder by #{self.class} (rake zena:build_fixtures)"
           @file.puts ""
           @file.puts self.class.prelude
@@ -317,24 +242,42 @@ module Zena
         @file.puts res
       end
 
-      def out_pair(k,v)
-        return if ignore_key?(k)
-        return if v.nil?
-        out sprintf('  %-16s %s', "#{k}:", v.to_s =~ /^\s*$/ ? v.inspect : v.to_s)
+      def out_pair(key, value)
+        return if @inserted_keys.include?(key)
+        return if ignore_key?(key)
+        return if value.nil?
+        @inserted_keys << key
+        res = sprintf('  %-16s ', "#{key}:")
+        if value.kind_of?(String)
+          value.gsub!(%r{\[FILE:(.*?)\]}) do
+            File.read("#{Zena::ROOT}/#{$1}")
+          end
+        end
+
+        if value =~ /\n/
+          res += "|\n    #{value.gsub("\n", "\n    ")}"
+        elsif value.to_s =~ /[\{\[:]/
+          res += value.inspect.gsub('\\#{', '#{')
+        else
+          res += value.to_s
+        end
+        out res
       end
 
       def ignore_key?(k)
-        (id_keys + multi_site_id_keys).include?(k)
+        false
       end
 
       def insert_id(key)
         return unless column_names.include?("#{key}_id")
-        out_pair("#{key}_id", Zena::FoxyParser::id(site, elements[@name][key]))
+        @inserted_keys << key
+        out_pair("#{key}_id", FoxyParser.id(site, elements[@name][key]))
       end
 
       def insert_multi_site_id(key)
         return unless column_names.include?("#{key}_id")
-        out_pair("#{key}_id", Zena::FoxyParser::multi_site_id(elements[@name][key]))
+        @inserted_keys << key
+        out_pair("#{key}_id", FoxyParser.multi_site_id(elements[@name][key]))
       end
 
       def id_keys
@@ -344,6 +287,20 @@ module Zena
       def multi_site_id_keys
         ['user']
       end
+
+      def make_prop(prop)
+        prop.each do |key, value|
+          if key == 'cached_role_ids'
+            prop[key] = value.split(',').map {|role_name| FoxyParser.id(site, role_name.strip)}
+          elsif value.kind_of?(String)
+            value.gsub!(%r{\[FILE:(.*?)\]}) do
+              File.read("#{Zena::ROOT}/#{$1}")
+            end
+          end
+        end
+
+        Node.encode_properties(Property::Properties[prop])
+      end
   end
 
   class FoxyUsersParser < FoxyParser
@@ -368,39 +325,58 @@ module Zena
   end
 
   class FoxyNodesParser < FoxyParser
-    attr_reader :virtual_classes, :versions, :zip_counter
+    attr_reader :roles, :versions, :zip_counter
 
     def initialize(table_name, opts = {})
       super
-      @virtual_classes = opts[:virtual_classes].all_elements
+      @roles    = opts[:roles].all_elements
       @versions        = opts[:versions].versions
       @zip_counter     = {}
       @inline_versions = {} # sub file generated by 'v_...' attributes
-      @contents        = {} # sub content generated by 'c_...' attributes
+      @inline_templates= {}
     end
 
     private
       def set_defaults
         super
-        # set publish_from, ...
 
         elements.each do |name, node|
-          node.keys.each do |k|
-            if k =~ /^v_/
-              # need version defaults
-              @defaults.each do |key,value|
-                next unless key =~ /^v_/
-                node[key] = value
+          has_template = node['template']
+
+          if template = node.delete('template')
+            add_template(template, name)
+          end
+
+          if !node.has_key?('node_name')
+            node['node_name'] = name
+            node[:header_keys] << 'node_name'
+          end
+
+          node['node_name'] = node['node_name'].url_name
+
+          if node.keys.include?('title') || node.keys.detect {|k| k =~ /^v_/}
+            # need version defaults
+            @defaults.each do |key,value|
+              next unless key =~ /^v_/
+              node[key] = value
+            end
+          end
+
+          # FIXME: better filtering, in a hurry right now
+          prop_field = nil
+          %w{text title summary comment}.each do |k|
+            if value = node.delete(k)
+              unless prop_field
+                prop_field = node['v_prop'] ||= {}
               end
-              break
+              prop_field[k] = value
             end
           end
 
-          node[:header_keys] += ['type','vclass_id','kpath', 'zip', 'publish_from', 'vhash', 'inherit',
-           'rgroup_id', 'wgroup_id', 'dgroup_id', 'skin', 'fullpath', 'basepath']
+          node[:header_keys] += %w{type vclass_id kpath zip publish_from vhash inherit rgroup_id wgroup_id dgroup_id skin_id fullpath basepath}
 
           klass = node['class']
-          if virtual_classes[site] && vc = virtual_classes[site][klass]
+          if roles[site] && vc = roles[site][klass]
             node['vclass_id'] = Zena::FoxyParser::id(site,klass)
             node['type']  = eval(vc['real_class'])
             node['kpath'] = vc['kpath']
@@ -431,24 +407,63 @@ module Zena
           else
             # build vhash
             records = [
-              { 'id' => Zena::FoxyParser::id(site, "#{name}_#{node['v_lang'] || node['ref_lang']}"),
-                'publish_from' => node['v_publish_from'], 'status' => Zena::Status[node['v_status'].to_sym],
-                'lang' => node['v_lang'] || node['ref_lang']
+              { 'id'           => Zena::FoxyParser::id(site, "#{name}_#{node['v_lang'] || node['ref_lang']}"),
+                'publish_from' => node['v_publish_from'],
+                'status'       => Zena::Status[node['v_status'].to_sym],
+                'lang'         => node['v_lang'] || node['ref_lang']
               }
             ]
           end
 
-          cached = Zena::Acts::Multiversion.cached_values_from_records(records)
+          cached = Zena::Use::VersionHash.cached_values_from_records(records)
+          # TODO: build index...
           node['publish_from'] = cached[:publish_from]
-          node['vhash'] = "'#{cached[:vhash].to_json}'"
+          node['vhash'] = cached[:vhash].to_json
 
           node['inherit'] = node['inherit'] ? 'yes' : 'no'
         end
 
+        build_inherited_fields
 
+        # build fullpath
+        elements.each do |k, node|
+          make_paths(node, k)
+        end
+      end
 
-        # set project, section, read/write/publish groups
+      def make_paths(node, name)
+        if !node['fullpath']
+          if node['parent'] && parent = elements[node['parent']]
+            parent_fullpath = make_paths(parent, node['parent'])
+            # Unquote content if it was an empty quoted string.
+            parent_fullpath = '' if parent_fullpath == "''"
+            node['fullpath'] = (parent_fullpath.split('/') + [node['node_name'] || name]).join('/')
+            klass = if roles[site] && vc = roles[site][node['class']]
+              vc['real_class']
+            else
+              node['class']
+            end
+            begin
+              eval(klass).kpath =~ /^#{Page.kpath}/
+              if node['custom_base']
+                node['basepath'] = node['fullpath']
+              else
+                node['basepath'] = parent['basepath']
+              end
+            rescue NameError
+              raise NameError.new("[#{site} #{table} #{name}] could not find class #{klass}.")
+            end
+          else
+            # If we do not quote the content, FoxyParser will insert NULL.
+            node['basepath'] = "''"
+            node['fullpath'] = "''"
+          end
+        end
+        node['fullpath']
+      end
 
+      # set project, section, read/write/publish groups
+      def build_inherited_fields
         [['project',"nil", "parent['type'].kpath =~ /^\#{Project.kpath}/", "current['parent']"],
          ['section',"nil", "parent['type'].kpath =~ /^\#{Section.kpath}/", "current['parent']"],
          ['rgroup' ,"node['inherit'] == 'no'", "parent['inherit'] == 'no'", "parent['rgroup']"],
@@ -498,38 +513,6 @@ module Zena
             end
           end
         end
-
-        # build fullpath
-        elements.each do |k, node|
-          make_paths(node, k)
-        end
-      end
-
-      def make_paths(node, name)
-        if !node['fullpath']
-          if node['parent'] && parent = elements[node['parent']]
-            node['fullpath'] = (make_paths(parent, node['parent']).split('/') + [node['name'] || name]).join('/')
-            klass = if virtual_classes[site] && vc = virtual_classes[site][node['class']]
-              vc['real_class']
-            else
-              node['class']
-            end
-            begin
-              eval(klass).kpath =~ /^#{Page.kpath}/
-              if node['custom_base']
-                node['basepath'] = node['fullpath']
-              else
-                node['basepath'] = parent['basepath']
-              end
-            rescue NameError
-              raise NameError.new("[#{site} #{table} #{name}] could not find class #{klass}.")
-            end
-          else
-            node['basepath'] = ""
-            node['fullpath'] = ""
-          end
-        end
-        node['fullpath']
       end
 
       def insert_headers
@@ -544,6 +527,7 @@ module Zena
           @zip_counter[site] += 1
           node['zip'] = @zip_counter[site]
         end
+
         super
       end
 
@@ -552,120 +536,85 @@ module Zena
         super || ['class'].include?(k)
       end
 
-      def out_pair(k,v)
-        if k.to_s =~ /^v_(.+)/
+      def out_pair(key, value)
+        if key.to_s =~ /^v_(.+)/
           # add key to default version
-          version_key($1,v)
-        elsif k.to_s =~ /^c_(.+)/
-          # add key to content
-          content_key($1,v)
+          @inserted_keys << key
+          version_key($1, value)
         else
           super
         end
       end
 
+      def add_template(template, name)
+        @inline_templates[site] ||= {}
+        @inline_templates[site][name] = template
+      end
+
       def version_key(key,value)
 
         @inline_versions[site] ||= {}
         unless @inline_versions[site][name]
+          # New inline version. Set defaults.
           @inline_versions[site][name] = version = {}
           version[:node] = node = elements[name]
-          version['node_id'] = Zena::FoxyParser::id(site, name)
-          # set defaults
+          version['node_id']      = Zena::FoxyParser::id(site, name)
+          version['publish_from'] = elements[name]['publish_from']
+          version['status']       = Zena::Status[:pub]
+          version['lang']         = elements[name]['ref_lang']
+          version['site_id']      = Zena::FoxyParser::multi_site_id(site)
+          version['number']       = 1
+
+          # Use DEFAULTS
           @defaults.each do |k,v|
-            if k =~ /^v_(.+)/
+            if k == 'v_status'
+              version['status'] = Zena::Status[v.to_sym]
+            elsif k =~ /^v_(.+)/
               version[$1] = v
             end
           end
-          version['publish_from'] ||= elements[name]['publish_from']
-          version['status'] ||= Zena::Status[:pub]
-          version['lang']   ||= elements[name]['ref_lang']
-          version['site_id']  = Zena::FoxyParser::multi_site_id(site)
-          version['number'] ||= 1
-          %W{title summary text comment}.each do |txt_field|
-            version[txt_field] ||= ''
-          end
-
-          if klass = elements[name]['type']
-            if klass = klass.version_class.content_class
-              if klass == ContactContent && !node['c_first_name']
-                first_name, user_name = node['v_title'].split
-                content_key('first_name', first_name)
-                content_key('name', user_name) if user_name
-              end
-            end
-          end
-
         end
+
         if key == 'status'
-          value = Zena::Status[key.to_sym]
+          value = Zena::Status[value.to_sym]
         end
-        @inline_versions[site][name][key] = value
-      end
 
-      def content_key(key,value)
-        @contents[site] ||= {}
-        klass = elements[name]['type']
-        klass = klass.version_class.content_class
-        @contents[site][klass] ||= {}
-        unless @contents[site][klass][name]
-          @contents[site][klass][name] = content = {}
-          content[:node] = elements[name]
-          content['site_id']  = Zena::FoxyParser::multi_site_id(site)
-        end
-        @contents[site][klass][name][key] = value
+        @inline_versions[site][name][key] = value
       end
 
       def after_parse
         super
         write_versions
-        write_contents
       end
 
       def write_versions
-        File.open("#{RAILS_ROOT}/test/fixtures/versions.yml", 'ab') do |file|
-          file.puts "\n# ========== #{site} (generated from 'nodes.yml') ==========="
-          file.puts ""
-
-          if versions = @inline_versions[site]
-            versions.each do |name, version|
-              file.puts ""
-              node = version.delete(:node)
-              version['id'] = Zena::FoxyParser::id(site, "#{name}_#{version['lang']}")
-              version['lang'] ||= node['ref_lang']
-              version['user_id'] ||= Zena::FoxyParser::multi_site_id(node['user'])
-              version['type'] = node['type'].version_class
-              file.puts "#{site}_#{name}:"
-              version.each do |k,v|
-                file.puts sprintf('  %-16s %s', "#{k}:", v.to_s =~ /^\s*$/ ? v.inspect : v.to_s)
-              end
-            end
-          end
-        end
-      end
+        #
+        node_file = @file
+          File.open(path_for_table('versions'), 'ab') do |file|
+            @file = file
+
+            if versions = @inline_versions[site]
+              out "\n# ========== #{site} (generated from 'nodes.yml') ==========="
+              out ""
+              versions.each do |name, version|
+                node = version.delete(:node)
+                version['id'] = Zena::FoxyParser::id(site, "#{name}_#{version['lang']}")
+                version['lang'] ||= node['ref_lang']
+                version['user_id'] ||= Zena::FoxyParser::multi_site_id(node['user'])
+                if prop = version.delete('prop')
+                  version['properties'] = make_prop(prop) unless prop.blank?
+                end
 
-      def write_contents
-        (@contents[site] || {}).each do |klass, contents|
-          File.open("#{RAILS_ROOT}/test/fixtures/#{klass.table_name}.yml", 'ab') do |file|
-            file.puts "\n# ========== #{site} (generated from 'nodes.yml') ==========="
-            file.puts ""
-            columns = klass.column_names
-            contents.each do |name, content|
-              file.puts ""
-              node = content.delete(:node)
-              content['id'] = Zena::FoxyParser::id(site, "#{name}_#{node['v_lang'] || node['ref_lang']}")
-              content['version_id'] = content['id'] if columns.include?('version_id')
-              content['node_id'] = node['id'] if columns.include?('node_id')
-              if klass.kind_of?(ContactContent)
-                content['address'] ||= ''
-              end
-              file.puts "#{site}_#{name}:"
-              content.each do |k,v|
-                file.puts sprintf('  %-16s %s', "#{k}:", v.to_s =~ /^\s*$/ ? v.inspect : v.to_s)
+                out ""
+                out "#{site}_#{name}:"
+                @inserted_keys = []
+                version.each do |k,v|
+                  out_pair(k, v)
+                end
               end
             end
           end
-        end
+        @file = node_file
       end
   end
 
@@ -675,41 +624,110 @@ module Zena
     def initialize(table_name, opts = {})
       super
       @versions = {}
+      @inline_attachments = {}
     end
 
     private
       def set_defaults
         super
         site_versions = @versions[site] = {}
-        raw_nodes = YAML::load(get_content(site, 'nodes').gsub(/<%.*?%>/m,''))
+        raw_nodes = YAML::load(get_content(site, 'nodes'))
 
-        elements.each do |k,v|
-          # set status
-          v[:header_keys] << 'status'
-          v['status'] = Zena::Status[v['status'].to_sym]
+        elements.each do |name, version|
+          version[:header_keys] += %w{number lang status}
 
-          v[:header_keys] << 'title'
-          v['title'] ||= raw_nodes[v['node']]['name'] || v['node']
+          version['status'] = Zena::Status[version['status'].to_sym]
 
-          node_versions = site_versions[v['node']] ||= []
-          node_versions << v
+          version['prop'] ||= {}
+          version['prop']['title'] ||= raw_nodes[version['node']]['node_name'] || version['node']
+
+          if prop = version.delete('prop')
+            version['properties'] = make_prop(prop) unless prop.blank?
+          end
+
+          if filename = version.delete('filename')
+            @inline_attachments[site] ||= {}
+            @inline_attachments[site][name] = {
+              'id' => FoxyParser::id(site, name),
+              'filename' => filename,
+              'user_id' => FoxyParser::id(site, version['user']),
+            }
+            version['attachment'] = name
+          end
+
+          node_versions = site_versions[version['node']] ||= []
+          node_versions << version
+        end
+      end
+
+      def after_parse
+        super
+        write_attachments
+      end
+
+      def write_attachments
+        #
+        node_file = @file
+          File.open(path_for_table('attachments'), 'ab') do |file|
+            @file = file
+
+            if attachments = @inline_attachments[site]
+              out "\n# ========== #{site} (generated from 'versions.yml') ==========="
+              out ""
+              attachments.each do |name, attachment|
+                out ""
+                out "#{site}_#{name}:"
+                @inserted_keys = []
+                attachment.each do |k,v|
+                  out_pair(k, v)
+                end
+              end
+            end
+          end
+        @file = node_file
+      end
+  end
+
+  class FoxyAttachmentsParser < FoxyParser
+
+    def initialize(table, opts={})
+      super
+    end
+
+    private
+      def set_defaults
+        super
+        raw_versions = YAML::load(get_content(site, 'versions'))
+        elements.each do |k, attachment|
+          version = attachment.delete('version')
+          attachment['user']  = raw_versions[version]['user']
         end
       end
+
   end
 
   class FoxySitesParser < FoxyParser
     private
+      def set_defaults
+        super
+        elements.each do |name, site|
+          if prop = site.delete('prop')
+            site['properties'] = make_prop(prop) unless prop.blank?
+          end
+        end
+      end
+
       def multi_site_id_keys
         super + ['su', 'anon']
       end
   end
 
   class FoxyRelationsParser < FoxyParser
-    attr_reader :virtual_classes
+    attr_reader :roles
 
     def initialize(table_name, opts={})
       super
-      @virtual_classes = opts[:virtual_classes].all_elements
+      @roles = opts[:roles].all_elements
     end
 
     private
@@ -729,7 +747,7 @@ module Zena
       end
 
       def get_kpath(klass)
-        if vc = virtual_classes[site][klass]
+        if vc = roles[site][klass]
           vc['kpath']
         else
           eval(klass).kpath
@@ -764,9 +782,39 @@ module Zena
       end
   end
 
-  class FoxyGroupsUsersParser < FoxyParser
-    attr_reader :nodes
+  class FoxyColumnsParser < FoxyParser
+    private
+      def set_defaults
+        super
+        elements.each do |name, col|
+          if !col['role']
+            col['role'], col['name'] = name.split('_')
+            col[:header_keys] << :role
+            col[:header_keys] << :name
+          end
+        end
+      end
+  end
+
+  class FoxyNodesRolesParser < FoxyParser
+    private
+      def set_defaults
+        super
+        elements.each do |name, col|
+          if !col['role']
+            if name =~ /^(.*)_(.*)$/
+              col['node'], col['role'] = $1, $2
+              col[:header_keys] << :role
+              col[:header_keys] << :node
+            else
+              puts "Missing 'role' for nodes_roles '#{name}'"
+            end
+          end
+        end
+      end
+  end
 
+  class FoxyGroupsUsersParser < FoxyParser
     private
       def set_defaults
         super
@@ -786,7 +834,9 @@ module Zena
     end
 
     def run
-      sites.each do |site|
+      Dir.foreach("#{Zena::ROOT}/test/sites") do |site|
+        next if site =~ /^\./ || !File.directory?(File.join("#{Zena::ROOT}/test/sites",site))
+        @inserted_keys = []
         out ""
         out "#{site}:"
         out_pair('site_id', Zena::FoxyParser::multi_site_id(site))