gitlab-markup 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 82795809627f394f8c953c348cd41b408fb3b205
-  data.tar.gz: 8ad6727f7393d9e0206dc7227b32a14931102448
+SHA256:
+  metadata.gz: '088585ef527b31da2dd72c9a6efe953a04276e6ca5a0cf411b0b8c32547b27ff'
+  data.tar.gz: ad0c68e99b095ef0f5f94e5d2343003b555f3ad220ae309db55c0627c8419f42
 SHA512:
-  metadata.gz: 18a7fde6790047ac49d7269835ef78747e8514b68e5c0cfe1ba8564ce2ddab30b23f9fb9c5fa3767412c1bd129d1b5dfce880c305eaee3bd522ac547dc7efa1a
-  data.tar.gz: b8ace4828588e671f59c6f8a184e9443819542a0b26526a2180d66e8edfdff8c4cf0979e130c27149c6a303aaedf813215463d2600aae000557c0cd77b576493
+  metadata.gz: 7e9841bddbba24c743d6da4fc6cba9bc3bf04019cc3b16a79d51b15638d778bfab192f3ecf17b64ea7c18470ec701c266ae630c22dc3936d0eed11530d956142
+  data.tar.gz: ffc895e79b9f1bc84e0214a1e9e7fcebcac0d0d8ab8ee33a7359cbe19ef3debffd0497500fa537ad024ec9297f5134c5e6aefb3d5069e886c304f613eb50d286

data/CONTRIBUTING.md

@@ -6,13 +6,18 @@ all contributions. By participating in this project, you agree to abide by the
 
 This library's only job is to decide which markup format to use and call out to an external library to convert the markup to HTML (see the [README](README.md) for more information on how markup is rendered)
 
-## Contributor license agreement
+## Developer Certificate of Origin + License
 
-By submitting code as an individual you agree to the [individual contributor
-license agreement][individual-agreement].
+By contributing to GitLab B.V., You accept and agree to the following terms and
+conditions for Your present and future Contributions submitted to GitLab B.V.
+Except for the license granted herein to GitLab B.V. and recipients of software
+distributed by GitLab B.V., You reserve all right, title, and interest in and to
+Your Contributions. All Contributions are subject to the following DCO + License
+terms.
 
-By submitting code as an entity you agree to the [corporate contributor license
-agreement][corporate-agreement].
+[DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md)
+
+_This notice should stay as the first item in the CONTRIBUTING.md file._
 
 ## Code of conduct
 

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 1.6.4 (2018-06-08)
+
+* Fixed extra blank line at start of rendered reStructuredText code block 
+
 ## 1.6.3 (2017-10-30)
 
 * Support PlantUML caption option and `uml::` directive

data/gitlab-markup.gemspec

