app/views/nodes/_table.rhtml public/javascripts/tablekit.js @@ -3,6 +3,12 @@ javascript date selection Mihai Bazon http://dynarch.com adapted to Rails by Gaspard Bucher + +tablekit table editor +--------------------- + Andrew Tetlaw & Millstream Web Software + http://www.millstream.com.au/view/code/tablekit/ + add/remove columns and drag&drop support added by Gaspard Bucher soft icons ---------- @@ -11,8 +17,8 @@ soft icons xspf mp3 player --------------- - Fabricio Zuardi - http://musicplayer.sourceforge.net/ + Fabricio Zuardi + http://musicplayer.sourceforge.net/ upload progress bar (sample application demo) ------------------- CREDITS @@ -1,5 +1,6 @@ require 'digest/sha1' require 'tempfile' +require 'json' # Methods added to this helper will be available to all templates in the application. module ApplicationHelper @@ -544,6 +545,40 @@ latex_template = %q{ render_to_string( :partial=>'nodes/gallery', :locals=>{:gallery=>images} ) end + + # Create a table from an attribute + def make_table(opts) + style, node, attribute, title, images, table = opts[:style], opts[:node], opts[:attribute], opts[:title], opts[:images], opts[:table] + case style.sub('.', '') + when ">" + prefix = "<div class='img_right'>" + suffix = "</div>" + when "<" + prefix = "<div class='img_left'>" + suffix = "</div>" + when "=" + prefix = "<div class='img_center'>" + suffix = "</div>" + else + prefix = suffix = "" + end + + unless table + # get attribute content + attribute = "d_#{attribute}" unless ['v_', 'd_'].include?(attribute[0..1]) + text = Node.zafu_attribute(node, attribute) + if text.blank? + table = [{"type"=>"table"},[["title"],["value"]]] + else + table = JSON.parse(text) + end + end + raise JSON::ParserError unless table.kind_of?(Array) && table.size == 2 && table[0].kind_of?(Hash) && table[0]['type'] == 'table' && table[1].kind_of?(Array) + + prefix + render_to_string( :partial=>'nodes/table', :locals=>{:table=>table}) + suffix + rescue JSON::ParserError + "<span class='unknownLink'>could not build table from text</span>" + end def list_nodes(ids=[], opts={}) style = opts[:style] || '' app/helpers/application_helper.rb @@ -65,7 +65,7 @@ module Zazen def scan #puts "SCAN:[#{@text}]" - if @text =~ /\A([^!"<\n\[]*)/m + if @text =~ /\A([^\|!"<\n\[]*)/m flush $& if @text[0..0] == '!' scan_exclam @@ -73,6 +73,8 @@ module Zazen scan_quote elsif @text[0..0] == '[' scan_bracket + elsif @text[0..0] == '|' + scan_pipe elsif @text[0..4] == '<code' # FIXME: implement <code..> and @@ instead of "extract" flush @@ -314,6 +316,53 @@ module Zazen end end + def scan_pipe + #puts "PIPE:[#{@text}]" + if @text =~ /\A\|([<=>]\.|)([0-9]+\.|)([a-zA-Z_]+)(\/([^\|]*)|)\|/m + # table |<.34.shopping_list/blah blah| + # table |shopping_list| + #puts "TABLE:#{$~.to_a.inspect}" + eat $& + style, id, attribute, title_opts, title = $1, $2, $3, $4, $5 + id = id[0..-2] if id != '' + if @translate_ids + if @translate_ids != :zip + node = @helper.find_node_by_pseudo(id, @context[:node]) + id = node.pseudo_id(@context[:node], @translate_ids) if node + end + store "|#{style}#{id}.#{attribute}#{title}|" + else + node = id == '' ? @context[:node] : @helper.find_node_by_pseudo(id, @context[:node]) + store @helper.make_table(:style=>style, :node=>node, :attribute=>attribute, :title=>title) + end + elsif @text =~ /\A\|([<=>]\.|)(#{PSEUDO_ID_REGEXP})\.([a-zA-Z_]+)(\/([^\|]*)|)\|/m + # table |<.:art++.shopping_list/blah blah| + # table |shopping_list| + #puts "TABLE SHORTCUT:#{$~.to_a.inspect}" + eat $& + text = $& + style, id, attribute, title_opts, title = $1, $2, $3, $4, $5 + if node = @helper.find_node_by_pseudo(id, @context[:node]) + if @translate_ids + # replace shortcut + store "|#{style}#{node.pseudo_id(@context[:node], @translate_ids || :zip)}.#{attribute}#{title}|" + else + # write table + store @helper.make_table(:style=>style, :node=>node, :attribute=>attribute, :title=>title) + end + elsif @translate_ids + # node not found, ignore + store text + else + # node not found + store "[#{id} not found]" + end + else + #puts "EAT:[#{$&}]" + # eat marker and continue scan + flush @text[0..0] + end + end def extract_code(fulltext) @escaped_code = [] lib/parser/lib/rules/zazen.rb @@ -116,6 +116,26 @@ image_with_http_link: image_with_ref: src: "!http://www.example.org/images/test.jpg!" res: "<p><img src=\"http://www.example.org/images/test.jpg\" alt=\"\" /></p>" + +table: + src: "|shopping_list|" + res: "<p>[make_table attribute:|shopping_list| style:||]</p>" + +table_title: + src: "|shopping_list/A list of frequent problems|" + res: "<p>[make_table attribute:|shopping_list| style:|| title:|A list of frequent problems|]</p>" + +table_id: + src: "|34.shopping_list|" + res: "<p>[make_table attribute:|shopping_list| node:|34| style:||]</p>" + +table_pseudo_id: + src: "|:art+.shopping_list|" + res: "<p>[make_table attribute:|shopping_list| node:|:art+| style:||]</p>" + +table_pseudo_path: + src: "|(../some/path).shopping_list|" + res: "<p>[make_table attribute:|shopping_list| node:|(../some/path)| style:||]</p>" link_with_title: src: '"this is a title":23' lib/parser/test/parser/zazen.yml @@ -15,7 +15,7 @@ end class ParserModule::DummyHelper def find_node_by_pseudo(*args) - nil + args[0] end end @@ -74,6 +74,12 @@ module Zafu end end +class String + def pseudo_id(*args) + self + end +end + class ParserTest < Test::Unit::TestCase yaml_test :zafu => {}, :zafu_asset => {}, :zafu_insight => {}, :zazen => {} #, :latex => {:module => :zazen, :output => 'latex'} @@test_parsers = {} lib/parser/test/parser_test.rb @@ -175,5 +175,33 @@ class ZazenHelperTest < ZenaTestHelper assert_equal "This \"is\":33 \"a\":#{nodes_zip(:wiki)} !#{nodes_zip(:bird_jpg)}! \"link\":#{nodes_zip(:lion)}.", zazen('This "is":(collections/art) "a":(/projects/wiki) !(/projects/wiki/bird)! "link":(people/lion).', :translate_ids => :zip, :node => zena) end + + def test_table_asset + login(:tiger) + @node = secure!(Node) { nodes(:status) } + assert_match %r{<table.*<th.*<td>title</td>.*<tr.*value}m, zazen("This is a table test:\n\n|shopping_list|") + assert_match %r{<table> + <th> + <td>problem</td> + <td>solution</td> + <td>cost</td> + </th> + <tr> + <td>dead hard drive</td> + <td>buy a new one</td> + <td>150.0</td> + </tr> + <tr> + <td>hurting hands</td> + <td>take a rest</td> + <td>0.0</td> + </tr> + <tr> + <td>buggy display</td> + <td>wait for a bug fix</td> + <td>0.0</td> + </tr> +</table>}m, zazen("This is a table test:\n\n|problems|") + end end \ No newline at end of file test/helpers/zazen_test.rb @@ -26,7 +26,18 @@ status_fr_assigned: key: assigned value: gaspard -cleanWater_en_d_tz: +cleanWater_en_tz: owner: cleanWater_en key: tz - value: Asia/Jakarta \ No newline at end of file + value: Asia/Jakarta + +status_en_problems: + owner: status_en + key: problems + value: | + [{"type":"table"}, + [["problem","solution","cost"], + ["dead hard drive", "buy a new one", 150.00], + ["hurting hands", "take a rest", 0.0], + ["buggy display", "wait for a bug fix", 0.0] + ]] \ No newline at end of file test/sites/zena/dyn_attributes.yml b7c65e9b84c1852e107f77d3ad76bc240ab4ad53 Gaspard Bucher gaspard@teti.ch http://github.com/zena/zena/commit/a60e834ec4e4fa906e26309fc3d382ec27be0df6 a60e834ec4e4fa906e26309fc3d382ec27be0df6 2008-10-23T04:41:13-07:00 2008-10-23T04:20:34-07:00 Started to work on new table helper for zazen. Refs [#228] e08c66fc36a9bd05eb8384b3056728455d64bfd4 Gaspard Bucher gaspard@teti.ch