md_to_bbcode 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9295ed6f4cfbd7e098369213d11366d9cbe1768260059e77527cb7c12c138313
-  data.tar.gz: fff8e9ebfff9bec8a269e2fc85ebd0751a109a874bc9f5d8479b415caa11ed84
+  metadata.gz: b852d6b172b3fb90659c9b2d73d0c439015e2f7eaae67bbe4b4dd054b3294d28
+  data.tar.gz: 2b1604824090ba1b3e2f9e3d8dc3ca33114ba3dd009ef93ac60f7b9bd21d54d7
 SHA512:
-  metadata.gz: a5f0576b887ae5ef515a67f5997e89d220d5078c25a69a4227ac6e955027f9e58767b94715717b897844d6ef96b21415ada9a40d5827e0b29068d0543ce25a99
-  data.tar.gz: b63c89b4c07d918719d24119f06a81b58104b5ff67e4d1cbd9387a19b2dd6027a32cd8a8c96b43411b0980c469ab3b122246a830e8f393bf091597855e07c68f
+  metadata.gz: d4551e53bace327117ba494f0f08ca6ce79713b703e94a5c055a8e78d1074e7087ac9d29b6ebc5717b9481a600e6f55101a5d165aa8cc5372907c4155a0a7a6e
+  data.tar.gz: c9d7804233ecdd7760026aeafaed92d19e0ff8200e2a892941827ce75ec892797dbcaa8bff7b2960be82c856d5dea04b6cf7b07682885bc1658caa847581df8c

data/lib/md_to_bbcode.rb

@@ -13,6 +13,7 @@ module MdToBbcode
     in_a_list = false
     in_a_code_block = false
     in_bold_text = false
+    in_italic_text = false
     markdown.split("\n").each do |line|
       unindented_line = in_a_list && line =~ /^  (.*)$/ ? $1 : line
       if unindented_line =~ /^```(.*)$/
@@ -33,7 +34,7 @@ module MdToBbcode
         line.gsub!(/!\[(.*?)\]\((.*?)\)/, '[img]\2[/img]')
         # Links
         line.gsub!(/\[(.*?)\]\((.*?)\)/, '[url=\2]\1[/url]')
-        # Bold
+        # Bold (do this before italic)
         if in_bold_text
           line.gsub!(/\*\*(.*?)\*\*/, '[/b]\1[b]')
         else
@@ -48,6 +49,21 @@ module MdToBbcode
             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
+          else
+            line.gsub!(/(.*)\*(\S.*)/, '\1[i]\2')
+            in_italic_text = true
+          end
+        end
         # Heading 1
         line.gsub!(/^# (.*?)$/, '[size=6][b]\1[/b][/size]')
         # Heading 2
@@ -58,6 +74,7 @@ module MdToBbcode
         line.gsub!(/^#### (.*?)$/, '[size=5]\1[/size]')
         # In-line code
         line.gsub!(/`(.*?)`/, '[b][font=Courier New]\1[/font][/b]')
+        # Bullets
         if line =~ /^\* (.+)$/
           # Single bullet line
           bbcode_lines << "[list]\n" unless in_a_list

data/lib/md_to_bbcode/version.rb

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

data/spec/api_spec.rb

@@ -20,6 +20,14 @@ describe MdToBbcode do
     expect('**Bold text**'.md_to_bbcode).to eq '[b]Bold text[/b]'
   end
 
+  it 'converts italic text' do
+    expect('*Italic text*'.md_to_bbcode).to eq '[i]Italic text[/i]'
+  end
+
+  it 'converts italic and bold mixed text' do
+    expect('*Italic and **bold** text* and then **bold and *italic* text**'.md_to_bbcode).to eq '[i]Italic and [b]bold[/b] text[/i] and then [b]bold and [i]italic[/i] text[/b]'
+  end
+
   it 'converts links' do
     expect('[Link text](https://my.domain.com/path)'.md_to_bbcode).to eq '[url=https://my.domain.com/path]Link text[/url]'
   end
@@ -34,37 +42,60 @@ describe MdToBbcode do
 
   it 'converts bold text on several lines' do
     md = <<~EOS
-    **Bold
-    text
-    on
-    multi-line**
+      **Bold
+      text
+      on
+      multi-line**
     EOS
     expect(md.md_to_bbcode).to eq(<<~EOS)
-    [b]Bold
-    text
-    on
-    multi-line[/b]
+      [b]Bold
+      text
+      on
+      multi-line[/b]
     EOS
   end
 
   it 'converts bold text on several lines mixed with single lines' do
     md = <<~EOS
-    **Bold text** on **single and
-    on
-    multi-line** but **with** some **new
-    text
-    on** other **lines**
-    all
-    **mixed** up
+      **Bold text** on **single and
+      on
+      multi-line** but **with** some **new
+      text
+      on** other **lines**
+      all
+      **mixed** up
+    EOS
+    expect(md.md_to_bbcode).to eq(<<~EOS)
+      [b]Bold text[/b] on [b]single and
+      on
+      multi-line[/b] but [b]with[/b] some [b]new
+      text
+      on[/b] other [b]lines[/b]
+      all
+      [b]mixed[/b] up
+    EOS
+  end
+
+  it 'converts bold and italic texts on several lines mixed with single lines' do
+    md = <<~EOS
+      **Bold text** on **single and
+      *on italic
+      words* on
+      multi-line** but **with** some **new
+      text
+      on** other **lines**
+      all *italic **and bold**
+      **mixed*** up
     EOS
     expect(md.md_to_bbcode).to eq(<<~EOS)
-    [b]Bold text[/b] on [b]single and
-    on
-    multi-line[/b] but [b]with[/b] some [b]new
-    text
-    on[/b] other [b]lines[/b]
-    all
-    [b]mixed[/b] up
+      [b]Bold text[/b] on [b]single and
+      [i]on italic
+      words[/i] on
+      multi-line[/b] but [b]with[/b] some [b]new
+      text
+      on[/b] other [b]lines[/b]
+      all [i]italic [b]and bold[/b]
+      [b]mixed[/b][/i] up
     EOS
   end
 
@@ -235,7 +266,7 @@ describe MdToBbcode do
       followed
       by** not bold on multi-lines.
 
-      **Bold text including a [link to Google](https://www.google.com).**
+      **Bold text including an italic *[link to Google](https://www.google.com)*.**
 
       This is a bullet list:
       * Bullet item 1
@@ -270,7 +301,7 @@ describe MdToBbcode do
 
       Here is some Ruby:
       ```ruby
-      puts 'Hello'
+      puts 'Hello' * 3 * 5
       # World
       puts `echo World`
       ```
@@ -305,7 +336,7 @@ describe MdToBbcode do
       followed
       by[/b] not bold on multi-lines.
 
-      [b]Bold text including a [url=https://www.google.com]link to Google[/url].[/b]
+      [b]Bold text including an italic [i][url=https://www.google.com]link to Google[/url][/i].[/b]
       
       This is a bullet list:
       [list]
@@ -342,7 +373,7 @@ describe MdToBbcode do
       [/list]
 
       Here is some Ruby:
-      [code]puts 'Hello'
+      [code]puts 'Hello' * 3 * 5
       # World
       puts `echo World`
       [/code]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md_to_bbcode
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec