reverse_markdown 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b06289903207da3e585d5b1c09e438dfcbdcbdf
-  data.tar.gz: aef0c5b8f5fbbe30991641a3c70a877080d873dc
+  metadata.gz: 11ce7d306707ed1f0e5a3ac81ad987aacb324923
+  data.tar.gz: 4b922a19fc5f0074ec8b2025fdb9cd731215b469
 SHA512:
-  metadata.gz: b7e209ff266f3e0bf3fe80246106b9b1ca2219eaf19514fd7a523ecccd58996a576cd1e1a5d1145c471aa1fc9d0dbfc9ee34a607772b238bb931f9dd2a132ba9
-  data.tar.gz: cc24189f772e4cb9fa240fa8901912729b33a81c727179bc0cc05cc5f6ea06f9512421967c9e01341b4a74f9d8aabed91d4156abbfff20cb4d7e4e7e96e82c67
+  metadata.gz: 3081f4ae63f7b19a6564fe67f84fcfa1294e0d6cc3b3f336bbc2a913d59d0acaf155e7261610b8dca3bb00cbbb6aaec27fda964deb23b3122941fd6010b45eda
+  data.tar.gz: 40ada4d795985e420fec12c9f5ce164897e87717276b66f155a163eeae679f7619d3f1e35512cf8753472b7a188d893ea044e744d305722773ed2b8fc311acf7

data/.travis.yml

@@ -11,6 +11,7 @@ rvm:
   - 2.2.5
   - 2.3.0
   - 2.3.1
+  - 2.4.2
 
 script: "bundle exec rake spec"
 

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 1.0.5 - February 2018
+- Fix newline handling within pre tags, thanks @niallcolfer (#69)
+
 ## 1.0.4 - November 2017
 - Make blockquote behave as true block, thanks for reporting @kanedo (#67)
 

data/lib/reverse_markdown/converters/pre.rb

@@ -2,15 +2,28 @@ module ReverseMarkdown
   module Converters
     class Pre < Base
       def convert(node, state = {})
+        content = treat_children(node, state)
         if ReverseMarkdown.config.github_flavored
-          "\n```#{language(node)}\n" << node.text.strip << "\n```\n"
+          "\n```#{language(node)}\n" << content.strip << "\n```\n"
         else
-          "\n\n    " << node.text.strip.lines.to_a.join("    ") << "\n\n"
+          "\n\n    " << content.lines.to_a.join("    ") << "\n\n"
         end
       end
 
       private
 
+      # Override #treat as proposed in https://github.com/xijo/reverse_markdown/pull/69
+      def treat(node, state)
+        case node.name
+        when 'code'
+          node.text
+        when 'br'
+          "\n"
+        else
+          super
+        end
+      end
+
       def language(node)
         lang = language_from_highlight_class(node)
         lang || language_from_confluence_class(node)

data/lib/reverse_markdown/version.rb

@@ -1,3 +1,3 @@
 module ReverseMarkdown
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/spec/lib/reverse_markdown/converters/pre_spec.rb

@@ -11,6 +11,16 @@ describe ReverseMarkdown::Converters::Pre do
       node = node_for("<pre>puts foo</pre>")
       expect(converter.convert(node)).to include "    puts foo\n"
     end
+
+    it 'preserves new lines' do
+      node = node_for("<pre>one<br>two<br>three</pre>")
+      expect(converter.convert(node)).to include "\n\n    one\n    two\n    three\n\n"
+    end
+
+    it 'handles code tags correctly' do
+      node = node_for("<pre><code>foobar</code></pre>")
+      expect(converter.convert(node)).to eq "\n\n    foobar\n\n"
+    end
   end
 
   context 'for github_flavored markdown' do
@@ -21,6 +31,16 @@ describe ReverseMarkdown::Converters::Pre do
       expect(converter.convert(node)).to include "```\nputs foo\n```"
     end
 
+    it 'preserves new lines' do
+      node = node_for("<pre>foo<br>bar</pre>")
+      expect(converter.convert(node)).to include "```\nfoo\nbar\n```"
+    end
+
+    it 'handles code tags correctly' do
+      node = node_for("<pre><code>foobar</code></pre>")
+      expect(converter.convert(node)).to include "```\nfoobar\n```"
+    end
+
     context 'syntax highlighting' do
       it 'works for "highlight-lang" mechanism' do
         div = node_for("<div class='highlight highlight-ruby'><pre>puts foo</pre></div>")

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
 require 'simplecov'
 # require 'byebug'
 
@@ -20,5 +17,5 @@ RSpec.configure do |config|
 end
 
 def node_for(html)
-  Nokogiri::XML.parse(html).root
+  Nokogiri::HTML.parse(html).root.child.child
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverse_markdown
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri