wikitext 0.2 → 0.3

data/ext/ary.h

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <ruby/ruby.h>
+#include <ruby.h>
 
 typedef struct
 {

data/ext/parser.c

@@ -192,20 +192,15 @@ inline void _Wikitext_indent(parser_t *parser)
     {
         char *old_end, *new_end;
         if (!parser->tabulation)
-        {
             parser->tabulation = str_new_size(space_count);
-            old_end = parser->tabulation->ptr;
-        }
         else if (parser->tabulation->len < space_count)
-        {
-            old_end = parser->tabulation->ptr;
-            str_grow(parser->tabulation, space_count);
-        }
-        else
-            old_end = parser->tabulation->ptr;
+            str_grow(parser->tabulation, space_count); // reallocates if necessary
+        old_end = parser->tabulation->ptr + parser->tabulation->len;
         new_end = parser->tabulation->ptr + space_count;
         while (old_end < new_end)
             *old_end++ = ' ';
+        if (space_count > parser->tabulation->len)
+            parser->tabulation->len = space_count;
         rb_str_cat(parser->output, parser->tabulation->ptr, space_count);
     }
     parser->current_indent += 2;
@@ -823,16 +818,44 @@ inline void _Wikitext_rollback_failed_external_link(parser_t *parser)
     parser->link_text   = Qnil;
 }
 
