Changeset 541

Timestamp:

2007-05-19 20:41:43 (2 years ago)

Author:

gaspard

Message:

[fix] lots of bug fixes related to looping redirects and complex zafu inclusions. Implemented '_edit' modes to update nodes with custom forms. Also added can='write', can='drive' test conditions

Files:

• trunk/app/controllers/application.rb (modified) (5 diffs)
• trunk/app/controllers/nodes_controller.rb (modified) (4 diffs)
• trunk/app/models/comment.rb (modified) (1 diff)
• trunk/app/models/node.rb (modified) (1 diff)
• trunk/app/models/template.rb (modified) (1 diff)
• trunk/app/models/template_content.rb (modified) (1 diff)
• trunk/app/views/discussions/_form.rhtml (modified) (1 diff)
• trunk/app/views/versions/edit.rhtml (modified) (1 diff)
• trunk/db/init/base/skins/default/Node.html (modified) (1 diff)
• trunk/db/init/base/skins/default/Project.html (modified) (1 diff)
• trunk/db/init/base/skins/default/layout.html (modified) (2 diffs)
• trunk/db/init/base/skins/default/title.html (added)
• trunk/lib/gettext_strings.rb (modified) (1 diff)
• trunk/lib/parser/lib/parser.rb (modified) (4 diffs)
• trunk/lib/parser/lib/rules/code_syntax.rb (modified) (1 diff)
• trunk/lib/parser/lib/rules/zafu.rb (modified) (1 diff)
• trunk/lib/parser/lib/rules/zena.rb (modified) (1 diff)
• trunk/lib/parser/test/parser_test.rb (modified) (1 diff)
• trunk/lib/parser/test/zafu.yml (modified) (3 diffs)
• trunk/locale/en/LC_MESSAGES/zena.mo (modified) (previous)
• trunk/locale/fr/LC_MESSAGES/zena.mo (modified) (previous)
• trunk/po/en/zena.po (modified) (7 diffs)
• trunk/po/fr/zena.po (modified) (9 diffs)
• trunk/po/zena.pot (modified) (7 diffs)
• trunk/test/integration/navigation_test.rb (modified) (2 diffs)

trunk/app/controllers/application.rb

@@ -181 +181 @@
-        end
-        @skin_names = [@skin_name, @skin.keys].flatten.uniq
-        
-        @expire_with_ids = []
-        
@@ -204 +203 @@
-    # tested in MainControllerTest
-    def get_template_text(opts)
-
+
+
-      @expire_with_ids << doc[:id]
-      
-      # FIXME: implement a link to set/remove 'dev' mode.
-      # session[:dev] ? doc.version.text : doc.version(:pub).text
-doc.version.text
+return doc.version.text, url
-    end
-
-    # TODO: implement
-    def template_url_for_asset(opts)
-find_template_document(opts)
+(find_template_document(opts) || [])[0]
-      if asset.public? && !current_site.authentication?
-        # force the use of a cacheable path for the data, even when navigating in '/oo'
@@ -243 +242 @@
-        skin_names << url.shift if url.size > 1
-      end
-
+skin_name = 
-      
-      skin_names.uniq.each do |skin_name|
@@ -253 +252 @@
-        break if document = secure(TextDocument) { TextDocument.find_by_path(path) } rescue nil
-      end
-document
+return document ? [document, ([skin_name] + url).join('/')] : nil
-    end
-  
@@ -303 +302 @@
-    # Choose best language to display content.
-    # 1. 'test.host/oo?lang=en' use 'lang', redirect without lang
-, do not redirect
-, do not redirect
+
+
-    # 4. 'test.host/'   use current session lang if any
-    # 5. 'test.host/'   use HTTP_ACCEPT_LANGUAGE
-    # 6. 'test.host/'   use default language
-    def set_lang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      
-      visitor.lang = session[:lang] # FIXME: this should not be needed, use global GetText.get_locale...

trunk/app/controllers/nodes_controller.rb

@@ -19 +19 @@
-=end
-class NodesController < ApplicationController
+  before_filter :clean_url, :only   => [:index, :show]
-  before_filter :find_node, :except => [:index, :not_found, :search, :attribute]
-  layout :popup_layout,     :only   => [:edit ]
@@ -190 +191 @@
-    
-    respond_to do |format|
-
+
+
+
+
+
+
+
-      format.js   { @flash = flash }
-    end
@@ -312 +319 @@
-  
-  protected
+    # Make sure the url is correct. Redirect if necessary.
+    def clean_url
+      case params[:action]
+      when 'index'
+        redirect_url = "/#{prefix}" if params[:prefix] != prefix || params[:lang]
+      when 'show'
+        redirect_url = if !params[:path] || params[:prefix] != prefix || params[:lang]
+          if params[:id]
+            zen_path(secure(Node) { Node.find_by_zip(params[:id]) })
+          else
+            request.parameters.merge(:prefix => prefix).delete(:lang)
+          end
+        end 
+      end
+
+      if redirect_url
+        redirect_to redirect_url
+        return false
+      end
+    end
+
+
+    
-    def find_node
-      if path = params[:path]
@@ -329 +359 @@
-        if params[:format] == '' || (params[:format] == 'html' && ( (zip != '' && @node.custom_base) || basepath != @node.basepath(true)))
-          redirect_to zen_path(@node, :mode => params[:mode])
+        elsif params[:mode] =~ /_edit/ && !@node.can_write?
+          redirect_to zen_path(@node)
-        end
-      elsif params[:id]

trunk/app/models/comment.rb

