zena 0.16.9 → 1.0.0.beta1

data/app/models/skin.rb

@@ -1,19 +1,4 @@
-# A skin is a master template containing all sub templates and css to render a full site or sectioon
+# A skin is a container for templates and css to render a full site or sectioon
 # of a site.
 class Skin < Section
-  before_save :set_need_skin_name_update
-  after_save  :update_skin_name
-
-  private
-
-    def set_need_skin_name_update
-      @need_skin_name_update = !new_record? && name_changed?
-      true # save can continue
-    end
-
-    def update_skin_name
-      return unless @need_skin_name_update
-      # FIXME: when moving a template or a page that is a parent of a template: we must sync skin_name after spread_project_and_section.
-      Skin.connection.execute "UPDATE template_contents SET skin_name = #{Zena::Db.quote(name)} WHERE template_contents.node_id IN (SELECT id FROM nodes WHERE nodes.section_id = #{Zena::Db.quote(self[:id])}) AND template_contents.site_id = #{Zena::Db.quote(self[:site_id])}"
-    end
 end

data/app/models/template.rb

@@ -1,91 +1,109 @@
 =begin rdoc
 Definitions:
 
-* master template: used to render a node. It is used depending on it's 'klass' filter.
+* master template: used to render a node. It is used depending on it's 'target_klass' filter.
 * helper template: included into another template.
 
 Render ---> Master template --include--> helper template --include--> ...
 
-For master templates, the name is build from the different filters (klass, mode, format):
+For master templates, the node_name is build from the different filters (target_klass, mode, format):
 
 Klass-mode-format. Examples: Node-index, Node--xml, Project-info. Note how the format is omitted when it is 'html'.
 
-Other templates have a name built from the given name, just like any other node.
+Other templates have a node_name built from the given name, just like any other node.
 
 =end
 class Template < TextDocument
-  validate :valid_section
-  after_save :update_content
 
+  property do |p|
+    p.string  'target_klass'
+    p.string  'format'
+    p.string  'mode'
+    p.string  'tkpath'
+
+    p.index(IdxTemplate) do |record|
+      {
+        'format'    => record.format,
+        'mode'      => record.mode,
+        'tkpath'    => record.tkpath,
+        'skin_id'   => record[:section_id],
+      }
+    end
+
+    safe_property :tkpath, :mode, :target_klass, :format
+  end
+
+  attr_protected    :tkpath
+  validate          :validate_section, :validate_target_klass
+  before_validation :template_content_before_validation
+
+  # Class Methods
   class << self
     def accept_content_type?(content_type)
       content_type =~ /text\/(html|zafu)/
     end
+  end # Class Methods
 
-    def version_class
-      TemplateVersion
-    end
+  def filename
+    "#{title}.#{ext}"
+  end
+
+  def skin
+    @skin ||= secure(Skin) { Skin.find(prop['skin_id']) }
   end
 
   private
 
     def set_defaults
-      # only set name from version title on creation
-      if name_changed?
-        new_name = self.name
-      elsif version.title_changed?
-        new_name = version.title
-      else
-        new_name = nil
-      end
+      super
+
+      # Force template extension to zafu
+      self.ext = 'zafu'
+
+      # Force template content-type to 'text/zafu'
+      self.content_type = 'text/zafu'
 
-      if new_name && !new_name.blank?
-        if new_name =~ /^([A-Z][a-zA-Z]+?)(-(([a-zA-Z_\+]*)(-([a-zA-Z_]+)|))|)(\.|\Z)/
-          # name/title changed force template_content update
-          content = redaction.redaction_content
-          content.klass  = $1                   unless content.klass_changed?
-          content.mode   = ($4 || '').url_name  unless content.mode_changed?
-          content.format = ($6 || 'html')       unless content.format_changed?
+      if node_name_changed?
+        if node_name =~ /^([A-Z][a-zA-Z]+?)(-(([a-zA-Z_\+]*)(-([a-zA-Z_]+)|))|)(\.|\Z)/
+          # node_name/title changed force  update
+          prop['target_klass']  = $1            unless prop.target_klass_changed?
+          prop['mode']   = ($4 || '').url_name  unless prop.mode_changed?
+          prop['format'] = ($6 || 'html')       unless prop.format_changed?
         else
