rtomayko-rdiscount 1.3.1.1 → 1.3.1.2

data/ext/extconf.rb

@@ -4,11 +4,5 @@ dir_config('rdiscount')
 
 HAVE_RANDOM = have_func('random')
 HAVE_SRANDOM = have_func('srandom')
-HAVE_FUNOPEN = have_func('funopen')
-HAVE_FOPENCOOKIE = have_func('fopencookie')
-
-unless HAVE_FUNOPEN || HAVE_FOPENCOOKIE
-  fail "No funopen or fopencookie support available."
-end
 
 create_makefile('rdiscount')

data/ext/rdiscount.c

@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include "ruby.h"
 #include "mkdio.h"
-#include "rbstrio.h"
 
 static VALUE rb_cRDiscount;
 
@@ -9,23 +8,30 @@ static VALUE
 rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
 {
     /* grab char pointer to markdown input text */
+    char *res;
+    int szres;
     VALUE text = rb_funcall(self, rb_intern("text"), 0);
+    VALUE buf = rb_str_buf_new(1024);
     Check_Type(text, T_STRING);
 
-    /* allocate a ruby string buffer and wrap it in a stream */
-    VALUE buf = rb_str_buf_new(4096);
-    FILE *stream = rb_str_io_new(buf);
-
     int flags = rb_rdiscount__get_flags(self);
 
     MMIOT *doc = mkd_string(RSTRING_PTR(text), RSTRING_LEN(text), flags);
-    markdown(doc, stream, flags);
 
-    fclose(stream);
+    if ( mkd_compile(doc, flags) ) {
+        szres = mkd_document(doc, &res);
+
+        if ( szres != EOF ) {
+            rb_str_cat(buf, res, szres);
+            rb_str_cat(buf, "\n", 1);
+        }
+    }
+    mkd_cleanup(doc);
 
     return buf;
 }
 
+#if 0
 static VALUE
 rb_rdiscount_toc_content(int argc, VALUE *argv, VALUE self)
 {
@@ -47,6 +53,7 @@ rb_rdiscount_toc_content(int argc, VALUE *argv, VALUE self)
 
     return buf;
 }
+#endif
 
 int rb_rdiscount__get_flags(VALUE ruby_obj)
 {
@@ -73,7 +80,9 @@ void Init_rdiscount()
 {
     rb_cRDiscount = rb_define_class("RDiscount", rb_cObject);
     rb_define_method(rb_cRDiscount, "to_html", rb_rdiscount_to_html, -1);
+#if 0
     rb_define_method(rb_cRDiscount, "toc_content", rb_rdiscount_toc_content, -1);
+#endif
 }
 
 /* vim: set ts=4 sw=4: */

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '1.3.1.1'
+  VERSION = '1.3.1.2'
 
   # Original Markdown formatted text.
   attr_reader :text

data/rdiscount.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '1.3.1.1'
+  s.version = '1.3.1.2'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2009-01-31'
+  s.date = '2009-02-27'
   s.email = 'r@tomayko.com'
   s.homepage = 'http://github.com/rtomayko/rdiscount'
   s.has_rdoc = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtomayko-rdiscount
 version: !ruby/object:Gem::Version 
-  version: 1.3.1.1
+  version: 1.3.1.2
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-31 00:00:00 -08:00
+date: 2009-02-27 00:00:00 -08:00
 default_executable: 
 dependencies: []