@@ -1,25 +1,30 @@
-require File.expand_path("../lib/github-markup", __FILE__)
+require File.expand_path('../lib/github-markup', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name          = "gitlab-markup"
+  s.name          = 'gitlab-markup'
   s.version       = GitHub::Markup::VERSION
-  s.summary       = "The code GitHub uses to render README.markup"
-  s.description   = "This gem is used by GitHub to render any fancy markup such " +
-                    "as Markdown, Textile, Org-Mode, etc. Fork it and add your own!"
-  s.authors       = ["Chris Wanstrath"]
-  s.email         = "chris@ozmm.org"
-  s.homepage      = "https://gitlab.com/gitlab-org/gitlab-markup"
-  s.license       = "MIT"
+  s.summary       = 'Fork from github-markup GitLab uses to render non markdown content'
+  s.description   = 'This gem is used by GitLab to render any non Markdown markup'
+  s.authors       = ['Chris Wanstrath']
+  s.email         = 'chris@ozmm.org'
+  s.homepage      = 'https://gitlab.com/gitlab-org/gitlab-markup'
+  s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($\)
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = %w[lib]
 
+  s.metadata = {
+    'bug_tracker_uri' => 'https://gitlab.com/gitlab-org/gitlab-markup/issues',
+    'changelog_uri'   => 'https://gitlab.com/gitlab-org/gitlab-markup/blob/master/HISTORY.md',
+    'source_code_uri' => 'https://gitlab.com/gitlab-org/gitlab-markup'
+  }
+
   s.add_development_dependency 'activesupport', '~> 4.0'
-  s.add_development_dependency 'minitest', '~> 5.4.3'
   s.add_development_dependency 'html-pipeline', '~> 1.0'
-  s.add_development_dependency 'sanitize', '~> 2.1.0'
+  s.add_development_dependency 'minitest', '~> 5.4.3'
   s.add_development_dependency 'nokogiri', '~> 1.6.1'
   s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
+  s.add_development_dependency 'sanitize', '~> 2.1.0'
 end

data/lib/github-markup.rb

@@ -1,6 +1,6 @@
 module GitHub
   module Markup
-    VERSION = '1.6.3'
+    VERSION = '1.6.4'
     Version = VERSION
   end
 end

data/lib/github/commands/rest2html

@@ -133,10 +133,10 @@ class GitHubHTMLTranslator(HTMLTranslator, object):
             language = classes[1]
             del classes[:]
             self.body.append(self.starttag(node, 'pre'))
-            self.body.append(self.starttag(node, 'code', lang=language))
+            self.body.append(self.starttag(node, 'code', suffix='', lang=language))
         else:
             self.body.append(self.starttag(node, 'pre'))
-            self.body.append(self.starttag(node, 'code'))
+            self.body.append(self.starttag(node, 'code', suffix=''))
 
     def depart_literal_block(self, node):
         self.body.append('</code>')

data/test/markup_test.rb

@@ -21,8 +21,9 @@ def assert_html_equal(expected, actual, msg = nil)
       expected_doc = Nokogiri::HTML(expected) {|config| config.noblanks}
       actual_doc   = Nokogiri::HTML(actual) {|config| config.noblanks}
 
-      expected_doc.search('//text()').each {|node| node.content = normalize_html node.content}
-      actual_doc.search('//text()').each {|node| node.content = normalize_html node.content}
+      # Normalize content of text nodes, excluding preformatted nodes
+      expected_doc.search('//text()[not(ancestor::pre)]').each {|node| node.content = normalize_html node.content}
+      actual_doc.search('//text()[not(ancestor::pre)]').each {|node| node.content = normalize_html node.content}
 
       ignore_changes = {"+" => Regexp.union(/^\s*id=".*"\s*$/), "-" => nil}
       expected_doc.diff(actual_doc) do |change, node|

data/test/markups/README.rst.html

@@ -17,16 +17,13 @@
 </ol>
 <p>The UTF-8 quote character in this table used to cause python to go boom. Now docutils just silently ignores it.</p>
 <pre>
-<code>
-A block of code</code>
+<code>A block of code</code>
 </pre>
 <pre>
-<code lang="python">
-python.code('hooray')</code>
+<code lang="python">python.code('hooray')</code>
 </pre>
 <pre>
-<code lang="python">
-&gt;&gt;&gt; some_function()
+<code lang="python">&gt;&gt;&gt; some_function()
 'result'</code>
 </pre>
 <table>
@@ -91,13 +88,11 @@ but no problem!</td>
 
 <p>Press <kbd>Ctrl+C</kbd> to quit</p>
 <pre>
-<code lang="plantuml">
-Bob -&gt; Alice: hello
+<code lang="plantuml">Bob -&gt; Alice: hello
 Alice -&gt; Bob: Go Away</code>
 </pre>
 <p>Caption with <strong>bold</strong> and <em>italic</em></p>
 <pre>
-<code lang="plantuml">
-Bob -&gt; Alice: hello
+<code lang="plantuml">Bob -&gt; Alice: hello
 Alice -&gt; Bob: Go Away</code>
 </pre>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-markup
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Chris Wanstrath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,77 +25,76 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: html-pipeline
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 5.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 5.4.3
 - !ruby/object:Gem::Dependency
-  name: sanitize
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: nokogiri-diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri-diff
+  name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
-description: This gem is used by GitHub to render any fancy markup such as Markdown,
-  Textile, Org-Mode, etc. Fork it and add your own!
+        version: 2.1.0
+description: This gem is used by GitLab to render any non Markdown markup
 email: chris@ozmm.org
 executables:
 - github-markup
@@ -160,7 +159,10 @@ files:
 homepage: https://gitlab.com/gitlab-org/gitlab-markup
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://gitlab.com/gitlab-org/gitlab-markup/issues
+  changelog_uri: https://gitlab.com/gitlab-org/gitlab-markup/blob/master/HISTORY.md
+  source_code_uri: https://gitlab.com/gitlab-org/gitlab-markup
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -177,10 +179,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: The code GitHub uses to render README.markup
+summary: Fork from github-markup GitLab uses to render non markdown content
 test_files:
 - test/fixtures/fail.sh
 - test/markup_test.rb