-VALUE Wikitext_parser_initialize(VALUE self)
+VALUE Wikitext_parser_initialize(int argc, VALUE *argv, VALUE self)
 {
+    // process arguments
+    VALUE options;
+    if (rb_scan_args(argc, argv, "01", &options) == 0) // 0 mandatory arguments, 1 optional argument
+        options = Qnil;
+
+    // defaults
+    VALUE autolink                  = Qtrue;
+    VALUE line_ending               = rb_str_new2("\n");
+    VALUE external_link_class       = rb_str_new2("external");
+    VALUE mailto_class              = rb_str_new2("mailto");
+    VALUE internal_link_prefix      = rb_str_new2("/wiki/");
+    VALUE space_to_underscore       = Qfalse;
+    VALUE treat_slash_as_special    = Qtrue;
+
+    // process options hash (override defaults)
+    if (!NIL_P(options) && TYPE(options) == T_HASH)
+    {
+#define OVERRIDE_IF_SET(name) \
+NIL_P(rb_hash_aref(options, ID2SYM(rb_intern(#name)))) ? name : rb_hash_aref(options, ID2SYM(rb_intern(#name)))
+        autolink                = OVERRIDE_IF_SET(autolink);
+        line_ending             = OVERRIDE_IF_SET(line_ending);
+        external_link_class     = OVERRIDE_IF_SET(external_link_class);
+        mailto_class            = OVERRIDE_IF_SET(mailto_class);
+        internal_link_prefix    = OVERRIDE_IF_SET(internal_link_prefix);
+        space_to_underscore     = OVERRIDE_IF_SET(space_to_underscore);
+        treat_slash_as_special  = OVERRIDE_IF_SET(treat_slash_as_special);
+    }
+
     // no need to call super here; rb_call_super()
-    rb_iv_set(self, "@autolink",                Qtrue);
-    rb_iv_set(self, "@line_ending",             rb_str_new2("\n"));
-    rb_iv_set(self, "@external_link_class",     rb_str_new2("external"));
-    rb_iv_set(self, "@mailto_class",            rb_str_new2("mailto"));
-    rb_iv_set(self, "@internal_link_prefix",    rb_str_new2("/wiki/"));
-    rb_iv_set(self, "@space_to_underscore",     Qfalse);
-    rb_iv_set(self, "@treat_slash_as_special",  Qtrue);
+    rb_iv_set(self, "@autolink",                autolink);
+    rb_iv_set(self, "@line_ending",             line_ending);
+    rb_iv_set(self, "@external_link_class",     external_link_class);
+    rb_iv_set(self, "@mailto_class",            mailto_class);
+    rb_iv_set(self, "@internal_link_prefix",    internal_link_prefix);
+    rb_iv_set(self, "@space_to_underscore",     space_to_underscore);
+    rb_iv_set(self, "@treat_slash_as_special",  treat_slash_as_special);
     return self;
 }
 

data/ext/parser.h

@@ -12,9 +12,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <ruby/ruby.h>
+#include <ruby.h>
 
-VALUE Wikitext_parser_initialize(VALUE self);
+VALUE Wikitext_parser_initialize(int argc, VALUE *argv, VALUE self);
 
 VALUE Wikitext_parser_tokenize(VALUE self, VALUE string);
 

data/ext/str.h

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <ruby/ruby.h>
+#include <ruby.h>
 
 typedef struct
 {

data/ext/token.h

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <ruby/ruby.h>
+#include <ruby.h>
 #include <stdint.h>     /* uint32_t */
 
 #define TOKEN_TEXT(token)   rb_str_new((const char *)token->start, (token->stop - token->start))

data/ext/wikitext.c

@@ -27,7 +27,7 @@ void Init_wikitext()
 
     // Wikitext::Parser
     cWikitextParser = rb_define_class_under(mWikitext, "Parser", rb_cObject);
-    rb_define_method(cWikitextParser, "initialize", Wikitext_parser_initialize, 0);
+    rb_define_method(cWikitextParser, "initialize", Wikitext_parser_initialize, -1);
     rb_define_method(cWikitextParser, "parse", Wikitext_parser_parse, -1);
     rb_define_method(cWikitextParser, "profiling_parse", Wikitext_parser_profiling_parse, 1);
     rb_define_method(cWikitextParser, "tokenize", Wikitext_parser_tokenize, 1);

data/ext/wikitext.h

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <ruby/ruby.h>
+#include <ruby.h>
 #include <stdint.h>
 
 #define ruby_inspect(obj) rb_funcall(rb_mKernel, rb_intern("p"), 1, obj)

data/spec/wikitext_spec.rb

@@ -21,9 +21,63 @@ describe Wikitext::Parser do
     @parser = Wikitext::Parser.new
   end
 
+  it 'should autolink by default' do
+    @parser.autolink.should == true
+  end
+
+  it 'should use linefeed as default line ending' do
+    @parser.line_ending.should == "\n"
+  end
+
+  it 'should use "external" as default external link class' do
+    @parser.external_link_class.should == 'external'
+  end
+
+  it 'should use "mailto" as default mailto class' do
+    @parser.mailto_class.should == 'mailto'
+  end
+
+  it 'should use "/wiki/" as default internal link prefix' do
+    @parser.internal_link_prefix.should == '/wiki/'
+  end
+
   it 'should turn space-to-underscore off by default' do
     @parser.space_to_underscore.should == false
   end
+
+  it 'should treat slash as special by default' do
+    @parser.treat_slash_as_special.should == true
+  end
+
+  describe 'overriding defaults at initialization time' do
+    it 'should allow overriding of autolink' do
+      Wikitext::Parser.new(:autolink => false).autolink.should == false
+    end
+
+    it 'should allow overriding of line ending' do
+      Wikitext::Parser.new(:line_ending => "\r").line_ending.should == "\r"
+    end
+
+    it 'should allow overriding of external link class' do
+      Wikitext::Parser.new(:external_link_class => 'foo').external_link_class.should == 'foo'
+    end
+
+    it 'should allow overriding of mailto class' do
+      Wikitext::Parser.new(:mailto_class => 'bar').mailto_class.should == 'bar'
+    end
+
+    it 'should allow overriding of internal link prefix' do
+      Wikitext::Parser.new(:internal_link_prefix => '/baz/').internal_link_prefix.should == '/baz/'
+    end
+
+    it 'should allow overriding of space-to-underscore' do
+      Wikitext::Parser.new(:space_to_underscore => true).space_to_underscore.should == true
+    end
+
+    it 'should allow overriding of treat slash as special' do
+      Wikitext::Parser.new(:treat_slash_as_special => false).treat_slash_as_special.should == false
+    end
+  end
 end
 
 describe Wikitext::Parser, 'parsing non-ASCII input' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wikitext
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Wincent Colaiuta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-18 00:00:00 +01:00
+date: 2008-02-19 00:00:00 +01:00
 default_executable: 
 dependencies: []