wikitext 1.5.3 → 1.6

data/ext/parser.c

@@ -237,7 +237,7 @@ VALUE _Wikitext_hyperlink(parser_t *parser, VALUE link_prefix, VALUE link_target
         rb_str_append(string, link_prefix);
     rb_str_append(string, link_target);
 
-    /* special handling for mailto URIs */
+    // special handling for mailto URIs
     const char *mailto = "mailto:";
     if (NIL_P(link_prefix) &&
         RSTRING_LEN(link_target) >= (long)sizeof(mailto) &&
@@ -258,7 +258,7 @@ VALUE _Wikitext_hyperlink(parser_t *parser, VALUE link_prefix, VALUE link_target
 void _Wikitext_append_img(parser_t *parser, char *token_ptr, int token_len)
 {
     rb_str_cat(parser->output, img_start, sizeof(img_start) - 1);   // <img src="
-    if (!NIL_P(parser->img_prefix))
+    if (!NIL_P(parser->img_prefix) && *token_ptr != '/')            // len always > 0
         rb_str_append(parser->output, parser->img_prefix);
     rb_str_cat(parser->output, token_ptr, token_len);
     rb_str_cat(parser->output, img_alt, sizeof(img_alt) - 1);       // " alt="
@@ -271,6 +271,8 @@ void _Wikitext_append_img(parser_t *parser, char *token_ptr, int token_len)
 // each time we enter one of those spans must ++ the indentation level
 void _Wikitext_indent(parser_t *parser)
 {
+    if (parser->base_indent == -1) // indentation disabled
+        return;
     int space_count = parser->current_indent + parser->base_indent;
     if (space_count > 0)
     {
@@ -290,6 +292,8 @@ void _Wikitext_indent(parser_t *parser)
 
 void _Wikitext_dedent(parser_t *parser, VALUE emit)
 {
+    if (parser->base_indent == -1) // indentation disabled
+        return;
     parser->current_indent -= 2;
     if (emit != Qtrue)
         return;
@@ -990,9 +994,15 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
         // :indent => 0 (or more)
         if (rb_funcall(options, rb_intern("has_key?"), 1, ID2SYM(rb_intern("indent"))) == Qtrue)
         {
-            base_indent = NUM2INT(rb_hash_aref(options, ID2SYM(rb_intern("indent"))));
-            if (base_indent < 0)
-                base_indent = 0;
+            VALUE indent = rb_hash_aref(options, ID2SYM(rb_intern("indent")));
+            if (indent == Qfalse)
+                base_indent = -1; // indentation disabled
+            else
+            {
+                base_indent = NUM2INT(indent);
+                if (base_indent < 0)
+                    base_indent = 0;
+            }
         }
 
         // :base_heading_level => 0/1/2/3/4/5/6
@@ -2416,14 +2426,14 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                     {
                         if (type == PATH || type == PRINTABLE || type == ALNUM || type == SPECIAL_URI_CHARS)
                             rb_str_cat(parser->link_target, token->start, TOKEN_LEN(token));
-                        else if (type == IMG_END)
+                        else if (type == IMG_END && RSTRING_LEN(parser->link_target) > 0)
                         {
                             // success
                             _Wikitext_append_img(parser, RSTRING_PTR(parser->link_target), RSTRING_LEN(parser->link_target));
                             token = NULL;
                             break;
                         }
-                        else // unexpected token (syntax error)
+                        else // unexpected token or zero-length target (syntax error)
                         {
                             // rollback
                             rb_str_cat(parser->output, literal_img_start, sizeof(literal_img_start) - 1);

data/lib/wikitext/nil_class.rb

@@ -21,7 +21,8 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require 'wikitext'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'ext',
+  'wikitext'))
 
 class NilClass
   def to_wikitext

data/lib/wikitext/parser.rb

@@ -22,7 +22,8 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require 'wikitext'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'ext',
+  'wikitext'))
 
 module Wikitext
   class Parser

data/lib/wikitext/rails.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require 'wikitext/string'
+require File.expand_path(File.join(File.dirname(__FILE__), 'string'))
 
 module Wikitext
   class TemplateHandler

data/lib/wikitext/string.rb

@@ -21,11 +21,13 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require 'wikitext/parser'
+require File.expand_path(File.join(File.dirname(__FILE__), 'parser'))
 
 class String
   def to_wikitext options = {}
-    Wikitext::Parser.shared_parser.parse wikitext_preprocess, options
+    default_options = { :indent => false }
+    Wikitext::Parser.shared_parser.parse wikitext_preprocess,
+      default_options.merge(options)
   end
   alias :w :to_wikitext
 

data/lib/wikitext/version.rb

@@ -22,5 +22,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Wikitext
-  VERSION = '1.5.3'
+  VERSION = '1.6'
 end # module Wikitext

data/rails/init.rb

@@ -24,7 +24,8 @@
 # Avoid Rails bug #2266 by not requiring during "rake gems:build"
 # See: https://rails.lighthouseapp.com/projects/8994/tickets/2266
 unless $gems_build_rake_task
-  require 'wikitext/nil_class'
-  require 'wikitext/string'
-  require 'wikitext/rails'
+  libdir = File.join(File.dirname(__FILE__), '..', 'lib', 'wikitext')
+  require File.expand_path(File.join(libdir, 'nil_class'))
+  require File.expand_path(File.join(libdir, 'string'))
+  require File.expand_path(File.join(libdir, 'rails'))
 end

data/spec/img_spec.rb

@@ -43,6 +43,15 @@ describe Wikitext::Parser, 'embedding img tags' do
     @parser.parse('{{foo/bar.png}}').should == %Q{<p><img src="/images/foo/bar.png" alt="foo/bar.png" /></p>\n}
   end
 
+  it 'should pass through empty image tags unchanged' do
+    @parser.parse('{{}}').should == %Q{<p>{{}}</p>\n}
+  end
+
+  it 'should not append prefix if img src starts with a slash' do
+    @parser.parse('{{/foo.png}}').should ==
+      %Q{<p><img src="/foo.png" alt="/foo.png" /></p>\n}
+  end
+
   it 'should work in BLOCKQUOTE blocks' do
     expected = dedent <<-END
       <blockquote>

data/spec/indentation_spec.rb

@@ -31,6 +31,10 @@ def indent spaces, string
   string.gsub /^/, ' ' * spaces
 end
 
+def nodent string
+  string.gsub /^ */, ''
+end
+
 describe Wikitext::Parser, 'indentation' do
   before do
     @parser         = Wikitext::Parser.new
@@ -43,34 +47,38 @@ describe Wikitext::Parser, 'indentation' do
   end
 
   it 'should default to no additional indentation' do
-    @parser.parse('* foo').should == @default_output
+    @parser.parse(@input).should == @default_output
   end
 
   it 'should add additional indentation as indicated by the "indent" option' do
-    @parser.parse('* foo', :indent => 1).should == indent(1, @default_output)
-    @parser.parse('* foo', :indent => 2).should == indent(2, @default_output)
-    @parser.parse('* foo', :indent => 3).should == indent(3, @default_output)
-    @parser.parse('* foo', :indent => 4).should == indent(4, @default_output)
-    @parser.parse('* foo', :indent => 5).should == indent(5, @default_output)
-    @parser.parse('* foo', :indent => 6).should == indent(6, @default_output)
+    @parser.parse(@input, :indent => 1).should == indent(1, @default_output)
+    @parser.parse(@input, :indent => 2).should == indent(2, @default_output)
+    @parser.parse(@input, :indent => 3).should == indent(3, @default_output)
+    @parser.parse(@input, :indent => 4).should == indent(4, @default_output)
+    @parser.parse(@input, :indent => 5).should == indent(5, @default_output)
+    @parser.parse(@input, :indent => 6).should == indent(6, @default_output)
+  end
+
+  it 'should perform no indentation when "indent" is "false"' do
+    @parser.parse(@input, :indent => false).should == nodent(@default_output)
   end
 
   it 'should complain if the "indent" option is nil' do
-    lambda { @parser.parse('* foo', :indent => nil) }.should raise_error(TypeError)
+    lambda { @parser.parse(@input, :indent => nil) }.should raise_error(TypeError)
   end
 
   it 'should complain if the "indent" options is not an integer' do
-    lambda { @parser.parse('* foo', :indent => 'bar') }.should raise_error(TypeError)
-    lambda { @parser.parse('* foo', :indent => /baz/) }.should raise_error(TypeError)
+    lambda { @parser.parse(@input, :indent => 'bar') }.should raise_error(TypeError)
+    lambda { @parser.parse(@input, :indent => /baz/) }.should raise_error(TypeError)
   end
 
   it 'should treat a negative "indent" as though it were zero' do
-    @parser.parse('* foo', :indent => -4).should == @default_output
+    @parser.parse(@input, :indent => -4).should == @default_output
   end
 
   it 'should coerce a float "indent" into an integer' do
-    @parser.parse('* foo', :indent => 0.0).should == @default_output
-    @parser.parse('* foo', :indent => 2.0).should == <<-END
+    @parser.parse(@input, :indent => 0.0).should == @default_output
+    @parser.parse(@input, :indent => 2.0).should == <<-END
   <ul>
     <li>foo</li>
   </ul>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wikitext
 version: !ruby/object:Gem::Version 
-  version: 1.5.3
+  version: "1.6"
 platform: ruby
 authors: 
 - Wincent Colaiuta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-28 00:00:00 +02:00
+date: 2009-05-07 00:00:00 +02:00
 default_executable: 
 dependencies: []