reverse_markdown 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1ee719972c0c06f84c6df44ff2cacdec0d3630c
-  data.tar.gz: 857ee9cfc3c01374fe0904dbed85ed63fb58ce79
+  metadata.gz: 01b3bd87ed314c7c27b36ea54e85094b8978f47a
+  data.tar.gz: 5e6281c33ddd442a52ada8b35753f7e50782f0f1
 SHA512:
-  metadata.gz: 4f5d772f3847ed3cb6e82e8f177dc70cc1143bb6f38edaf98eaa554d0d2965f6a8f85fe14d7999b72ef824ea10a4d5eb93d991a6c7d51d609f34aafa8faf8859
-  data.tar.gz: dbb1c987a62990504c492879026ebdb37d3fb82bc7f12b16bdb60be920cb489e90cbf574162c39d96bdae145054abfdaddcd9eb7de7f66f7753fc3af77b73abb
+  metadata.gz: 9ddc12421dd427d581c14e0c4fe3eb98087bb057b24401b7e8bed7975ed8a1ff52b1ddefbbb9494c8a7136dbe35010cb0fcd31ef2419be338247bf45b5ef90ea
+  data.tar.gz: 9078b5ed562091011c7d3de8578bf514fcfba0c83aad596c9752c38b5e56a00d63e38c737e6c9e09fcad75b338ed673b4f7a78f34c8ed3141e5cfb2a70748e3c

data/.travis.yml

