mongoid_markdown_extension 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7931a4b45d301e84a32199bdeb55c8b88354ab100e03343b471f133f67703efd
-  data.tar.gz: 8add6626be35350d1fb4017baf8239c9d60d31f8ffb9c5218d6f3caebe52d9ff
+  metadata.gz: ec8e015b5cfba63e62b5e27e5291363427d405becf26f9b8b798c61e42dcb080
+  data.tar.gz: 535cd7396fb5267661ad155a7f3037d80a03a87fb36db3e1209c097d82609310
 SHA512:
-  metadata.gz: 9ccc13b39c9a1fba48b6e5fb5baf136702dc0f1b9171206389b869be6fbfbc103e4f25c677ac3caefa945e6e28ed16adde1f12248a02f8f95500df49a996728c
-  data.tar.gz: 706bf6154f6c2833bf6da66a7bce54715167593f65e30e8432ff6a4b5194947d529b641e2bc299c41ed6406ecb10c9b07a332572f8e034f1b11efc45394b9a21
+  metadata.gz: 2180a3997703c5a2a84624b754a29ffc59a233c82d1ffb328ba5cfd2a70d6e3463958cea22af745071958c95320a50cf4ee40459a39ebd4debe031f895b17599
+  data.tar.gz: f2cf2ea23f98fc0a576c7f9b4d99e3ae97a99a801ac8727358b6668b8ad255239292caf7eb7f70680df4ca7cb8b20dd8278a3b7e6265ed3cd3f0b3df0562d553

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/.travis.yml

@@ -18,7 +18,7 @@ matrix:
       env: MONGOID_VERSION=4
     - rvm: 2.3.3
       env: MONGOID_VERSION=5
-    - rvm: 2.3.3
+    - rvm: 2.7.2
       env: MONGOID_VERSION=6
-    - rvm: 2.5.0
+    - rvm: 2.7.2
       env: MONGOID_VERSION=7

data/CHANGELOG.md

@@ -1,8 +1,15 @@
 # CHANGELOG
 
+## 0.2.0
+
+- Added `linebreaks` option to `to_inline_html`
+- Added `inline_render_class` configuration option
+- Fixed `to_inline_html`
+- Fixed usage of String methods
+
 ## 0.1.10
 
-- FIX: pass configuration to `InlineRenderer` as well
+- Fixed passing configuration to `InlineRenderer`
 
 ## 0.1.9
 

data/lib/mongoid_markdown_extension/inline_renderer.rb

@@ -40,8 +40,11 @@ module MongoidMarkdownExtension
       nil
     end
 
-    def paragraph(text)
-      text + '<br /><br />'
+    def postprocess(full_document)
+      full_document
+        .gsub(/(<\/p>\s*<p>)+?/, '<br><br>')
+        .gsub(/(<\/?p>)+?/, '')
+        .chop
     end
   end
 end

data/lib/mongoid_markdown_extension/markdown.rb

@@ -38,28 +38,21 @@ module MongoidMarkdownExtension
     end
 
     def initialize(str)
-      super str.to_s
-      @str = str.to_s
-    end
-
-    def to_s
-      @str
+      super(str.to_s)
     end
 
     def to_html
-      markdown_renderer.render(@str).html_safe
+      markdown_renderer.render(to_s).html_safe
     end
 
-    def to_inline_html
-      markdown_inline_renderer.render(@str).gsub(/(<br\s?\/?>)+?\Z/, '').html_safe
+    def to_inline_html(line_breaks: false)
+      rendered = markdown_inline_renderer.render(to_s).gsub(/(<br\s?\/?>)+?\z/, '')
+      rendered.gsub!(/(<br\s?\/?>)+?\Z/, '') if !line_breaks
+      rendered.html_safe
     end
 
     def to_stripped_s
-      markdown_stripdown_renderer.render(@str).try(:strip)
-    end
-
-    def mongoize
-      @str
+      markdown_stripdown_renderer.render(to_s).try(:strip)
     end
 
     private
@@ -74,11 +67,12 @@ module MongoidMarkdownExtension
 
     # TODO: how to combine custom render class with the InlineRenderer?
     def markdown_inline_renderer
+      inline_render_class = MongoidMarkdownExtension::Markdown.configuration.inline_render_class
       render_options = MongoidMarkdownExtension::Markdown.configuration.render_options
       extensions = MongoidMarkdownExtension::Markdown.configuration.extensions
       extensions[:tables] = false
 
-      Redcarpet::Markdown.new(InlineRenderer.new(render_options), extensions)
+      Redcarpet::Markdown.new(inline_render_class.new(render_options), extensions)
     end
 
     def markdown_stripdown_renderer
@@ -88,6 +82,7 @@ module MongoidMarkdownExtension
 
   class Configuration
     attr_accessor :extensions
+    attr_accessor :inline_render_class
     attr_accessor :render_class
     attr_accessor :render_options
 
@@ -100,6 +95,7 @@ module MongoidMarkdownExtension
         strikethrough: true,
         superscript: true
       }
+      @inline_render_class = MongoidMarkdownExtension::InlineRenderer
       @render_class = Redcarpet::Render::HTML
       @render_options = {}
     end

data/lib/mongoid_markdown_extension/version.rb

@@ -1,3 +1,3 @@
 module MongoidMarkdownExtension
-  VERSION = '0.1.10'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/test/mongoid_markdown_extension/markdown_test.rb

@@ -35,12 +35,12 @@ module MongoidMarkdownExtension
       describe 'setup block' do
         it 'yields self' do
           MongoidMarkdownExtension::Markdown.configure do |config|
