reverse_markdown 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 345b5116f393914034fa05e3ceae0f7cabbda791
-  data.tar.gz: ecc2a58d1b46fb2c338d95009d2866239b4de880
+  metadata.gz: ae1d23f69d1494799f0b6773df49559fb53c6979
+  data.tar.gz: 65231dac3cf20c1a549dd3807ad9c8a9c44a05ca
 SHA512:
-  metadata.gz: d509a043b014bd9e6f72e56bb728befc8923668646b054e7ea6b4cd8576e45e2130a51d1a3100e87c61b518be80e47078b1d19a741e3469ff835790cf901d543
-  data.tar.gz: f199c4efb681293e100f7c5bfbd7436c6ea194273b3a7e76509ec6387f689ceabdfeb1838de8a8e5de976802f6f7e3945f6458aaa6a01d71751c160d1402c286
+  metadata.gz: 850a262c23e1ef0c661fa4e338cba4fc3e4a7c420ca5f7381eeaf65c63280ba00d861ee11f92b7340d7336caf441981eab1453f8b9c89d592678935eda0ec121
+  data.tar.gz: d135d8464c76aa9a10cf03cbafe7670b8100c2dd10b9b7c62245f4b8bde79441eb9aeffaa13ec630c153595bde78d8f069a3929533109a7f19eb24fe77e8d68a

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.1.1
+  - 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.6.1 - January 2015
+### Changed
+- Setting config options in block style will last for all following `convert` calls.
+- Inline config options are only applied to this particular operation
+
+### Removed
+- `config.reset` is removed
 
 ## 0.6.0 - September 2014
 ### Added

data/README.md

@@ -70,7 +70,7 @@ The following options are available:
 
 ### As options
 
-Just pass your chosen configuration options in after the input
+Just pass your chosen configuration options in after the input. The given options will last for this operation only.
 
 ```ruby
 ReverseMarkdown.convert(input, unknown_tags: :raise, github_flavored: true)
@@ -78,12 +78,12 @@ ReverseMarkdown.convert(input, unknown_tags: :raise, github_flavored: true)
 
 ### Preconfigure
 
-Or configure it block style on a initializer level
+Or configure it block style on a initializer level. These configurations will last for all conversions until they are set to something different.
 
 ```ruby
 ReverseMarkdown.config do |config|