@@ -2,7 +2,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - 2.1.1
+  - 2.1.5
   - 2.2.0
 
 script: "bundle exec rake spec"

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 0.8.0 - April 2015
+### Added
+- `article` tag is now supported and treated like a div
+
+### Changed
+- Special characters are treated correctly inside of backticks, see (#47)
+
 ## 0.7.0 - February 2015
 ### Added
 - pre-tags support syntax github and confluence syntax highlighting now

data/lib/reverse_markdown/cleaner.rb

@@ -62,6 +62,7 @@ module ReverseMarkdown
     private
 
     def preserve_border_whitespaces(string, options = {}, &block)
+      return string if string =~ /\A\s*\Z/
       default_border = options.fetch(:default_border, '')
       string_start   = present_or_default(string[/\A\s*/], default_border)
       string_end     = present_or_default(string[/\s*\Z/], default_border)

data/lib/reverse_markdown/converters.rb

@@ -5,6 +5,10 @@ module ReverseMarkdown
       @@converters[tag_name.to_sym] = converter
     end
 
+    def self.unregister(tag_name)
+      @@converters.delete(tag_name.to_sym)
+    end
+
     def self.lookup(tag_name)
       @@converters[tag_name.to_sym] or default_converter(tag_name)
     end

data/lib/reverse_markdown/converters/div.rb

@@ -6,6 +6,7 @@ module ReverseMarkdown
       end
     end
 
-    register :div, Div.new
+    register :div,     Div.new
+    register :article, Div.new
   end
 end

data/lib/reverse_markdown/converters/em.rb

@@ -6,7 +6,7 @@ module ReverseMarkdown
         if content.strip.empty? || already_italic?(node)
           content
         else
-          "_#{content}_"
+          "#{content[/^\s*/]}_#{content.strip}_#{content[/\s*$/]}"
         end
       end
 

data/lib/reverse_markdown/converters/strong.rb

@@ -6,7 +6,7 @@ module ReverseMarkdown
         if content.strip.empty? || already_strong?(node)
           content
         else
-          "**#{content}**"
+          "#{content[/^\s*/]}**#{content.strip}**#{content[/\s*$/]}"
         end
       end
 

data/lib/reverse_markdown/converters/text.rb

@@ -27,7 +27,9 @@ module ReverseMarkdown
         text = preserve_nbsp(text)
         text = remove_border_newlines(text)
         text = remove_inner_newlines(text)
-        escape_keychars text
+        text = escape_keychars(text)
+
+        preserve_keychars_within_backticks(text)
       end
 
       def preserve_nbsp(text)
@@ -41,6 +43,12 @@ module ReverseMarkdown
       def remove_inner_newlines(text)
         text.tr("\n\t", ' ').squeeze(' ')
       end
+
+      def preserve_keychars_within_backticks(text)
+        text.gsub(/`.*?`/) do |match|
+          match.gsub('\_', '_').gsub('\*', '*')
+        end
+      end
     end
 
     register :text, Text.new

data/lib/reverse_markdown/version.rb

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

data/spec/assets/basic.html

@@ -14,6 +14,10 @@
     before <em> <em> <br /> </em> </em> and after em tags containing whitespace
     <em><em>double em tags</em></em>
     <p><em><em>double em tags in p tag</em></em></p>
+    <em> em with leading and trailing </em>whitespace
+    <em>     
+        em with extra leading and trailing   
+        </em>whitespace
 
     <strong>strong tag content</strong>
     before <strong></strong> and after empty strong tags
@@ -27,6 +31,10 @@
           double strong tags containing whitespace
         </strong>
       </strong> after
+    <strong> strong with leading and trailing </strong>whitespace
+    <strong>     
+        strong with extra leading and trailing   
+        </strong>whitespace
 
     <b>b tag content</b>
     <i>i tag content</i>

data/spec/components/basic_spec.rb

@@ -19,6 +19,8 @@ describe ReverseMarkdown do
   it { should match /before and after em tags containing whitespace/ }
   it { should match /_double em tags_/ }
   it { should match /_double em tags in p tag_/ }
+  it { should match /_em with leading and trailing_ whitespace/ }
+  it { should match /_em with extra leading and trailing_ whitespace/ }
 
   it { should match /\*\*strong tag content\*\*/ }
   it { should match /before and after empty strong tags/ }
@@ -26,6 +28,8 @@ describe ReverseMarkdown do
   it { should match /\*\*double strong tags\*\*/ }
   it { should match /\*\*double strong tags in p tag\*\*/ }
   it { should match /before \*\*double strong tags containing whitespace\*\* after/ }
+  it { should match /\*\*strong with leading and trailing\*\* whitespace/ }
+  it { should match /\*\*strong with extra leading and trailing\*\* whitespace/ }
 
   it { should match /_i tag content_/ }
   it { should match /\*\*b tag content\*\*/ }

data/spec/components/from_the_wild_spec.rb

@@ -7,9 +7,7 @@ describe ReverseMarkdown do
   subject { ReverseMarkdown.convert(input) }
 
   it "should make sense of strong-crazy markup (as seen in the wild)" do
-    expect(subject).to eq '**.' + "  \n" +
-      ' \*\*\* intentcast ** : logo design' + "   \n" +
-      "**.**\n\n"
+    expect(subject).to eq "**.  \n \\*\\*\\* intentcast** : logo design   \n **.**\n\n"
   end
 
 end

data/spec/lib/reverse_markdown/cleaner_spec.rb

@@ -45,6 +45,11 @@ describe ReverseMarkdown::Cleaner do
       result = cleaner.remove_inner_whitespaces("foo\t \tbar")
       expect(result).to eq "foo bar"
     end
+
+    it 'keeps lines that only contain whitespace' do
+      result = cleaner.remove_inner_whitespaces("foo \nbar \n \n  \nfoo")
+      expect(result).to eq "foo \nbar \n \n  \nfoo"
+    end
   end
 
   describe '#clean_punctuation_characters' do

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

@@ -28,4 +28,29 @@ describe ReverseMarkdown::Converters::Text do
     expect(result).to eq "foo bar  "
   end
 
+  context 'within backticks' do
+    it "preserves single underscores" do
+      input = node_for("<p>`foo_bar`</p>")
+      result = converter.convert(input)
+      expect(result).to eq '`foo_bar`'
+    end
+
+    it "preserves multiple underscores" do
+      input = node_for("<p>`foo_bar __example__`</p>")
+      result = converter.convert(input)
+      expect(result).to eq '`foo_bar __example__`'
+    end
+
+    it "preserves single asterisks" do
+      input = node_for("<p>`def foo *args`</p>")
+      result = converter.convert(input)
+      expect(result).to eq '`def foo *args`'
+    end
+
+    it "preserves multiple asterisks" do
+      input = node_for("<p>`def foo 2***3`</p>")
+      result = converter.convert(input)
+      expect(result).to eq '`def foo 2***3`'
+    end
+  end
 end

data/spec/lib/reverse_markdown/converters_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe ReverseMarkdown::Converters do
+  before { ReverseMarkdown.config.unknown_tags = :raise }
+  let(:converters) { ReverseMarkdown::Converters }
+
+  describe '.register and .unregister' do
+    it 'adds a converter mapping to the list' do
+      expect { converters.lookup(:foo) }.to raise_error
+
+      converters.register :foo, :foobar
+      expect(converters.lookup(:foo)).to eq :foobar
+
+      converters.unregister :foo
+      expect { converters.lookup(:foo) }.to raise_error
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ CodeClimate::TestReporter.start
 require 'simplecov'
 # require 'byebug'
 
-SimpleCov.adapters.define 'gem' do
+SimpleCov.profiles.define 'gem' do
   add_filter '/spec/'
   add_filter '/autotest/'
   add_group 'Libraries', '/lib/'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverse_markdown
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -176,6 +176,7 @@ files:
 - 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/converters_spec.rb
 - spec/lib/reverse_markdown_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/xijo/reverse_markdown
@@ -235,5 +236,6 @@ test_files:
 - 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/converters_spec.rb
 - spec/lib/reverse_markdown_spec.rb
 - spec/spec_helper.rb