openlogcleaner 0.0.22 → 0.0.23

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/lib/openlogcleaner/html_document.rb

@@ -22,28 +22,47 @@ module OpenLogCleaner
     end
 
     def add_messages(doc)
-      doc.css('div').each do |msg|
-        begin
-          case msg['class']
-          when 'post'
-            add_post(msg)
-          when 'emote'
-            add_emote(msg)
-          when 'info', 'system'
-            next
-          else
-            # warn about an unknown div, unless it's the container div, which is
-            # element conversations get wrapped in by this code.
-            # This allows multiple passes, should this code be updated.
-            raise "Unknown div class '#{msg['class']}'" unless msg['id'] == 'container'
+      if (dl = doc.at('dl'))
+        elements = dl.children.to_a
+        elements.delete_if { |elem| Nokogiri::XML::Text === elem }
+        until elements.empty?
+          dt, dd = elements.shift, elements.shift
+          add_list_entry(dt, dd)
+        end
+      else
+        doc.css('div').each do |msg|
+          begin
+            case msg['class']
+            when 'post'
+              add_post(msg)
+            when 'emote'
+              add_emote(msg)
+            when 'info', 'system'
+              next
+            else
+              # warn about an unknown div, unless it's the container div, which is
+              # element conversations get wrapped in by this code.
+              # This allows multiple passes, should this code be updated.
+              raise "Unknown div class '#{msg['class']}'" unless msg['id'] == 'container'
+            end
+          rescue Exception => e
+            warn msg.inspect
+            raise e
           end
-        rescue Exception => e
-          warn msg.inspect
-          raise e
         end
       end
     end
 
+    def add_list_entry(dt, dd)
+      name = dt.inner_text
+      if dt[:style] =~ /color: #([a-f0-9]{6});/i
+        color = $1
+      end
+      content = dd.inner_html
+      say = (dt[:class] && dt[:class] =~ /say/) ? true : false
+      add_message(say ? Say.new(name, content, color) : Emote.new(name, content, color))
+    end
+
     def add_post(msg)
       return if msg.children.first.name == 'font' # deal with system messages
       return if msg.at('table') # deal with welcome messages

data/openlogcleaner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openlogcleaner}
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Stott"]

metadata

@@ -2,7 +2,7 @@
 name: openlogcleaner
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors: 
 - Jonathan Stott