ruby-bbcode 0.0.2 → 0.0.3

data/README.textile

@@ -1,6 +1,6 @@
 h1. Ruby-BBcode
 
-This plugin 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.
+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.
 
 The parser recognizes all "official tags":http://www.bbcode.org/reference.php and allows to easily extend this set with custom tags.
 
@@ -12,6 +12,8 @@ h2. Example
 h2. Installing
 
 Add the folling line to the Gemfile in your Rails application:
+<pre><code>gem 'ruby-bbcode'</code></pre>
+Or grab it directly 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>

data/lib/ruby-bbcode/version.rb

@@ -1,3 +1,3 @@
 module RubyBbcode
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/ruby-bbcode.rb

@@ -24,8 +24,6 @@ module RubyBBCode
       text.gsub!('<', '&lt;')
       text.gsub!('>', '&gt;')
     end
-    text.gsub!("\r\n", "\n")
-    text.gsub!("\n", "<br />\n")
 
     valid = parse(text, use_tags)
     raise valid.join(', ') if valid != true
@@ -77,7 +75,7 @@ module RubyBBCode
           # Check if the found tag is allowed
           last_tag = tags[tags_list.last.to_sym]
           allowed_tags = last_tag[:only_allow]
-          if (!ti[:is_tag] and last_tag[:require_between] != true) or (ti[:is_tag] and (allowed_tags.include?(ti[:tag].to_sym) == false))
+          if (!ti[:is_tag] and last_tag[:require_between] != true and ti[:text].lstrip != "") or (ti[:is_tag] and (allowed_tags.include?(ti[:tag].to_sym) == false))
             # Last opened tag does not allow tag
             err = "[#{tags_list.last}] can only contain [#{allowed_tags.to_sentence(@@to_sentence_bbcode_tags)}] tags, so "
             err += "[#{ti[:tag]}]" if ti[:is_tag]
@@ -94,7 +92,10 @@ module RubyBBCode
           element = {:is_tag => true, :tag => ti[:tag].to_sym, :nodes => [] }
           element[:params] = {:tag_param => ti[:params][:tag_param]} if tag[:allow_tag_param] and ti[:params][:tag_param] != nil
         else
-          element = {:is_tag => false, :text => ti[:text] }
+          text = ti[:text]
+          text.gsub!("\r\n", "\n")
+          text.gsub!("\n", "<br />\n")
+          element = {:is_tag => false, :text => text }
           if bbtree_depth > 0
             tag = tags[bbtree_current_node[:tag]]
             if tag[:require_between] == true

data/test/dummy/config/environment.rb

@@ -1,5 +1,15 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 
+
+Dummy::Application.configure do
+  # Log error messages when you accidentally call methods on nil
+  config.whiny_nils = true
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end
+           
+
 # Initialize the rails application
 Dummy::Application.initialize!

data/test/ruby_bbcode_test.rb

@@ -2,6 +2,11 @@ require 'test_helper'
 
 class RubyBbcodeTest < Test::Unit::TestCase
 
+  def test_multiline
+    assert_equal "line1<br />\nline2", "line1\nline2".bbcode_to_html
+    assert_equal "line1<br />\nline2", "line1\r\nline2".bbcode_to_html
+  end
+  
   def test_strong
     assert_equal '<strong>simple</strong>', '[b]simple[/b]'.bbcode_to_html
     assert_equal "<strong>line 1<br />\nline 2</strong>", "[b]line 1\nline 2[/b]".bbcode_to_html
@@ -48,6 +53,14 @@ class RubyBbcodeTest < Test::Unit::TestCase
                    '[ul][li]item1[/li][li]item2[/li][/ul][ul][li]item1[/li][li]item2[/li][/ul]'.bbcode_to_html
   end
 
+  def test_whitespace_in_only_allowed_tags
+    assert_equal "<ol><br />\n<li>item 1</li><br />\n<li>item 2</li><br />\n</ol>", 
+                   "[ol]\n[li]item 1[/li]\n[li]item 2[/li]\n[/ol]".bbcode_to_html
+        assert_equal "<ol> <li>item 1</li>  <li>item 2</li>	</ol>", 
+                   "[ol] [li]item 1[/li]  [li]item 2[/li]	[/ol]".bbcode_to_html
+
+  end
+
   def test_illegal_items
     assert_raise RuntimeError do
       '[li]Illegal item[/li]'.bbcode_to_html

metadata

@@ -1,33 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-bbcode
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Maarten Bezemer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-19 00:00:00 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies: []
-
 description: Convert BBCode to HTML and check whether the BBCode is valid.
-email: 
+email:
 - maarten.bezemer@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/tags/tags.rb
 - lib/ruby-bbcode/version.rb
 - lib/ruby-bbcode.rb
@@ -42,38 +32,29 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/veger/ruby-bbcode
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: ruby-bbcode-0.0.2
-test_files: 
+summary: ruby-bbcode-0.0.3
+test_files:
 - test/ruby_bbcode_test.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/application.rb