bbcodeizer 0.1.2 → 0.1.3

data/lib/bbcodeizer/version.rb

@@ -1,3 +1,3 @@
 module Bbcodeizer
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/bbcodeizer.rb

@@ -68,10 +68,14 @@ module BBCodeizer
                   :image => [ :image, :flickr ] }
 
     # Parses all bbcode in +text+ and returns a new HTML-formatted string.
-    def bbcodeize(text)
+    def bbcodeize(text, options = Hash.new)
       text = text.dup
-      @deactivated ||= Array.new
-      (TagList - @deactivated).each do |tag|
+
+      disabled = Array.new
+      disabled += @deactivated if @deactivated
+      disabled += decode_tags(options[:disabled]) if options[:disabled]
+
+      (TagList - disabled).each do |tag|
         if Tags.has_key?(tag)
           apply_tag(text, tag)
         else
@@ -87,19 +91,13 @@ module BBCodeizer
     # Configuration option to deactivate particular +tags+.
     def deactivate(*tags)
       @deactivated ||= Array.new
-      @deactivated = tags.inject(@deactivated) do |deactivated, tag|
-        tag = TagGroups[tag] if TagGroups.key?(tag)
-        deactivated + Array(tag)
-      end
+      @deactivated += decode_tags(*tags)
     end
 
     # Configuration option to reactivate particular +tags+.
     def activate(*tags)
       @deactivated ||= Array.new
-      @deactivated = tags.inject(@deactivated) do |deactivated, tag|
-        tag = TagGroups[tag] if TagGroups.key?(tag)
-        deactivated - Array(tag)
-      end
+      @deactivated -= decode_tags(*tags)
     end
 
     # Configuration option to change the replacement string used for a particular +tag+. The source
@@ -157,6 +155,13 @@ module BBCodeizer
     end
     alias_method :apply_tag, :apply_tags
 
+    def decode_tags(*tags)
+      tags.inject(Array.new) do |decoded_tags, tag|
+        decoded_tag = TagGroups.key?(tag) ? TagGroups[tag] : tag
+        decoded_tags + Array(decoded_tag)
+      end
+    end
+
     # http://stackoverflow.com/questions/88311/how-best-to-generate-a-random-string-in-ruby
     def random_string
       (0...16).map{ ('a'..'z').to_a[rand(26)] }.join

data/lib/bbcodeizer_helper.rb

@@ -2,7 +2,7 @@ require 'bbcodeizer'
 
 module BBCodeizeHelper
   # Parses all bbcode in +text+ and returns a new HTML-formatted string.
-  def bbcodeize(text)
-    BBCodeizer.bbcodeize(text)
+  def bbcodeize(text, options = Hash.new)
+    BBCodeizer.bbcodeize(text, options)
   end
 end

data/rdoc/BBCodeizeHelper.html

@@ -137,7 +137,7 @@
           
           <div class="method-heading">
             <span class="method-name">bbcodeize</span><span
-              class="method-args">(text)</span>
+              class="method-args">(text, options = Hash.new)</span>
             <span class="method-click-advice">click to toggle source</span>
           </div>
           
@@ -151,8 +151,8 @@
             <div class="method-source-code" id="bbcodeize-source">
 <pre>
 <span class="ruby-comment"># File lib/bbcodeizer_helper.rb, line 5</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier">bbcodeize</span>(<span class="ruby-identifier">text</span>)
-  <span class="ruby-constant">BBCodeizer</span>.<span class="ruby-identifier">bbcodeize</span>(<span class="ruby-identifier">text</span>)
+<span class="ruby-keyword">def</span> <span class="ruby-identifier">bbcodeize</span>(<span class="ruby-identifier">text</span>, <span class="ruby-identifier">options</span> = <span class="ruby-constant">Hash</span>.<span class="ruby-identifier">new</span>)
+  <span class="ruby-constant">BBCodeizer</span>.<span class="ruby-identifier">bbcodeize</span>(<span class="ruby-identifier">text</span>, <span class="ruby-identifier">options</span>)
 <span class="ruby-keyword">end</span></pre>
             </div><!-- bbcodeize-source -->
             

data/rdoc/created.rid

@@ -1,5 +1,5 @@
-Sun, 11 Sep 2011 16:44:25 -0700
+Sun, 11 Sep 2011 17:03:49 -0700
 README	Sun, 11 Sep 2011 15:37:41 -0700
-lib/bbcodeizer/version.rb	Sun, 11 Sep 2011 16:43:57 -0700
-lib/bbcodeizer.rb	Sun, 11 Sep 2011 16:43:01 -0700
-lib/bbcodeizer_helper.rb	Sun, 11 Sep 2011 16:31:58 -0700
+lib/bbcodeizer/version.rb	Sun, 11 Sep 2011 17:03:43 -0700
+lib/bbcodeizer.rb	Sun, 11 Sep 2011 17:02:51 -0700
+lib/bbcodeizer_helper.rb	Sun, 11 Sep 2011 17:00:47 -0700

data/rdoc/lib/bbcodeizer/version_rb.html

@@ -24,7 +24,7 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">2011-09-11 16:43:57 -0700</dd>
+      <dd class="modified-date">2011-09-11 17:03:43 -0700</dd>
 
       
       <dt class="requires">Requires</dt>

data/rdoc/lib/bbcodeizer_helper_rb.html

@@ -24,7 +24,7 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">2011-09-11 16:31:58 -0700</dd>
+      <dd class="modified-date">2011-09-11 17:00:47 -0700</dd>
 
       
       <dt class="requires">Requires</dt>

data/rdoc/lib/bbcodeizer_rb.html

@@ -24,7 +24,7 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">2011-09-11 16:43:01 -0700</dd>
+      <dd class="modified-date">2011-09-11 17:02:51 -0700</dd>
 
       
       <dt class="requires">Requires</dt>

data/test/bbcodeizer_test.rb

@@ -106,6 +106,15 @@ class BbcodeizerTest < Test::Unit::TestCase
       bbcodeize("[color=red]Red Text[/color]"))
   end
 
+  def test_disable
+    assert_equal(
+      "I am [b]really[/b] happy!",
+      bbcodeize("I am [b]really[/b] happy!", :disabled => [ :bold ]))
+    assert_equal(
+      "I am <strong>really</strong> happy!",
+      bbcodeize("I am [b]really[/b] happy!", :disabled => [ :video ]))
+  end
+
   def test_deactivation
     BBCodeizer.deactivate(:bold)
     assert_equal(

metadata

@@ -2,7 +2,7 @@
 name: bbcodeizer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jonathan Dance