@@ -3,11 +3,27 @@ CHANGESET1: to: '0.14.1' CHANGES: - basic: - if_or: "<r:if can='write' or_test='[d_foo]'>hello</r:if>" - if_or: "<r:if can='write' or_test='d_foo'>hello</r:if>" + if_or: + old: "<r:if can='write' or_test='[d_foo]'>hello</r:if>" + new: "<r:if can='write' or_test='d_foo'>hello</r:if>" SHOULD_CHANGE: basic: - link_sharp_name: "<r:link sharp='[name]'/>" - link_sharp_name: "<r:link sharp='#{name}'/>" \ No newline at end of file + link_anchor_name: + old: "<r:link anchor='[name]'/>" + new: "<r:link anchor='#{name}'/>" + +CHANGESET2: + from: '0.15.1' + to: '0.15.2' + + CHANGES: + basic: + link_sharp: + old: "<r:link sharp='true'/>" + new: "<r:link anchor='true'/>" + anchor_with_link: + old: "<r:link anchor='true'/>" + new: "<r:anchor do='link'/>" + + doc/zafu_changes.yml @@ -18,6 +18,9 @@ module Zafu end end res[key.to_sym] = value + elsif tag_type == :link && k == :_name + # :_name set by r_anchor + res[:name] ||= v elsif tag_type == :link && ![:style, :class, :id, :title].include?(k) # bad html parameter for links (some keys for link tags are used as query parameters) # filter out @@ -26,10 +29,10 @@ module Zafu end end - if params[:anchor] - @anchor_param = nil - res[:name] = anchor_name(params[:anchor], node) - end + #if params[:anchor] + # @anchor_param = nil + # res[:name] = anchor_name(params[:anchor], node) + #end res end lib/zafu/core/html.rb @@ -14,7 +14,9 @@ module Zafu if key = @params[:store_date] set_stored(Date, key, current_date) end - @anchor_param = @params[:anchor] + if @method != 'link' + @anchor_param = @params[:anchor] + end true end @@ -23,11 +25,10 @@ module Zafu def after_render(text) if @anchor_param @params[:anchor] = @anchor_param # set back in case of double rendering so it is computed again - res = r_anchor + super + r_anchor + super else - res = super + super end - res end # Our special version of r_expand_with tag with "set_" parsing. lib/zafu/core/move_to_parser.rb @@ -64,15 +64,15 @@ module Zafu opts[:mode] = mode.inspect end - if sharp = params.delete(:sharp) - opts[:sharp] = sharp.inspect + if anchor = params.delete(:anchor) + opts[:anchor] = anchor.inspect end - if sharp_in = params.delete(:in) - finder, klass = build_finder_for(:first, sharp_in, {}) + if anchor_in = params.delete(:in) + finder, klass = build_finder_for(:first, anchor_in, {}) return unless finder return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node) - opts[:sharp_in] = finder + opts[:anchor_in] = finder end if @html_tag && @html_tag != 'a' @@ -87,7 +87,7 @@ module Zafu end (params.keys - [:style, :class, :id, :rel, :name, :anchor, :attr, :tattr, :trans, :text]).each do |k| - next if k.to_s =~ /if_|set_/ + next if k.to_s =~ /if_|set_|\A_/ query_params[k] = params[k] end @@ -207,7 +207,13 @@ module Zafu end def r_anchor(obj=node) - "<a name='#{anchor_name(@anchor_param, obj)}'></a>" + if single_child_method == 'link' + link = @blocks[0] + link.params.merge!(:_name => anchor_name(params[:type] || 'true', obj)) + expand_block(link) + else + "<a name='#{anchor_name(@anchor_param, obj)}'></a>" + end end def r_check_lang @@ -226,7 +232,7 @@ module Zafu "#{base_class.to_s.underscore}#{erb_node_id(obj)}" end end - + def link_to_update(target, opts = {}) method = opts[:method] || :get lib/zafu/support/links.rb @@ -187,10 +187,10 @@ module Zena # link inside the cms "":34 title, id = $1, $2 if id =~ /(.*?)#(.*)/ - id, sharp = $1, $2 - sharp = 'true' if sharp == '' + id, anchor = $1, $2 + anchor = 'true' if anchor == '' end - store @helper.make_link(:title=>title,:id=>id,:sharp=>sharp) + store @helper.make_link(:title=>title,:id=>id,:anchor=>anchor) end elsif @text =~ /\A"([^"]*)":(#{PSEUDO_ID_REGEXP})((_[a-z]+|)(\.[a-z]+|)(#[a-z_\/\[\]]*|))/m #puts "SHORTCUT_LINK:[#{$&}]" @@ -209,10 +209,10 @@ module Zena title = "#{node.fullpath}#{mode_format}" end if id =~ /(.*?)#(.*)/ - id, sharp = $1, $2 - sharp = 'true' if sharp == '' + id, anchor = $1, $2 + anchor = 'true' if anchor == '' end - store @helper.make_link(:title=>title,:id=>id,:sharp=>sharp,:node=>node) + store @helper.make_link(:title=>title,:id=>id,:anchor=>anchor,:node=>node) end elsif @translate_ids store $& lib/zena/parser/zazen_rules.rb @@ -17,20 +17,22 @@ module Zena return '#' unless node - - if sharp = options.delete(:sharp) - if sharp =~ /\[(.+)\]/ - sharp_value = node.safe_read($1) - elsif sharp == 'true' - sharp_value = "node#{node[:zip]}" + if anchor = options.delete(:anchor) + if anchor =~ /\[(.+)\]/ + anchor_value = node.safe_read($1) + elsif anchor == 'true' + anchor_value = "node#{node[:zip]}" else - sharp_value = sharp + fixed = true + anchor_value = anchor end - if sharp_in = options.delete(:sharp_in) - sharp_node = sharp_in.kind_of?(Node) ? sharp_in : (node.find(:first, [sharp_in]) || node) - return "#{zen_path(sharp_node, options)}##{sharp_value}" + if anchor_in = options.delete(:anchor_in) + anchor_node = anchor_in.kind_of?(Node) ? anchor_in : (node.find(:first, [anchor_in]) || node) + return "#{zen_path(anchor_node, options)}##{anchor_value}" + elsif fixed + return "#{zen_path(node, options)}##{anchor_value}" else - return "##{sharp_value}" + return "##{anchor_value}" end end lib/zena/use/urls.rb @@ -77,16 +77,16 @@ module Zena def make_link(opts) # for latex refs, see http://www.tug.org/applications/hyperref/manual.html link_opts = {} - if sharp = opts[:sharp] - if sharp =~ /\[(.+?)\/(.*)\]/ - sharp_in, sharp = $1, $2 - sharp = sharp == '' ? 'true' : "[#{sharp}]" - link_opts[:sharp_in] = sharp_in + if anchor = opts[:anchor] + if anchor =~ /\[(.+?)\/(.*)\]/ + anchor_in, anchor = $1, $2 + anchor = anchor == '' ? 'true' : "[#{anchor}]" + link_opts[:anchor_in] = anchor_in end - if ['[id]', '[zip]'].include?(sharp) - link_opts[:sharp] = 'true' + if ['[id]', '[zip]'].include?(anchor) + link_opts[:anchor] = 'true' else - link_opts[:sharp] = sharp + link_opts[:anchor] = anchor end end if opts[:id] =~ /(\d+)(_\w+|)(\.\w+|)/ lib/zena/use/zazen.rb @@ -157,13 +157,13 @@ link_no_title: src: '"":23' res: '[make_link id:|23| title:||]' -link_sharp: +link_anchor: src: '"hello":23#world of fame' - res: "[make_link id:|23| sharp:|world| title:|hello|] of fame" + res: "[make_link anchor:|world| id:|23| title:|hello|] of fame" -link_sharp_same_as_title: +link_anchor_same_as_title: src: '"hello":23# I love you' - res: "[make_link id:|23| sharp:|true| title:|hello|] I love you" + res: "[make_link anchor:|true| id:|23| title:|hello|] I love you" link_with_ending_punct: src: "I love \"\":20." test/unit/zena/parser/zazen.yml @@ -65,6 +65,10 @@ class UrlsTest < Zena::View::TestCase assert_equal "/en/image30_pv.jpg?#{node.updated_at.to_i + Iformat['pv'][:hash_id]}", zen_path(node, :format => 'jpg', :mode => 'pv') end + def test_zen_path_with_anchor + assert_equal '/en/section12.html#comments', zen_path(nodes(:people), :anchor => 'comments') + end + def test_zen_path_asset login(:ant) node = secure!(Node) { nodes(:zena) } test/unit/zena/use/urls_test.rb @@ -260,20 +260,20 @@ link_root: tem: "<a href='<%= zen_path((secure(Node) { Node.find(_ID(zena))})) %>'><%= @node.version.title %></a>" res: "<a href='/oo'>status title</a>" -link_sharp: - src: "<r:link sharp='true'/>" +link_anchor: + src: "<r:link anchor='true'/>" res: "<a href='#node22'>status title</a>" -link_sharp_name: - src: "<r:link sharp='[name]'/>" +link_anchor_name: + src: "<r:link anchor='[name]'/>" res: "<a href='#status'>status title</a>" -link_sharp_in: - src: "<r:link sharp='true' in='project' mode='tree'/>" +link_anchor_in: + src: "<r:link anchor='true' in='project' mode='tree'/>" res: "<a href='/oo/projects/cleanWater_tree#node22'>status title</a>" -link_sharp_name_in: - src: "<r:link sharp='[name]' in='parent'/>" +link_anchor_name_in: + src: "<r:link anchor='[name]' in='parent'/>" res: "<a href='/oo/projects/cleanWater#status'>status title</a>" link_stored: @@ -300,7 +300,7 @@ anchor: res: "<a name='node22'></a><a name='status'></a> 22" anchor_in_link: - src: "<r:link anchor='true'/>" + src: "<r:anchor do='link'/>" res: "<a name='node22' href='/oo/projects/cleanWater/page22.html'>status title</a>" show_title_anchor: @@ -320,7 +320,7 @@ link_version: version_anchor: context: node: 'opening' - src: "<r:traductions><r:each join=', '><r:link tattr='lang' anchor='true'/></r:each></r:traductions>" + src: "<r:traductions><r:each join=', '><r:anchor do='link' tattr='lang'/></r:each></r:traductions>" res: "<a name='version27.2' href='/oo/projects/cleanWater/post27.html?lang=en'>english</a>, <a name='version27.1' href='/oo/projects/cleanWater/post27.html?lang=fr'>french</a>" title: test/unit/zena/zena_tags/basic.yml @@ -11,19 +11,19 @@ hello: tem: "<%= zazen('Hello *World*') %>" res: "Hello World" -link_sharp: +link_anchor: tem: "<%= zazen('see \"\":22#') %>" res: "see <a href=\"#node22\">status title</a>" -link_sharp_attribute: +link_anchor_attribute: tem: "<%= zazen('see \"\":22#[name]') %>" res: "see <a href=\"#status\">status title</a>" -link_sharp_in: +link_anchor_in: tem: "<%= zazen('see \"\":22#[parent/]') %>" res: "see <a href=\"/oo/projects/cleanWater#node22\">status title</a>" -link_sharp_in_name: +link_anchor_in_name: tem: "<%= zazen('see \"\":22#[parent/name]') %>" res: "see <a href=\"/oo/projects/cleanWater#status\">status title</a>" test/unit/zena/zena_tags/zazen.yml b5bc6a9f194f41cb87775c0eacd074706535cc94 Gaspard Bucher gaspard@teti.ch http://github.com/zena/zena/commit/bd56bd152be1939f213b6743f50d427150e937f4 bd56bd152be1939f213b6743f50d427150e937f4

2009-11-05T08:13:28-08:00

Changed syntax for anchors in links. See doc/zafu_changes.yml for details. a15d975a3e181a9c3d0a4aac7b506b5276104e49 Gaspard Bucher gaspard@teti.ch