greenmat 3.2.2.1 → 3.2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80fadf21193eda5c5eab714095a6d86a0d608d27
-  data.tar.gz: a12b70fb72898b4fc831abf617cad4f92017bfd5
+  metadata.gz: ad510ebbbe81b765116b386b8ced689042d16bda
+  data.tar.gz: 8a9a99fea907d338c33f6191b67b2bf6824dc3ad
 SHA512:
-  metadata.gz: 0c4ae5bcfb8486f165bf8606c220d89e0877c6bd51c6d23b3bde3ceb3a818c1fdea613efdd433c71eab53d0dde327f017fa4be42f7fbee449af96dce0564c387
-  data.tar.gz: 3e2b9324e321d3660e2f9ba4ba3580e6ef18c61ad7857ceccdfb3a89ddd2930edf87e9c6bb9cd77664646d1f2639d17bdf086fa8210e359ee27e9c95889ed532
+  metadata.gz: d67f98f40aa8f3847189a345de7e38ee2852c372b91acc767d0e546c424d3e63e18aa6566de0fc21859d1894fc949fa70bf43cc04ddeceff3ed7efd8c6b021c3
+  data.tar.gz: 64b1a708033a21a9f4554b2d5d5fff44b2a1d116a46cd7331478410ea13ff37067a850925c4ca47434815620b63d8f8470fe2e1871460530012fe4a6b66a49bc

data/.travis.yml

@@ -6,9 +6,9 @@ install: travis_retry bundle install --without=benchmark
 
 rvm:
   - 2.0.0
-  - 2.1
-  - 2.2
-  - ruby-head
-
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 notifications:
   email: false

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v3.2.2.2
+
+* Fix bugs in UTF-8 handling. [#3](https://github.com/increments/greenmat/pull/3) ([@gfx](https://github.com/gfx))
+
 ## v3.2.2.1
 
 * Fix a bug where bad memory access would happen in a document starting with `@`.

data/ext/greenmat/autolink.c

@@ -16,6 +16,7 @@
 
 #include "buffer.h"
 #include "autolink.h"
+#include "houdini.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -169,7 +170,7 @@ sd_autolink__www(
 {
 	size_t link_end;
 
-	if (max_rewind > 0 && !ispunct(data[-1]) && !isspace(data[-1]))
+	if (max_rewind > 0 && !ispunct(data[-1]) && is_non_space(data[-1]))
 		return 0;
 
 	if (size < 4 || memcmp(data, "www.", strlen("www.")) != 0)
@@ -180,7 +181,7 @@ sd_autolink__www(
 	if (link_end == 0)
 		return 0;
 
-	while (link_end < size && !isspace(data[link_end]))
+	while (link_end < size && is_non_space(data[link_end]))
 		link_end++;
 
 	link_end = autolink_delim(data, link_end, max_rewind, size);
@@ -222,7 +223,7 @@ sd_autolink__email(
 		return 0;
 
 	for (link_end = 0; link_end < size; ++link_end) {
-		uint8_t c = data[link_end];
+		char c = data[link_end];
 
 		if (isalnum(c))
 			continue;
@@ -280,7 +281,7 @@ sd_autolink__url(
 		return 0;
 
 	link_end += domain_len;
-	while (link_end < size && !isspace(data[link_end]))
+	while (link_end < size && is_non_space(data[link_end]))
 		link_end++;
 
 	link_end = autolink_delim(data, link_end, max_rewind, size);

data/ext/greenmat/houdini.h

@@ -1,6 +1,7 @@
 #ifndef HOUDINI_H__
 #define HOUDINI_H__
 
+#include <stdlib.h>
 #include "buffer.h"
 
 #ifdef __cplusplus
@@ -22,6 +23,8 @@ extern void houdini_escape_html(struct buf *ob, const uint8_t *src, size_t size)
 extern void houdini_escape_html0(struct buf *ob, const uint8_t *src, size_t size, int secure);
 extern void houdini_escape_href(struct buf *ob, const uint8_t *src, size_t size);
 
+#define is_non_space(c) (!isspace(c) || (c) >= 0x7f)
+
 #ifdef __cplusplus
 }
 #endif

data/ext/greenmat/html.c

@@ -137,7 +137,7 @@ rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, v
 
 			if (i < lang->size) {
 				size_t org = i;
-				while (i < lang->size && !isspace(lang->data[i]))
+				while (i < lang->size && is_non_space(lang->data[i]))
 					i++;
 
 				if (lang->data[org] == '.')

data/greenmat.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "nokogiri", "~> 1.6.0"
+  s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rake-compiler", "~> 0.8.3"
   s.add_development_dependency "rspec", "~> 3.2"
-  s.add_development_dependency "rubygems-xcodeproj_generator", '~> 0.1'
   s.add_development_dependency "test-unit", "~> 2.5.4"
 end

data/lib/greenmat/version.rb

@@ -1,3 +1,3 @@
 module Greenmat
-  VERSION = '3.2.2.1'
+  VERSION = '3.2.2.2'
 end

data/test/markdown_test.rb

@@ -131,6 +131,24 @@ HTML
     html_equal exp, rd
   end
 
+  def test_auto_linked_www_utf8_issue
+		rd = render_with({ autolink: true }, "www.example.com/码")
+		exp = %{<p><a href="http://www.example.com/%E7%A0%81">www.example.com/码</a></p>\n}
+    assert_equal exp, rd
+  end
+
+  def test_auto_linked_url_utf8_issue
+		rd = render_with({ autolink: true }, "http://example.com/码")
+    exp = %{<p><a href="http://example.com/%E7%A0%81">http://example.com/码</a></p>\n}
+    assert_equal exp, rd
+  end
+
+  def test_auto_linked_email_utf8_issue
+    rd = render_with({ autolink: true }, "r@example.comあ")
+    exp = %{<p><a href="mailto:r@example.com">r@example.com</a>あ</p>\n}
+    assert_equal exp, rd
+  end
+
   def test_memory_leak_when_parsing_char_links
     @markdown.render(<<-leaks)
 2. Identify the wild-type cluster and determine all clusters
@@ -243,6 +261,12 @@ fenced
     assert !out.include?("<pre><code>")
   end
 
+  def test_that_fenced_flag_works_with_utf8
+    text = "```ム\ncode\n```"
+    out = Greenmat::Markdown.new(Greenmat::Render::HTML, :fenced_code_blocks => true).render(text)
+    assert out.include?(%{<pre><code class="ム">})
+  end
+
   def test_that_indented_flag_works
     text = <<indented
 This is a simple text

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greenmat
 version: !ruby/object:Gem::Version
-  version: 3.2.2.1
+  version: 3.2.2.2
 platform: ruby
 authors:
 - Natacha Porté
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -26,47 +26,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
-  name: rubygems-xcodeproj_generator
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,6 @@ files:
 - lib/greenmat/version.rb
 - spec/greenmat/markdown_spec.rb
 - spec/spec_helper.rb
-- tasks/generate_xcode_project.rake
 - tasks/greenmat.rake
 - tasks/spec.rake
 - test/MarkdownTest_1.0.3/MarkdownTest.pl
@@ -247,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Markdown parser for Qiita, based on Redcarpet.

data/tasks/generate_xcode_project.rake

@@ -1,5 +0,0 @@
-require 'rubygems/xcodeproj_generator/rake_task'
-
-Rubygems::XcodeprojGenerator::RakeTask.new do |project|
-  project.build_command = 'bundle exec rake compile'
-end