md_to_bbcode 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b852d6b172b3fb90659c9b2d73d0c439015e2f7eaae67bbe4b4dd054b3294d28
-  data.tar.gz: 2b1604824090ba1b3e2f9e3d8dc3ca33114ba3dd009ef93ac60f7b9bd21d54d7
+  metadata.gz: 882bfada1866cb31be09d565ddbdf8b7a4a76570e66c2f0618951ad7815888f7
+  data.tar.gz: 70b7c9fb216b71575e56521104e3ccc23cbd807c0cfff63ac2791d3c0dc0d957
 SHA512:
-  metadata.gz: d4551e53bace327117ba494f0f08ca6ce79713b703e94a5c055a8e78d1074e7087ac9d29b6ebc5717b9481a600e6f55101a5d165aa8cc5372907c4155a0a7a6e
-  data.tar.gz: c9d7804233ecdd7760026aeafaed92d19e0ff8200e2a892941827ce75ec892797dbcaa8bff7b2960be82c856d5dea04b6cf7b07682885bc1658caa847581df8c
+  metadata.gz: 2aca2c89a8854d459a603d114dadb2fdb9afb3b002a5cb90b1744f352facee7d5a3784276473d09f6eee33753df59210383f66353f4b452162db1a11fd1e413c
+  data.tar.gz: 40d70ca3254263bc8a0deb320b1845d1aa8b074a908de38465ae7ee1db28a68accd141d84a5e425c6e5da62f3cb7a5740576a1d160ba48b9f74731f6a1206161

data/lib/md_to_bbcode.rb

@@ -30,40 +30,50 @@ module MdToBbcode
         # Don't change anything at the formatting
         bbcode_lines << "#{line}\n"
       else
-        # Images (do this gsub before links and any single tags, like bold, headings...)
-        line.gsub!(/!\[(.*?)\]\((.*?)\)/, '[img]\2[/img]')
-        # Links
-        line.gsub!(/\[(.*?)\]\((.*?)\)/, '[url=\2]\1[/url]')
-        # Bold (do this before italic)
-        if in_bold_text
-          line.gsub!(/\*\*(.*?)\*\*/, '[/b]\1[b]')
-        else
-          line.gsub!(/\*\*(.*?)\*\*/, '[b]\1[/b]')
-        end
-        if line =~ /.*\*\*.*/
-          if in_bold_text
-            line.gsub!(/(.*)\*\*(.*)/, '\1[/b]\2')
-            in_bold_text = false
-          else
-            line.gsub!(/(.*)\*\*(.*)/, '\1[b]\2')
-            in_bold_text = true
-          end
-        end
-        # Italic
-        if in_italic_text
-          line.gsub!(/\*(\S.*?)\*/, '[/i]\1[i]')
-        else
-          line.gsub!(/\*(\S.*?)\*/, '[i]\1[/i]')
-        end
-        if line =~ /.*\*.*/
-          if in_italic_text
-            line.gsub!(/(.*\S)\*(.*)/, '\1[/i]\2')
-            in_italic_text = false
+        # Handle in-line code markers first
+        line = line.split(/(`.+?`)/).map do |field|
+          if field[0] == '`'
+            # Don't change anything at the formatting
+            "#{in_bold_text ? '' : '[b]'}[font=Courier New]#{field[1..-2]}[/font]#{in_bold_text ? '' : '[/b]'}"
           else
-            line.gsub!(/(.*)\*(\S.*)/, '\1[i]\2')
-            in_italic_text = true
+            # Apply the formatting except the formatting used for whole lines (headers, bullets, lists...)
+            # Images (do this gsub before links and any single tags, like bold, headings...)
+            field.gsub!(/!\[(.*?)\]\((.*?)\)/, '[img]\2[/img]')
+            # Links
+            field.gsub!(/\[(.*?)\]\((.*?)\)/, '[url=\2]\1[/url]')
+            # Bold (do this before italic)
+            if in_bold_text
+              field.gsub!(/\*\*(.*?)\*\*/, '[/b]\1[b]')
+            else
+              field.gsub!(/\*\*(.*?)\*\*/, '[b]\1[/b]')
+            end
+            if field =~ /.*\*\*.*/
+              if in_bold_text
+                field.gsub!(/(.*)\*\*(.*)/, '\1[/b]\2')
+                in_bold_text = false
+              else
+                field.gsub!(/(.*)\*\*(.*)/, '\1[b]\2')
+                in_bold_text = true
+              end
+            end
+            # Italic
+            if in_italic_text
+              field.gsub!(/\*(\S.*?)\*/, '[/i]\1[i]')
+            else
+              field.gsub!(/\*(\S.*?)\*/, '[i]\1[/i]')
+            end
+            if field =~ /.*\*.*/
+              if in_italic_text
+                field.gsub!(/(.*\S)\*(.*)/, '\1[/i]\2')
+                in_italic_text = false
+              else
+                field.gsub!(/(.*)\*(\S.*)/, '\1[i]\2')
+                in_italic_text = true
+              end
+            end
+            field
           end
-        end
+        end.join
         # Heading 1
         line.gsub!(/^# (.*?)$/, '[size=6][b]\1[/b][/size]')
         # Heading 2
@@ -72,8 +82,6 @@ module MdToBbcode
         line.gsub!(/^### (.*?)$/, '[size=5][b]\1[/b][/size]')
         # Heading 4
         line.gsub!(/^#### (.*?)$/, '[size=5]\1[/size]')
-        # In-line code
-        line.gsub!(/`(.*?)`/, '[b][font=Courier New]\1[/font][/b]')
         # Bullets
         if line =~ /^\* (.+)$/
           # Single bullet line

data/lib/md_to_bbcode/version.rb

@@ -1,5 +1,5 @@
 module MdToBbcode
 
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
 end

data/spec/api_spec.rb

@@ -36,6 +36,48 @@ describe MdToBbcode do
     expect('`in-line code`'.md_to_bbcode).to eq '[b][font=Courier New]in-line code[/font][/b]'
   end
 
+  it 'converts inline code in bold text' do
+    expect('**Bold `in-line code` to display**'.md_to_bbcode).to eq '[b]Bold [font=Courier New]in-line code[/font] to display[/b]'
+  end
+
+  it 'converts inline code in italic text' do
+    expect('*Italic `in-line code` to display*'.md_to_bbcode).to eq '[i]Italic [b][font=Courier New]in-line code[/font][/b] to display[/i]'
+  end
+
+  it 'converts inline code in a multi-line bold text' do
+    md = <<~EOS
+      **Bold
+      `in-line code`
+      on
+      multi-line**
+    EOS
+    expect(md.md_to_bbcode).to eq(<<~EOS)
+      [b]Bold
+      [font=Courier New]in-line code[/font]
+      on
+      multi-line[/b]
+    EOS
+  end
+
+  it 'converts inline code in a multi-line italic text' do
+    md = <<~EOS
+      *Italic
+      `in-line code`
+      on
+      multi-line*
+    EOS
+    expect(md.md_to_bbcode).to eq(<<~EOS)
+      [i]Italic
+      [b][font=Courier New]in-line code[/font][/b]
+      on
+      multi-line[/i]
+    EOS
+  end
+
+  it 'does not convert other formatting in inline code' do
+    expect('`# in-line *code* that is **not formatted**`'.md_to_bbcode).to eq '[b][font=Courier New]# in-line *code* that is **not formatted**[/font][/b]'
+  end
+
   it 'converts images' do
     expect('![Image text](https://my.domain.com/image.jpg)'.md_to_bbcode).to eq '[img]https://my.domain.com/image.jpg[/img]'
   end
@@ -278,6 +320,7 @@ describe MdToBbcode do
       Here is a link to [Google](https://www.google.com/) in a middle of a line.
 
       An inline code block `this is code` to be inserted.
+      And **another one in bold: `this is *code* that **is preformatted**` but written** in bold.
 
       ### Heading h3
 
@@ -350,6 +393,7 @@ describe MdToBbcode do
       Here is a link to [url=https://www.google.com/]Google[/url] in a middle of a line.
       
       An inline code block [b][font=Courier New]this is code[/font][/b] to be inserted.
+      And [b]another one in bold: [font=Courier New]this is *code* that **is preformatted**[/font] but written[/b] in bold.
       
       [size=5][b]Heading h3[/b][/size]
       

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: md_to_bbcode
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
 description: Provides an API and an executable to convert Markdown text to BBCode
   format
 email: