ruby-bbcode 1.0.1 → 2.0.0

data/lib/ruby-bbcode/templates/bbcode_errors_template.rb

@@ -0,0 +1,68 @@
+require 'json'
+
+module RubyBBCode::Templates
+  # This class is designed to help us build up the (original) BBCode annotated with the error information.
+  # It starts out as a template such as...
+  #   @opening_part = '[url=%param%]
+  #   @closing_part = '[/url]'
+  # and then slowly turns into...
+  #   @opening_part = '[url=http://www.blah.com"]cool beans'
+  #   @closing_part = '[/url]'
+  class BBCodeErrorsTemplate
+    attr_accessor :opening_part
+
+    def initialize(node)
+      @node = node
+      @tag_definition = node.definition # tag_definition
+      @opening_part = "[#{node[:tag]}#{node.allow_params? ? '%param%' : ''}]"
+      unless @node[:errors].empty?
+        @opening_part = "<span class='bbcode_error' #{BBCodeErrorsTemplate.error_attribute(@node[:errors])}>#{@opening_part}</span>"
+      end
+      @closing_part = "[/#{node[:tag]}]"
+    end
+
+    def self.convert_text(node)
+      # Keep the text as it was
+      return "<span class='bbcode_error' #{error_attribute(node[:errors])}>#{node[:text]}</span>" unless node[:errors].empty?
+      node[:text]
+    end
+
+    def inlay_between_text!
+      # Set the between text between the tags again, if required to do so...
+      @opening_part << get_between
+    end
+
+    def inlay_params!
+      # Iterate over known tokens and fill in their values, if provided
+      @tag_definition[:param_tokens].each do |token|
+        # Use %param% to insert the parameters and their values (and re-add %param%)
+        param_value = @node[:params][token[:token]]
+        @opening_part.gsub!('%param%', " #{token[:token]}=#{param_value}%param%") unless param_value.nil?
+      end
+    end
+
+    def inlay_closing_part!
+    end
+
+    def remove_unused_tokens!
+      @opening_part.gsub!('%param%', '')
+    end
+
+    def closing_part
+      @node[:closed] == false ? '' : @closing_part
+    end
+
+    private
+
+      def get_between
+        return @node[:between] if @tag_definition[:require_between] and @node[:between]
+        ''
+      end
+
+      def self.error_attribute(errors)
+        # Escape (double) quotes so the JSON can be generated properly (and parsed properly by JavaScript)
+        escapedErrors = errors.map { |error| error.gsub("\"","&quot;").gsub("'", "&#39;")}
+        "data-bbcode-errors='#{JSON.fast_generate(escapedErrors)}'"
+      end
+  end
+end

data/lib/ruby-bbcode/templates/html_template.rb

@@ -0,0 +1,55 @@
+module RubyBBCode::Templates
+  # This class is designed to help us build up the HTML data.  It starts out as a template such as...
+  #   @opening_part = '<a href="%url%">%between%'
+  #   @closing_part = '</a>'
+  # and then slowly turns into...
+  #   @opening_part = '<a href="http://www.blah.com">cool beans'
+  #   @closing_part = '</a>'
+  class HtmlTemplate
+    attr_accessor :opening_part, :closing_part
+
+    def initialize(node)
+      @node = node
+      @tag_definition = node.definition # tag_definition
+      @opening_part = node.definition[:html_open].dup
+      @closing_part = node.definition[:html_close].dup
+    end
+
+    # Newlines are converted to html <br /> syntax before being returned.
+    def self.convert_text(node)
+      return '' if node[:text].nil?
+      # convert_newlines_to_br
+      node[:text].gsub("\r\n", "\n").gsub("\n", "<br />\n")
+    end
+
+    def inlay_between_text!
+      @opening_part.gsub!('%between%', @node[:between]) if between_text_as_param?
+    end
+
+    def inlay_params!
+      # Iterate over known tokens and fill in their values, if provided
+      @tag_definition[:param_tokens].each do |token|
+        param_value = @node[:params][token[:token]] || token[:default]
+        param_value = CGI.escape(param_value) if token[:uri_escape]
+        @opening_part.gsub!("%#{token[:token].to_s}%", "#{token[:prefix]}#{param_value}#{token[:postfix]}") unless param_value.nil?
+      end
+    end
+
+    def inlay_closing_part!
+      @closing_part.gsub!('%between%', @node[:between]) if between_text_as_param?
+    end
+
+    def remove_unused_tokens!
+      @tag_definition[:param_tokens].each do |token|
+        @opening_part.gsub!("%#{token[:token]}%", '')
+      end
+    end
+
+    private
+
+    # Return true if the between text is needed as param
+    def between_text_as_param?
+      @tag_definition[:require_between]
+    end
+  end
+end

data/lib/ruby-bbcode/version.rb

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

data/lib/tags/tags.rb

@@ -61,59 +61,69 @@ module RubyBBCode
         :example => '[img]http://www.google.com/intl/en_ALL/images/logo.gif[/img].',
         :only_allow => [],
         :require_between => true,
-        :allow_tag_param => true, :allow_tag_param_between => false,
-        :tag_param => /^(\d*)x(\d*)$/,
-        :tag_param_tokens => [{:token => :width, :prefix => 'width="', :postfix => '" ' },
-                              { :token => :height,  :prefix => 'height="', :postfix => '" ' } ],
-        :tag_param_description => 'The image parameters \'%param%\' are incorrect, <width>x<height> excepted'},
+        :allow_quick_param => true, :allow_between_as_param => false,
+        :quick_param_format => /^(\d+)x(\d+)$/,
+        :param_tokens => [{:token => :width, :prefix => 'width="', :postfix => '" ', :optional => true },
+                              { :token => :height,  :prefix => 'height="', :postfix => '" ', :optional => true } ],
+        :quick_param_format_description => 'The image parameters \'%param%\' are incorrect, \'<width>x<height>\' excepted'},
       :url => {
         :html_open => '<a href="%url%">%between%', :html_close => '</a>',
         :description => 'Link to another page',
         :example => '[url]http://www.google.com/[/url].',
         :only_allow => [],
         :require_between => true,
-        :allow_tag_param => true, :allow_tag_param_between => true,
-        :tag_param => /^((((http|https|ftp):\/\/)|\/).+)$/, :tag_param_tokens => [{ :token => :url }],
-        :tag_param_description => 'The URL should start with http:// https://, ftp:// or /, instead of \'%param%\'' },
+        :allow_quick_param => true, :allow_between_as_param => true,
+        :quick_param_format => /^((((http|https|ftp):\/\/)|\/).+)$/,
+        :quick_param_format_description => 'The URL should start with http:// https://, ftp:// or /, instead of \'%param%\'',
+        :param_tokens => [{ :token => :url }]},
       :quote => {
         :html_open => '<div class="quote">%author%', :html_close => '</div>',
         :description => 'Quote another person',
         :example => '[quote]BBCode is great[/quote]',
-        :allow_tag_param => true, :allow_tag_param_between => false,
-        :tag_param => /(.*)/,
-        :tag_param_tokens => [{:token => :author, :prefix => '<strong>', :postfix => ' wrote:</strong>'}]},
+        :allow_quick_param => true, :allow_between_as_param => false,
+        :quick_param_format => /(.*)/,
+        :param_tokens => [{:token => :author, :prefix => '<strong>', :postfix => ' wrote:</strong>', :optional => true}]},
       :size => {
         :html_open => '<span style="font-size: %size%px;">', :html_close => '</span>',
         :description => 'Change the size of the text',
         :example => '[size=32]This is 32px[/size]',
-        :allow_tag_param => true, :allow_tag_param_between => false,
-        :tag_param => /(\d*)/,
-        :tag_param_tokens => [{:token => :size}]},
+        :allow_quick_param => true, :allow_between_as_param => false,
+        :quick_param_format => /(\d+)/,
+        :quick_param_format_description => 'The size parameter \'%param%\' is incorrect, a number is expected',
+        :param_tokens => [{:token => :size}]},
       :color => {
         :html_open => '<span style="color: %color%;">', :html_close => '</span>',
         :description => 'Change the color of the text',
         :example => '[color=red]This is red[/color]',
-        :allow_tag_param => true, :allow_tag_param_between => false,
-        :tag_param => /(([a-z]+)|(#[0-9a-f]{6}))/i,
-        :tag_param_tokens => [{:token => :color}]},
+        :allow_quick_param => true, :allow_between_as_param => false,
+        :quick_param_format => /(([a-z]+)|(#[0-9a-f]{6}))/i,
+        :param_tokens => [{:token => :color}]},
       :youtube => {
-        :html_open => '<object width="400" height="325"><param name="movie" value="http://www.youtube.com/v/%between%"></param><embed src="http://www.youtube.com/v/%between%" type="application/x-shockwave-flash" width="400" height="325"></embed></object>', :html_close => '',
-        :description => 'Youtube video',
+        :html_open => '<iframe id="player" type="text/html" width="%width%" height="%height%" src="http://www.youtube.com/embed/%between%?enablejsapi=1" frameborder="0"></iframe>', :html_close => '',
+        :description => 'YouTube video',
         :example => '[youtube]E4Fbk52Mk1w[/youtube]',
         :only_allow => [],
-        :url_varients => ["youtube.com", "youtu.be", "y2u.be"], # NOT USED
         :url_matches => [/youtube\.com.*[v]=([^&]*)/, /youtu\.be\/([^&]*)/, /y2u\.be\/([^&]*)/],
-        :require_between => true},
+        :require_between => true,
+        :param_tokens => [
+          { :token => :width, :optional => true, :default => 400 },
+          { :token => :height, :optional => true, :default => 320 }
+        ]},
       :vimeo => {
-        :html_open => '<iframe src="http://player.vimeo.com/video/%between%?badge=0" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>', 
+        :html_open => '<iframe src="http://player.vimeo.com/video/%between%?badge=0" width="%width%" height="%height%" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>',
         :html_close => '',
         :description => 'Vimeo video',
         :example => '[vimeo]http://vimeo.com/46141955[/vimeo]',
         :only_allow => [],
         :url_matches => [/vimeo\.com\/([^&]*)/],
-        :require_between => true},
+        :require_between => true,
+        :param_tokens => [
+          { :token => :width, :optional => true, :default => 400 },
+          { :token => :height, :optional => true, :default => 320 }
+        ]},
       :media => {
         :multi_tag => true,
+        :require_between => true,
         :supported_tags => [
           :youtube,
           :vimeo

data/test/ruby_bbcode_bbcode_test.rb

@@ -0,0 +1,189 @@
+require 'test_helper'
+
+class RubyBbcodeBbcodeTest < Minitest::Test
+
+  def test_multiline
+    assert_equal "line1\nline2", "line1\nline2".bbcode_show_errors
+    assert_equal "line1\r\nline2", "line1\r\nline2".bbcode_show_errors
+  end
+
+  def test_strong
+    assert_equal '[b]simple[/b]', '[b]simple[/b]'.bbcode_show_errors
+    assert_equal "[b]line 1\nline 2[/b]", "[b]line 1\nline 2[/b]".bbcode_show_errors
+  end
+
+  def test_em
+    assert_equal '[i]simple[/i]', '[i]simple[/i]'.bbcode_show_errors
+    assert_equal "[i]line 1\nline 2[/i]", "[i]line 1\nline 2[/i]".bbcode_show_errors
+  end
+
+  def test_u
+    assert_equal '[u]simple[/u]', '[u]simple[/u]'.bbcode_show_errors
+    assert_equal "[u]line 1\nline 2[/u]", "[u]line 1\nline 2[/u]".bbcode_show_errors
+  end
+
+  def test_code
+    assert_equal '[code]simple[/code]', '[code]simple[/code]'.bbcode_show_errors
+    assert_equal "[code]line 1\nline 2[/code]", "[code]line 1\nline 2[/code]".bbcode_show_errors
+  end
+
+  def test_strikethrough
+    assert_equal '[s]simple[/s]', '[s]simple[/s]'.bbcode_show_errors
+    assert_equal "[s]line 1\nline 2[/s]", "[s]line 1\nline 2[/s]".bbcode_show_errors
+  end
+
+  def test_size
+    assert_equal '[size size=32]32px Text[/size]', '[size=32]32px Text[/size]'.bbcode_show_errors
+  end
+
+  def test_color
+    assert_equal '[color color=red]Red Text[/color]', '[color=red]Red Text[/color]'.bbcode_show_errors
+    assert_equal '[color color=#ff0023]Hex Color Text[/color]', '[color color=#ff0023]Hex Color Text[/color]'.bbcode_show_errors
+  end
+
+  def test_center
+    assert_equal '[center]centered[/center]', '[center]centered[/center]'.bbcode_show_errors
+  end
+
+  def test_ordered_list
+    assert_equal '[ol][li]item 1[/li][li]item 2[/li][/ol]', '[ol][li]item 1[/li][li]item 2[/li][/ol]'.bbcode_show_errors
+  end
+
+  def test_unordered_list
+    assert_equal '[ul][li]item 1[/li][li]item 2[/li][/ul]', '[ul][li]item 1[/li][li]item 2[/li][/ul]'.bbcode_show_errors
+  end
+
+  def test_list_common_syntax
+    assert_equal '[list][*]item 1[/*][*]item 2[/*][/list]', '[list][*]item 1[*]item 2[/list]'.bbcode_show_errors
+  end
+
+  def test_list_common_syntax_explicit_closing
+    assert_equal '[list][*]item 1[/*][*]item 2[/*][/list]', '[list][*]item 1[/*][*]item 2[/*][/list]'.bbcode_show_errors
+  end
+
+  def test_two_lists
+    assert_equal '[ul][li]item1[/li][li]item2[/li][/ul][ul][li]item1[/li][li]item2[/li][/ul]',
+                   '[ul][li]item1[/li][li]item2[/li][/ul][ul][li]item1[/li][li]item2[/li][/ul]'.bbcode_show_errors
+  end
+
+  def test_whitespace_in_only_allowed_tags
+    assert_equal "[ol]\n[li]item 1[/li]\n[li]item 2[/li]\n[/ol]",
+                   "[ol]\n[li]item 1[/li]\n[li]item 2[/li]\n[/ol]".bbcode_show_errors
+    assert_equal "[ol] [li]item 1[/li]  [li]item 2[/li]\t[/ol]",
+                   "[ol] [li]item 1[/li]  [li]item 2[/li]\t[/ol]".bbcode_show_errors
+  end
+
+  def test_quote
+    assert_equal '[quote]quoting[/quote]', '[quote]quoting[/quote]'.bbcode_show_errors
+    assert_equal '[quote author=someone]quoting[/quote]', '[quote=someone]quoting[/quote]'.bbcode_show_errors
+    assert_equal '[quote author=Kitten][quote author=creatiu]f1[/quote]f2[/quote]',
+                  '[quote author=Kitten][quote=creatiu]f1[/quote]f2[/quote]'.bbcode_show_errors
+  end
+
+  def test_link
+    assert_equal '[url url=http://www.google.com]http://www.google.com[/url]', '[url]http://www.google.com[/url]'.bbcode_show_errors
+    assert_equal '[url url=http://google.com]Google[/url]', '[url=http://google.com]Google[/url]'.bbcode_show_errors
+    assert_equal '[url url=/index.html]Home[/url]', '[url=/index.html]Home[/url]'.bbcode_show_errors
+  end
+
+  def test_image
+    assert_equal '[img]http://www.ruby-lang.org/images/logo.gif[/img]',
+                   '[img]http://www.ruby-lang.org/images/logo.gif[/img]'.bbcode_show_errors
+    assert_equal '[img width=95 height=96]http://www.ruby-lang.org/images/logo.gif[/img]',
+                   '[img=95x96]http://www.ruby-lang.org/images/logo.gif[/img]'.bbcode_show_errors
+    assert_equal '[img width=123 height=456]http://www.ruby-lang.org/images/logo.gif[/img]',
+                   '[img width=123 height=456]http://www.ruby-lang.org/images/logo.gif[/img]'.bbcode_show_errors
+  end
+
+  def test_youtube
+    assert_equal '[youtube]E4Fbk52Mk1w[/youtube]',
+                   '[youtube]E4Fbk52Mk1w[/youtube]'.bbcode_show_errors
+  end
+
+  def test_youtube_with_full_url
+    assert_equal '[youtube]E4Fbk52Mk1w[/youtube]',
+                   '[youtube]http://www.youtube.com/watch?feature=player_embedded&v=E4Fbk52Mk1w[/youtube]'.bbcode_show_errors
+  end
+
+  def test_youtube_with_url_shortener
+    assert_equal '[youtube]cSohjlYQI2A[/youtube]',
+                   '[youtube]http://www.youtu.be/cSohjlYQI2A[/youtube]'.bbcode_show_errors
+  end
+
+  def test_disable_tags
+    assert_equal '[b]foobar[/b]', '[b]foobar[/b]'.bbcode_show_errors({}, :disable, :b)
+    assert_equal '[b][i]foobar[/i][/b]', '[b][i]foobar[/i][/b]'.bbcode_show_errors({}, :disable, :b)
+    assert_equal '[b][i]foobar[/i][/b]', '[b][i]foobar[/i][/b]'.bbcode_show_errors({}, :disable, :b, :i)
+  end
+
+  def test_enable_tags
+    assert_equal '[b]foobar[/b]' , '[b]foobar[/b]'.bbcode_show_errors({}, :enable, :b)
+    assert_equal '[b][i]foobar[/i][/b]', '[b][i]foobar[/i][/b]'.bbcode_show_errors({}, :enable, :b)
+    assert_equal '[b][i]foobar[/i][/b]', '[b][i]foobar[/i][/b]'.bbcode_show_errors({}, :enable, :b, :i)
+  end
+
+  def test_addition_of_tags
+    mydef = {
+      :test => {
+        :html_open => '<test>', :html_close => '</test>',
+        :description => 'This is a test',
+        :example => '[test]Test here[/test]'}
+    }
+    assert_equal 'pre [test]Test here[/test] post', 'pre [test]Test here[/test] post'.bbcode_show_errors(mydef)
+    assert_equal 'pre [b][test]Test here[/test][/b] post', 'pre [b][test]Test here[/test][/b] post'.bbcode_show_errors(mydef)
+  end
+
+  def test_multiple_tag_test
+    assert_equal '[b]bold[/b][i]italic[/i][u]underline[/u][quote]quote[/quote][url url=https://test.com]link[/url]',
+                   '[b]bold[/b][i]italic[/i][u]underline[/u][quote]quote[/quote][url=https://test.com]link[/url]'.bbcode_show_errors
+  end
+
+  def test_no_xss_hax
+    expected = "[url url=http://www.google.com' onclick='javascript:alert]google[/url]"
+    assert_equal expected, "[url=http://www.google.com' onclick='javascript:alert]google[/url]".bbcode_show_errors
+  end
+
+  def test_media_tag
+    assert_equal '[youtube]cSohjlYQI2A[/youtube]', '[media]http://www.youtube.com/watch?v=cSohjlYQI2A[/media]'.bbcode_show_errors
+    assert_equal '[vimeo]46141955[/vimeo]', '[media]http://vimeo.com/46141955[/media]'.bbcode_show_errors
+  end
+
+  def test_vimeo_tag
+    input = '[vimeo]http://vimeo.com/46141955[/vimeo]'
+    input2 = '[vimeo]46141955[/vimeo]'
+
+    assert_equal '[vimeo]46141955[/vimeo]', input.bbcode_show_errors
+    assert_equal '[vimeo]46141955[/vimeo]', input2.bbcode_show_errors
+  end
+
+  def test_failing_media_tag
+    assert_equal '<span class=\'bbcode_error\' data-bbcode-errors=\'["Unknown multi-tag type for [media]"]\'>[media]</span>http://www.youtoob.com/watch?v=cSohjlYQI2A[/media]', '[media]http://www.youtoob.com/watch?v=cSohjlYQI2A[/media]'.bbcode_show_errors
+  end
+
+  def test_wrong_tags
+    assert_equal '<span class=\'bbcode_error\' data-bbcode-errors=\'["[b] not closed"]\'>[b]</span>Not closed', '[b]Not closed'.bbcode_show_errors
+    assert_equal '<span class=\'bbcode_error\' data-bbcode-errors=\'["[b] not closed"]\'>[b]</span>2 not <span class=\'bbcode_error\' data-bbcode-errors=\'["[i] not closed"]\'>[i]</span>closed', '[b]2 not [i]closed'.bbcode_show_errors
+
+    assert_equal 'Closing tag not matching<span class=\'bbcode_error\' data-bbcode-errors=\'["Closing tag [/b] doesn&#39;t match an opening tag"]\'>[/b]</span>', 'Closing tag not matching[/b]'.bbcode_show_errors
+
+    assert_equal '<span class=\'bbcode_error\' data-bbcode-errors=\'["[b] not closed"]\'>[b]</span>Other closing tag<span class=\'bbcode_error\' data-bbcode-errors=\'["Closing tag [/i] doesn&#39;t match [b]"]\'>[/i]</span>', '[b]Other closing tag[/i]'.bbcode_show_errors
+  end
+
+  def test_failing_quick_param
+    assert_equal '<span class=\'bbcode_error\' data-bbcode-errors=\'["The image parameters &#39;illegal&#39; are incorrect, &#39;<width>x<height>&#39; excepted"]\'>[img]</span>image[/img]', '[img=illegal]image[/img]'.bbcode_show_errors
+  end
+
+  def test_failing_between_texts
+    assert_equal '<span class=\'bbcode_error\' data-bbcode-errors=\'["No text between [img] and [/img] tags."]\'>[img]</span>[/img]', '[img][/img]'.bbcode_show_errors
+    assert_equal '[url]<span class=\'bbcode_error\' data-bbcode-errors=\'["The URL should start with http:// https://, ftp:// or /, instead of &#39;illegal url&#39;"]\'>illegal url</span>[/url]', '[url]illegal url[/url]'.bbcode_show_errors
+  end
+
+  def test_missing_parent_tags
+    assert_equal '<span class=\'bbcode_error\' data-bbcode-errors=\'["[li] can only be used in [ul] and [ol]"]\'>[li]</span>[/li]', '[li][/li]'.bbcode_show_errors
+  end
+
+  def test_illegal_unallowed_childs
+    assert_equal '[ul]<span class=\'bbcode_error\' data-bbcode-errors=\'["[ul] can only contain [li] and [*] tags, so &quot;Illegal text&quot; is not allowed"]\'>Illegal text</span>[/ul]', '[ul]Illegal text[/ul]'.bbcode_show_errors
+    assert_equal '[ul]<span class=\'bbcode_error\' data-bbcode-errors=\'["[ul] can only contain [li] and [*] tags, so [b] is not allowed"]\'>[b]</span>Illegal tag[/b][/ul]', '[ul][b]Illegal tag[/b][/ul]'.bbcode_show_errors
+  end
+end

data/test/{ruby_bbcode_test.rb → ruby_bbcode_html_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RubyBbcodeTest < Test::Unit::TestCase
+class RubyBbcodeHtmlTest < Minitest::Test
 
   def test_multiline
     assert_equal "line1<br />\nline2", "line1\nline2".bbcode_to_html
@@ -53,12 +53,6 @@ class RubyBbcodeTest < Test::Unit::TestCase
     assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[ul][li]item 1[/li][li]item 2[/li][/ul]'.bbcode_to_html
   end
 
-  def test_unordered_list_omit_closing
-    assert_raise RuntimeError do
-      assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[ul][li]item 1[li]item 2[/ul]'.bbcode_to_html
-    end
-  end
-
   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
   end
@@ -75,53 +69,12 @@ class RubyBbcodeTest < Test::Unit::TestCase
   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
-    end
-    assert_equal ['[li] can only be used in [ul] and [ol]'],
-                   '[li]Illegal item[/li]'.bbcode_check_validity
-    assert_raise RuntimeError do
-      '[b][li]Illegal item[/li][/b]'.bbcode_to_html
-    end
-
-    assert_equal ['[li] can only be used in [ul] and [ol], so using it in a [b] tag is not allowed'],
-                   '[b][li]Illegal item[/li][/b]'.bbcode_check_validity
-  end
-
-  def test_illegal_list_contents
-    assert_raise RuntimeError do
-      '[ul]Illegal list[/ul]'.bbcode_to_html
-    end
-    assert_equal ['[ul] can only contain [li] and [*] tags, so "Illegal list" is not allowed'],
-                   '[ul]Illegal list[/ul]'.bbcode_check_validity
-    assert_raise RuntimeError do
-      '[ul][b]Illegal list[/b][/ul]'.bbcode_to_html
-    end
-    assert_equal ['[ul] can only contain [li] and [*] tags, so [b] is not allowed'],
-                   '[ul][b]Illegal list[/b][/ul][/b]'.bbcode_check_validity
-  end
-
-  def test_illegal_list_contents_text_between_list_items
-    assert_raise RuntimeError do
-      '[ul][li]item[/li]Illegal list[/ul]'.bbcode_to_html
-    end
-    assert_equal ['[ul] can only contain [li] and [*] tags, so "Illegal text" is not allowed'],
-                   '[ul][li]item[/li]Illegal text[/ul]'.bbcode_check_validity
-    assert_raise RuntimeError do
-      '[ul][li]item[/li]Illegal list[li]item[/li][/ul]'.bbcode_to_html
-    end
-    assert_equal ['[ul] can only contain [li] and [*] tags, so "Illegal text" is not allowed'],
-                   '[ul][li]item[/li]Illegal text[li]item[/li][/ul]'.bbcode_check_validity
+    assert_equal "<ol> <li>item 1</li>  <li>item 2</li>\t</ol>",
+                   "[ol] [li]item 1[/li]  [li]item 2[/li]\t[/ol]".bbcode_to_html
   end
 
   def test_quote
-    assert_equal '<div class="quote">quoting</div>',  '[quote]quoting[/quote]'.bbcode_to_html
+    assert_equal '<div class="quote">quoting</div>', '[quote]quoting[/quote]'.bbcode_to_html
     assert_equal '<div class="quote"><strong>someone wrote:</strong>quoting</div>', '[quote=someone]quoting[/quote]'.bbcode_to_html
     assert_equal '<div class="quote"><strong>Kitten wrote:</strong><div class="quote"><strong>creatiu wrote:</strong>f1</div>f2</div>',
                   '[quote=Kitten][quote=creatiu]f1[/quote]f2[/quote]'.bbcode_to_html
@@ -133,45 +86,34 @@ class RubyBbcodeTest < Test::Unit::TestCase
     assert_equal '<a href="/index.html">Home</a>', '[url=/index.html]Home[/url]'.bbcode_to_html
   end
 
-  def test_illegal_link
-    assert_raise RuntimeError do
-      # Link within same domain must start with a /
-      '[url=index.html]Home[/url]'.bbcode_to_html
-    end
-    assert_raise RuntimeError do
-      # Link within same domain must start with a / and a link to another domain with http://, https:// or ftp://
-      '[url=www.google.com]Google[/url]'.bbcode_to_html
-    end
-    assert_raise RuntimeError do
-      '[url]htfp://www.google.com[/url]'.bbcode_to_html
-    end
-  end
-
   def test_image
     assert_equal '<img src="http://www.ruby-lang.org/images/logo.gif" alt="" />',
                    '[img]http://www.ruby-lang.org/images/logo.gif[/img]'.bbcode_to_html
     assert_equal '<img src="http://www.ruby-lang.org/images/logo.gif" width="95" height="96" alt="" />',
                    '[img=95x96]http://www.ruby-lang.org/images/logo.gif[/img]'.bbcode_to_html
+    assert_equal '<img src="http://www.ruby-lang.org/images/logo.gif" width="123" height="456" alt="" />',
+                   '[img width=123 height=456]http://www.ruby-lang.org/images/logo.gif[/img]'.bbcode_to_html
   end
 
   def test_youtube
-    assert_equal '<object width="400" height="325"><param name="movie" value="http://www.youtube.com/v/E4Fbk52Mk1w"></param><embed src="http://www.youtube.com/v/E4Fbk52Mk1w" type="application/x-shockwave-flash" width="400" height="325"></embed></object>' ,
+    assert_equal '<iframe id="player" type="text/html" width="400" height="320" src="http://www.youtube.com/embed/E4Fbk52Mk1w?enablejsapi=1" frameborder="0"></iframe>',
                    '[youtube]E4Fbk52Mk1w[/youtube]'.bbcode_to_html
+    assert_equal '<iframe id="player" type="text/html" width="640" height="480" src="http://www.youtube.com/embed/E4Fbk52Mk1w?enablejsapi=1" frameborder="0"></iframe>',
+                   '[youtube width=640 height=480]E4Fbk52Mk1w[/youtube]'.bbcode_to_html
   end
 
   def test_youtube_with_full_url
     full_url = "http://www.youtube.com/watch?feature=player_embedded&v=E4Fbk52Mk1w"
-    assert_equal '<object width="400" height="325"><param name="movie" value="http://www.youtube.com/v/E4Fbk52Mk1w"></param><embed src="http://www.youtube.com/v/E4Fbk52Mk1w" type="application/x-shockwave-flash" width="400" height="325"></embed></object>' ,
+    assert_equal '<iframe id="player" type="text/html" width="400" height="320" src="http://www.youtube.com/embed/E4Fbk52Mk1w?enablejsapi=1" frameborder="0"></iframe>',
                    "[youtube]#{full_url}[/youtube]".bbcode_to_html
   end
-  
+
   def test_youtube_with_url_shortener
     full_url = "http://www.youtu.be/cSohjlYQI2A"
-    assert_equal '<object width="400" height="325"><param name="movie" value="http://www.youtube.com/v/cSohjlYQI2A"></param><embed src="http://www.youtube.com/v/cSohjlYQI2A" type="application/x-shockwave-flash" width="400" height="325"></embed></object>' ,
+    assert_equal '<iframe id="player" type="text/html" width="400" height="320" src="http://www.youtube.com/embed/cSohjlYQI2A?enablejsapi=1" frameborder="0"></iframe>',
                    "[youtube]#{full_url}[/youtube]".bbcode_to_html
   end
 
-
   def test_html_escaping
     assert_equal '<strong>&lt;i&gt;foobar&lt;/i&gt;</strong>', '[b]<i>foobar</i>[/b]'.bbcode_to_html
     assert_equal '<strong><i>foobar</i></strong>', '[b]<i>foobar</i>[/b]'.bbcode_to_html(false)
@@ -181,6 +123,20 @@ class RubyBbcodeTest < Test::Unit::TestCase
     assert_equal '2 is > 1', '2 is > 1'.bbcode_to_html(false)
   end
 
+  def test_uri_escaping
+    # There is no tag available, so create our own to test URI escaping
+    escape_param_def = {
+      :escapequery => {
+        :html_open => '<a href="%query%">%between%', :html_close => '</a>',
+        :require_between => true, :allow_quick_param => false, :allow_between_as_param => true,
+        :param_tokens => [{:token => :query, :uri_escape => true}]}
+    }
+    assert_equal '<a href="Escaped+string+%28to+be+used+as+URL+%26+more%29">Escaped string (to be used as URL & more)</a>',
+        '[escapequery]Escaped string (to be used as URL & more)[/escapequery]'.bbcode_to_html(true, escape_param_def)
+    assert_equal '<a href="http%3A%3A%2Fwww.text.com%2Fpage.php%3Fparam1%3D1%26param2%3D2">http::/www.text.com/page.php?param1=1&param2=2</a>',
+        '[escapequery]http::/www.text.com/page.php?param1=1&param2=2[/escapequery]'.bbcode_to_html(true, escape_param_def)
+  end
+
   def test_disable_tags
     assert_equal "[b]foobar[/b]", "[b]foobar[/b]".bbcode_to_html(true, {}, :disable, :b)
     assert_equal "[b]<em>foobar</em>[/b]", "[b][i]foobar[/i][/b]".bbcode_to_html(true, {}, :disable, :b)
@@ -199,11 +155,6 @@ class RubyBbcodeTest < Test::Unit::TestCase
     assert_equal "<strong>foobar</strong>", foo
   end
 
-  # commented this out, it kinda just gets in the way of development atm
-  #def test_self_tag_list
-  #  assert_equal 16, RubyBBCode::Tags.tag_list.size
-  #end
-
   def test_addition_of_tags
     mydef = {
       :test => {
@@ -220,66 +171,93 @@ class RubyBbcodeTest < Test::Unit::TestCase
                    "[b]bold[/b][i]italic[/i][u]underline[/u][quote]quote[/quote][url=https://test.com]link[/url]".bbcode_to_html
   end
 
-  def test_no_ending_tag
-    assert_raise RuntimeError do
-      "this [b]should not be bold".bbcode_to_html
-    end
-  end
-
-  def test_no_start_tag
-    assert_raise RuntimeError do
-      "this should not be bold[/b]".bbcode_to_html
-    end
-  end
-
-  def test_different_start_and_ending_tags
-    assert_raise RuntimeError do
-      "this [b]should not do formatting[/i]".bbcode_to_html
-    end
-  end
-  
   def test_no_xss_hax
     expected = "<a href=\"http://www.google.com&quot; onclick=\&quot;javascript:alert\">google</a>"
     assert_equal expected, '[url=http://www.google.com" onclick="javascript:alert]google[/url]'.bbcode_to_html
   end
-  
-    # TODO:  This stack level problem should be validated during the validations
-  #def test_stack_level_too_deep
-  #  num = 2300  # increase this number if the test starts failing.  It's very near the tipping point
-  #  openers = "[s]hi i'm" * num
-  #  closers = "[/s]" * num
-  #  assert_raise( SystemStackError ) do
-  #    (openers+closers).bbcode_to_html
-  #  end
-  #end
-  
-  def test_mulit_tag
+
+  def test_media_tag
     input1 = "[media]http://www.youtube.com/watch?v=cSohjlYQI2A[/media]"
     input2 = "[media]http://vimeo.com/46141955[/media]"
-    
-    output1 = "<object width=\"400\" height=\"325\"><param name=\"movie\" value=\"http://www.youtube.com/v/cSohjlYQI2A\"></param><embed src=\"http://www.youtube.com/v/cSohjlYQI2A\" type=\"application/x-shockwave-flash\" width=\"400\" height=\"325\"></embed></object>"
-    output2 = '<iframe src="http://player.vimeo.com/video/46141955?badge=0" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>'
-    
-    
+
+    output1 = '<iframe id="player" type="text/html" width="400" height="320" src="http://www.youtube.com/embed/cSohjlYQI2A?enablejsapi=1" frameborder="0"></iframe>'
+    output2 = '<iframe src="http://player.vimeo.com/video/46141955?badge=0" width="400" height="320" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>'
+
     assert_equal output1, input1.bbcode_to_html
     assert_equal output2, input2.bbcode_to_html
   end
-  
+
   def test_vimeo_tag
     input = "[vimeo]http://vimeo.com/46141955[/vimeo]"
     input2 = "[vimeo]46141955[/vimeo]"
-    output = '<iframe src="http://player.vimeo.com/video/46141955?badge=0" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>'
-    
+    output = '<iframe src="http://player.vimeo.com/video/46141955?badge=0" width="400" height="320" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>'
+
     assert_equal output, input.bbcode_to_html
     assert_equal output, input2.bbcode_to_html
+
+    assert_equal '<iframe src="http://player.vimeo.com/video/46141955?badge=0" width="640" height="480" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>',
+                   '[vimeo width=640 height=480]46141955[/vimeo]'.bbcode_to_html
+  end
+
+  def test_raised_exceptions
+    # Test whether exceptions are raised when the BBCode contains errors
+    assert_raises RuntimeError do
+      'this [b]should raise an exception'.bbcode_to_html
+    end
+    assert_raises RuntimeError do
+      '[ul][li]item 1[li]item 2[/ul]'.bbcode_to_html
+    end
   end
-  
-  def test_failing_multi_tag
-    input1 = "[media]http://www.youtoob.com/watch?v=cSohjlYQI2A[/media]"
-    
-    assert_equal input1, input1.bbcode_to_html
+
+  def test_uppercase
+    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
   end
-  
-  
 
+  def test_uppercase_with_params
+    assert_equal '<span style="font-size: 4px;">simple</span>', '[SIZE=4]simple[/SIZE]'.bbcode_to_html
+    assert_equal "<span style=\"font-size: 4px;\">line 1<br />\nline 2</span>", "[SIZE=4]line 1\nline 2[/SIZE]".bbcode_to_html
+  end
+
+  def test_uppercase_at_tag_open
+    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
+  end
+
+  def test_uppercase_at_tag_close
+    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
+  end
+
+  def test_nested_uppercase_tags
+    assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[UL][LI]item 1[/LI][LI]item 2[/LI][/UL]'.bbcode_to_html
+    assert_equal "<ul><li>line 1<br />\nline 2</li><li>line 1<br />\nline 2</li></ul>", "[UL][LI]line 1\nline 2[/LI][LI]line 1\nline 2[/LI][/UL]".bbcode_to_html
+  end
+
+  def test_parent_uppercase_in_nested_tags
+    assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[UL][li]item 1[/li][li]item 2[/li][/UL]'.bbcode_to_html
+    assert_equal "<ul><li>line 1<br />\nline 2</li><li>line 1<br />\nline 2</li></ul>", "[UL][li]line 1\nline 2[/li][li]line 1\nline 2[/li][/UL]".bbcode_to_html
+  end
+
+  # Checking the HTML output is the only way to see whether a tag is recognized
+  # The BBCode validity test ignores unknown tags (and treats them as text)
+  def test_modified_taglist
+    assert_equal '<strong>simple</strong>', '[b]simple[/b]'.bbcode_to_html
+
+    tags = RubyBBCode::Tags.tag_list
+    b_tag = tags.delete :b
+    begin
+      # Make sure we captured the contents of the b-tag
+      assert b_tag.instance_of? Hash
+
+      # Now no HTML is generated, as the tag is removed
+      assert_equal '[b]simple[/b]', '[b]simple[/b]'.bbcode_to_html
+    ensure
+      # Always restore as this change is permanent (and messes with other tests)
+      tags[:b] = b_tag
+    end
+
+    # Restored to the original/correct situation
+    assert_equal '<strong>simple</strong>', '[b]simple[/b]'.bbcode_to_html
+  end
 end