Changeset 1219

Timestamp:

2008-10-11 08:45:14 (3 months ago)

Author:

gaspard

Message:

commit a1dc9167ff3008a31caa7a5f618d1f0d5edbdff1
Merge: 50bfde6... 6dab57d...
Author: Gaspard Bucher <gaspard@teti.ch>

Merge branch 'export_226'

Files:

• trunk/README (modified) (1 diff)
• trunk/app/helpers/application_helper.rb (modified) (2 diffs)
• trunk/app/models/node.rb (modified) (10 diffs)
• trunk/config/awstats.conf.rhtml (modified) (1 diff)
• trunk/db/init/base/help.en.zml (modified) (2 diffs)
• trunk/db/init/base/help.fr.zml (modified) (2 diffs)
• trunk/db/migrate/000_zena/046_fix_zazen_image_tag.rb (added)
• trunk/lib/parser/lib/rules/zazen.rb (modified) (8 diffs)
• trunk/lib/parser/test/parser/zazen.yml (modified) (3 diffs)
• trunk/test/helpers/zazen_test.rb (modified) (6 diffs)
• trunk/test/helpers/zena_parser/zazen.yml (modified) (3 diffs)
• trunk/test/sites/zena/versions.yml (modified) (1 diff)
• trunk/test/unit/iformat_test.rb (modified) (1 diff)
• trunk/test/unit/node_test.rb (modified) (3 diffs)
• trunk/vendor/gettext-1.90.0.zip (deleted)
• trunk/vendor/plugins/gettext_fix (added)
• trunk/vendor/plugins/gettext_fix/patch (added)
• trunk/vendor/plugins/gettext_fix/patch/base_additions.rb (added)

trunk/README

@@ -102 +102 @@
-=== 3. install Gems
-
-
-
-
-
+
+
-From source
-

trunk/app/helpers/application_helper.rb

@@ -304 +304 @@
-  # ** [!>.14!] or [!>14!] inline image surrounded with <p class='img_right'></p>
-  # ** [!=.14!] or [!=14!] inline image with <p class='img_center'></p>
-.
+_
-  # ** all the options above can be used together as in [!>.14.med!] : inline image on the right, size 'med'.
-  # ** [![2,3,5]!] gallery : inline preview with javascript inline viewer
@@ -334 +334 @@
-  
-  # Find a node's zip based on a query shortcut. Used by zazen to create a link for ""::art for example.
-
-
-
+
+
+
+
+
+
-
-  # Parse the text in the given context (used by zazen)

trunk/app/models/node.rb

@@ -258 +258 @@
-      native_classes[kp] || VirtualClass.find(:first, :conditions=>["site_id = ? AND kpath = ?",current_site[:id], kp])
-    end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      str = id.to_s
-      if str =~ /\A\d+\Z/
-        # zip
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-    end
@@ -414 +435 @@
-          name   = "#{$1}#{$4}"
-          lang   = $2.blank? ? nil : $2[1..-1]
-
+ # FIXME: this should be done with proper 'start_path' [#226]
-          attrs['name']     = name
-          attrs['v_lang']   = lang || attrs['v_lang'] || visitor.lang
@@ -433 +454 @@
-          
-          # we have a zml file. Create a version with this file
-
+ # FIXME: this should be done with proper 'start_path' (= parent.path) [#226]
-          attrs['name']     = name
-          attrs['v_lang'] ||= lang
@@ -541 +562 @@
-      node
-    end
-
-    # Find a node's zip based on a query shortcut. Used by zazen to create a link for ""::art for example.
-    def find_node_by_shortcut(string,offset=0)
-      raise Zena::AccessViolation if self.scoped_methods == []
-      find(:first, Node.match_query(string.gsub('-',' '), :offset => offset))
-    end
-    
-    # Paginate found results. Returns [previous_page, collection, next_page]. You can specify page and items per page in the query hash :
@@ -636 +651 @@
-    # Translate attributes from the visitor's reference to the application.
-    # This method translates dates, zazen shortcuts and zips and returns a stringified hash.
-
+, start_path = nil
-      res = {}
-      res['parent_id'] = new_attributes[:_parent_id] if new_attributes[:_parent_id] # real id set inside zena.
@@ -649 +664 @@
-      
-      if !res['parent_id'] && p = attributes['parent_id']
-
+, :id, start_path
-      end
-      
@@ -656 +671 @@
-        
-        if ['rgroup_id', 'wgroup_id', 'pgroup_id'].include?(key)
-
+, :id
-        elsif ['rgroup', 'wgroup', 'pgroup'].include?(key)
-
+, :id
-        elsif ['user_id'].include?(key)
-
+, :id
-        elsif ['v_publish_from', 'log_at', 'event_at'].include?(key)
-          if attributes[key].kind_of?(Time)
@@ -670 +685 @@
-        elsif key =~ /^(\w+)_id$/
-          if key[0..1] == 'd_'
-:zip
+ :zip, start_path
-          else
-
+,  :id, start_path
-          end
-        elsif key =~ /^(\w+)_ids$/
@@ -678 +693 @@
-          values = attributes[key].kind_of?(Array) ? attributes[key] : attributes[key].split(',')
-          if key[0..1] == 'd_'
-:zip
+ :zip, start_path
-          else
-:id 
+  :id, start_path
-          end
-          res[key] = values.compact
@@ -701 +716 @@
-    end
-
-
+, start_path = nil
-      attributes = YAML::load( File.read( filepath ) )
-      attributes.delete(:_parent_id)
-
+, start_path
-    end
-    

trunk/config/awstats.conf.rhtml

@@ -166 +166 @@
-# Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]"
-#
-
+ stats.<%= host %>
-
-

trunk/db/init/base/help.en.zml

@@ -25 +25 @@
-  |_. markup |_. result |
-  | @!37!@ | image '37' in std format |
-.
-.
-.
+_
+_
+_
-  | @!<.37!@ | image '37', float left (see below) |
-  | @!37!:http://example.org@ | image '37', link to 'example.org' |
@@ -75 +75 @@
-  |_. markup |_. result |
-  | @!37!@ | image '37' in std format |
-.
-.
-.
+_
+_
+_
-  | @!<.37!@ | image '37', float left (see below) |
-  | @!37!:http://example.org@ | image '37', link to 'example.org' |

trunk/db/init/base/help.fr.zml

@@ -23 +23 @@
-  |_. markup |_. result |
-  | @!37!@ | image '37' in std format |
-.
-.
-.
+_
+_
+_
-  | @!<.37!@ | image '37', float left (see below) |
-  | @!37!:http://example.org@ | image '37', link to 'example.org' |
@@ -69 +69 @@
-  |_. markup |_. result |
-  | @!37!@ | image '37' in std format |
-.
-.
-.
+_
+_
+_
-  | @!<.37!@ | image '37', float left (see below) |
-  | @!37!:http://example.org@ | image '37', link to 'example.org' |

trunk/lib/parser/lib/rules/zazen.rb

@@ -6 +6 @@
-module Zazen
-  module Tags
-    
-    # This is not exactly how compile/render is meant to work with Parser, but there is no real need for a two step
-    # rendering, so we compile here (enter(:void)) instead of doing this whith 'start'. This also lets us have the
@@ -48 +47 @@
-module Zazen
-  module Rules
+    PSEUDO_ID_REGEXP = ":[0-9a-zA-Z-]+\\+*|\\([^\\)]+\\)"
+    
-    def start(mode)
-      @helper = @options[:helper]
@@ -150 +151 @@
-          store @helper._('[documents]')
-        end
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-              link = link_node[:zip].to_s + rest
-            end
@@ -181 +181 @@
-          store $&
-        else
-#{offset != '' ? offset.size+1 : ''}
-
-\.
-.
+
+
+_
+_
-        #puts "IMAGE:[#{$&}]"
-        eat $&
-        style, id, other_opts, mode, title_opts, title, link = $1, $2, $3, $4, $5, $6, $8
-:([a-zA-Z-]+)(\+*)(.*)
-3
-shortcut($1,$2.size
+(#{PSEUDO_ID_REGEXP})(.*)$
+2
+pseudo($1
-            link = link_node[:zip].to_s + rest
-          end
@@ -221 +221 @@
-          store @helper.make_link(:title=>title,:id=>id,:sharp=>sharp)
-        end
-:([a-zA-Z-]+)(\+*
+(#{PSEUDO_ID_REGEXP}
-        #puts "SHORTCUT_LINK:[#{$&}]"
-        eat $&
-id, offset, mode = $1, $2, $3, $4
-shortcut(id,offset.size
-
+pseudo_id, mode_format, mode, format, dash = $1, $2, $3, $4, $5, $6
+pseudo(pseudo_id
+_format
-          if @parse_shortcuts
-            # replace shortcut
-            store "\"#{title}\":#{id}"
-          else
-
+
+
+
+
+
-            if id =~ /(.*?)#(.*)/
-              id, sharp = $1, $2
@@ -241 +245 @@
-          store $&
-        else
-
+
+
-        end
-      else
@@ -381 +386 @@
-    def parse_document_ids(str)
-      str.split(',').map do |id|
-
-
-
+
+
-            if node.kind_of?(Document)
-              # replace shortcut
@@ -393 +397 @@
-            end
-          elsif @parse_shortcuts
-":#{id}#{offset}"
+id
-          else
-            nil # document not found

trunk/lib/parser/test/parser/zazen.yml

@@ -36 +36 @@
-    Text updated in [July 2008].
-    
-.
+_
-  res: "<p>Text updated in [July 2008].</p>\n\n\n\t<p>[make_image id:|30| images:true mode:|full| style:||]</p>"
-
@@ -83 +83 @@
-  
-image_with_format:
-.
+_
-  res: "<p>[make_image id:|21| images:true mode:|mini| style:||]</p>"
-  
@@ -99 +99 @@
-  
-image_with_link:
-.
+_
-  res: "<p>[make_image id:|12| images:true link:|12| mode:|pv| style:||]</p>"
-  
-image_with_link_mode:
-.
+_
-  res: "<p>[make_image id:|12| images:true link:|20_changes| mode:|pv| style:||]</p>"
-  
-image_with_link_mode_and_format:
-.
+_
-  res: "<p>[make_image id:|12| images:true link:|20_med.data| mode:|pv| style:||]</p>"
-  
-image_with_http_link:
-.
+_
-  res: "<p>[make_image id:|12| images:true link:|http://www.example.org| mode:|pv| style:||]</p>"
-

trunk/test/helpers/zazen_test.rb

@@ -8 +8 @@
-    super
-  end
-
+
-  # all these additions are replaced by the traduction of 'unknown link' if the user does not have read access to the linked node.
-  def test_bad_link
-    assert_match %r{unknown link}, zazen('"hello":99')
-  end
-
+
-  def test_wiki_link
-    login(:tiger)
@@ -19 +19 @@
-    assert_match %r{<cite>blah</cite> <cite>blih <a.*>test</a> it</cite>}, zazen('??blah?? ??blih ?test? it??')
-  end
-
+
-  def test_image_title
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-  end
-
+
-  def test_make_link
-    login(:tiger)
@@ -43 +41 @@
-
-  def test_make_image
-
-
-
-
-
-
-
+
+
+
+
+
-  end
-
@@ -56 +52 @@
-    assert_match %r{<p><a.*href=.*oo/projects/cleanWater/document25\.pdf.*img src='/images/ext/pdf.png' width='32' height='32' alt='pdf document' class='doc'/></a></p>}, zazen('!25!')
-    assert_match %r{<p><a.*href=.*oo/projects/cleanWater/document25\.pdf.*img src='/images/ext/pdf.png' width='32' height='32' alt='pdf document' class='doc'/></a></p>}, zazen('!025!') # same as '!25!'
-.
+_
-  end
-
@@ -64 +60 @@
-
-  def test_make_image_align
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  end
-
-  def test_make_iformat
-
-
-
-
-
+
+
+
-  end
-
-  def test_all_options
-
-
-
-
-
+
+
+
-  end
-
-  def test_make_gallery
-    login(:anon)
-
-
-
-
-
-
-
+
+
+
+
+
-  end
-
-  def test_list_nodes
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  end
-
-  def test_image_as_link
-
-
-
-
-
-
-
+
+
+
+
+
-  end
-
-  def test_full
-
-
-
+
-  end
-
+
-  def test_empty_image_ref
-    assert_equal '<p>!!</p>', zazen('!!')
@@ -141 +123 @@
-    assert_equal "<p>!!!</p>", zazen('!!!')
-  end
-
+
-  def test_no_images
-
-
-
+
-  end
-  
+  def test_pseudo_id
+    assert_equal '<p>This is a <a href="/en/contact15.html">people/lion</a>.</p>', zazen('This is a "link"::lio.')
+    assert_equal '<p>This is a <a href="/en/image30_pv.jpg">projects/wiki/bird_pv.jpg</a>.</p>', zazen('This is a "link"::bir_pv.data.')
+  end
+  
+  def test_pseudo_id_numbers_only
+    login(:lion)
+    lion = secure!(Node) { nodes(:lion) }
+    assert lion.update_attributes(:name => '1234')
+    login(:anon)
+    assert_equal '<p>This is a <a href="/en/contact15.html">people/1234</a>.</p>', zazen('This is a "link"::123.')
+  end
+  
+  def test_pseudo_path
+    login(:lion)
+    lion = secure!(Node) { nodes(:lion) }
+    assert lion.update_attributes(:name => 'status')
+    
+    @node = secure!(Node) { nodes(:cleanWater) }
+    assert_equal '<p>Read <a href="/oo/projects/cleanWater/page22.html">projects/cleanWater/status</a></p>', zazen('Read "":(/projects/cleanWater/status)')
+    assert_equal '<p>Read <a href="/oo/projects/cleanWater/page22.html">projects/cleanWater/status</a></p>', zazen('Read "":(status)')
+    
+    @node = secure!(Node) { nodes(:people) }
+    assert_equal '<p>Read <a href="/oo/projects/cleanWater/page22.html">projects/cleanWater/status</a></p>', zazen('Read "":(/projects/cleanWater/status)')
+    assert_equal "<p>See <img src='/en/image30_med.jpg' width='220' height='200' alt='bird' class='med'/></p>", zazen('See !:(/projects/wiki/bird)_med!')
+    assert_equal "<p>See <a href=\"/oo/contact15.html\"><img src='/en/image30_med.jpg' width='220' height='200' alt='bird' class='med'/></a></p>", zazen('See !:(/projects/wiki/bird)_med!:(status)')
+    assert_equal '<p>Read <a href="/oo/contact15.html">people/status</a></p>', zazen('Read "":(status)')
+    
+    @node = secure!(Node) { nodes(:wiki) }
+    assert_equal "<p>See <a href=\"/oo/projects/cleanWater\"><img src='/en/image30_med.jpg' width='220' height='200' alt='bird' class='med'/></a></p>", zazen('See !:(bird)_med!:(/projects/cleanWater)')
+  end
+
-end

trunk/test/helpers/zena_parser/zazen.yml

@@ -29 +29 @@
-  
-complex_link:
-.
+_
-  res: "<p style=\"text-align:left;\"><div class='img_left'><a href=\"/oo/projects/cleanWater/page22.html\"><img src='/en/image31_pv.jpg' width='70' height='70' alt='flower' class='pv'/></a></div></p>\n\n\n\t<h4 class=\"clear\"><a href=\"/oo/projects/cleanWater/page22.html\">status title</a></h4>"
-
@@ -50 +50 @@
-zip_shortcut_link_with_mode_format:
-  tem: "<%= zazen('Look \"here\"::lake_life.rss, \"\"::lake+_life.data.') %>"
-</a>, <a href=.*image24_life.jpg.*projects/cleanWater/lake
+_life.rss</a>, <a href=.*image24_life.jpg.*projects/cleanWater/lake_life.jpg
-
-zip_shortcut_image:
@@ -57 +57 @@
-
-zip_shortcut_image_with_options:
-.med! or !=.:lake+.
+_med! or !=.:lake+_
-  res: "/<p>Look \[projects/cleanWater/lakeAddress is not a document\] or .*center.*<img src=.*image24_pv.jpg/"
-

trunk/test/sites/zena/versions.yml

@@ -78 +78 @@
-    Fusce erat erat, nonummy non, facilisis ut, tristique quis, risus. Vestibulum libero sem, aliquet id, varius at, pellentesque in, diam. Fusce in diam. Quisque congue eros pellentesque leo. Phasellus tortor odio, cursus sed, ullamcorper sed, luctus et, velit. Etiam consectetuer. In luctus, quam eget dictum euismod, mi dui sollicitudin ante, nec nonummy erat dui nec tellus. Quisque quam. Curabitur in orci. Vivamus eu turpis.
-    
-.
+_
-    
-    Maecenas at est. Morbi sem enim, posuere in, commodo vel, imperdiet non, augue. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Phasellus consequat pharetra elit. Pellentesque purus ante, ornare ac, tristique vitae, congue sit amet, pede. Curabitur eu nibh at lorem luctus lacinia. Proin lobortis. Nullam leo. Fusce fermentum facilisis erat. Nam dolor.

trunk/test/unit/iformat_test.rb

@@ -156 +156 @@
-    imf = Iformat.create(:name => 'header', :height=>'34', :width => '500', :size => 'force')
-    assert imf.new_record?, "New record"
-%{fn}
+Name
-  end
-  

trunk/test/unit/node_test.rb

@@ -32 +32 @@
-    login(:tiger)
-    [
-.
-.
+_
+_
-       
-      ["Hi ![30,:lake+]! ![]!",
@@ -41 +41 @@
-       "Hi !{30,24}! !{}!"],
-
-.
-.
+_
+_
-       
-      ["Hi, this is normal "":1/ just a\n\n* asf\n* asdf ![23,33]!",
@@ -1333 +1333 @@
-  end
-  
+  def test_translate_pseudo_id_path
+    login(:lion)
+    lion = secure!(Node) { nodes(:lion) }
+    assert lion.update_attributes(:name => 'status')
+       # path                           base_path
+    { ['(/projects/cleanWater/status)', nil]  => nodes_id(:status), 
+      ['(/projects/cleanWater/status)', 'people']  => nodes_id(:status),
+      ['(status)', 'people']  => nodes_id(:lion),
+      ['(status)', 'projects/cleanWater']  => nodes_id(:status),
+    }.each do |k,v|
+      assert_equal v, secure(Node) { Node.translate_pseudo_id(k[0],:id,k[1]) }, "'#{k.inspect}' should translate to '#{v}'"
+    end
+  end
+  
-  def test_safe_attribute
-    login(:ant)