ruby-bbcode 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81fc51b37a07ce293879a04f6c2e94d0888a5069
-  data.tar.gz: 7f35303b08f5a4f37c311b6aa70babe8e6918d04
+  metadata.gz: 6b074eb2a8df2745cba8702182ea59e14620b6c0
+  data.tar.gz: 91083a7047d379cefc3d596c36e867ef2a176d71
 SHA512:
-  metadata.gz: dc09a68f466ee66a7a2591bff3fff64e48db3f2ea2e65f6226979ec5620e9bd0e2e084bfe85162d9c0d9beef5fb0781ffcd4b55d4e5bd5caf06dc9a2d4f836fd
-  data.tar.gz: c93e42b5f4b448f9589d105845a116f8d183aa2f66025c09ab07b518de01d85c5c7b0da5c7c92f43fef7233761ccfc5200d8f829331d0415ad9d3415775d4e59
+  metadata.gz: 7410da90e9630381a1a5202ffbd70e4df951dfc9d074c6be65003b9cb759862b71c54c50e818db046bad53603029b40cb3904c1a516c66f859c0e6419d0e101e
+  data.tar.gz: 66cc66ede05370b5c549327a60ce913f58d6e4e507b476de3581e7747a5c5aa9b247e3aa51ea7aa9bc14d206283a69881c9287f4b1467b95612107836974007e

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Upcoming
 --------
 
+Version 2.0.1 - 15-Jan-2015
+
+* Remove EOL newlines before/after self-closing tags (issue #29)
+
 Version 2.0.0 - 09-Apr-2015
 ---------------------------
 

data/lib/ruby-bbcode/bbtree.rb

@@ -46,6 +46,14 @@ 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
+        @tags_list[-1][:nodes][0][:text].chomp! unless @tags_list[-1][:nodes][0][:text].nil?
+        @tags_list[-2][:nodes][0][:text].chomp! unless @tags_list.length < 2 or @tags_list[-2][:nodes][0][:text].nil?
+      end
+
       @tags_list.pop     # remove latest tag in tags_list since it's closed now...
       # The parsed data manifests in @bbtree.current_node.children << TagNode.new(element) which I think is more confusing than needed
 

data/lib/ruby-bbcode/tag_sifter.rb

@@ -251,7 +251,6 @@ module RubyBBCode
     end
 
     def parent_of_self_closing_tag?
-      tag_being_parsed = @ti.definition
       was_last_tag_self_closable = @bbtree.current_node[:definition][:self_closable] unless @bbtree.current_node[:definition].nil?
 
       was_last_tag_self_closable and last_tag_fit_in_this_tag?

data/lib/ruby-bbcode/version.rb

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

data/test/ruby_bbcode_html_test.rb

@@ -57,6 +57,10 @@ class RubyBbcodeHtmlTest < Minitest::Test
     assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[list][*]item 1[*]item 2[/list]'.bbcode_to_html
   end
 
+  def test_newline_list_common_syntax
+    assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', "[list]\n[*]item 1\n[*]item 2\n[/list]".bbcode_to_html
+  end
+
   def test_list_common_syntax_explicit_closing
     assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[list][*]item 1[/*][*]item 2[/*][/list]'.bbcode_to_html
   end

data/test/unit/tag_sifter_test.rb

@@ -27,7 +27,6 @@ class TagSifterTest < MiniTest::Test
   # but that captures specifically the .be or .com and treats them differently...
   def test_youtubes_via_there_url_shortener
     url_from_shortener = "http://youtu.be/E4Fbk52Mk1w"
-    directory_format = "http://youtube.googleapis.com/v/E4Fbk52Mk1w"
     expected_output = 'E4Fbk52Mk1w'
     mock_regex_matches = @@tags[:youtube][:url_matches]
 

data/test/unit/tags_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class TagSifterTest < MiniTest::Test
   def test_taglist_modification
     tags = RubyBBCode::Tags.tag_list
-    assert_equal nil, RubyBBCode::Tags.tag_list[:test]
+    assert_nil RubyBBCode::Tags.tag_list[:test]
     begin
       tags[:test] = 'test'
 
@@ -12,6 +12,6 @@ class TagSifterTest < MiniTest::Test
       # Always restore as this change is permanent (and messes with other tests)
       tags.delete :test
     end
-    assert_equal nil, RubyBBCode::Tags.tag_list[:test]
+    assert_nil RubyBBCode::Tags.tag_list[:test]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bbcode
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Maarten Bezemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,16 +56,44 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Convert BBCode to HTML and check whether the BBCode is valid.
 email: maarten.bezemer@gmail.com
 executables: []
@@ -119,14 +147,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: ruby-bbcode-2.0.0
+summary: ruby-bbcode-2.0.1
 test_files:
-- test/test_helper.rb
+- test/unit/tag_sifter_test.rb
+- test/unit/tags_test.rb
 - test/ruby_bbcode_validity_test.rb
 - test/ruby_bbcode_bbcode_test.rb
+- test/test_helper.rb
 - test/ruby_bbcode_html_test.rb
-- test/unit/tag_sifter_test.rb
-- test/unit/tags_test.rb