-            config.must_be_kind_of MongoidMarkdownExtension::Configuration
+            _(config).must_be_kind_of MongoidMarkdownExtension::Configuration
           end
         end
 
         it 'returns default values' do
-          MongoidMarkdownExtension::Markdown.configuration.extensions.must_equal(
+          _(MongoidMarkdownExtension::Markdown.configuration.extensions).must_equal(
             autolink: true,
             footnotes: true,
             highlight: true,
@@ -48,85 +48,105 @@ module MongoidMarkdownExtension
             strikethrough: true,
             superscript: true
           )
-          MongoidMarkdownExtension::Markdown.configuration.render_class.must_equal Redcarpet::Render::HTML
-          MongoidMarkdownExtension::Markdown.configuration.render_options.must_equal({})
+          _(MongoidMarkdownExtension::Markdown.configuration.inline_render_class).must_equal MongoidMarkdownExtension::InlineRenderer
+          _(MongoidMarkdownExtension::Markdown.configuration.render_class).must_equal Redcarpet::Render::HTML
+          _(MongoidMarkdownExtension::Markdown.configuration.render_options).must_equal({})
         end
       end
     end
 
     describe '#to_s' do
       it 'returns the original value' do
-        subject.to_s.must_equal string
+        _(subject.to_s).must_equal string
       end
     end
 
     describe '#to_html' do
       it 'survives nil' do
-        MongoidMarkdownExtension::Markdown.new(nil).to_html.must_equal ''
+        _(MongoidMarkdownExtension::Markdown.new(nil).to_html).must_equal ''
       end
 
       it 'converts the string to html' do
-        subject.to_html.must_equal Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(string)
+        _(subject.to_html).must_equal Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(string)
       end
     end
 
     describe '#to_inline_html' do
       let(:string) { "some text with _italic_\n\nfoo" }
+      let(:string_with_line_breaks) { "some text with line break  \nfoo" }
 
       it 'survives nil' do
-        MongoidMarkdownExtension::Markdown.new(nil).to_inline_html.must_equal ''
+        _(MongoidMarkdownExtension::Markdown.new(nil).to_inline_html).must_equal ''
       end
 
       it 'converts the string to html' do
-        subject.to_inline_html.wont_include '<p>'
+        _(subject.to_inline_html).wont_include '<p>'
       end
 
-      it 'replaces <p> with <br />' do
-        subject.to_inline_html.must_equal 'some text with <em>italic</em><br /><br />foo'
+      it 'replaces <p> with <br>' do
+        _(subject.to_inline_html).must_equal 'some text with <em>italic</em><br><br>foo'
+      end
+
+      it 'allows line breaks' do
+        inline_html = MongoidMarkdownExtension::Markdown
+          .new(string_with_line_breaks)
+          .to_inline_html(line_breaks: true)
+        _(inline_html).must_equal "some text with line break<br>\nfoo"
       end
     end
 
     describe '#to_stripped_s' do
       it 'survives nil' do
-        MongoidMarkdownExtension::Markdown.new(nil).to_stripped_s.must_equal ''
+        _(MongoidMarkdownExtension::Markdown.new(nil).to_stripped_s).must_equal ''
       end
 
       it 'converts the markdown to stripped string' do
-        subject.to_stripped_s.wont_include '_'
+        _(subject.to_stripped_s).wont_include '_'
       end
 
       it 'removes newlines' do
-        subject.to_stripped_s.wont_include "\n"
+        _(subject.to_stripped_s).wont_include "\n"
       end
     end
 
     describe '#mongoize' do
       it 'returns string' do
-        subject.mongoize.must_equal string
+        _(subject.mongoize).must_equal string
       end
     end
 
     describe '.mongoize' do
       describe 'when passed a string' do
         it 'returns it back' do
-          MongoidMarkdownExtension::Markdown.mongoize(string).must_equal string
+          _(MongoidMarkdownExtension::Markdown.mongoize(string)).must_equal string
         end
       end
 
       describe 'when passed markdown object' do
         it 'returns its string' do
-          MongoidMarkdownExtension::Markdown.mongoize(subject).must_be_kind_of String
+          _(MongoidMarkdownExtension::Markdown.mongoize(subject)).must_be_kind_of String
         end
       end
     end
 
     describe '.demongoize' do
       it 'does not change the value' do
-        MongoidMarkdownExtension::Markdown.demongoize(string).must_equal string
+        _(MongoidMarkdownExtension::Markdown.demongoize(string)).must_equal string
       end
 
       it 'returns markdown object' do
-        MongoidMarkdownExtension::Markdown.demongoize(string).must_be_kind_of MongoidMarkdownExtension::Markdown
+        _(MongoidMarkdownExtension::Markdown.demongoize(string)).must_be_kind_of MongoidMarkdownExtension::Markdown
+      end
+    end
+
+    describe "splitting" do
+      it "returns correctly instantiated markdown objects" do
+        markdown = MongoidMarkdownExtension::Markdown.new("foo\nbar\nfar\nboo")
+        split_markdown = markdown.split("\n")
+
+        _(split_markdown.first).must_be_kind_of MongoidMarkdownExtension::Markdown
+        _(split_markdown.first.to_s).must_equal "foo"
+        _(split_markdown.first.to_html).must_match /<p>foo<\/p>/
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_markdown_extension
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -96,6 +96,7 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Custom field type for Mongoid that handles Markdown conversion via Redcarpet