bbcode-rails 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e92689b8f46d26711cfcab4041edd5b64f02a21a
-  data.tar.gz: 3c7892df9c5f386f3fe64130670e2bf0c226f7b8
+  metadata.gz: 347807d619401620f7eb88ad15405a00867bf570
+  data.tar.gz: 0f167fefb0c8fc6ab4a0ab0b2c2bc440b4a17bd0
 SHA512:
-  metadata.gz: 20ec7751adda1c00022ad58f9e5f789d93490348d1d6376afb6b4e87e8ddac7a520071994bf431e152767c294c7a1ad3f2a615f0813459a5e9d467d097624ecd
-  data.tar.gz: b1d80c0d6396fc43af8a0ea401d6eb7a50e6b01aa4a0e527407469d9bc7cab32dd9d1d5a30f50511526bef732bdeb3483af206f3105042cb428cd36b88122387
+  metadata.gz: 3632535904a3db28cd65540545b026b0fcae76544ac6756bc8ac7362396e7e02d3d9b3746cff310cb0e103f3aaa642092cf66dcbe91d529465cbe17e3028c3ce
+  data.tar.gz: 198b3be08e56674d2385bbafeb84236fc479917c4ca93ae504d9535d44b18270f988ed86c62cf31f06311db0317f1747981be4a6ccb2d3b4b4ba54a5cba795bd

data/lib/bbcode-rails.rb

@@ -28,11 +28,6 @@ module BBCode
     str.gsub!('"', '"')
     str.gsub!("'", ''')
 
-    # Taken from bb-ruby, who took it from Rails Actionpack
-    str.gsub!(/\r\n?/, "\n") # \r\n and \r => \n
-    str.gsub!(/\n+/, '<br>')  # 1+ newline   => br
-
-
     # Let's iterate over the pieces to build a tree
     # It works like this:
     # For each object you have two things:
@@ -159,7 +154,15 @@ module BBCode
         end
       end
 
-      result.map(&:to_s).join('').strip
+      result_str = result.map(&:to_s).join('').strip
+
+      # extracted from bb-ruby, which extracted it from Rails ActionPack
+      start_tag = '<p>'
+      result_str.gsub!(/\r\n?/, "\n")                   # \r\n and \r => \n
+      result_str.gsub!(/\n\n+/, "</p>\n\n#{start_tag}") # 2+ newline  => paragraph
+      result_str.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br>')  # 1 newline   => br
+      result_str.insert 0, start_tag
+      result_str << '</p>'
     rescue BBCode::ParseError => e
       if raise_error
         raise e

data/lib/bbcode-rails/version.rb

@@ -1,3 +1,3 @@
 module BBCode
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbcode-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Marcel Müller