@@ -4 +4 @@
-belong to the user _anon_ (see #User) and must have the 'athor_name' field set.
-
-ZENA_ENV[:moderate_anonymous_comments] is set
+anonymous is moderated (User#moderated?)
-=end
-class Comment < ActiveRecord::Base

trunk/app/models/node.rb

@@ -462 +462 @@
-  # Same as fullpath, but the path includes the root node.
-  def rootpath
-ZENA_ENV[:site_name]
+visitor.site.name
-  end
-  

trunk/app/models/template.rb

@@ -26 +26 @@
-  end
-  
-  # Find the
-  # TODO: test
-  def sweep_cache
-    super
-    if self.kind_of?(Skin)
-      tmpl = "#{name}/any"
-    else
-      tmpl = "#{parent(:secure=>false)[:name]}/#{name}"
-    end
-    ZENA_ENV[:languages].each do |lang|
-      filepath = File.join(RAILS_ROOT,'app', 'views', 'templates', 'compiled')
-      filepath = "#{filepath}/#{tmpl}_#{lang}.rhtml"
-      if File.exist?(filepath)
-        File.delete(filepath)
-      end
-    end
-  end
-  
-  private
-  

trunk/app/models/template_content.rb

@@ -42 +42 @@
-      self[:skin_name] = node.section.name
-      self[:mode] = nil if self[:mode] == ''
+      self[:klass] = nil if self[:klass] == ''
-    end
-  

trunk/app/views/discussions/_form.rhtml

@@ -12 +12 @@
-  </div>
-  <div class='lang'>
-ZENA_ENV[:languages]
+visitor.site.lang_list
-  </div>
-  <div class='action'>

trunk/app/views/versions/edit.rhtml

@@ -8 +8 @@
-<div class='tab'>
-  <% form_tag( node_path(@node[:zip]), :method => :put, :multipart => @node.kind_of?(Document), :id => 'node_form') do -%>
-
+
+
+
+
-  <div class='validate'>
-    <div><input type="submit" onclick="$('loader').style.visibility = 'visible';" value='<%= _('validate') %>'/></div>

trunk/db/init/base/skins/default/Node.html

@@ -15 +15 @@
-  </r:with>
-  <r:with part='body/container/content/main'>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    
-    <r:summary text=''/>

trunk/db/init/base/skins/default/Project.html

@@ -13 +13 @@
-    
-    <r:home>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-      <r:summary text=''/>
-      <r:text/>
-      <r:else>
-h1 do='title' class='s30' status='true' actions='all'>this is the title</h1
+r:include template='title.html'/
-      </r:else>
-    </r:home>

trunk/db/init/base/skins/default/layout.html

@@ -26 +26 @@
-    </div>
-
-node' name='menu' select='root
-
+void' name='menu
+root' do='
-        <li do='each'><r:link attr='name'/>
-          <ul do='pages'>
@@ -35 +35 @@
-      </ul>
-    </div>
-
+
+
+
-  </div>
-

trunk/lib/gettext_strings.rb

@@ -63 +63 @@
-    
-    N_('no result found')   # search template
+    N_('search results')    # search template
-    
-    N_('btn_unplublish')    # version action

trunk/lib/parser/lib/parser.rb

@@ -16 +16 @@
-      
-      if test = @strings[url]
-test['src']
+return test['src'], url.split('_').join('/')
-      else
-        nil
@@ -71 +71 @@
-      end
-      
- = helper.send(:get_template_text, :src=>url, :current_folder=>'') || "<span class='parser_error'>template '#{url}' not found</span>"
+, url = helper.send(:get_template_text, :src=>url, :current_folder=>'') || ["<span class='parser_error'>template '#{url}' not found</span>", url]
-      url = "/#{url}" unless url[0..0] == '/' # has to be an absolute path
-      return [text, url]
@@ -165 +165 @@
-    expand_with(:preflight=>true)
-    if @parts != {}
-
+
+
-    else
-      expand_with(:blocks => @included_blocks)
@@ -198 +199 @@
-        return false if replacer.empty?
-        replace_with(replacer)
+        @params[:name] = name # in case replaced again
-      end
-    end

trunk/lib/parser/lib/rules/code_syntax.rb

@@ -102 +102 @@
-  def step
-    if ztag = scan(/\A<\/?r:[^>]+>/)  
-
+?
-      start_group :tag, "<#{$1}r:"
-      start_group :ztag, $2

trunk/lib/parser/lib/rules/zafu.rb

@@ -210 +210 @@
-          eat $&
-          if $1 != @end_tag
-            puts [@end_tag, $1].inspect
-            # error bad closing ztag
-            store "<span class='parser_error'>#{$&.gsub('<', '&lt;').gsub('>','&gt;')}</span>"

trunk/lib/parser/lib/rules/zena.rb

@@ -1082 +1082 @@
-      elsif lang = @params[:lang]
-        "#{node}.version.lang == #{lang.inspect}"
+      elsif can  = @params[:can]
+        # TODO: test
+        case can
+        when 'write'
+          "#{node}.can_write?"
+        when 'drive'
+          "#{node}.can_drive?"
+        end
-      elsif test = @params[:test]
-        value1, op, value2 = test.split(/\s+/)

trunk/lib/parser/test/parser_test.rb

@@ -36 +36 @@
-  testfile :zafu, :zafu_asset, :zafu_insight, :zazen
-  def test_single
-ztag_same_name_as_tag
+include_replace_same
-  end
-  

trunk/lib/parser/test/zafu.yml

@@ -33 +33 @@
-very_messy:
-  src: "this <r: blah> </r:truc> whak"
-z
+r
-
-bad_closing_tag:
-  src: "this <r:test>looks </r:truc> ok"
-z
+r
-
-do_tag:
@@ -214 +214 @@
-
-name_title:
-
+ <b do='void' name='comment'>nothing</b>
-  res: "title: <h1>dummy</h1>"
-
@@ -224 +224 @@
-  src: "include_with: <r:include template='/name/title'><h1 do='with' part='title' do='hello'/></r:include>"
-  res: "include_with: title: <h1>hello world!</h1>"
+
+include_with_keep_name:
+  src: "keep name: <r:include template='/name/title'><h1 do='with' part='title'><r:hello/> <i do='void' name='comment'>none</i></h1></r:include>"
+  res: "keep name: title: <h1>hello world! <i>none</i></h1>"
+  
+include_include:
+  src: "from ii: <r:include template='/include/with/keep/name'><r:with part='title/comment'>rabbit</r:with></r:include>"
+  res: "from ii: keep name: title: <h1>hello world! <i>rabbit</i></h1>"
+
+include_for_reverse:
+  src: "from ifr: <r:include template='/name'><r:with part='super/comment'>IFR</r:with></r:include>"
+  res: "from ifr: super: hey ho"
+
+include_replace_same:
+  src: "from IRS: <r:include template='/include/super/man'><span do='with' part='super/man'>goldorak</span></r:include>"
+  res: "from IRS: include_super: super: hey <span>goldorak</span>"
+
+include_reverse:
+  src: "from ir: <r:include template='/include/for/reverse'><h1 do='with' part='super'><i do='void' name='comment'>none</i> <r:hello/></h1></r:include>"
+  res: "from ir: from ifr: super: <h1><i>IFR</i> hello world!</h1>"
-
-include_empty:

trunk/po/en/zena.po

@@ -2 +2 @@
-msgstr ""
-"Project-Id-Version: 0.8.2\n"
-8 12:26
+9 18:28
-"PO-Revision-Date: 2007-05-14 15:18+0100\n"
-"Last-Translator: Gaspard Bucher <gaspard@teti.ch>\n"
@@ -14 +14 @@
-"X-Poedit-Basepath: /Users/gaspard/svk/zena\n"
-
-77
+85
-msgid "Please log in"
-msgstr "Please log in."
-
-
-
-
-
-
+
-msgid "datetime"
-msgstr "%Y-%m-%d %H:%M"
@@ -38 +34 @@
-msgstr "Invalid role."
-
-0
+2
-msgid "Backup created."
-msgstr ""
-
-2
+4
-msgid "Could not create backup."
-msgstr ""
-
-5
+7
-msgid "node updated"
-msgstr "Node successfully updated."
-
-7
+9
-msgid "could not update"
-msgstr "The node could not be updated."
-
-0
+8
-msgid "node not found"
-msgstr "Node not found."
-
-04
+12
-msgid "Order updated"
-msgstr "Order updated."
-
-06
+14
-msgid "Could not update order."
-msgstr ""
@@ -95 +91 @@
-msgstr ""
-
-3
+4
-msgid "Redaction proposed for publication."
-msgstr ""
-
-5
+6
-msgid "Could not propose redaction."
-msgstr ""
-
-2
+3
-msgid "Proposition refused."
-msgstr ""
-
-5
+6
-msgid "Could not refuse proposition."
-msgstr ""
@@ -669 +665 @@
-#: app/views/templates/document_create_tabs/_template.rhtml:3
-#: app/views/templates/document_create_tabs/_text_doc.rhtml:3
-2
+5
-msgid "validate"
-msgstr " validate "
@@ -965 +961 @@
-msgstr ""
-
-3
+6
-msgid "save"
-msgstr " save "
-
-17
+20
-msgid "btn_add_document"
-msgstr "<img src='/images/picture_add.png' alt='add documents'/>"
@@ -1187 +1183 @@
-msgstr "Node not found."
-
-
+
+
+
+
+
-#, fuzzy
-msgid "btn_unplublish"
-msgstr "<img src='/images/wand.png' alt='publish'/>"
-
-8
+9
-msgid "status_50"
-msgstr ""
-
-69
+70
-msgid "status_40"
-msgstr ""
-
-0
+1
-msgid "status_35"
-msgstr ""
-
-1
+2
-msgid "status_33"
-msgstr ""
-
-2
+3
-msgid "status_30"
-msgstr ""
-
-3
+4
-msgid "status_20"
-msgstr ""
-
-4
+5
-msgid "status_10"
-msgstr ""
-
-5
+6
-msgid "status_0"
-msgstr ""
-
-7
+8
-msgid "en"
-msgstr ""
-
-8
+9
-msgid "fr"
-msgstr ""
-
-79
+80
-msgid "de"
-msgstr ""
-
-0
+1
-msgid "Monday"
-msgstr ""
-
-1
+2
-msgid "Tuesday"
-msgstr ""
-
-2
+3
-msgid "Wednesday"
-msgstr ""
-
-3
+4
-msgid "Thursday"
-msgstr ""
-
-4
+5
-msgid "Friday"
-msgstr ""
-
-5
+6
-msgid "Saturday"
-msgstr ""
-
-6
+7
-msgid "Sunday"
-msgstr ""
-
-8
+9
-msgid "mon"
-msgstr ""
-
-89
+90
-msgid "tue"
-msgstr ""
-
-0
+1
-msgid "wed"
-msgstr ""
-
-1
+2
-msgid "thu"
-msgstr ""
-
-2
+3
-msgid "fri"
-msgstr ""
-
-3
+4
-msgid "sat"
-msgstr ""
-
-4
+5
-msgid "sun"
-msgstr ""
-
-6
+7
-msgid "January"
-msgstr ""
-
-7
+8
-msgid "February"
-msgstr ""
-
-8
+9
-msgid "March"
-msgstr ""
-
-99
+100
-msgid "April"
-msgstr ""
-
-0
+1
-msgid "May"
-msgstr ""
-
-1
+2
-msgid "June"
-msgstr ""
-
-2
+3
-msgid "July"
-msgstr ""
-
-3
+4
-msgid "August"
-msgstr ""
-
-4
+5
-msgid "September"
-msgstr ""
-
-5
+6
-msgid "October"
-msgstr ""
-
-6
+7
-msgid "November"
-msgstr ""
-
-7
+8
-msgid "December"
-msgstr ""
-
-09
+10
-msgid "User name:"
-msgstr ""
-
-0
+1
-msgid "Password:"
-msgstr ""
-
-3
+4
-msgid "you are editing the original"
-msgstr ""
-
-4
+5
-msgid "redaction saved"
-msgstr ""

trunk/po/fr/zena.po

@@ -2 +2 @@
-msgstr ""
-"Project-Id-Version: 0.8.2\n"
-8 12:26
-8 14:28
+9 18:28
+9 20:37
-"Last-Translator: Gaspard Bucher <gaspard@teti.ch>\n"
-"Language-Team: fr <gaspard@teti.ch>\n"
@@ -14 +14 @@
-"X-Poedit-Basepath: /Users/gaspard/svk/zena\n"
-
-77
+85
-msgid "Please log in"
-msgstr "Veuillez vous authentifier."
-
-
-
-
-
-
-
+
+
-msgid "datetime"
-msgstr "%d.%m.%Y %H:%M"
@@ -39 +35 @@
-msgstr "Role non-valable."
-
-0
+2
-msgid "Backup created."
-msgstr "Copie de sauvegarde effectuée."
-
-2
+4
-msgid "Could not create backup."
-msgstr "La sauvegarde n'a pas pu être créée."
-
-5
+7
-msgid "node updated"
-msgstr "Objet mis à jour."
-
-7
+9
-msgid "could not update"
-msgstr "L'objet n'a pas pu être mis à jour."
-
-0
+8
-msgid "node not found"
-msgstr "objet non trouvé"
-
-04
+12
-msgid "Order updated"
-msgstr "Ordre mis à jour."
-
-06
+14
-msgid "Could not update order."
-msgstr "L'ordre n'a pas pu être mis à jour."
@@ -96 +92 @@
-msgstr "La version n'a pas pu être éditée."
-
-3
+4
-msgid "Redaction proposed for publication."
-msgstr "La rédaction a été proposée pour la publication."
-
-5
+6
-msgid "Could not propose redaction."
-msgstr "La rédaction n'a pas pu être proposée pour la publication."
-
-2
+3
-msgid "Proposition refused."
-msgstr "La proposition a été refusée."
-
-5
+6
-msgid "Could not refuse proposition."
-msgstr "La proposition n'a pas pu être refusée."
@@ -751 +747 @@
-#: app/views/templates/document_create_tabs/_text_doc.rhtml:3
-#: app/views/users/_form.rhtml:45
-2
+5
-msgid "validate"
-msgstr " valider "
@@ -1054 +1050 @@
-msgstr "choisir les versions et visualiser les changements"
-
-3
+6
-msgid "save"
-msgstr " enregistrer "
-
-17
+20
-msgid "btn_add_document"
-msgstr "<img src='/images/picture_add.png' alt='ajouter des documents'/>"
@@ -1211 +1207 @@
-
-#: lib/gettext_strings.rb:51
-#, fuzzy
-msgid "original by"
-original
+premiÚre version par
-
-#: lib/gettext_strings.rb:52
@@ -1247 +1242 @@
-msgstr "la recherche n'a donné aucun résultat"
-
-
+
+
+
+
+
-msgid "btn_unplublish"
-msgstr "<img src='/images/delete.png' alt='dépublier'/>"
-
-8
+9
-msgid "status_50"
-msgstr "publié"
-
-69
+70
-msgid "status_40"
-msgstr "proposé"
-
-0
+1
-msgid "status_35"
-msgstr "proposé avec"
-
-1
+2
-msgid "status_33"
-msgstr "rédaction visible"
-
-2
+3
-msgid "status_30"
-msgstr "rédaction"
-
-3
+4
-msgid "status_20"
-msgstr "remplacé"
-
-4
+5
-msgid "status_10"
-msgstr "enlevé"
-
-5
+6
-msgid "status_0"
-msgstr "effacé"
-
-7
+8
-msgid "en"
-msgstr "anglais"
-
-8
+9
-msgid "fr"
-msgstr "français"
-
-79
+80
-msgid "de"
-msgstr "allemand"
-
-0
+1
-msgid "Monday"
-msgstr "lundi"
-
-1
+2
-msgid "Tuesday"
-msgstr "mardi"
-
-2