rmultimarkdown 4.5.3.1 → 4.5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01eacdd7bad00819a2a4d15a640a771475a33678
-  data.tar.gz: 84872c1f1f7979477f09f825d4cc8489c0054014
+  metadata.gz: d175433e6b773f208302634ae4a98fd19843a33a
+  data.tar.gz: 6196eef19a7bb5802a4a60b757557d83983cf6a8
 SHA512:
-  metadata.gz: 2e28e39be1746d5c7bf6b097786ea9a177f507d1b54ed0f77a4b386e349ffcfb8f34ed3759d7f015764587b409e4be05309e57b71ba76cfb677aeff859c5b447
-  data.tar.gz: 66c339a9513da6db084ceb048929a43f3324ce2bdc70ee1589ebc65fff1a6708e0fbc5e3aeb8add45311f1dbbda70eeb20caf2f6dbf3233798ce1e51c98761d1
+  metadata.gz: 94a12726d7a0e62191317902b33ae7076e1157c10176a3cba4e838c384ff00ee40e069d069dd505bd98f630a1b2474565c4ad3017816f4c90a461958146bdbf0
+  data.tar.gz: 18d9054243c74d3dafa979e77539cb587b9dddd554fe734d8d23fa578ba870be7ebe6940f79657163613cdeb5d724916a06fdda5cff7badba99e613249bc2410

data/ext/multi_markdown.c

@@ -1,9 +1,23 @@
 #include "ruby.h"
+#include <ruby/encoding.h>
+
 #include "../MultiMarkdown-4/parser.h"
 
+// Tries to convert a C string into an encoded ruby String
+static VALUE encoded_str_new2(char *str, char *encoding) {
+  VALUE result = rb_str_new2(str);
+
+  int enc = rb_enc_find_index(encoding);
+  if (enc > 0) {
+    rb_enc_associate_index(result, enc);
+  }
+
+  return result;
+}
+
 static VALUE rb_cMultiMarkdown;
 
-int get_exts(VALUE self) {
+static int get_exts(VALUE self) {
   int extensions = 0;
   if (rb_funcall(self, rb_intern("smart"), 0) == Qtrue)
     extensions = extensions | EXT_SMART;
@@ -30,7 +44,7 @@ char *get_text(VALUE self) {
 
 static VALUE rb_multimarkdown_to_html(VALUE self) {
   char *html = markdown_to_string(get_text(self), get_exts(self), HTML_FORMAT);
-  VALUE result = rb_str_new2(html);
+  VALUE result = encoded_str_new2(html, "UTF-8");
   free(html);
 
   return result;
@@ -38,7 +52,7 @@ static VALUE rb_multimarkdown_to_html(VALUE self) {
 
 static VALUE rb_multimarkdown_to_latex(VALUE self) {
   char *latex = markdown_to_string(get_text(self), get_exts(self), LATEX_FORMAT);
-  VALUE result = rb_str_new2(latex);
+  VALUE result = encoded_str_new2(latex, "UTF-8");
   free(latex);
 
   return result;
@@ -46,7 +60,7 @@ static VALUE rb_multimarkdown_to_latex(VALUE self) {
 
 static VALUE rb_multimarkdown_extract_metadata_keys(VALUE self) {
   char *metadata_keys = extract_metadata_keys(get_text(self), get_exts(self));
-  VALUE str = rb_str_new2(metadata_keys);
+  VALUE str = encoded_str_new2(metadata_keys, "UTF-8");
   free(metadata_keys);
 
   return rb_funcall(str, rb_intern("split"), 1, rb_str_new2("\n"));
@@ -57,7 +71,7 @@ static VALUE rb_multimarkdown_extract_metadata_value(VALUE self, VALUE key) {
   char *pkey = StringValuePtr(key);
 
   char *metadata = extract_metadata_value(get_text(self), get_exts(self), pkey);
-  VALUE result = rb_str_new2(metadata);
+  VALUE result = encoded_str_new2(metadata, "UTF-8");
   free(metadata);
 
   return result;

data/lib/multi_markdown/version.rb

@@ -1,6 +1,6 @@
 class MultiMarkdown
 
   # The ruby 'multimarkdown' gem version
-  VERSION = "4.5.3.1"
+  VERSION = "4.5.3.2"
 
 end

data/test/multi_markdown_test.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 $: << File.join(File.dirname(__FILE__), "../lib")
 
 require 'test/unit'
@@ -60,5 +62,16 @@ Lorem Ipsum
     assert_equal(nil, multimarkdown.metadata["MetaTheMeta1"])
   end
 
+  def test_encoding
+      multimarkdown = MultiMarkdown.new(<<-eof)
+umlauts: M€tädätä
+
+ÄÖÜßäöüµ√
+=========
+
+eof
+      assert_match(/<h1[^>]*>ÄÖÜßäöüµ√<\/h1>/, multimarkdown.to_html.strip)
+      assert_equal("M€tädätä", multimarkdown.metadata('umlauts'))
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmultimarkdown
 version: !ruby/object:Gem::Version
-  version: 4.5.3.1
+  version: 4.5.3.2
 platform: ruby
 authors:
 - Till Schulte-Coerne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler