reverse_markdown 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae1d23f69d1494799f0b6773df49559fb53c6979
-  data.tar.gz: 65231dac3cf20c1a549dd3807ad9c8a9c44a05ca
+  metadata.gz: d1ee719972c0c06f84c6df44ff2cacdec0d3630c
+  data.tar.gz: 857ee9cfc3c01374fe0904dbed85ed63fb58ce79
 SHA512:
-  metadata.gz: 850a262c23e1ef0c661fa4e338cba4fc3e4a7c420ca5f7381eeaf65c63280ba00d861ee11f92b7340d7336caf441981eab1453f8b9c89d592678935eda0ec121
-  data.tar.gz: d135d8464c76aa9a10cf03cbafe7670b8100c2dd10b9b7c62245f4b8bde79441eb9aeffaa13ec630c153595bde78d8f069a3929533109a7f19eb24fe77e8d68a
+  metadata.gz: 4f5d772f3847ed3cb6e82e8f177dc70cc1143bb6f38edaf98eaa554d0d2965f6a8f85fe14d7999b72ef824ea10a4d5eb93d991a6c7d51d609f34aafa8faf8859
+  data.tar.gz: dbb1c987a62990504c492879026ebdb37d3fb82bc7f12b16bdb60be920cb489e90cbf574162c39d96bdae145054abfdaddcd9eb7de7f66f7753fc3af77b73abb

data/.travis.yml

@@ -10,4 +10,4 @@ script: "bundle exec rake spec"
 notifications:
   disabled: false
   recipients:
-    - xijo@gmx.de
+    - johannes.opper@gmail.com

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 0.7.0 - February 2015
+### Added
+- pre-tags support syntax github and confluence syntax highlighting now
+
 ## 0.6.1 - January 2015
 ### Changed
 - Setting config options in block style will last for all following `convert` calls.

data/README.md

@@ -100,8 +100,11 @@ end
 
 # Thanks
 
-..to Ben Woosley for his improvements to the first version.
-
-..to Harlan T. Wood for his help with the newer versions.
-
-..and all contributors
+Thanks to all [contributors](https://github.com/xijo/reverse_markdown/graphs/contributors) and all other helpers:
+
+- [Empact](https://github.com/Empact) Ben Woosley
+- [harlantwood](https://github.com/harlantwood) Harlan T. Wood
+- [aprescott](https://github.com/aprescott) Adam Prescott
+- [danschultzer](https://github.com/danschultzer) Dan Schultzer
+- [Benjamin-Dobell](https://github.com/Benjamin-Dobell) Benjamin Dobell
+- [schkovich](https://github.com/schkovich) Goran Miskovic

data/lib/reverse_markdown/converters/pre.rb

@@ -1,15 +1,28 @@
-require 'base64'
-
 module ReverseMarkdown
   module Converters
     class Pre < Base
       def convert(node)
         if ReverseMarkdown.config.github_flavored
-          "```\n" << node.text.strip << "\n```\n"
+          "\n```#{language(node)}\n" << node.text.strip << "\n```\n"
         else
           "\n\n    " << node.text.strip.lines.to_a.join("    ") << "\n\n"
         end
       end
+
+      private
+
+      def language(node)
+        lang = language_from_highlight_class(node)
+        lang || language_from_confluence_class(node)
+      end
+
+      def language_from_highlight_class(node)
+        node.parent['class'].to_s[/highlight-([a-zA-Z0-9]+)/, 1]
+      end
+
+      def language_from_confluence_class(node)
+        node['class'].to_s[/brush:\s?(:?.*);/, 1]
+      end
     end
 
     register :pre, Pre.new

data/lib/reverse_markdown/version.rb

@@ -1,3 +1,3 @@
 module ReverseMarkdown
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

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

@@ -5,13 +5,13 @@ describe ReverseMarkdown::Converters::Blockquote do
   let(:converter) { ReverseMarkdown::Converters::Blockquote.new }
 
   it 'converts nested elements as well' do
-    input = Nokogiri::XML.parse("<blockquote><ul><li>foo</li></ul></blockquote>").root
+    input = node_for("<blockquote><ul><li>foo</li></ul></blockquote>")
     result = converter.convert(input)
     expect(result).to eq "> - foo"
   end
 
   it 'can deal with paragraphs inside' do
-    input = Nokogiri::XML.parse("<blockquote><p>Some text.</p><p>Some more text.</p></blockquote>").root
+    input = node_for("<blockquote><p>Some text.</p><p>Some more text.</p></blockquote>")
     result = converter.convert(input)
     expect(result).to eq "> Some text.\n> \n> Some more text."
   end

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

@@ -7,12 +7,12 @@ describe ReverseMarkdown::Converters::Del do
     before { ReverseMarkdown.config.github_flavored = true }
 
     it 'converts the input as expected' do
-      input = Nokogiri::XML.parse('<del>deldeldel</del>').root
+      input = node_for('<del>deldeldel</del>')
       expect(converter.convert(input)).to eq '~~deldeldel~~'
     end
 
     it 'skips empty tags' do
-      input = Nokogiri::XML.parse('<del></del>').root
+      input = node_for('<del></del>')
       expect(converter.convert(input)).to eq ''
     end
 
@@ -26,7 +26,7 @@ describe ReverseMarkdown::Converters::Del do
     before { ReverseMarkdown.config.github_flavored = false }
 
     it 'does not convert anything' do
-      input = Nokogiri::XML.parse('<del>deldeldel</del>').root
+      input = node_for('<del>deldeldel</del>')
       expect(converter.convert(input)).to eq 'deldeldel'
     end
 

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

@@ -5,7 +5,7 @@ describe ReverseMarkdown::Converters::Li do
   let(:converter) { ReverseMarkdown::Converters::Li.new }
 
   it 'does not fail without a valid parent context' do
-    input = Nokogiri::XML.parse("<li>foo</li>").root
+    input = node_for("<li>foo</li>")
     result = converter.convert(input)
     expect(result).to eq "- foo\n"
   end

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

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe ReverseMarkdown::Converters::Pre do
+
+  let(:converter) { ReverseMarkdown::Converters::Pre.new }
+
+  context 'for standard markdown' do
+    before { ReverseMarkdown.config.github_flavored = false }
+
+    it 'converts with indentation' do
+      node = node_for("<pre>puts foo</pre>")
+      expect(converter.convert(node)).to include "    puts foo\n"
+    end
+  end
+
+  context 'for github_flavored markdown' do
+    before { ReverseMarkdown.config.github_flavored = true }
+
+    it 'converts with backticks' do
+      node = node_for("<pre>puts foo</pre>")
+      expect(converter.convert(node)).to include "```\nputs foo\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>")
+        pre = div.children.first
+        expect(converter.convert(pre)).to include "```ruby\n"
+      end
+
+      it 'works for the confluence mechanism' do
+        pre = node_for("<pre class='theme: Confluence; brush: html/xml; gutter: false'>puts foo</pre>")
+        expect(converter.convert(pre)).to include "```html/xml\n"
+      end
+    end
+  end
+
+end

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

@@ -5,25 +5,25 @@ describe ReverseMarkdown::Converters::Text do
   let(:converter) { ReverseMarkdown::Converters::Text.new }
 
   it 'treats newline within text as a single whitespace' do
-    input = Nokogiri::XML.parse("<p>foo\nbar</p>").root
+    input = node_for("<p>foo\nbar</p>")
     result = converter.convert(input)
     expect(result).to eq 'foo bar'
   end
 
   it 'removes leading newlines' do
-    input = Nokogiri::XML.parse("<p>\n\nfoo bar</p>").root
+    input = node_for("<p>\n\nfoo bar</p>")
     result = converter.convert(input)
     expect(result).to eq 'foo bar'
   end
 
   it 'removes trailing newlines' do
-    input = Nokogiri::XML.parse("<p>foo bar\n\n</p>").root
+    input = node_for("<p>foo bar\n\n</p>")
     result = converter.convert(input)
     expect(result).to eq 'foo bar'
   end
 
   it 'keeps nbsps' do
-    input = Nokogiri::XML.parse("<p>foo\u00A0bar \u00A0</p>").root
+    input = node_for("<p>foo\u00A0bar \u00A0</p>")
     result = converter.convert(input)
     expect(result).to eq "foo&nbsp;bar &nbsp;"
   end

data/spec/spec_helper.rb

@@ -18,3 +18,7 @@ RSpec.configure do |config|
     ReverseMarkdown.instance_variable_set(:@config, nil)
   end
 end
+
+def node_for(html)
+  Nokogiri::XML.parse(html).root
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverse_markdown
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -174,6 +174,7 @@ files:
 - spec/lib/reverse_markdown/converters/br_spec.rb
 - spec/lib/reverse_markdown/converters/del_spec.rb
 - spec/lib/reverse_markdown/converters/li_spec.rb
+- spec/lib/reverse_markdown/converters/pre_spec.rb
 - spec/lib/reverse_markdown/converters/text_spec.rb
 - spec/lib/reverse_markdown_spec.rb
 - spec/spec_helper.rb
@@ -232,6 +233,7 @@ test_files:
 - spec/lib/reverse_markdown/converters/br_spec.rb
 - spec/lib/reverse_markdown/converters/del_spec.rb
 - spec/lib/reverse_markdown/converters/li_spec.rb
+- spec/lib/reverse_markdown/converters/pre_spec.rb
 - spec/lib/reverse_markdown/converters/text_spec.rb
 - spec/lib/reverse_markdown_spec.rb
 - spec/spec_helper.rb