reverse_markdown 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e62d51d33119ebe3919029cf32b1e642af179b43
-  data.tar.gz: aaab49c9d182d104a60b9a8fb42e11cb499fc29d
+SHA256:
+  metadata.gz: 69b75c5dec924f267e5861ed24edafa23a8bb12f3e03cd7068e00ae19406424b
+  data.tar.gz: d53a1f8630a532183b491e982250a3bb175d9ed84188103535255e27ff8d39a7
 SHA512:
-  metadata.gz: 6b8c45f72cd959a8115c2f4b188e98edf93383958439981e989381d86620ff7d301ac0d3102ea95bc5522b60e957236c7d3d3b4d24fb0e40e7fe5d571f7c9a1b
-  data.tar.gz: 648a73ecc734e66f4168445bef75b88cb8d9348c6a90304f3e99622df0be0b1553928f511f40ce4765f495e0ad8c589bf61fd8d0e17a8d73c872b9f3904fc9d1
+  metadata.gz: '02949ddc3b08f23f07148bbda7e00a07214d3bc423ec880284c938e30fa872e305ca66fe2b1a9af796c5225dc935fa06c4e19f4085c75d5eaa0b0023eca45961'
+  data.tar.gz: 7c58e5b6fc0560de0e3ef879685db3a8d8f541b07d471b7747492e9918a40334d84a66fcc1c8f76bff061990c661c9b53730e994b435aab28e634ff12cfd6968

data/.travis.yml

@@ -1,5 +1,5 @@
-before_install:
-  - gem install bundler
+# before_install:
+#   - gem install bundler
 
 rvm:
   - 1.9.3
@@ -12,11 +12,13 @@ rvm:
   - 2.3.0
   - 2.3.1
   - 2.4.2
-  - jruby-9.1.16.0
+  - 2.5.3
+  - 2.6.2
+  - jruby-9.2.8.0
 
 script: "bundle exec rake spec"
 
 notifications:
   disabled: false
   recipients:
-    - johannes.opper@gmail.com
+    - xijo@pm.me

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 1.2.0 - August 2019
+- Handle windows `\r\n` within text blocks, thanks for reporting @krisdigital
+- Handle paragraphs in `li` tags, thanks @gstamp
+
 ## 1.1.0 - April 2018
 - Support Jruby, thanks @grddev (#71)
 - Bypass `<tfoot>` tags, thanks @mu-is-too-short (#70)

data/lib/reverse_markdown/converters/li.rb

@@ -2,10 +2,14 @@ module ReverseMarkdown
   module Converters
     class Li < Base
       def convert(node, state = {})
-        content     = treat_children(node, state)
-        indentation = indentation_from(state)
-        prefix      = prefix_for(node)
-        "#{indentation}#{prefix}#{content.chomp}\n"
+        contains_child_paragraph = node.children.first ? node.children.first.name == 'p' : false
+        content_node             = contains_child_paragraph ? node.children.first : node
+        content                  = treat_children(content_node, state)
+        indentation              = indentation_from(state)
+        prefix                   = prefix_for(node)
+
+        "#{indentation}#{prefix}#{content.chomp}\n" +
+          (contains_child_paragraph ? "\n" : '')
       end
 
       def prefix_for(node)

data/lib/reverse_markdown/converters/text.rb

@@ -48,7 +48,7 @@ module ReverseMarkdown
       end
 
       def remove_inner_newlines(text)
-        text.tr("\n\t", ' ').squeeze(' ')
+        text.tr("\r\n\t", ' ').squeeze(' ')
       end
 
       def preserve_keychars_within_backticks(text)

data/lib/reverse_markdown/version.rb

@@ -1,3 +1,3 @@
 module ReverseMarkdown
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/reverse_markdown.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/xijo/reverse_markdown"
   s.summary     = %q{Convert html code into markdown.}
   s.description = %q{Map simple html back into markdown, e.g. if you want to import existing html data in your application.}
-
+  s.licenses    = ["WTFPL"]
   s.rubyforge_project = "reverse_markdown"
 
   s.files         = `git ls-files`.split("\n")

data/spec/html_to_markdown_to_html_spec.rb

@@ -52,6 +52,16 @@ describe 'Round trip: HTML to markdown (via reverse_markdown) to HTML (via redca
     ")
   end
 
+  it "should preserve lists with paragraphs" do
+    roundtrip_should_preserve("
+      <ul>
+        <li><p>Bird</p></li>
+        <li><p>McHale</p></li>
+        <li><p>Parish</p></li>
+      </ul>
+      ")
+  end
+
   it "should preserve <hr> tags" do
     roundtrip_should_preserve("<hr />")
   end

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

@@ -21,6 +21,11 @@ describe ReverseMarkdown::Converters::Pre do
       node = node_for("<pre><code>foobar</code></pre>")
       expect(converter.convert(node)).to eq "\n\n    foobar\n\n"
     end
+
+    it 'handles indented correctly' do
+      node = node_for("<pre><code>if foo\n  return bar\nend</code></pre>")
+      expect(converter.convert(node)).to eq "\n\n    if foo\n      return bar\n    end\n\n"
+    end
   end
 
   context 'for github_flavored markdown' do

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

@@ -10,6 +10,12 @@ describe ReverseMarkdown::Converters::Text do
     expect(result).to eq 'foo bar'
   end
 
+  it 'handles windows-style \r\n correctly' do
+    input = node_for("<p>foo \r\n\r\n bar</p>")
+    result = converter.convert(input)
+    expect(result).to eq 'foo bar'
+  end
+
   it 'removes leading newlines' do
     input = node_for("<p>\n\nfoo bar</p>")
     result = converter.convert(input)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverse_markdown
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -181,7 +181,8 @@ files:
 - spec/lib/reverse_markdown_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/xijo/reverse_markdown
-licenses: []
+licenses:
+- WTFPL
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -198,8 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: reverse_markdown
-rubygems_version: 2.6.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Convert html code into markdown.