breakout_parser 0.0.10 → 0.0.11

data/ext/breakout_parser/parser.tab.h

@@ -42,40 +42,44 @@
      T_CHAR = 258,
      BOLD_START = 259,
      ITALIC_START = 260,
-     T_WORD = 261,
-     TICKET_LINK = 262,
-     LINK = 263,
-     SVN_REVISION_LINK = 264,
-     GIT_REVISION_LINK = 265,
-     WIKI_LINK = 266,
-     ANCHOR_LINK = 267,
-     URL_WITH_PROTO_LINK = 268,
-     URL_WITHOUT_PROTO_LINK = 269,
-     FILE_LINK = 270,
-     IMAGE_LINK = 271,
-     URL = 272,
-     EMAIL = 273,
-     UL = 274,
-     H1 = 275,
-     H2 = 276,
-     H3 = 277,
-     H4 = 278,
-     H5 = 279,
-     INLINE_CODE = 280,
-     SPACE = 281,
-     BR = 282,
-     OLI = 283,
-     ULI = 284,
-     PRE_CODE_START = 285,
-     PRE_CODE_END = 286,
-     PRE_START = 287,
-     PRE_END = 288,
-     CODE_START = 289,
-     CODE_END = 290,
-     NOTEXTILE_START = 291,
-     NOTEXTILE_END = 292,
-     BOLD_END = 293,
-     ITALIC_END = 294
+     BOLD_ITALIC_START = 261,
+     ITALIC_BOLD_START = 262,
+     T_WORD = 263,
+     TICKET_LINK = 264,
+     LINK = 265,
+     SVN_REVISION_LINK = 266,
+     GIT_REVISION_LINK = 267,
+     WIKI_LINK = 268,
+     ANCHOR_LINK = 269,
+     URL_WITH_PROTO_LINK = 270,
+     URL_WITHOUT_PROTO_LINK = 271,
+     FILE_LINK = 272,
+     IMAGE_LINK = 273,
+     URL = 274,
+     EMAIL = 275,
+     UL = 276,
+     H1 = 277,
+     H2 = 278,
+     H3 = 279,
+     H4 = 280,
+     H5 = 281,
+     INLINE_CODE = 282,
+     SPACE = 283,
+     BR = 284,
+     OLI = 285,
+     ULI = 286,
+     PRE_CODE_START = 287,
+     PRE_CODE_END = 288,
+     PRE_START = 289,
+     PRE_END = 290,
+     CODE_START = 291,
+     CODE_END = 292,
+     NOTEXTILE_START = 293,
+     NOTEXTILE_END = 294,
+     BOLD_END = 295,
+     ITALIC_END = 296,
+     REVERT_BOLD = 297,
+     REVERT_ITALIC = 298
    };
 #endif
 
@@ -95,7 +99,7 @@ typedef union YYSTYPE
 
 
 /* Line 1676 of yacc.c  */
-#line 99 "parser.tab.h"
+#line 103 "parser.tab.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

data/ext/breakout_parser/parser.y

@@ -66,6 +66,7 @@ void yyerror(const char *msg)
 
 
 %token <ivalue> T_CHAR BOLD_START ITALIC_START
+%token <ivalue> BOLD_ITALIC_START ITALIC_BOLD_START
 %token <svalue> T_WORD TICKET_LINK LINK SVN_REVISION_LINK GIT_REVISION_LINK WIKI_LINK ANCHOR_LINK
 %token <svalue> URL_WITH_PROTO_LINK URL_WITHOUT_PROTO_LINK
 %token <svalue> FILE_LINK IMAGE_LINK
@@ -77,6 +78,7 @@ void yyerror(const char *msg)
 %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
+%token REVERT_BOLD REVERT_ITALIC
 
 //%type <dvalue> expression
 //%type <dvalue> term
@@ -121,7 +123,11 @@ word : chars
       | BOLD_END       {concat("</strong>",9)}
       | ITALIC_START   {$1 ? concat(" <em>",5) : concat("<em>",4)}
       | ITALIC_END     {concat("</em>",5)}
+      | BOLD_ITALIC_START {$1 ? concat(" <strong><em>",13) : concat("<strong><em>",12)}
+      | ITALIC_BOLD_START {$1 ? concat(" <em><strong>",13) : concat("<em><strong>",12)}
       | INLINE_CODE    {process_inline_code($1)}
+      | REVERT_BOLD    {revert_bold()}
+      | REVERT_ITALIC  {revert_italic()}
 
 link: TICKET_LINK            {process_ticket_link($1)}
     | SVN_REVISION_LINK      {process_svn_link($1)}
@@ -421,3 +427,22 @@ process_email(const char*url){
     process_link_tail(url,NULL,NULL);
 }
 
+revert_bold(){
+    char *p;
+    for( p=bufptr-1; p >= (buf+7) ; p--){
+        if( 0 == strncmp(p-7, "<strong>", 8) ){
+            memcpy(p-7,"       *",8);
+            break;
+        }
+    }
+}
+
+revert_italic(){
+    char *p;
+    for( p=bufptr-1; p >= (buf+3) ; p--){
+        if( 0 == strncmp(p-3, "<em>", 4) ){
+            memcpy(p-3,"   _",4);
+            break;
+        }
+    }
+}

data/spec/parser_spec.rb

@@ -114,6 +114,12 @@ describe 'BreakoutParser' do
       parse("  @code1@   @code2@  ").should == "<code>code1</code> <code>code2</code>"
       parse("  @code1@ xxx @code2@  ").should == "<code>code1</code> xxx <code>code2</code>"
     end
+    %w', .'.each do |c|
+      it "stops on #{c.inspect}" do
+        parse("@some code@#{c}").should == "<code>some code</code>#{c}"
+        parse("@some code@#{c} @another code@").should == "<code>some code</code>#{c} <code>another code</code>"
+      end
+    end
   end
 
 ###############################################################################
@@ -138,13 +144,13 @@ describe 'BreakoutParser' do
       parse("aaa * bbb").should == 'aaa * bbb'
     end
     it "w/o closing tag" do
-      parse("*bold").should == '<strong>bold</strong>'
+      parse("*bold").should == '*bold'
     end
     it "nesting1 w/o closing tags" do
-      parse("*bold1 *bold2").should == '<strong>bold1 <strong>bold2</strong></strong>'
+      parse("*bold1 *bold2").gsub(/ +/,' ').should == '*bold1 *bold2'
     end
     it "nesting2 w/o closing tags" do
-      parse("*bold1  *bold2").should == '<strong>bold1 <strong>bold2</strong></strong>'
+      parse("*bold1  *bold2").gsub(/ +/,' ').should == '*bold1 *bold2'
     end
 
     it "not parses '*.*'" do
@@ -183,30 +189,57 @@ describe 'BreakoutParser' do
       parse("aaa _ bbb").should == 'aaa _ bbb'
     end
     it "w/o closing tag" do
-      parse("_italic").should == '<em>italic</em>'
+      parse("_italic").should == '_italic'
     end
     it "nesting1 w/o closing tags" do
-      parse("_italic1 _italic2").should == '<em>italic1 <em>italic2</em></em>'
+      parse("_italic1 _italic2").gsub(/ +/,' ').should == '_italic1 _italic2'
     end
     it "nesting2 w/o closing tags" do
-      parse("_italic1  _italic2").should == '<em>italic1 <em>italic2</em></em>'
+      parse("_italic1  _italic2").gsub(/ +/,' ').should == '_italic1 _italic2'
     end
   end
 
 ###############################################################################
 
   describe "combinations" do
+    it "both bold and italic" do
+      s = "_*aaa bbb ccc*_"
+      parse(s).should == "<em><strong>aaa bbb ccc</strong></em>"
+    end
+    it "both italic and bold" do
+      s = "*_aaa bbb ccc_*"
+      parse(s).should == "<strong><em>aaa bbb ccc</em></strong>"
+    end
+
+    it "start b+i, end first italic then bold" do
+      s = "*_aaa bbb_ ccc*"
+      parse(s).should == "<strong><em>aaa bbb</em> ccc</strong>"
+    end
+    it "start i+b, end first bold then italic" do
+      s = "_*aaa bbb* ccc_"
+      parse(s).should == "<em><strong>aaa bbb</strong> ccc</em>"
+    end
+
+    it "start first italic then bold, end both" do
+      s = "_aaa *bbb ccc*_"
+      parse(s).should == "<em>aaa <strong>bbb ccc</strong></em>"
+    end
+    it "start first bold then italic, end both" do
+      s = "*aaa _bbb ccc_*"
+      parse(s).should == "<strong>aaa <em>bbb ccc</em></strong>"
+    end
+
     it "bold in italic" do
       s = "_aaa *bbb* ccc_"
       parse(s).should == "<em>aaa <strong>bbb</strong> ccc</em>"
     end
     it "bold in italic - no closing1" do
       s = "_aaa *bbb* ccc"
-      parse(s).should == "<em>aaa <strong>bbb</strong> ccc</em>"
+      parse(s).should == "_aaa <strong>bbb</strong> ccc"
     end
     it "bold in italic - no closing2" do
       s = "_aaa *bbb ccc"
-      parse(s).should == "<em>aaa <strong>bbb ccc</strong></em>"
+      parse(s).gsub(/ {2,}/,' ').should == "_aaa *bbb ccc"
     end
 
     it "italic in bold" do
@@ -215,11 +248,11 @@ describe 'BreakoutParser' do
     end
     it "italic in bold - no closing1" do
       s = "*aaa _bbb_ ccc"
-      parse(s).should == "<strong>aaa <em>bbb</em> ccc</strong>"
+      parse(s).should == "*aaa <em>bbb</em> ccc"
     end
     it "italic in bold - no closing2" do
       s = "*aaa _bbb ccc"
-      parse(s).should == "<strong>aaa <em>bbb ccc</em></strong>"
+      parse(s).gsub(/ {2,}/,' ').should == "*aaa _bbb ccc"
     end
 
     {'ul' => '*', 'ol' => '#'}.each do |l,c|

metadata

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