pidgin2adium 3.0.1 → 3.1.0

data/.autotest

@@ -1,4 +1,26 @@
+require 'autotest/growl'
+require 'autotest/fsevent'
+
 Autotest.add_hook :initialize do |at|
+  # Modifying ext/balance_tags_c.c triggers spec/balance_tags_c_extn_spec.rb
+  at.add_mapping(/ext\/.*\/(.*)\.[ch]/) do |_, m|
+    ["spec/#{m[1]}_extn_spec.rb"]
+  end
+
+  at.add_mapping(%r{lib/pidgin2adium.rb}) do |_, m|
+    ["spec/pidgin2adium_spec.rb"]
+  end
+
+  at.add_mapping(%r{lib/pidgin2adium/(.+_log_parser).rb}) do |_, m|
+    ["spec/#{m[1]}_spec.rb"]
+  end
+
+  # Re-run spec files when they change
+  at.add_mapping(%r{^spec/.+_spec.rb$}) do |filename, _|
+    filename
+  end
+
+  at.libs = %w{. lib spec}
 end
 
 Autotest.add_hook :run_command do |at|

data/.gitignore

@@ -20,3 +20,10 @@ pkg
 
 ## PROJECT::SPECIFIC
 .bundle
+ext/balance_tags_c/Makefile
+ext/balance_tags_c/balance_tags_c.bundle
+ext/balance_tags_c/balance_tags_c.o
+.rvmrc
+spec/output-dir
+spec/nonexistent_output_dir
+Gemfile.lock

data/{History.txt → ChangeLog}

@@ -1,3 +1,14 @@
+=== 3.1.0 / 2010-08-13
+* Compatible with Ruby 1.9!
+  - removed dependency on "parsedate" library, which 1.9 doesn't have
+* log_parser.rb has been split into separate files (1 per class, more or less)
+  - "require pidgin2adium/log_parser" will still pull in all of the split-up
+    classes
+* balance_tags_c extension really does work now
+* Cleans up more junk from Pidgin logfiles when parsing
+* Bugfixes and more graceful handling of error states
+* Fully tested (except bin/pidgin2adium, which remains tricky)
+
 === 3.0.1 / 2010-08-07
 Bugfix release:
 * balance_tags_c.c: Use rb_eval_string instead of rb_reg_regcomp to avoid

data/Gemfile

@@ -1,11 +1,3 @@
 source 'http://gemcutter.org'
 
-group :runtime do
-  gem "rake"
-end
-
-group :development do
-  gem "bundler", ">= 0.9.26"
-  gem "jeweler"
-  gem "rspec", ">= 1.2.9"
-end
+gemspec :path => '.'

data/README.rdoc

@@ -43,47 +43,46 @@ The library style allows you to parse a log file and get back a LogFile[link:cla
  require 'pidgin2adium'
  logfile = Pidgin2Adium.parse("/path/to/log/file.html", "gabe,gbw,gabeb-w")
  if logfile == false
-     puts "Oh no! Could not parse!"
+   puts "Oh no! Could not parse!"
  else
-     logfile.each do |message|
-	# Every message has these properties
-	puts "Sender's screen name: #{message.sender}"
- 	puts "Time message was sent: #{message.time}"
- 	puts "Sender's alias: #{message.buddy_alias}"
- 	if [Pidgin2Adium::XMLMessage, Pidgin2Adium::AutoReplyMessage, Pidgin2Adium::Event].include?(message.class)
- 	    # All of these have a body
- 	    puts "Message body: #{message.body}"
- 	    if message.class == Pidgin2Adium::Event
- 		puts "Event type: #{message.event_type}"
- 	    end
- 	elsif message.class == Pidgin2Adium::StatusMessage
-	    # Only StatusMessage has status
- 	    puts "Status: #{message.status}"
- 	end
- 	# Prints out the message in Adium log format
- 	puts message.to_s
+   logfile.each do |message|
+     # Every Message subclass has sender, time, and buddy_alias
+     puts "Sender's screen name: #{message.sender}"
+     puts "Time message was sent: #{message.time}"
+     puts "Sender's alias: #{message.buddy_alias}"
+     if message.respond_to?(:body)
+       puts "Message body: #{message.body}"
+       if message.respond_to?(:event) # Pidgin2Adium::Event class
+         puts "Event type: #{message.event_type}"
+       end
+     elsif message.respond_to?(:status) # Pidgin2Adium::StatusMessage
+       puts "Status: #{message.status}"
      end
-     success = logfile.write_out()
-     # To overwrite file if it exists:
-     # logfile.write_out(overwrite = true)
-     # To specify your own output dir (default = Pidgin2Adium::ADIUM_LOG_DIR):
-     # logfile.write_out(false, output_dir = my_dir)
-     # Or combine them:
-     # logfile.write_out(true, my_dir)
-     if success == false
-	 puts "An error occurred!"
-     elsif success == Pidgin2Adium::FILE_EXISTS
-	# Not returned if overwrite set to true
-	puts "File already exists."
-    else
-	puts "Successfully wrote out log file!"
-	puts "Path to output file: #{success}"
-    end
-    # This deletes search indexes so Adium re-indexes the new chat logs.
-    # It is not automatically called after log_file.write_out()
-    # Call it after converting all the logs, since it takes up a bit of
-    # processing power.
-    Pidgin2Adium.delete_search_indexes()
+     # Prints out the message in Adium log format
+     puts message.to_s
+   end
+
+   success = logfile.write_out()
+   # To overwrite file if it exists:
+   # logfile.write_out(overwrite = true)
+   # To specify your own output dir (default = Pidgin2Adium::ADIUM_LOG_DIR):
+   # logfile.write_out(false, output_dir = my_dir)
+   # Or combine them:
+   # logfile.write_out(true, my_dir)
+   if success == false
+     puts "An error occurred!"
+   elsif success == Pidgin2Adium::FILE_EXISTS
+     # Not returned if overwrite set to true
+     puts "File already exists."
+   else
+     puts "Successfully wrote out log file!"
+     puts "Path to output file: #{success}"
+   end
+   # This deletes search indexes so Adium re-indexes the new chat logs.
+   # It is not automatically called after log_file.write_out()
+   # Call it after converting all the logs, since it takes up a bit of
+   # processing power.
+   Pidgin2Adium.delete_search_indexes()
  end
 
 ===Example 2 (using library)

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'bundler'
 
 begin
   require 'jeweler'
@@ -12,7 +11,9 @@ begin
     gem.homepage = "http://github.com/gabebw/pidgin2adium"
     gem.authors = ["Gabe Berke-Williams"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.add_bundler_dependencies
+    gem.add_development_dependency(%q<bundler>, [">= 0.9.26"])
+    gem.add_development_dependency(%q<jeweler>, [">= 0"])
+    gem.add_development_dependency(%q<rspec>, [">= 1.2.9"])
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -52,6 +53,7 @@ rescue Gem::LoadError
 end
 
 task :spec => :check_dependencies
+task :spec => "extconf:compile"
 
 task :default => :spec
 

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.1.0

data/bin/pidgin2adium

@@ -21,76 +21,85 @@ Written by Gabe Berke-Williams (gbw@rubyforge.org)
 EOL
 
 options = {}
+
 oparser = OptionParser.new do |opts|
-    opts.banner = "Usage: #{File.basename($0)} [options]"
-    opts.on('-i', '--in=IN_DIR', String, 'Directory where pidgin logs are stored') do |i|
-	options[:in] = i
-    end
-    opts.on('-a alias1,alias2', "--aliases alias1,alias2",
-	    "A comma-separated list of your alias(es)",
-	    "so this script knows which person in a chat",
-	    "is you. Whitespace and case do not matter.") do |aliases|
-	options[:aliases] = aliases
-    end
-    opts.on('-o', '--out OUT_DIR',
-	    'The top-level directory under which to',
-	    'store the logs (each in its own folder',
-	    'by screen name).',
-	    "Defaults  to: #{Pidgin2Adium::ADIUM_LOG_DIR}") do |out|
-	options[:output_dir] = out
-    end
-    opts.on('-f', '--force', 'If this is set, then logs in the Adium log',
-	    'folder that have the same name as converted',
-	    'logs will be overwritten.') do |f|
-	options[:force] = f
-    end
-    opts.on("-v", "--version", "Show version information") do
-	puts version
-	exit
-    end
-    opts.on_tail("-h", "--help", "Show this message") do
-	puts version
-	puts opts
-	exit
-    end
+  opts.banner = "Usage: #{File.basename($0)} [options]"
+  opts.on('-i', '--in=IN_DIR', String, 'Directory where pidgin logs are stored') do |i|
+    options[:in] = i
+  end
+
+  opts.on('-a alias1,alias2', "--aliases alias1,alias2",
+          "A comma-separated list of your alias(es)",
+          "so this script knows which person in a chat",
+          "is you. Whitespace and case do not matter.") do |aliases|
+    options[:aliases] = aliases
+  end
+
+  opts.on('-o', '--out OUT_DIR',
+          'The top-level directory under which to',
+          'store the logs (each in its own folder',
+          'by screen name).',
+          "Defaults  to: #{Pidgin2Adium::ADIUM_LOG_DIR}") do |out|
+    options[:output_dir] = out
+  end
+
+  opts.on('-f', '--force', 'If this is set, then logs in the Adium log',
+          'folder that have the same name as converted',
+          'logs will be overwritten.') do |f|
+    options[:force] = f
+  end
+
+  opts.on("-v", "--version", "Show version information") do
+    puts version
+    exit
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts version
+    puts opts
+    exit
+  end
 end
+
 begin
-    oparser.parse!
+  oparser.parse!
 rescue => bang
-    if bang.class == OptionParser::MissingArgument 
-	# No argument provided for a switch that requires an argument.
-	puts '"%s" requires an argument.' % bang.args[0]
-	exit 1
-    elsif bang.class == OptionParser::InvalidOption 
-	# Provided a switch that we don't handle.
-	puts '"%s" is not a valid switch.' % bang.args[0]
-    elsif bang.class == OptionParser::NeedlessArgument
-	# Raised when argument provided for a switch that doesn't take an argument.
-	puts bang.message
-    end
+  if bang.class == OptionParser::MissingArgument
+    # No argument provided for a switch that requires an argument.
+    puts '"%s" requires an argument.' % bang.args[0]
+    exit 1
+  elsif bang.class == OptionParser::InvalidOption
+    # Provided a switch that we don't handle.
+    puts '"%s" is not a valid switch.' % bang.args[0]
+  elsif bang.class == OptionParser::NeedlessArgument
+    # Raised when argument provided for a switch that doesn't take an argument.
+    puts bang.message
+  end
 end
 
 need_opts = false
 required_opts = [[:i, :in], [:a, :aliases]]
+
 required_opts.each do |short, long|
-    if options.has_key?(long)
-	next
-    else
-	need_opts = true
-	puts "Required option -#{short}/--#{long} missing."
-    end
+  if options.has_key?(long)
+    next
+  else
+    need_opts = true
+    puts "Required option -#{short}/--#{long} missing."
+  end
 end
+
 if need_opts
-    puts oparser.to_s
-    exit 1
+  puts oparser.to_s
+  exit 1
 end
 
 extra_opts = {:overwrite => options[:force]}
 if options.has_key?(:output_dir)
-    extra_opts[:output_dir] = options[:output_dir]
+  extra_opts[:output_dir] = options[:output_dir]
 end
 
 log_converter = Pidgin2Adium::LogConverter.new(options[:in],
-					       options[:aliases],
-					       extra_opts)
+                                               options[:aliases],
+                                               extra_opts)
 log_converter.start

data/ext/balance_tags_c/balance_tags_c.c

@@ -28,171 +28,171 @@ static VALUE mP2A;
  * Balances tags of _text_. Returns modified text.
  */
 VALUE balance_tags_c(VALUE mod, VALUE text){
-    if( TYPE(text) != T_STRING ){
-	rb_raise(rb_eArgError, "bad argument to balance_tags_c, String only please.");
+  if( TYPE(text) != T_STRING ){
+    rb_raise(rb_eArgError, "bad argument to balance_tags_c, String only please.");
+  }
+  VALUE tagstack = rb_ary_new2(1);
+  int stacksize = 0;
+  VALUE tagqueue = rb_str_new2("");
+  VALUE ZERO = INT2FIX(0),
+        ONE = INT2FIX(1);
+  VALUE newtext = rb_str_new2("");
+  // Known single-entity/self-closing tags
+  VALUE single_tags = rb_ary_new3(5,
+      rb_str_new2("br"),
+      rb_str_new2("hr"),
+      rb_str_new2("img"),
+      rb_str_new2("input"),
+      rb_str_new2("meta"));
+  // Tags that can be immediately nested within themselves
+  VALUE nestable_tags = rb_ary_new3(4,
+      rb_str_new2("blockquote"),
+      rb_str_new2("div"),
+      rb_str_new2("span"),
+      rb_str_new2("font"));
+  // 1: tagname, with possible leading "/"
+  // 2: attributes
+  VALUE tag_regex = rb_eval_string("/<(\\/?\\w*)\\s*([^>]*)>/");
+  VALUE pos;  // position in text
+  VALUE match;
+  VALUE tag;
+  VALUE attributes;
+  VALUE t; // loop variable when iterating over tagstack at end of while loop
+  int matchlen;
+  int done = 0;
+  int j, k, i; // loop counters
+
+  // WP bug fix for comments - in case you REALLY meant to type '< !--'
+  rb_funcall(text, rb_intern("gsub!"), 2,
+      rb_str_new2("< !--"),
+      rb_str_new2("<    !--"));
+
+  // WP bug fix for LOVE <3 (and other situations with '<' before a number)
+  rb_funcall(text,rb_intern("gsub!"), 2,
+      rb_eval_string("/<([0-9]{1})/"),
+      rb_str_new2("&lt;\\1"));
+
+  pos = rb_funcall(text, rb_intern("=~"), 1, tag_regex);
+  done = (pos == Qnil);
+  while ( ! done ){
+    rb_str_concat(newtext, tagqueue);
+    match = rb_funcall(text, rb_intern("match"), 1, tag_regex);
+    tag = rb_funcall(rb_reg_nth_match(1, match), rb_intern("downcase"), 0);
+    attributes = rb_reg_nth_match(2, match);
+
+    matchlen = NUM2INT(rb_funcall(rb_reg_nth_match(0, match), rb_intern("size"), 0));
+
+    // clear the shifter
+    tagqueue = rb_str_new2("");
+    // Pop or Push
+    if (0 == rb_str_cmp(rb_str_substr(tag, 0, 1), rb_str_new2("/"))){ // End Tag
+      rb_funcall(tag, rb_intern("slice!"), 2, ZERO, ONE);
+      // if too many closing tags
+      if(stacksize <= 0){
+        tag = rb_str_new2("");
+        //or close to be safe: tag = '/' << tag
+      } else if (0 == rb_str_cmp(RARRAY_PTR(tagstack)[stacksize - 1], tag)){
+        // found closing tag
+        // if stacktop value == tag close value then pop
+        // Close Tag
+        tag = rb_str_append(rb_str_new2("</"), tag);
+        rb_str_concat(tag, rb_str_new2(">"));
+        // Pop
+        rb_ary_pop(tagstack);
+        stacksize--;
+      } else { // closing tag not at top, search for it
+        for(j=stacksize-1; j>=0; j--){
+          if(0 == rb_str_cmp(RARRAY_PTR(tagstack)[j], tag) ){
+            // add tag to tagqueue
+            for(k = stacksize-1;k>=j;k--){
+              rb_str_concat(tagqueue, rb_str_new2("</"));
+              rb_str_concat(tagqueue, rb_ary_pop(tagstack));
+              rb_str_concat(tagqueue, rb_str_new2(">"));
+              stacksize--;
+            }
+            break;
+          }
+        }
+        tag = rb_str_new2("");
+      }
+    } else {
+      // Begin Tag
+
+      // Tag Cleaning
+
+      if( ( RSTRING_LEN(attributes) > 0 && // test length before rb_str_substr
+            (0 == rb_str_cmp(rb_str_substr(attributes, -1, 1), rb_str_new2("/"))) ) ||
+          (0 == rb_str_cmp(tag, rb_str_new2(""))) ){
+        // If: self-closing or '', don't do anything.
+      } else if ( rb_ary_includes(single_tags, tag) ) {
+        // ElseIf: it's a known single-entity tag but it doesn't close itself, do so
+        rb_str_concat(attributes, rb_str_new2("/"));
+      } else {
+        // Push the tag onto the stack
+        // If the top of the stack is the same as the tag we want
+        // to push, close previous tag
+        if ( (stacksize > 0) &&
+            (Qfalse == rb_ary_includes(nestable_tags, tag)) &&
+            (0 == rb_str_cmp(rb_ary_entry(tagstack, stacksize - 1), tag))){
+          tagqueue = rb_str_new2("</");
+          rb_str_concat(tagqueue, rb_ary_pop(tagstack));
+          rb_str_concat(tagqueue, rb_str_new2(">"));
+          stacksize--;
+        }
+        rb_ary_push(tagstack, tag);
+        stacksize++;
+      }
+
+      // Attributes
+      if( 0 != rb_str_cmp(attributes, rb_str_new2("")) ){
+        attributes = rb_str_plus(rb_str_new2(" "), attributes);
+      }
+      tag = rb_str_plus(rb_str_new2("<"), tag);
+      rb_str_concat(tag, attributes);
+      rb_str_concat(tag, rb_str_new2(">"));
+      //If already queuing a close tag, then put this tag on, too
+      if( RSTRING_LEN(tagqueue) > 0 ){
+        rb_str_concat(tagqueue, tag);
+        tag = rb_str_new2("");
+      }
     }
-    VALUE tagstack = rb_ary_new2(1);
-    int stacksize = 0;
-    VALUE tagqueue = rb_str_new2("");
-    VALUE ZERO = INT2FIX(0),
-	  ONE = INT2FIX(1);
-    VALUE newtext = rb_str_new2("");
-    // Known single-entity/self-closing tags
-    VALUE single_tags = rb_ary_new3(5,
-	    rb_str_new2("br"),
-	    rb_str_new2("hr"),
-	    rb_str_new2("img"),
-	    rb_str_new2("input"),
-	    rb_str_new2("meta"));
-    // Tags that can be immediately nested within themselves
-    VALUE nestable_tags = rb_ary_new3(4,
-	    rb_str_new2("blockquote"),
-	    rb_str_new2("div"),
-	    rb_str_new2("span"),
-	    rb_str_new2("font"));
-    // 1: tagname, with possible leading "/"
-    // 2: attributes
-    VALUE tag_regex = rb_eval_string("/<(\\/?\\w*)\\s*([^>]*)>/");
-    VALUE pos;  // position in text
-    VALUE match;
-    VALUE tag;
-    VALUE attributes;
-    VALUE t; // loop variable when iterating over tagstack at end of while loop
-    int matchlen;
-    int done = 0;
-    int j, k, i; // loop counters
-
-    // WP bug fix for comments - in case you REALLY meant to type '< !--'
-    rb_funcall(text, rb_intern("gsub!"), 2,
-	    rb_str_new2("< !--"),
-	    rb_str_new2("<    !--"));
-
-    // WP bug fix for LOVE <3 (and other situations with '<' before a number)
-    rb_funcall(text,rb_intern("gsub!"), 2,
-            rb_eval_string("/<([0-9]{1})/"),
-	    rb_str_new2("&lt;\\1"));
-
+    rb_str_concat(newtext,
+        rb_str_plus(rb_str_substr(text, 0, NUM2INT(pos)), tag));
+    text = rb_str_substr(text,
+        NUM2INT(pos)+matchlen,
+        RSTRING_LEN(text) - (NUM2INT(pos)+matchlen));
     pos = rb_funcall(text, rb_intern("=~"), 1, tag_regex);
     done = (pos == Qnil);
-    while ( ! done ){
-	rb_str_concat(newtext, tagqueue);
-	match = rb_funcall(text, rb_intern("match"), 1, tag_regex);
-	tag = rb_funcall(rb_reg_nth_match(1, match), rb_intern("downcase"), 0);
-	attributes = rb_reg_nth_match(2, match);
-
-	matchlen = NUM2INT(rb_funcall(rb_reg_nth_match(0, match), rb_intern("size"), 0));
-
-	// clear the shifter
-	tagqueue = rb_str_new2("");
-	// Pop or Push
-	if (0 == rb_str_cmp(rb_str_substr(tag, 0, 1), rb_str_new2("/"))){ // End Tag
-	    rb_funcall(tag, rb_intern("slice!"), 2, ZERO, ONE);
-	    // if too many closing tags
-	    if(stacksize <= 0){
-		tag = rb_str_new2("");
-		//or close to be safe: tag = '/' << tag
-	    } else if (0 == rb_str_cmp(RARRAY_PTR(tagstack)[stacksize - 1], tag)){
-		// found closing tag
-		// if stacktop value == tag close value then pop
-		// Close Tag
-		tag = rb_str_append(rb_str_new2("</"), tag);
-		rb_str_concat(tag, rb_str_new2(">"));
-		// Pop
-		rb_ary_pop(tagstack);
-		stacksize--;
-		} else { // closing tag not at top, search for it
-		    for(j=stacksize-1; j>=0; j--){
-			if(0 == rb_str_cmp(RARRAY_PTR(tagstack)[j], tag) ){
-			    // add tag to tagqueue
-			    for(k = stacksize-1;k>=j;k--){
-				rb_str_concat(tagqueue, rb_str_new2("</"));
-				rb_str_concat(tagqueue, rb_ary_pop(tagstack));
-				rb_str_concat(tagqueue, rb_str_new2(">"));
-				stacksize--;
-			    }
-			    break;
-			}
-		    }
-		    tag = rb_str_new2("");
-		}
-	    } else {
-		// Begin Tag
-
-		// Tag Cleaning
-
-		if( ( RSTRING_LEN(attributes) > 0 && // test length before rb_str_substr
-		    (0 == rb_str_cmp(rb_str_substr(attributes, -1, 1), rb_str_new2("/"))) ) ||
-			(0 == rb_str_cmp(tag, rb_str_new2(""))) ){
-		    // If: self-closing or '', don't do anything.
-		} else if ( rb_ary_includes(single_tags, tag) ) {
-		    // ElseIf: it's a known single-entity tag but it doesn't close itself, do so
-		    rb_str_concat(attributes, rb_str_new2("/"));
-		} else {
-		    // Push the tag onto the stack
-		    // If the top of the stack is the same as the tag we want
-		    // to push, close previous tag
-		    if ( (stacksize > 0) &&
-			(Qfalse == rb_ary_includes(nestable_tags, tag)) &&
-			(0 == rb_str_cmp(rb_ary_entry(tagstack, stacksize - 1), tag))){
-			tagqueue = rb_str_new2("</");
-			rb_str_concat(tagqueue, rb_ary_pop(tagstack));
-			rb_str_concat(tagqueue, rb_str_new2(">"));
-			stacksize--;
-		    }
-		    rb_ary_push(tagstack, tag);
-		    stacksize++;
-		}
-
-		// Attributes
-		if( 0 != rb_str_cmp(attributes, rb_str_new2("")) ){
-		    attributes = rb_str_plus(rb_str_new2(" "), attributes);
-		}
-		tag = rb_str_plus(rb_str_new2("<"), tag);
-		rb_str_concat(tag, attributes);
-		rb_str_concat(tag, rb_str_new2(">"));
-		//If already queuing a close tag, then put this tag on, too
-		if( RSTRING_LEN(tagqueue) > 0 ){
-		    rb_str_concat(tagqueue, tag);
-		    tag = rb_str_new2("");
-		}
-	    }
-	    rb_str_concat(newtext,
-		    rb_str_plus(rb_str_substr(text, 0, pos-1), tag));
-	    text = rb_str_substr(text,
-		    NUM2INT(pos)+matchlen,
-		    RSTRING_LEN(text) - (NUM2INT(pos)+matchlen));
-	    pos = rb_funcall(text, rb_intern("=~"), 1, tag_regex);
-	    done = (pos == Qnil);
-	}
-
-	// Clear Tag Queue
-	rb_str_concat(newtext, tagqueue);
-
-	// Add Remaining text
-	rb_str_concat(newtext, text);
-
-	i = NUM2INT(rb_funcall(tagstack, rb_intern("length"), 0)) - 1;
-	// Empty Stack
-	for(; i >= 0; i--){
-	    // Add remaining tags to close
-	    t = RARRAY_PTR(tagstack)[i];
-	    rb_str_concat(newtext, rb_str_new2("</"));
-	    rb_str_concat(newtext, t);
-	    rb_str_concat(newtext, rb_str_new2(">"));
-	}
-
-	// WP fix for the bug with HTML comments
-	rb_funcall(newtext, rb_intern("gsub!"), 2,
-		rb_str_new2("< !--"),
-		rb_str_new2("<!--"));
-	rb_funcall(newtext, rb_intern("gsub!"), 2,
-		rb_str_new2("<    !--"),
-		rb_str_new2("< !--"));
-
-	return newtext;
+  }
+
+  // Clear Tag Queue
+  rb_str_concat(newtext, tagqueue);
+
+  // Add Remaining text
+  rb_str_concat(newtext, text);
+
+  i = NUM2INT(rb_funcall(tagstack, rb_intern("length"), 0)) - 1;
+  // Empty Stack
+  for(; i >= 0; i--){
+    // Add remaining tags to close
+    t = RARRAY_PTR(tagstack)[i];
+    rb_str_concat(newtext, rb_str_new2("</"));
+    rb_str_concat(newtext, t);
+    rb_str_concat(newtext, rb_str_new2(">"));
+  }
+
+  // WP fix for the bug with HTML comments
+  rb_funcall(newtext, rb_intern("gsub!"), 2,
+      rb_str_new2("< !--"),
+      rb_str_new2("<!--"));
+  rb_funcall(newtext, rb_intern("gsub!"), 2,
+      rb_str_new2("<    !--"),
+      rb_str_new2("< !--"));
+
+  return newtext;
 }
 
 void Init_balance_tags_c(){
-    mP2A = rb_define_module("Pidgin2Adium");
-    rb_define_module_function(mP2A, "balance_tags_c", balance_tags_c, 1);
+  mP2A = rb_define_module("Pidgin2Adium");
+  rb_define_module_function(mP2A, "balance_tags_c", balance_tags_c, 1);
 }