rpeg-multimarkdown 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 153a563efa3e2d15f47874308fb8ff2060752964
-  data.tar.gz: 9459fdddb5815ca24026973817a7744b82da97a7
+  metadata.gz: 1a2db27270d9a4205d98c91760432207cf2cddcf
+  data.tar.gz: 8b3a88efb70610fb70c2db1bd173d7926b5c038f
 SHA512:
-  metadata.gz: 375d6044a041d31de74bb7e166900f5f1df03a32bf75694544f0cf455c93475afc8b40d2165331658a8d2a60185116abb9f54f942510e98037062461c019f71c
-  data.tar.gz: 667c389c1a25ee4abda0acc197bb86a93e6adc91a5505dd6e27a7a9714c0997b459f7929daa3bee6831b7dbc3213a9dc08a414f7d40f5d124bda125821bc2b99
+  metadata.gz: 9e5452b984d43c447b563973760b0879fc515257eca20c5f7310fc026bf93e0b46585b6e72ffd80a45104007e2455702be46520c775242f8b7ae5859637ca828
+  data.tar.gz: 9182a060242a16d96d62d61db84244c469676b3761c7807b6c49843f00854888cd51e6bdfe3baf0602ba8f192461e169f2e64f6030d2c2c27bdca7c377c5647e

data/README.markdown

@@ -50,10 +50,10 @@ Hacking:
 Changes
 -------
 
-  * [Version 0.2.1](http://github.com/djungelvral/rpeg-multimarkdown/tree/v0.2.1)
-	  * Fixed ruby module tests, which weren't actually running
-  * [Version 0.2](http://github.com/djungelvral/rpeg-multimarkdown/tree/v0.2)
+  * [Version 0.2.2](http://github.com/djungelvral/rpeg-multimarkdown/tree/v0.2.2)
 	  * Bringing everything up to date with the last version of peg-multimarkdown
+	  * Fixed ruby module tests, which weren't actually running
+	  * Preserve encoding, e.g. for UTF-8
   * [Version 0.1.1](http://github.com/djungelvral/rpeg-multimarkdown/tree/v0.1.1)
 
 COPYING

data/Rakefile

@@ -8,7 +8,7 @@ require 'rubygems/package_task'
 task :default => :test
 
 DLEXT = RbConfig::CONFIG['DLEXT']
-VERS = '0.2.1'
+VERS = '0.2.2'
 
 spec = Gem::Specification.new do |s|
   s.name              = "rpeg-multimarkdown"

data/ext/markdown.c

@@ -35,7 +35,10 @@ rb_multimarkdown_to_html(int argc, VALUE *argv, VALUE self)
     char *html = markdown_to_string(ptext, extensions, HTML_FORMAT);
     VALUE result = rb_str_new2(html);
     free(html);
-
+    
+    /* Take the encoding from the input, and apply to output */
+    rb_enc_copy(result, text);
+        
     return result;
 }
 
@@ -53,6 +56,9 @@ rb_multimarkdown_to_latex(int argc, VALUE *argv, VALUE self)
     VALUE result = rb_str_new2(latex);
     free(latex);
 
+    /* Take the encoding from the input, and apply to output */
+    rb_enc_copy(result, text);
+        
     return result;
 }
 
@@ -71,9 +77,18 @@ rb_multimarkdown_extract_metadata(VALUE self, VALUE key)
 
     /* Display metadata on request */
     char *metadata = extract_metadata_value(ptext, extensions, pkey);
-    VALUE result = rb_str_new2(metadata);
+    int exists = metadata != NULL;
+    /* metadata might be null, if not present */
+    /* rb_str_new2 == rb_str_new_cstr */
+    VALUE result = exists ? rb_str_new2(metadata) : Qnil;
     free(metadata);
 
+    /* Take the encoding from the input, and apply to output */
+    if(exists)
+    {
+        rb_enc_copy(result, text);
+    }
+    
     return result;
 }
 

data/test/multimarkdown_test.rb

@@ -7,7 +7,7 @@ require 'multimarkdown'
 MARKDOWN_TEST_DIR = "#{File.dirname(__FILE__)}/MultiMarkdownTest"
 
 class MultiMarkdownTest < MiniTest::Test
-
+  
   def test_that_extension_methods_are_present_on_multimarkdown_class
     assert MultiMarkdown.instance_methods.include?(:to_html),
       "MultiMarkdown class should respond to #to_html"
@@ -60,6 +60,33 @@ class MultiMarkdownTest < MiniTest::Test
     multimarkdown.to_html(true)
   end
 
+  def test_that_encoding_is_preserved_for_html
+    test = "Écouté bien!"
+    html = MultiMarkdown.new(test, :smart).to_html
+    assert_equal html.encoding, test.encoding
+    assert_equal "<p>Écouté bien!</p>", html.strip
+  end
+
+  def test_that_encoding_is_preserved_for_latex
+    test = "Écouté bien!"
+    latex = MultiMarkdown.new(test, :smart).to_latex
+    assert_equal latex.encoding, test.encoding
+    assert_equal "Écouté bien!", latex.strip
+  end
+
+  def test_that_encoding_is_preserved_for_metadata
+    test = "Title: Some åccentéd document\n\nÉcouté bien!"
+    title = MultiMarkdown.new(test, :smart).extract_metadata("title")
+    refute_nil title
+    assert_equal title.encoding, test.encoding
+    assert_equal "Some åccentéd document", title.strip
+  end
+
+  def test_that_missing_metadata_returns_nil
+    test = "Title: Some document\n\nHere's some text"
+    author = MultiMarkdown.new(test, :smart).extract_metadata("author")
+    assert_nil author
+  end
 
 
   # Build tests for each file in the MarkdownTest test suite

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpeg-multimarkdown
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Oliver Whyte