-          # name set but it is not a master template name
-          content = redaction.redaction_content
-          content.klass  = nil
-          content.mode   = nil
-          content.format = nil
-          if new_name =~ /(.*)\.zafu$/
-            self.name = $1
-          end
+          # node_name set but it is not a master template name
+          prop['target_klass']  = nil
+          prop['mode']   = nil
+          prop['format'] = nil
         end
       end
 
-      if version.content.changed?
-        content = version.content
-        content.mode = content.mode.url_name if content.mode
+      if version.edited?
+         prop['mode'] = prop['mode'].url_name if prop['mode']
 
-        if !content.klass.blank?
-          # update name
-          content.format = 'html' if content.format.blank?
-          self[:name] = name_from_content(:format => content.format, :mode => content.mode, :klass => content.klass)
-          version.title = self[:name]
+        if !prop['target_klass'].blank?
+          # update node_name
+          prop['format'] = 'html' if prop['format'].blank?
+          self.node_name = node_name_from_mode_and_format
+          self.title = self.node_name
 
-          if version.text.blank? && content.format == 'html' && content.mode != '+edit'
+          if text.blank? && prop['format'] == 'html' && prop['mode'] != '+edit'
             # set a default text
 
-            if content.klass == 'Node'
-              version.text = <<END_TXT
+            if prop['target_klass'] == 'Node'
+              self.text = <<END_TXT
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" do='void' lang="en" set_lang='[v_lang]' xml:lang='en'>
 <head do='void' name='head'>
-  <title do='title_for_layout' do='show' attr='v_title' name='page_title'>page title</title>
+  <title do='title_for_layout' do='show' attr='title' name='page_title'>page title</title>
   <!-- link href='favicon.png' rel='shortcut icon' type='image/png' / -->
   <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
   <r:void name='stylesheets'>
-    <r:stylesheets list='reset,zena,code'/>
+    <r:stylesheets/>
     <link href="style.css" rel="Stylesheet" type="text/css"/>
   </r:void>
 
-  <r:javascripts list='prototype,effects,zena'/>
+  <r:javascripts/>
   <r:uses_datebox/>
 </head>
 <body>
@@ -96,34 +114,46 @@ class Template < TextDocument
 </html>
 END_TXT
             else
-              version.text = "<r:include template='Node'/>\n"
+              self.text = "<r:include template='Node'/>\n"
             end
           end
         end
       end
-
-      super
     end
 
-    def valid_section
-      @need_skin_name_update = !new_record? && section_id_changed?
-      errors.add('parent_id', 'Invalid parent (section is not a Skin)') unless section.kind_of?(Skin)
-    end
-
-    def name_from_content(opts={})
-      opts[:format]  ||= version.content.format
-      opts[:mode  ]  ||= version.content.mode
-      opts[:klass ]  ||= version.content.klass
+    def node_name_from_mode_and_format(opts={})
+      opts[:format]  ||= prop['format']
+      opts[:mode  ]  ||= prop['mode']
+      opts[:target_klass ]  ||= prop['target_klass']
       format = opts[:format] == 'html' ? '' : "-#{opts[:format]}"
       mode   = (!opts[:mode].blank? || format != '') ? "-#{opts[:mode]}" : ''
-      "#{opts[:klass]}#{mode}#{format}"
+      "#{opts[:target_klass]}#{mode}#{format}"
     end
 
-    def update_content
-      if @need_skin_name_update
-        Template.connection.execute "UPDATE template_contents SET skin_name = #{Template.connection.quote(section[:name])} WHERE node_id = #{Template.connection.quote(self[:id])}"
-        @need_skin_name_update = nil
+    def validate_section
+      errors.add('parent_id', 'invalid (section is not a Skin)') unless section.kind_of?(Skin)
+    end
+
+    def validate_target_klass
+      if prop.target_klass_changed? && prop['target_klass']
+        errors.add('format', "can't be blank") unless prop['format']
+        # this is a master template (found when choosing the template for rendering)
+        if target_klass = Node.get_class(prop['target_klass'])
+          prop['tkpath'] = target_klass.kpath
+        else
+          errors.add('target_klass', 'invalid')
+        end
       end
     end
 
+    def template_content_before_validation
+      prop['mode']  = nil if prop['mode' ].blank?
+      prop['target_klass'] = nil if prop['target_klass'].blank?
+      unless prop['target_klass']
+        # this template is not meant to be accessed directly (partial used for inclusion)
+        prop['tkpath'] = nil
+        prop['mode']   = nil
+        prop['format'] = nil
+      end
+    end
 end

data/app/models/template_content.rb

@@ -1,7 +1,12 @@
+class TemplateContent < ActiveRecord::Base
+end
+=begin
+TODO: cleanup
+
 class TemplateContent < ActiveRecord::Base
   include Zena::Use::Upload::UploadedFile
 
-  include RubyLess::SafeClass
+  include RubyLess
   safe_attribute  :tkpath, :skin_name, :mode, :klass
   safe_method     :ext => String, :format => String, :content_type => String, :filename => String
   #attr_public  :file ?
@@ -12,8 +17,8 @@ class TemplateContent < ActiveRecord::Base
   before_validation :template_content_before_validation
   validate   :validate_template_content
 
-  extend  Zena::Acts::Multiversion
-  act_as_content
+  # extend  Zena::Acts::Multiversion
+  # act_as_content
 
   def preload_version(v)
     # dummy called by Version
@@ -37,7 +42,7 @@ class TemplateContent < ActiveRecord::Base
   end
 
   def size(format=nil)
-    version.text.size
+    text.size
   end
 
   def filename
@@ -55,11 +60,11 @@ class TemplateContent < ActiveRecord::Base
 
   def file=(file)
     @new_file = file
-    version.text = file.read
+    text = file.read
   end
 
   def file(mode=nil)
-    @new_file ||= StringIO.new(version.text)
+    @new_file ||= StringIO.new(text)
   end
 
   def version
@@ -112,3 +117,4 @@ class TemplateContent < ActiveRecord::Base
       end
     end
 end
+=end

data/app/models/text_document.rb

@@ -10,25 +10,28 @@ The version class used by text documents is the TextDocumentVersion.
 Content (file data) is stored in the TextDocumentVersion. The content class (TextDocumentContent) is responsible for faking the exitence of a real file.
 =end
 class TextDocument < Document
+
+  # Class Methods
   class << self
     # Return true if a new text document can be created with the content_type. Used by the superclass Document to choose the corret subclass when creating a new object.
     def accept_content_type?(content_type)
       (content_type =~ /^(text)/ && Zena::TYPE_TO_EXT[content_type.chomp] != ['rtf']) || (content_type =~ /x-javascript/)
     end
 
-    def version_class
-      TextDocumentVersion
+    # Return true if the content_type can change independantly from the file
+    def accept_content_type_change?
+      true
     end
-  end
+  end # Class Methods
 
 
   def can_parse_assets?
-    return ['text/css'].include?(version.content.content_type)
+    return ['text/css'].include?(content_type)
   end
 
   # Parse text content and replace all reference to relative urls ('img/footer.png') by their zen_path ('/en/image34.png')
   def parse_assets(text, helper, key)
-    if key == 'v_text' && version.content.content_type == 'text/css'
+    if key == 'text' && prop['content_type'] == 'text/css'
       res = text.dup
       # use skin as root
       skin = section
@@ -40,7 +43,7 @@ class TextDocument < Document
         return text
       end
 
-      current_folder = parent.fullpath
+      current_dir = parent.fullpath
 
       res.gsub!(/url\(\s*(.*?)\s*\)/) do
         match, src = $&, $1
@@ -66,7 +69,11 @@ class TextDocument < Document
             "url(#{quote}#{src}#{quote})"
           end
         else
-          if new_src = helper.send(:template_url_for_asset, :src => src, :current_folder=>current_folder, :parse_assets => true)
+          if new_src = helper.send(:template_url_for_asset,
+              :src          => src,
+              :base_path    => current_dir,
+              :parse_assets => true )
+
             "url(#{quote}#{new_src}#{quote})"
           elsif !(src =~ /\.\./) && File.exist?(File.join(SITES_ROOT, current_site.public_path, src))
             "url(#{quote}#{src}?#{File.mtime(File.join(SITES_ROOT, current_site.public_path, src)).to_i}#{quote})"
@@ -83,12 +90,35 @@ class TextDocument < Document
     res
   end
 
+  def file=(file)
+    @new_file = file
+    self.text = @new_file.read
+  end
+
+  def file(format=nil)
+    @loaded_file ||= @new_file || StringIO.new(text)
+  end
+
+  def filename
+    "#{title}.#{ext}"
+  end
+
+  # Get the file path defined in attachment.
+  def filepath(format=nil)
+    nil
+  end
+
+  # Return document file size (= version's text size).
+  def size(format=nil)
+    (text || '').size
+  end
+
   # Parse text and replace absolute urls ('/en/image30.jpg') by their relative value in the current skin ('img/bird.jpg')
   def unparse_assets(text, helper, key)
-    if key == 'v_text' && version.content.content_type == 'text/css'
+    if key == 'text' && prop['content_type'] == 'text/css'
       res = text.dup
       # use parent as relative root
-      current_folder = parent.fullpath
+      current_dir = parent.fullpath
 
       res.gsub!(/url\(('|")(.*?)\1\)/) do
         if $2[0..6] == 'http://'
@@ -98,10 +128,10 @@ class TextDocument < Document
           if url =~ /\A\/\w\w\/.*?(\d+)(_\w+|)\./
             zip, mode = $1, $2
             if asset = secure(Node) { Node.find_by_zip(zip) }
-              if asset.fullpath =~ /\A#{current_folder}\/(.+)/
-                "url(#{quote}#{$1}#{mode}.#{asset.version.content.ext}#{quote})"
+              if asset.fullpath =~ /\A#{current_dir}\/(.+)/
+                "url(#{quote}#{$1}#{mode}.#{asset.prop['ext']}#{quote})"
               else
-                "url(#{quote}/#{asset.fullpath}#{mode}.#{asset.version.content.ext}#{quote})"
+                "url(#{quote}/#{asset.fullpath}#{mode}.#{asset.prop['ext']}#{quote})"
               end
             else
               errors.add('asset', '{{zip}} not found', :zip => zip)
@@ -122,46 +152,49 @@ class TextDocument < Document
     end
   end
 
-  # List of keys to export in a zml file. "v_text" is ignored since it's exported in a separate file.
+  # List of keys to export in a zml file. "text" is ignored since it's exported in a separate file.
   def export_keys
     h = super
-    h[:zazen].delete('v_text')
+    h[:zazen].delete('text')
     h
   end
 
   # List of keys which need transformations
   def parse_keys
-    (super + (version.content.content_type == 'text/css' ? ['v_text'] : [])).uniq
-  end
-
-  # Return the code language used for syntax highlighting.
-  def content_lang
-    ctype = version.content.content_type
-    if ctype =~ /^text\/(.*)/
-      case $1
-      when 'x-ruby-script'
-        'ruby'
-      when 'html', 'zafu'
-        'zafu'
-      else
-        $1
-      end
-    else
-      nil
-    end
+    (super + (content_type == 'text/css' ? ['text'] : [])).uniq
   end
 
   private
+    class AssetHelper
+      attr_accessor :visitor
+      include Zena::Acts::Secure                # secure
+      include Zena::Use::Zazen::ViewMethods     # make_image, ...
+      include Zena::Use::ZafuTemplates::Common  # template_url_for_asset
+      include Zena::Use::Urls::Common           # data_path
+    end
 
     # Overwrite superclass (DocumentContent) behavior
     def valid_file
       return true
     end
 
-    def document_before_validation
+    def set_defaults
       super
-      content = version.content
-      content[:content_type] ||= 'text/plain'
-      content[:ext]  ||= 'txt'
+      self.content_type = 'text/plain' if content_type.blank?
+      self.ext          = 'txt'        if ext.blank?
+      parse_assets_text_assets
+    end
+
+    # Called from Document#set_defaults
+    def set_attachment_filename
+      # do nothing
+    end
+
+    def parse_assets_text_assets
+      if can_parse_assets? && prop.text_changed?
+        helper = AssetHelper.new
+        helper.visitor = visitor
+        self.text = parse_assets(self.text, helper, 'text')
+      end
     end
 end