pidgin2adium 3.2.2 → 3.2.3

data/ChangeLog

@@ -1,3 +1,8 @@
+=== 3.2.3 / 2010-11-08
+* Be more liberal in what Pidgin2Adium accepts when parsing the date and
+getting basic time info for the first line. Thanks to Matthew Jakubowski for
+helping me fix this bug.
+
 === 3.2.2 / 2010-11-08
 * Use DateTime#strftime to get dates in xmlschema format. DateTime#xmlschema
 doesn't exist in Ruby 1.8, and Ruby 1.9 has DateTime#iso8601, not
@@ -20,6 +25,7 @@ both work in 3.2.0.
 * Moved Message and its subclasses into messages/ subdir
   - You can now do "require 'pidgin2adium/messages/all'",
     though the old "require 'pidgin2adium/message" will still work
+
 === 3.1.0 / 2010-08-13
 * Compatible with Ruby 1.9!
   - removed dependency on "parsedate" library, which 1.9 doesn't have

data/lib/pidgin2adium/parsers/basic_parser.rb

@@ -28,6 +28,13 @@ module Pidgin2Adium
     # Minimal times don't have a date
     MINIMAL_TIME_REGEX = /^\d{1,2}:\d{1,2}:\d{1,2}(?: [AP]M)?$/
 
+    # Time regexes must be set before pre_parse!().
+    # "4/18/2007 11:02:00 AM" => %w{4, 18, 2007}
+    # ONLY used (if at all) in first line of chat ("Conversation with...at...")
+    TIME_REGEX_FIRST_LINE = %r{^(\d{1,2})/(\d{1,2})/(\d{4}) \d{1,2}:\d{2}:\d{2} [AP]M$}
+    # "2007-04-17 12:33:13" => %w{2007, 04, 17}
+    TIME_REGEX = /^(\d{4})-(\d{2})-(\d{2}) \d{2}:\d{2}:\d{2}$/
+
     def initialize(src_path, user_aliases)
       @src_path = src_path
       # Whitespace is removed for easy matching later on.
@@ -50,13 +57,6 @@ module Pidgin2Adium
         return nil
       end
 
-      # Time regexes must be set before pre_parse!().
-      # "4/18/2007 11:02:00 AM" => %w{4, 18, 2007}
-      # ONLY used (if at all) in first line of chat ("Conversation with...at...")
-      @time_regex_first_line = %r{^(\d{1,2})/(\d{1,2})/(\d{4}) \d{1,2}:\d{2}:\d{2} [AP]M$}
-      # "2007-04-17 12:33:13" => %w{2007, 04, 17}
-      @time_regex = /^(\d{4})-(\d{2})-(\d{2}) \d{2}:\d{2}:\d{2}$/
-
       begin
         successfully_set_variables = pre_parse!
         if not successfully_set_variables
@@ -286,23 +286,52 @@ module Pidgin2Adium
         # You should be able to fill everything else in. If you can't,
         # something's wrong.
         @basic_time_info = case pidgin_chat_time_start
-                           when @time_regex
+                           when TIME_REGEX
                              {:year => $1.to_i,
                               :mon => $2.to_i,
                               :mday => $3.to_i}
-                           when @time_regex_first_line
+                           when TIME_REGEX_FIRST_LINE
                              {:year => $3.to_i,
                               :mon => $1.to_i,
                               :mday => $2.to_i}
+                           else
+                             nil
                            end
-        # Need @basic_time_info set for create_adium_time
+        if @basic_time_info.nil?
+          begin
+            parsed_time = DateTime.parse(pidgin_chat_time_start)
+            @basic_time_info = {:year => parsed_time.year,
+                                :mon => parsed_time.mon,
+                                :mday => parsed_time.mday}
+          rescue ArgumentError
+            # Couldn't parse the date
+            Pidgin2Adium.oops("#{@src_path}: couldn't parse the date in the first line.")
+            @basic_time_info = nil
+          end
+        end
+
+        # Note: need @basic_time_info set for create_adium_time
         # When the chat started, in Adium's format
         @adium_chat_time_start = create_adium_time(pidgin_chat_time_start)
-        [@service,
-          @user_SN,
-          @partner_SN,
-          @basic_time_info,
-          @adium_chat_time_start].all?
+
+        first_line_variables = [@service,
+                                @user_SN,
+                                @partner_SN,
+                                @basic_time_info,
+                                @adium_chat_time_start]
+        if first_line_variables.all?
+          true
+        else
+          # Print an informative error message
+          unset_variable_names = []
+          unset_variable_names << 'service' if @service.nil?
+          unset_variable_names << 'user_SN' if @user_SN.nil?
+          unset_variable_names << 'partner_SN' if @partner_SN.nil?
+          unset_variable_names << 'basic_time_info' if @basic_time_info.nil?
+          unset_variable_names << 'adium_chat_time_start' if @adium_chat_time_start.nil?
+          Pidgin2Adium.oops("Couldn't set these variables: #{unset_variable_names.join(', ')}")
+          false
+        end
       end
     end
 
@@ -357,7 +386,7 @@ module Pidgin2Adium
       # Return nil, which will get compact'ed out
       return nil if @ignore_events.detect{|regex| str =~ regex }
 
-      regex, status = @status_map.detect{|regex, status| str =~ regex}
+      regex, status = @status_map.detect{|rxp, stat| str =~ rxp}
       if regex and status
         # Status message
         buddy_alias = regex.match(str)[1]
@@ -365,11 +394,11 @@ module Pidgin2Adium
         msg = StatusMessage.new(sender, time, buddy_alias, status)
       else
         # Test for event
-        regex = @lib_purple_events.detect{|regex| str =~ regex }
+        regex = @lib_purple_events.detect{|rxp| str =~ rxp }
         event_type = 'libpurpleEvent' if regex
         unless regex and event_type
           # not a libpurple event, try others
-          regex, event_type = @event_map.detect{|regex,event_type| str =~ regex}
+          regex, event_type = @event_map.detect{|rxp,ev_type| str =~ rxp}
           unless regex and event_type
             error(sprintf("Error parsing status or event message, no status or event found: %p", str))
             return false

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Pidgin2Adium
-  VERSION = "3.2.2"
+  VERSION = "3.2.3"
 end

data/pidgin2adium.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pidgin2adium}
-  s.version = "3.2.2"
+  s.version = "3.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabe Berke-Williams"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 2
-  - 2
-  version: 3.2.2
+  - 3
+  version: 3.2.3
 platform: ruby
 authors: 
 - Gabe Berke-Williams