-  config.ignore_unknown_tags = false
-  config.github_flavored     = true
+  config.unknown_tags     = :bypass
+  config.github_flavored  = true
 end
 ```
 

data/lib/reverse_markdown.rb

@@ -40,9 +40,10 @@ module ReverseMarkdown
     end
 
     root or return ''
-    config.apply(options)
-    result = ReverseMarkdown::Converters.lookup(root.name).convert(root)
-    config.reset
+
+    result = config.with(options) do
+      ReverseMarkdown::Converters.lookup(root.name).convert(root)
+    end
     cleaner.tidy(result)
   end
 

data/lib/reverse_markdown/config.rb

@@ -3,18 +3,24 @@ module ReverseMarkdown
     attr_accessor :unknown_tags, :github_flavored
 
     def initialize
-      reset
+      @unknown_tags    = :pass_through
+      @github_flavored = false
+      @inline_options = {}
     end
 
-    def apply(options = {})
-      options.each do |method, value|
-        __send__(:"#{method}=", value)
-      end
+    def with(options = {})
+      @inline_options = options
+      result = yield
+      @inline_options = {}
+      result
     end
 
-    def reset
-      @unknown_tags    = :pass_through
-      @github_flavored = false
+    def unknown_tags
+      @inline_options[:unknown_tags] || @unknown_tags
+    end
+
+    def github_flavored
+      @inline_options[:github_flavored] || @github_flavored
     end
   end
 end

data/lib/reverse_markdown/converters/text.rb

@@ -23,11 +23,17 @@ module ReverseMarkdown
       end
 
       def treat_text(node)
-        text = remove_border_newlines(node.text)
+        text = node.text
+        text = preserve_nbsp(text)
+        text = remove_border_newlines(text)
         text = remove_inner_newlines(text)
         escape_keychars text
       end
 
+      def preserve_nbsp(text)
+        text.gsub(/\u00A0/, " ")
+      end
+
       def remove_border_newlines(text)
         text.gsub(/\A\n+/, '').gsub(/\n+\z/, '')
       end

data/lib/reverse_markdown/version.rb

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

data/reverse_markdown.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "reverse_markdown"
   s.version     = ReverseMarkdown::VERSION
   s.authors     = ["Johannes Opper"]
-  s.email       = ["xijo@gmx.de"]
+  s.email       = ["johannes.opper@gmail.com"]
   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.}

data/spec/assets/paragraphs.html

@@ -11,5 +11,14 @@
         <code>Content</code>
       </pre>
     </p>
+    <p>
+      <strong>Trailing whitespace: </strong>
+    </p>
+    <p>
+      <strong>Trailing non-breaking space:&nbsp;</strong>
+    </p>
+    <p>
+      <strong><em>Combination:&nbsp;</em></strong>
+    </p>
   </body>
 </html>

data/spec/components/paragraphs_spec.rb

@@ -9,4 +9,7 @@ describe ReverseMarkdown do
   it { should_not start_with "\n\n" }
   it { should start_with "First content\n\nSecond content\n\n" }
   it { should include "\n\n_Complex_\n\n    Content" }
+  it { should include "**Trailing whitespace:**" }
+  it { should include "**Trailing non-breaking space: **" }
+  it { should include "**_Combination: _**" }
 end

data/spec/lib/reverse_markdown/config_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe ReverseMarkdown::Config do
+  describe '#with' do
+    let(:config) { ReverseMarkdown.config }
+
+    it 'takes additional options into account' do
+      config.with(github_flavored: :foobar) do
+        expect(ReverseMarkdown.config.github_flavored).to eq :foobar
+      end
+    end
+
+    it 'returns the result of a given block' do
+      expect(config.with { :something }).to eq :something
+    end
+
+    it 'resets to original settings afterwards' do
+      config.github_flavored = :foo
+      config.with(github_flavored: :bar) do
+        expect(ReverseMarkdown.config.github_flavored).to eq :bar
+      end
+      expect(ReverseMarkdown.config.github_flavored).to eq :foo
+    end
+
+  end
+end

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

@@ -22,4 +22,10 @@ describe ReverseMarkdown::Converters::Text do
     expect(result).to eq 'foo bar'
   end
 
+  it 'keeps nbsps' do
+    input = Nokogiri::XML.parse("<p>foo\u00A0bar \u00A0</p>").root
+    result = converter.convert(input)
+    expect(result).to eq "foo&nbsp;bar &nbsp;"
+  end
+
 end

data/spec/spec_helper.rb

@@ -15,6 +15,6 @@ require 'reverse_markdown'
 
 RSpec.configure do |config|
   config.after(:each) do
-    ReverseMarkdown.config.reset
+    ReverseMarkdown.instance_variable_set(:@config, nil)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverse_markdown
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -97,7 +97,7 @@ dependencies:
 description: Map simple html back into markdown, e.g. if you want to import existing
   html data in your application.
 email:
-- xijo@gmx.de
+- johannes.opper@gmail.com
 executables:
 - reverse_markdown
 extensions: []
@@ -169,6 +169,7 @@ files:
 - spec/components/unknown_tags_spec.rb
 - spec/html_to_markdown_to_html_spec.rb
 - spec/lib/reverse_markdown/cleaner_spec.rb
+- spec/lib/reverse_markdown/config_spec.rb
 - spec/lib/reverse_markdown/converters/blockquote_spec.rb
 - spec/lib/reverse_markdown/converters/br_spec.rb
 - spec/lib/reverse_markdown/converters/del_spec.rb
@@ -226,6 +227,7 @@ test_files:
 - spec/components/unknown_tags_spec.rb
 - spec/html_to_markdown_to_html_spec.rb
 - spec/lib/reverse_markdown/cleaner_spec.rb
+- spec/lib/reverse_markdown/config_spec.rb
 - spec/lib/reverse_markdown/converters/blockquote_spec.rb
 - spec/lib/reverse_markdown/converters/br_spec.rb
 - spec/lib/reverse_markdown/converters/del_spec.rb