wikitext 1.0.2 → 1.0.3

data/ext/parser.c

@@ -1170,7 +1170,15 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                     ary_push(parser->scope, BLOCKQUOTE_START);
                     ary_push(parser->line, BLOCKQUOTE_START);
                 }
-                else if (parser->scope->count == 0 || (IN(P) && !IN(BLOCKQUOTE)))
+                else if (IN(BLOCKQUOTE))
+                {
+                    // illegal here
+                    i = NIL_P(parser->capture) ? parser->output : parser->capture;
+                    _Wikitext_pop_excess_elements(parser);
+                    _Wikitext_start_para_if_necessary(parser);
+                    rb_str_cat(i, escaped_blockquote_start, sizeof(escaped_blockquote_start) - 1);
+                }
+                else
                 {
                     // would be nice to eliminate the repetition here but it's probably the clearest way
                     _Wikitext_rollback_failed_link(parser);             // if any
@@ -1182,14 +1190,6 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                     ary_push(parser->scope, BLOCKQUOTE_START);
                     ary_push(parser->line, BLOCKQUOTE_START);
                 }
-                else
-                {
-                    // everywhere else, BLOCKQUOTE_START is illegal (in LI, BLOCKQUOTE, H1_START etc)
-                    i = NIL_P(parser->capture) ? parser->output : parser->capture;
-                    _Wikitext_pop_excess_elements(parser);
-                    _Wikitext_start_para_if_necessary(parser);
-                    rb_str_cat(i, escaped_blockquote_start, sizeof(escaped_blockquote_start) - 1);
-                }
                 break;
 
             case BLOCKQUOTE_END:

data/lib/wikitext/rails.rb

@@ -1,3 +1,17 @@
+# Copyright 2008 Wincent Colaiuta
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 require 'wikitext/string'
 
 module Wikitext

data/lib/wikitext/string.rb

@@ -1,3 +1,17 @@
+# Copyright 2008 Wincent Colaiuta
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 require 'wikitext'
 
 class String
@@ -15,7 +29,7 @@ private
   # for now do this in pure Ruby
   # if speed later becomes a concern can whip up a Ragel C extension to do it
   def wikitext_preprocess
-    gsub /\b(bug|issue|request) #(\d+)/i, '[[issues/\2|\1 #\2]]'
+    gsub /\b(bug|issue|request|ticket) #(\d+)/i, '[[issues/\2|\1 #\2]]'
   end
 
 end

data/lib/wikitext/version.rb

@@ -13,5 +13,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Wikitext
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end # module Wikitext

data/spec/regressions_spec.rb

@@ -744,4 +744,22 @@ describe Wikitext::Parser, 'regressions' do
     END
     @parser.parse(input).should == expected
   end
+
+  # discovered at: http://rails.wincent.com/wiki/Testing_cookies_in_Rails
+  it 'should handle BLOCKQUOTE_START blocks which follow lists' do
+    # example text taken from wiki article and edited for brevity
+    input = dedent <<-END
+      * This article
+      <blockquote>The cookies</blockquote>
+    END
+    expected = dedent <<-END
+      <ul>
+        <li>This article</li>
+      </ul>
+      <blockquote>
+        <p>The cookies</p>
+      </blockquote>
+    END
+    @parser.parse(input).should == expected
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wikitext
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Wincent Colaiuta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-27 00:00:00 +01:00
+date: 2008-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wikitext
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Wikitext-to-HTML translator