Changeset 496

Timestamp:

2007-05-08 09:15:14 (2 years ago)

Author:

gaspard

Message:

[fix] small bug fixes to clean tests.

Files:

• trunk/app/controllers/versions_controller.rb (modified) (1 diff)
• trunk/app/helpers/application_helper.rb (modified) (3 diffs)
• trunk/app/models/image.rb (modified) (1 diff)
• trunk/app/views/documents/show.rhtml (modified) (1 diff)
• trunk/app/views/versions/edit.rhtml (modified) (1 diff)
• trunk/db/init/base/skins/default/notes.html (modified) (1 diff)
• trunk/lib/multiversion.rb (modified) (1 diff)
• trunk/lib/parser/lib/rules/zazen.rb (modified) (1 diff)
• trunk/lib/parser/lib/rules/zena.rb (modified) (2 diffs)
• trunk/lib/parser/test/parser_test.rb (modified) (1 diff)
• trunk/lib/parser/test/zazen.yml (modified) (2 diffs)
• trunk/public/images/ext (modified) (1 prop)
• trunk/test/fixtures/versions.yml (modified) (1 diff)
• trunk/test/fixtures/zips.yml (modified) (1 diff)
• trunk/test/helpers/basic.yml (modified) (1 diff)

trunk/app/controllers/versions_controller.rb

@@ -166 +166 @@
-    def find_node
-      @node = secure(Node) { Node.find_by_zip(params[:node_id]) }
-
+try to 
-    end
-    

trunk/app/helpers/application_helper.rb

@@ -212 +212 @@
-  # * [!14!:www.example.com] use an image for an outgoing link
-  def zazen(text, opt={})
+    return '' unless text
-    opt = {:images=>true, :pretty_code=>true}.merge(opt)
-    img = opt[:images]
@@ -231 +232 @@
-  # Creates a link to the node referenced by id
-  def make_link(opts)
+    link_opts = {}
+    if opts[:id] =~ /(\d+)(_\w+|)(\.\w+|)/
+      opts[:id]     = $1
+      link_opts[:mode]   = ($2 != '') ? $2[1..-1] : nil
+      link_opts[:format] = ($3 != '') ? $3[1..-1] : nil
+    end
-    node = secure(Node) { Node.find_by_zip(opts[:id]) }
-    title = (opts[:title] && opts[:title] != '') ? opts[:title] : node.v_title
+    
+    link_opts[:format] = node.c_ext if link_opts[:format] == 'data'
-    if opts[:id][0..0] == '0'
-
-
-
+, link_opts
+
+, link_opts
-    end
-  rescue ActiveRecord::RecordNotFound
@@ -299 +308 @@
-    if link.nil?
-      prefix + image + suffix
-$
+
-      prefix + make_link(:id=>link,:title=>image) + suffix
-    else

trunk/app/models/image.rb

@@ -65 +65 @@
-  # Be carefull as this method changes the current file. So you should make a backup version before croping the image (the popup editor displays a warning).
-  def c_crop=(format)
-format[:x].to_i, format[:y].to_i, format[:w].to_i, format[:h].to_i
->= 0 && y >= 0 && w <= c_width && h <= c_height
+[format[:x].to_i, 0].max, [format[:y].to_i,0].max, [format[:w].to_i, c_width].min, [format[:h].to_i, c_height].min
+< c_width && y < c_height && w > 0 && h > 0
-      # do crop
-      if file = version.content.crop(format)

trunk/app/views/documents/show.rhtml

@@ -13 +13 @@
-      <tr>
-        <td class='preview'><p><%= img_tag(@node, :mode=>'pv') %></p><p class='size'><%= fsize(@node.c_size) %></p></td>
-id
+zip
-    </table>
-    <p class='btn_validate'><%= link_to transb("upload more"), new_document_path(:parent_id => @node.parent_zip) %> // <%= node_actions(:actions => :edit) %> </p>

trunk/app/views/versions/edit.rhtml

@@ -15 +15 @@
-    <div><%# FIXME = submit_to_remote('backup', transb('backup'), :url=>{:action => 'backup', :controller=>'version', :id=>@node.v_id}, :loading=>"$('loader').style.visibility = 'visible';") %></div>
-    <% end -%>
-# FIXME = url_for :controller=>'document', :action=>'new', :parent_id=>@node 
+= new_document_path(:parent_id=>@node[:zip])
-  </div>
-  <div class='readers'>

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

@@ -4 +4 @@
-    <z:form><li class='inline_form'><form>
-      <input type='hidden' name='node[parent_id]' value='' do='void' set_value='[project_id]'/>
-Note
+Post
-      <z:input type='date_box' attr='log_at'/>
-      <input type='text' name='node[v_title]' do='void' set_value='[v_title]' size='25'/>

trunk/lib/multiversion.rb

@@ -290 +290 @@
-          
-          if number && !new_record? && can_drive?
-TODO
+FIXME: IS NOT SECURE !!! does not work
-            @version = versions.find_by_number(number)
-          else

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

@@ -89 +89 @@
-    
-    def scan_quote
-
+[^\s]*
-        eat $&
-        # link inside the cms "":34

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

@@ -191 +191 @@
-    end
-    
-    # TODO: test
-    # TODO: replace with a more general 'zazen' or 'show' with id ?
-    def r_summary
-      unless @params[:or]
-        text = @params[:text] ? @params[:text].inspect : node_attribute('v_summary')
-@params[:text].inspec
+tex
-      else
-        first_name = 'v_summary'
@@ -210 +209 @@
-        "<% end %>"
-      end
-        
-      # if opt[:as]
-      #   key = "#{opt[:as]}#{obj.v_id}"
-      #   preview_for = opt[:as]
-      #   opt.delete(:as)
-      # else
-      #   key = "#{sym}#{obj.v_id}"
-      # end
-      # if opt[:text]
-      #   text = opt[:text]
-      #   opt.delete(:text)
-      # else
-      #   text = obj.send(sym)
-      #   if (text.nil? || text == '') && sym == :v_summary
-      #     text = obj.v_text
-      #     opt[:images] = false
-      #   else
-      #     opt.delete(:limit)
-      #   end
-      # end
-      # if [:v_text, :v_summary].include?(sym)
-      #   if obj.kind_of?(TextDocument) && sym == :v_text
-      #     lang = obj.content_lang
-      #     lang = lang ? " lang='#{lang}'" : ""
-      #     text = "<code#{lang} class='full'>#{text}</code>"
-      #   end
-      #   text  = zazen(text, opt)
-      #   klass = " class='text'"
-      # else
-      #   klass = ""
-      # end
-      # if preview_for
-      #   render_to_string :partial=>'node/show_attr', :locals=>{:id=>obj[:id], :text=>text, :preview_for=>preview_for, :key=>key, :klass=>klass,
-      #                                                        :key_on=>"#{key}#{Time.now.to_i}_on", :key_off=>"#{key}#{Time.now.to_i}_off"}
-      # else
-      #   "<div id='#{key}'#{klass}>#{text}</div>"
-      # end
-    end
-    

trunk/lib/parser/test/parser_test.rb

@@ -36 +36 @@
-  testfile :zafu, :zafu_asset, :zafu_insight, :zazen
-  def test_single
-fu', 'include_empty
+zen', 'link_with_mode_and_format
-  end
-  

trunk/lib/parser/test/zazen.yml

@@ -84 +84 @@
-  res: "<p>[make_image id:|12| images:true link:|12| size:|pv| style:||]</p>"
-  
+image_with_link_mode:
+  src: "!12.pv!:20_changes"
+  res: "<p>[make_image id:|12| images:true link:|20_changes| size:|pv| style:||]</p>"
+  
+image_with_link_mode_and_format:
+  src: "!12.pv!:20_med.data"
+  res: "<p>[make_image id:|12| images:true link:|20_med.data| size:|pv| style:||]</p>"
+  
-image_with_http_link:
-  src: "!12.pv!:http://www.example.org"
@@ -95 +103 @@
-  src: '"this is a title":23'
-  res: '<p>[make_link id:|23| title:|this is a title|]</p>'
+
+link_with_mode:
+  src: 'I like "":20_med'
+  res: '<p>I like [make_link id:|20_med| title:||]</p>'
+
+link_with_format:
+  src: 'look "here":30.data'
+  res: '<p>look [make_link id:|30.data| title:|here|]</p>'
+    
+link_with_mode_and_format:
+  src: 'look "here":30_med.data'
+  res: '<p>look [make_link id:|30_med.data| title:|here|]</p>'
-
-link_no_title:

trunk/test/fixtures/versions.yml

@@ -9 +9 @@
-  comment:        no comment yet
-  title:          Zena the wild CMS
-no summary yet
-nothing written yet
+''
+This is the root of your peaceful tests.
-  lang:           en
-  number:         1

trunk/test/fixtures/zips.yml

@@ -1 +1 @@
-zena_counter:
-  site_id:      1
-48
+62
-  
-ocean_counter:

trunk/test/helpers/basic.yml

@@ -449 +449 @@
-        <p>You are all invited to <strong>Romanel</strong> for a great party this weekend.</p></div>
-
+summary:
+  context:
+    node: 'zena'
+  src: "<z:summary/>"
+  res: "<div id='v_summary11' class='zazen'></div>"
+
+summary_exists:
+  src: "<z:summary/>"
+  res: "<div id='v_summary22' class='zazen'><p>status summary</p></div>"
+
-empty_summary:
-  src: "<z:summary text=''/>"
-  res: "<div id='v_summary22' class='zazen'></div>"
+
+summary_or_text_has_summary:
+  src: "<z:summary or='v_text'/>"
+  res: "<div id='v_summary22' class='zazen'><p>status summary</p></div>"
+
+summary_or_text_no_summary:
+  context:
+    node: 'zena'
+  src: "<z:summary or='v_text'/>"
+  res: "<div id='v_text11' class='zazen'><p>This is the root of your peaceful tests.</p></div>"