breakout_parser 0.0.6 → 0.0.7

data/ext/breakout_parser/parser.tab.h

@@ -71,8 +71,10 @@
      PRE_END = 287,
      CODE_START = 288,
      CODE_END = 289,
-     BOLD_END = 290,
-     ITALIC_END = 291
+     NOTEXTILE_START = 290,
+     NOTEXTILE_END = 291,
+     BOLD_END = 292,
+     ITALIC_END = 293
    };
 #endif
 
@@ -92,7 +94,7 @@ typedef union YYSTYPE
 
 
 /* Line 1676 of yacc.c  */
-#line 96 "parser.tab.h"
+#line 98 "parser.tab.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

data/ext/breakout_parser/parser.y

@@ -75,6 +75,7 @@ void yyerror(const char *msg)
 %token <svalue> INLINE_CODE
 %token SPACE BR /*BRBR*/ OLI ULI
 %token PRE_CODE_START PRE_CODE_END PRE_START PRE_END CODE_START CODE_END
+%token NOTEXTILE_START NOTEXTILE_END
 %token BOLD_END ITALIC_END
 
 //%type <dvalue> expression
@@ -153,6 +154,7 @@ br   : BR          {concat("<br />",6)}
 //     | BRBR        {concat("<br /><br />",12)}
 
 code : PRE_CODE_START {concat("<pre><code>",11)} chars PRE_CODE_END {concat("</code></pre>",13)}
+     | NOTEXTILE_START chars NOTEXTILE_END
      | PRE_START      {concat("<pre>",5)}        chars PRE_END      {concat("</pre>",6)}
      | CODE_START     {concat("<code>",6)}       chars CODE_END     {concat("</code>",7)}
 

data/spec/parser_spec.rb

@@ -429,11 +429,18 @@ describe 'BreakoutParser' do
 
   [
     %w'<pre><code> </code></pre>',
-    %w'<pre> </pre>'
+    %w'<pre> </pre>',
+    %w'<notextile> </notextile>'
   ].each do |ot,ct|
     # ot - opening tag
     # ct - closing tag
 
+    if ot == '<notextile>'
+      ote,cte = '',''
+    else
+      ote,cte = ot,ct
+    end
+
     describe "#{ot}..#{ct}" do
       it "works" do
         s = <<-EOF
@@ -443,8 +450,7 @@ describe 'BreakoutParser' do
 
         EOF
 
-        parse("#{ot}#{s.strip}#{ct}").should ==
-          "#{ot}#{h(s.strip)}#{ct}"
+        parse("#{ot}#{s.strip}#{ct}").should == "#{ote}#{h(s.strip)}#{cte}"
 
         s = <<-EOF
             while ( 1 < 2 ) do
@@ -458,71 +464,70 @@ describe 'BreakoutParser' do
             * ccc
 
         EOF
-        parse("#{ot}#{s.strip}#{ct}").should ==
-          "#{ot}#{h(s.strip)}#{ct}"
+        parse("#{ot}#{s.strip}#{ct}").should == "#{ote}#{h(s.strip)}#{cte}"
       end
       it "not parses *bold*" do
         s = "#{ot} *bold*#{ct}"
-        parse(s).should == s
+        parse(s).should == s.gsub(ot,ote).gsub(ct,cte).strip
       end
       it "not parses _italic_" do
         s = "#{ot} _italic_#{ct}"
-        parse(s).should == s
+        parse(s).should == s.gsub(ot,ote).gsub(ct,cte).strip
       end
       it "not parses UL lists" do
         s = "#{ot}\n * l1\n * l2\n * l3#{ct}"
-        parse(s).should == s.sub(">\n",">")
+        parse(s).should == s.sub(">\n",">").gsub(ot,ote).gsub(ct,cte).strip
       end
       it "not parses OL lists" do
         s = "#{ot}\n # l1\n # l2\n # l3#{ct}"
-        parse(s).should == s.sub(">\n",">")
+        parse(s).should == s.sub(">\n",">").gsub(ot,ote).gsub(ct,cte).strip
       end
       it "not parses H1..H5" do
         1.upto(5) do |i|
           s = "#{ot}\nh#{i}. zzzzzzz\n#{ct}"
-          parse(s).should == "#{ot}h#{i}. zzzzzzz#{ct}"
+          parse(s).should == "#{ote}h#{i}. zzzzzzz#{cte}"
         end
       end
       it "not parses raw text links" do
         s = "#{ot}xxx http://www.ru yyy#{ct}"
-        parse(s).should == s
+        parse(s).should == s.gsub(ot,ote).gsub(ct,cte)
         s = "#{ot}http://www.ru#{ct}"
-        parse(s).should == s
+        parse(s).should == s.gsub(ot,ote).gsub(ct,cte)
       end
       it "keeps newlines" do
         s = "#{ot}aaa\nbbb#{ct}"
-        parse(s).should == s
+        parse(s).should == s.gsub(ot,ote).gsub(ct,cte)
         s = "#{ot}aaa\n\nbbb\nccc#{ct}"
-        parse(s).should == s
+        parse(s).should == s.gsub(ot,ote).gsub(ct,cte)
       end
 
       it "w/o closing tags" do
         s = "#{ot}aaa"
-        parse(s).should match(%r"#{ot}aaa\n?#{ct}")
+        parse(s).should match(%r"#{ote}aaa\n?#{cte}")
       end
 
       it "in middle of text" do
         s = "xxx #{ot}yyyy#{ct} jjj"
-        parse(s).should == s
+        parse(s).should == s.gsub(ot,ote).gsub(ct,cte)
       end
 
       it "with 2 instances" do
         s = "xxx #{ot}yyyy#{ct} <jjj> #{ot}asdkjaslkd#{ct} END"
-        parse(s).should == s.sub('<jjj>','&lt;jjj&gt;')
+        parse(s).should == s.sub('<jjj>','&lt;jjj&gt;').gsub(ot,ote).gsub(ct,cte)
       end
 
       it "works with unicode" do
         s = "привет #{ot} жжж #{ct} пока!"
-        parse(s).should match(%r|привет ?#{ot} жжж#{ct} ?пока!|)
+        parse(s).should match(%r|привет ?#{ote} жжж#{cte} ?пока!|)
 
-        s = 'абвгдеёжзийклмнопрстуфхцчшщьыъэюя'
-        parse(s).should == s
+        s = "#{ot}абвгдеёжзийклмнопрстуфхцчшщьыъэюя#{ct}"
+        parse(s).should == s.gsub(ot,ote).gsub(ct,cte)
 
-        s = 'АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЫЪЭЮЯ'
-        parse(s).should == s
+        s = "#{ot}АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЫЪЭЮЯ#{ct}"
+        parse(s).should == s.gsub(ot,ote).gsub(ct,cte)
 
-        s = '☸☹☺☻☼☽☾☿'
-        parse(s).should == s
+        s = "#{ot}☸☹☺☻☼☽☾☿#{ct}"
+        parse(s).should == s.gsub(ot,ote).gsub(ct,cte)
       end
 
       it "should escape lone closing tags" do
@@ -532,12 +537,12 @@ describe 'BreakoutParser' do
 
       it "should skip newlines and spaces at end" do
         s = "#{ot} aaa bbb ccc \n\n\n  \t\n\n\n\r\n\r\n   \t  #{ct}"
-        parse(s).should == "#{ot} aaa bbb ccc#{ct}"
+        parse(s).should == "#{ote} aaa bbb ccc#{cte}".strip
       end
 
       it "escapes html chars" do
         HTML_ESCAPE.each do |k,v|
-          parse("#{ot}#{k}#{ct}").should == "#{ot}#{v}#{ct}"
+          parse("#{ot}#{k}#{ct}").should == "#{ote}#{v}#{cte}"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: breakout_parser
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Andrey "Zed" Zaikin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +05:00
+date: 2010-03-09 00:00:00 +05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency