ruby-bbcode 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b074eb2a8df2745cba8702182ea59e14620b6c0
-  data.tar.gz: 91083a7047d379cefc3d596c36e867ef2a176d71
+  metadata.gz: 37d4c690e1a1f4568999f6dd0828a1412bdb4258
+  data.tar.gz: aa02eeaae1f5ae2da7729f392f2d1d7245f6d374
 SHA512:
-  metadata.gz: 7410da90e9630381a1a5202ffbd70e4df951dfc9d074c6be65003b9cb759862b71c54c50e818db046bad53603029b40cb3904c1a516c66f859c0e6419d0e101e
-  data.tar.gz: 66cc66ede05370b5c549327a60ce913f58d6e4e507b476de3581e7747a5c5aa9b247e3aa51ea7aa9bc14d206283a69881c9287f4b1467b95612107836974007e
+  metadata.gz: b684a64a382dab2ee8371ee013e2dc03955371724dc325df15530f0bd8ce3c06a62b74b531610eae22015903d572303976a4ee885316c9c91cf01219fb1e32d4
+  data.tar.gz: 1d9f6990314aaa90a072575039e45990449149ca9b8babe85c2fce09d869f70e625e9f767731ff7db86accc0640d4830f3be5ca376aad82748556ba2e0760798

data/CHANGELOG.md

@@ -1,7 +1,11 @@
 Upcoming
 --------
 
-Version 2.0.1 - 15-Jan-2015
+Version 2.0.2 - 10-Apr-2017
+
+* Fix error when tags are in self-closing tags (issue #30)
+
+Version 2.0.1 - 15-Jan-2017
 
 * Remove EOL newlines before/after self-closing tags (issue #29)
 

data/README.md

@@ -0,0 +1,66 @@
+# Ruby-BBCode
+
+[![gem version](https://badge.fury.io/rb/ruby-bbcode.svg)](https://badge.fury.io/rb/ruby-bbcode) [![Build Status](https://travis-ci.org/veger/ruby-bbcode.svg?branch=master)](https://travis-ci.org/veger/ruby-bbcode) [![Code Coverage](https://coveralls.io/repos/github/veger/ruby-bbcode/badge.svg?branch=master)](https://coveralls.io/github/veger/ruby-bbcode?branch=master)
+
+This gem adds support for [BBCode](http:/www.bbcode.org/) to Ruby. The BBCode is parsed by a parser before converted to HTML, allowing to convert nested BBCode tags in strings to their correct HTML equivalent. The parser also checks whether the BBCode is valid and gives errors for incorrect BBCode texts.
+Additionally, annotations can be added to the BBCode string the showing errors that are present, assuming there are any errors.
+
+The parser recognizes all [official tags](http://www.bbcode.org/reference.php) and allows to easily extend this set with custom tags.
+
+## Examples
+
+`bbcode_to_html` can be used to convert a BBCode string to HTML:
+
+```ruby
+'This is [b]bold[/b] and this is [i]italic[/i].'.bbcode_to_html
+ => 'This is <strong>bold</strong> and this is <em>italic</em>.'
+ ```
+
+`bbcode_show_errors` can be used to convert a BBCode to BBCode annotated with errors (assuming the original BBCode did contain errors):
+
+```ruby
+'[img=no_dimensions_here]image.png[/img]'.bbcode_show_errors
+ => '<span class=\'bbcode_error\' data-bbcode-errors=\'["The image parameters \'no_dimensions_here\' are incorrect, \'<width>x<height>\' excepted"]\'>[img]</span>image.png[/img]'
+ ```
+
+These HTML attributes containing the JSON representation of the errors can be used to inform the user about the problems.
+The following JavaScript/jQuery example makes use of the [Bootstrap tooltips plugin](http://getbootstrap.com/javascript/#tooltips) to show the errors in tooltip popups:
+```javascript
+$(".bbcode_error").tooltip({
+  title: function() {
+    var errors = JSON.parse($(this).attr('data-bbcode-errors'));
+    return errors.join("\n");
+  }
+});
+```
+
+## Installing
+
+Add the following line to the Gemfile of your application:
+```ruby
+gem 'ruby-bbcode'
+```
+
+Or to use the source code from the repository:
+```ruby
+gem 'ruby-bbcode', :git => 'git://github.com/veger/ruby-bbcode.git'
+```
+
+Run
+```shell
+bundle install
+```
+
+And Ruby-BBCode is available in your application.
+
+_Note_: Do not forget to restart your server!
+
+## Acknowledgements
+
+A big thanks to [@TheNotary](https://github.com/TheNotary) for all contributions he made to this project!
+
+Some of the ideas and the tests came from [bb-ruby](https://github.com/cpjolicoeur/bb-ruby) of Craig P Jolicoeur.
+
+## License
+
+MIT License. See the included [MIT-LICENCE](MIT-LICENSE) file.

data/lib/ruby-bbcode/bbtree.rb

@@ -46,7 +46,6 @@ module RubyBBCode
 
     # Step down the bbtree a notch because we've reached a closing tag
     def retrogress_bbtree
-      # print @tags_list[-1].inspect
       if @tags_list[-1].definition[:self_closable]
         # It is possible that the next (self_closable) tag is on the next line
         # Remove newline of current tag and parent tag as they are (probably) not intented as an actual newline here but as tag separator
@@ -58,8 +57,7 @@ module RubyBBCode
       # The parsed data manifests in @bbtree.current_node.children << TagNode.new(element) which I think is more confusing than needed
 
       if within_open_tag?
-        # Set the current node to be the node we've just parsed over which is infact within another node??...
-        @current_node = TagNode.new(self.nodes.last)
+        @current_node = @tags_list[-1]
       else # If we're still at the root of the BBTree or have returned back to the root via encountring closing tags...
         @current_node = TagNode.new({:nodes => self.nodes})  # Note:  just passing in self works too...
       end

data/lib/ruby-bbcode/version.rb

@@ -2,5 +2,5 @@ module RubyBBCode
   # Version of RubyBBCode
   #
   # Follows semantic versioning: http://semver.org/
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/test/ruby_bbcode_html_test.rb

@@ -55,6 +55,7 @@ class RubyBbcodeHtmlTest < Minitest::Test
 
   def test_list_common_syntax
     assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[list][*]item 1[*]item 2[/list]'.bbcode_to_html
+    assert_equal '<ul><li><strong>item 1</strong> test</li><li>item 2</li></ul>', "[list]\n[*][b]item 1[/b] test[*]item 2[/list]".bbcode_to_html
   end
 
   def test_newline_list_common_syntax

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bbcode
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Maarten Bezemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,13 +99,13 @@ email: maarten.bezemer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.textile
+- README.md
 - CHANGELOG.md
 - MIT-LICENSE
 files:
 - CHANGELOG.md
 - MIT-LICENSE
-- README.textile
+- README.md
 - Rakefile
 - lib/ruby-bbcode.rb
 - lib/ruby-bbcode/bbtree.rb
@@ -150,7 +150,7 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: ruby-bbcode-2.0.1
+summary: ruby-bbcode-2.0.2
 test_files:
 - test/unit/tag_sifter_test.rb
 - test/unit/tags_test.rb

data/README.textile

@@ -1,56 +0,0 @@
-h1. Ruby-BBCode
-
-!https://badge.fury.io/rb/ruby-bbcode.svg!:http://badge.fury.io/rb/ruby-bbcode !https://travis-ci.org/veger/ruby-bbcode.svg?branch=master!:https://travis-ci.org/veger/ruby-bbcode !https://coveralls.io/repos/veger/ruby-bbcode/badge.svg?branch=master(Coverage Status)!:https://coveralls.io/r/veger/ruby-bbcode?branch=master
-
-This gem adds support for "BBCode":http:/www.bbcode.org/ to Ruby. The BBCode is parsed by a parser before converted to HTML, allowing to convert nested BBCode tags in strings to their correct HTML equivalent. The parser also checks whether the BBCode is valid and gives errors for incorrect BBCode texts.
-Additionally, annotations can be added to the BBCode string the showing errors that are present, assuming there are any errors.
-
-The parser recognizes all "official tags":http://www.bbcode.org/reference.php and allows to easily extend this set with custom tags.
-
-See "changelog":CHANGELOG.md for the (recent) notable changes of this gem.
-
-h2. Examples
-
-<code>bbcode_to_html</code> can be used to convert a BBCode string to HTML:
-
-<pre><code>'This is [b]bold[/b] and this is [i]italic[/i].'.bbcode_to_html
- => 'This is <strong>bold</strong> and this is <em>italic</em>.'</code></pre>
-
-<code>bbcode_show_errors</code> can be used to convert a BBCode to BBCode annotated with errors (assuming the original BBCode did contain errors):
-
-<pre><code>'[img=no_dimensions_here]image.png[/img]'.bbcode_show_errors
- => '<span class=\'bbcode_error\' data-bbcode-errors=\'["The image parameters \'no_dimensions_here\' are incorrect, \'<width>x<height>\' excepted"]\'>[img]</span>image.png[/img]'</code></pre>
-
-These HTML attributes containing the JSON representation of the errors can be used to inform the user about the problems.
-The following JavaScript/jQuery example makes use of the "Bootstrap tooltips plugin":http://getbootstrap.com/javascript/#tooltips to show the errors in tooltip popups:
-<pre><code>$(".bbcode_error").tooltip({
-  title: function() { 
-    var errors = JSON.parse($(this).attr('data-bbcode-errors'));
-    return errors.join("\n");
-  }
-});</code></pre>
-
-h2. Installing
-
-Add the following line to the Gemfile of your application:
-<pre><code>gem 'ruby-bbcode'</code></pre>
-
-Or to use the source code from the repository:
-<pre><code>gem 'ruby-bbcode', :git => 'git://github.com/veger/ruby-bbcode.git'</code></pre>
-
-Run
-<pre><code>bundle install</code></pre>
-
-And Ruby-BBCode is available in your application.
-
-_Note_: Do not forget to restart your server!
-
-h2. Acknowledgements
-
-A big thanks to "TheNotary":https://github.com/TheNotary for all contributions he made to this project!
-
-Some of the ideas and the tests came from "bb-ruby":http://github.com/cpjolicoeur/bb-ruby of Craig P Jolicoeur.
-
-h2. License
-
-MIT License. See the included "MIT-LICENCE":MIT-LICENSE file.