breakout_parser 0.0.5 → 0.0.6

data/ext/breakout_parser/parser.tab.h

@@ -60,18 +60,19 @@
      H3 = 276,
      H4 = 277,
      H5 = 278,
-     SPACE = 279,
-     BR = 280,
-     OLI = 281,
-     ULI = 282,
-     PRE_CODE_START = 283,
-     PRE_CODE_END = 284,
-     PRE_START = 285,
-     PRE_END = 286,
-     CODE_START = 287,
-     CODE_END = 288,
-     BOLD_END = 289,
-     ITALIC_END = 290
+     INLINE_CODE = 279,
+     SPACE = 280,
+     BR = 281,
+     OLI = 282,
+     ULI = 283,
+     PRE_CODE_START = 284,
+     PRE_CODE_END = 285,
+     PRE_START = 286,
+     PRE_END = 287,
+     CODE_START = 288,
+     CODE_END = 289,
+     BOLD_END = 290,
+     ITALIC_END = 291
    };
 #endif
 
@@ -91,7 +92,7 @@ typedef union YYSTYPE
 
 
 /* Line 1676 of yacc.c  */
-#line 95 "parser.tab.h"
+#line 96 "parser.tab.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

data/ext/breakout_parser/parser.y

@@ -72,6 +72,7 @@ void yyerror(const char *msg)
 %token <svalue> URL
 %token <svalue> UL
 %token <svalue> H1 H2 H3 H4 H5
+%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 BOLD_END ITALIC_END
@@ -112,12 +113,13 @@ words: word
 
 word : chars
       | link
-      | T_WORD           {concat2($1)} // TODO: somehow pass T_WORD's length here
+      | T_WORD         {concat2($1)} // TODO: somehow pass T_WORD's length here
       | URL            {process_url($1)}
       | BOLD_START     {$1 ? concat(" <strong>",9) : concat("<strong>",8)}
       | BOLD_END       {concat("</strong>",9)}
       | ITALIC_START   {$1 ? concat(" <em>",5) : concat("<em>",4)}
       | ITALIC_END     {concat("</em>",5)}
+      | INLINE_CODE    {process_inline_code($1)}
 
 link: TICKET_LINK            {process_ticket_link($1)}
     | SVN_REVISION_LINK      {process_svn_link($1)}
@@ -186,6 +188,20 @@ need_hex_convert(const char*p, const char*pend){
     return 0;
 }
 
+process_inline_code(const char*p){
+    if( *p == ' ' || *p == 9 ){
+        concat_raw_char(' ');
+        while( *p == ' ' || *p == 9 ) p++;
+    }
+    if( *p == '@' ) p++;
+    concat("<code>",6);
+    for(; *p ; p++){
+        if( *p == '@' && *(p+1) == 0 ) break;
+        concat_escaped_char( *p );
+    }
+    concat("</code>",7);
+}
+
 process_header(const char*title){
     const char*p,*pend;
 

data/ext/breakout_parser/ruby_ext.c

@@ -19,8 +19,21 @@ extern size_t in_buf_len, bufsize, space_name_len;
 
 VALUE method_parse(VALUE self, VALUE text, VALUE r_space_name) {
     VALUE s;
-    char *p    = RSTRING(text)->ptr;
+    char *p;
+
+    if(!text || text == Qnil || text == Qfalse){
+        // NULL input string
+        return rb_str_new("",0);
+    }
+
+    p          = RSTRING(text)->ptr;
     in_buf_len = RSTRING(text)->len;
+
+    if(!p || in_buf_len <= 0){
+        // empty input string
+        return rb_str_new("",0);
+    }
+
     while( in_buf_len > 0 && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')){
         p++;
         in_buf_len--;

data/spec/parser_spec.rb

@@ -29,6 +29,27 @@ describe 'BreakoutParser' do
     parse(s).size.should == s.strip.size
   end
 
+  it "handles nil & false text well" do
+    parse(false).should == ""
+    parse(false,false).should == ""
+    parse("",false).should == ""
+    parse(nil).should == ""
+    parse(nil,nil).should == ""
+    parse("",nil).should == ""
+  end
+
+  it "handles nil space_name well" do
+    lambda{
+      parse("#123",nil)
+    }.should raise_error(TypeError)
+  end
+
+  it "handles false space_name well" do
+    lambda{
+      parse("#123",false)
+    }.should raise_error(TypeError)
+  end
+
   it "strips tailing spaces and newlines" do
     parse("aaa         ").should == "aaa"
     parse("aaa\t\t\t\t\t\t").should == "aaa"
@@ -59,6 +80,42 @@ describe 'BreakoutParser' do
     parse("aaa\r\n\r\n\r\nbbb").should == "aaa" + "<br />"*3 + "bbb"
   end
 
+###############################################################################
+
+  describe "@code@" do
+    it "only" do
+      parse("@smth@").should == '<code>smth</code>'
+    end
+    it "at beginning" do
+      parse("@smth@\nxxx").should == '<code>smth</code><br />xxx'
+    end
+    it "in the middle of text" do
+      parse("xxx @smth@ yyy").should == 'xxx <code>smth</code> yyy'
+    end
+    it "parses @multiline\\nsmth@" do
+      parse("@multiline\nsmth@").should == "@multiline<br />smth@"
+    end
+    it "not confuses" do
+      parse("look at @this code@ and mail me at xxx@yyy.com").should ==
+        'look at <code>this code</code> and mail me at xxx@yyy.com'
+    end
+    it "w/o closing tag" do
+      parse("@smth").should == '@smth'
+    end
+    it "nesting1 w/o closing tags" do
+      parse("@smth1 @smth2").should == '@smth1 @smth2'
+    end
+    it "nesting2 w/o closing tags" do
+      parse("@smth1  @smth2").should == '@smth1 @smth2'
+    end
+    it "two times" do
+      parse("@code1@ @code2@").should == "<code>code1</code> <code>code2</code>"
+      parse("@code1@   @code2@").should == "<code>code1</code> <code>code2</code>"
+      parse("  @code1@   @code2@  ").should == "<code>code1</code> <code>code2</code>"
+      parse("  @code1@ xxx @code2@  ").should == "<code>code1</code> xxx <code>code2</code>"
+    end
+  end
+
 ###############################################################################
 
   describe "*bold*" do
@@ -662,7 +719,7 @@ describe 'BreakoutParser' do
     s.to_s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }
   end
 
-  def parse s
-    BreakoutParser.parse(s, "test_space").strip
+  def parse s, space_name = "test_space"
+    BreakoutParser.parse(s, space_name).strip
   end
 end

metadata

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