breakout_parser 0.0.12-x86-mingw32 → 0.0.13-x86-mingw32

data/ChangeLog

@@ -1,3 +1,10 @@
+[ 0.0.13 ]
+
+    * add "h-" to header ids
+        (https://www.assembla.com/spaces/breakout/tickets/5793)
+    * handle [un]numbered lists of level 2 and 3 (**,***,##,###)
+        (https://www.assembla.com/spaces/breakout/tickets/5687)
+
 [ 0.0.12 ]
 
     * new internal calling convention

data/spec/parser_spec.rb

@@ -11,6 +11,19 @@ describe 'BreakoutParser' do
   end
   def hex_string s; self.class.hex_string(s); end
 
+  def unformat s
+    s.strip.split("\n").map(&:strip).join
+  end
+
+  def get_data fname
+    r = File.read(File.dirname(__FILE__) + '/data/' + fname)
+    if self.class.description[' numbered list multilevel']
+      r.gsub!('*','#')
+      r.gsub!('ul>','ol>')
+    end
+    r
+  end
+
   it 'accepts from 2 to 4 arguments' do
     [0,1,5,6,7,8,9,10].each do |argc|
       lambda{
@@ -319,6 +332,31 @@ describe 'BreakoutParser' do
       parse("hello\n\n * a\n * b\n * c\nworld").should ==
         "hello<br /><br /><ul><li>a</li><li>b</li><li>c</li></ul>world"
     end
+
+    describe "multilevel" do
+      it "at start" do
+        # NOTE: not sure that list1.html is correct enough, but it should render fine
+        parse(get_data('list1')).should == unformat(get_data('list1.html'))
+      end
+
+      it "in middle" do
+        parse(get_data('list2')).should == unformat(get_data('list2.html'))
+      end
+
+      it "three levels" do
+        parse(get_data('list3')).should == unformat(get_data('list3.html'))
+      end
+
+      it "mess - should have matching count of opening and closing tags" do
+        r = parse(get_data('list4'))
+        r.scan('<ul>').count.should > 0
+        r.scan('<ul>').count.should <= r.scan('</ul>').count
+      end
+
+      it "at end" do
+        parse(get_data('list5')).should == unformat(get_data('list5.html'))
+      end
+    end
   end
 
 ###############################################################################
@@ -347,58 +385,84 @@ describe 'BreakoutParser' do
       parse("hello\n\n # a\n # b\n # c\nworld").should ==
         "hello<br /><br /><ol><li>a</li><li>b</li><li>c</li></ol>world"
     end
+
+    describe "multilevel" do
+      it "at start" do
+        # NOTE: not sure that list1.html is correct enough, but it should render fine
+        parse(get_data('list1')).should == unformat(get_data('list1.html'))
+      end
+
+      it "in middle" do
+        parse(get_data('list2')).should == unformat(get_data('list2.html'))
+      end
+
+      it "three levels" do
+        parse(get_data('list3')).should == unformat(get_data('list3.html'))
+      end
+
+      it "mess - should have matching count of opening and closing tags" do
+        r = parse(unformat(get_data('list4')))
+        r.scan('<ol>').count.should > 0
+        r.scan('<ol>').count.should <= r.scan('</ol>').count
+      end
+
+      it "at end" do
+        parse(get_data('list5')).should == unformat(get_data('list5.html'))
+      end
+    end
   end
 
 ###############################################################################
+# headers
 
   1.upto(5) do |lvl|
     describe "H#{lvl}" do
       it "at the beginning" do
-        parse("h#{lvl}. xxx").should == "<h#{lvl} id=\"xxx\">xxx</h#{lvl}>"
+        parse("h#{lvl}. xxx").should == "<h#{lvl} id=\"h-xxx\">xxx</h#{lvl}>"
       end
       it "after 1 line of text" do
-        parse("abcd\nh#{lvl}. xxx").should == "abcd<br /><h#{lvl} id=\"xxx\">xxx</h#{lvl}>"
+        parse("abcd\nh#{lvl}. xxx").should == "abcd<br /><h#{lvl} id=\"h-xxx\">xxx</h#{lvl}>"
       end
       it "after 2 lines of text" do
-        parse("abcd\ndefgh\nh#{lvl}. xxx").should == "abcd<br />defgh<br /><h#{lvl} id=\"xxx\">xxx</h#{lvl}>"
+        parse("abcd\ndefgh\nh#{lvl}. xxx").should == "abcd<br />defgh<br /><h#{lvl} id=\"h-xxx\">xxx</h#{lvl}>"
       end
       it "in middle of other words" do
         parse("abcd defgh h#{lvl}. xxx yyy").should == "abcd defgh h#{lvl}. xxx yyy"
       end
       it "in middle of other lines" do
-        parse("abcd defgh\nh#{lvl}. xxx\nyyy").should == "abcd defgh<br /><h#{lvl} id=\"xxx\">xxx</h#{lvl}><br />yyy"
+        parse("abcd defgh\nh#{lvl}. xxx\nyyy").should == "abcd defgh<br /><h#{lvl} id=\"h-xxx\">xxx</h#{lvl}><br />yyy"
       end
 
       it "converts spaces to underscores in id" do
-        parse("h#{lvl}. xxx   yyy z").should == "<h#{lvl} id=\"xxx___yyy_z\">xxx   yyy z</h#{lvl}>"
+        parse("h#{lvl}. xxx   yyy z").should == "<h#{lvl} id=\"h-xxx___yyy_z\">xxx   yyy z</h#{lvl}>"
       end
       it "keeps underscores in id" do
-        parse("h#{lvl}. xxx___yyy_z").should == "<h#{lvl} id=\"xxx___yyy_z\">xxx___yyy_z</h#{lvl}>"
+        parse("h#{lvl}. xxx___yyy_z").should == "<h#{lvl} id=\"h-xxx___yyy_z\">xxx___yyy_z</h#{lvl}>"
       end
       it "keeps dashes in id" do
-        parse("h#{lvl}. xxx---yyy-z").should == "<h#{lvl} id=\"xxx---yyy-z\">xxx---yyy-z</h#{lvl}>"
+        parse("h#{lvl}. xxx---yyy-z").should == "<h#{lvl} id=\"h-xxx---yyy-z\">xxx---yyy-z</h#{lvl}>"
       end
       it "keeps dots in id" do
-        parse("h#{lvl}. xxx...yyy.z").should == "<h#{lvl} id=\"xxx...yyy.z\">xxx...yyy.z</h#{lvl}>"
+        parse("h#{lvl}. xxx...yyy.z").should == "<h#{lvl} id=\"h-xxx...yyy.z\">xxx...yyy.z</h#{lvl}>"
       end
 
       %w'Ъ ъ : ; , привет" \' ! < >'.each do |c|
         it "converts id to hex if it contains \"#{c}\"" do
           idhex = hex_string("xxx#{c}yyy")
-          parse("h#{lvl}. xxx#{c}yyy").should == "<h#{lvl} id=\"#{idhex}\">xxx#{h(c)}yyy</h#{lvl}>"
+          parse("h#{lvl}. xxx#{c}yyy").should == "<h#{lvl} id=\"h-#{idhex}\">xxx#{h(c)}yyy</h#{lvl}>"
         end
       end
 
       it "skips excess spaces" do
-        parse("h#{lvl}.  \t  xxx   \t ").should == "<h#{lvl} id=\"xxx\">xxx</h#{lvl}>"
+        parse("h#{lvl}.  \t  xxx   \t ").should == "<h#{lvl} id=\"h-xxx\">xxx</h#{lvl}>"
       end
 
       it "thinks that \\r is EOL" do
-        parse("h#{lvl}. xxx\ryyy").should == "<h#{lvl} id=\"xxx\">xxx</h#{lvl}><br />yyy"
-        parse("h#{lvl}. xxx\r").should == "<h#{lvl} id=\"xxx\">xxx</h#{lvl}>"
+        parse("h#{lvl}. xxx\ryyy").should == "<h#{lvl} id=\"h-xxx\">xxx</h#{lvl}><br />yyy"
+        parse("h#{lvl}. xxx\r").should == "<h#{lvl} id=\"h-xxx\">xxx</h#{lvl}>"
 
         parse("h#{lvl}. xxx\r yyy").sub(' yyy','yyy').should ==
-          "<h#{lvl} id=\"xxx\">xxx</h#{lvl}><br />yyy"
+          "<h#{lvl} id=\"h-xxx\">xxx</h#{lvl}><br />yyy"
       end
     end
   end
@@ -740,14 +804,15 @@ describe 'BreakoutParser' do
     a = {}
     a["wiki:Name"]  = '<a class="wiki_link" title="Name" href="/wiki/show/test_space/Name">Name</a>'
     a["Name"]       = '<a class="wiki_link" title="Name" href="/wiki/show/test_space/Name">Name</a>'
-    a["Name#Ref"]   = '<a class="wiki_link" title="Name#Ref" href="/wiki/show/test_space/Name#Ref">Name#Ref</a>'
-    a["#Ref"]       = '<a href="#Ref" title="#Ref" class="wiki_link">#Ref</a>'
-    a["#привет"]    = %Q|<a href="##{hex_string("привет")}" title="#привет" class="wiki_link">#привет</a>|
-    a["#with  spc"] = %Q|<a href="#with__spc" title="#with  spc" class="wiki_link">#with  spc</a>|
-    a["#with__usc"] = %Q|<a href="#with__usc" title="#with__usc" class="wiki_link">#with__usc</a>|
-    a["#with--dsh"] = %Q|<a href="#with--dsh" title="#with--dsh" class="wiki_link">#with--dsh</a>|
-    a["#with!xclm"] = %Q|<a href="##{hex_string("with!xclm")}" title="#with!xclm" class="wiki_link">#with!xclm</a>|
-    a["#with&amp"]  = %Q|<a href="##{hex_string("with&amp")}" title="#with&amp" class="wiki_link">#with&amp;amp</a>|
+    a["Name#Ref"]   = '<a class="wiki_link" title="Name#Ref" href="/wiki/show/test_space/Name#h-Ref">Name#Ref</a>'
+    a["Name#h-Ref"]   = '<a class="wiki_link" title="Name#h-Ref" href="/wiki/show/test_space/Name#h-h-Ref">Name#h-Ref</a>'
+    a["#Ref"]       = '<a href="#h-Ref" title="#Ref" class="wiki_link">#Ref</a>'
+    a["#привет"]    = %Q|<a href="#h-#{hex_string("привет")}" title="#привет" class="wiki_link">#привет</a>|
+    a["#with  spc"] = %Q|<a href="#h-with__spc" title="#with  spc" class="wiki_link">#with  spc</a>|
+    a["#with__usc"] = %Q|<a href="#h-with__usc" title="#with__usc" class="wiki_link">#with__usc</a>|
+    a["#with--dsh"] = %Q|<a href="#h-with--dsh" title="#with--dsh" class="wiki_link">#with--dsh</a>|
+    a["#with!xclm"] = %Q|<a href="#h-#{hex_string("with!xclm")}" title="#with!xclm" class="wiki_link">#with!xclm</a>|
+    a["#with&amp"]  = %Q|<a href="#h-#{hex_string("with&amp")}" title="#with&amp" class="wiki_link">#with&amp;amp</a>|
 
     a["ticket:234"] = '<a href="/spaces/test_space/tickets/234">#234</a>'
     a["revision:1f4bdab77be696efd"] =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: breakout_parser
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: x86-mingw32
 authors: 
 - Andrey "Zed" Zaikin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 +06:00
+date: 2010-04-27 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency