pidgin2adium 3.2.0 → 3.2.1

data/ChangeLog

@@ -1,3 +1,12 @@
+=== 3.2.1 / 2010-11-08
+* Use straight DateTime.parse when possible, and only fall back on hacky
+Date._strptime when we have to.
+
+=== 3.2.0 / 2010-10-12
+* Last release broke 1.8 compatibility due to use of strptime. 1.8 and 1.9
+both work in 3.2.0.
+* Moved Pidgin2Adium::VERSION to its own file
+
 === 3.1.1 / 2010-08-13
 * Moved BasicParser and its subclasses into parsers/ subdir
   - You can now do "require 'pidgin2adium/parsers/all'",

data/lib/pidgin2adium/parsers/basic_parser.rb

@@ -24,6 +24,10 @@ module Pidgin2Adium
   # using this class directly.
   class BasicParser
     include Pidgin2Adium
+
+    # Minimal times don't have a date
+    MINIMAL_TIME_REGEX = /^\d{1,2}:\d{1,2}:\d{1,2}(?: [AP]M)?$/
+
     def initialize(src_path, user_aliases)
       @src_path = src_path
       # Whitespace is removed for easy matching later on.
@@ -195,7 +199,8 @@ module Pidgin2Adium
         "%Y-%m-%d %H:%M:%S",    # 2008-01-22 23:08:24
         "%Y/%m/%d %H:%M:%S", # 2008/01/22 04:01:45
         "%Y-%m-%d %H:%M:%S",  # 2008-01-22 04:01:45
-        '%a %d %b %Y %H:%M:%S %p %Z' # "Sat 18 Apr 2009 10:43:35 AM PDT"
+        '%a %d %b %Y %H:%M:%S %p %Z', # "Sat 18 Apr 2009 10:43:35 AM PDT"
+        '%a %b %d %H:%M:%S %Y' # "Wed May 24 19:00:33 2006"
       ]
       try_to_parse_time_with_formats(time, formats)
     end
@@ -209,14 +214,29 @@ module Pidgin2Adium
       try_to_parse_time_with_formats(minimal_time, formats)
     end
 
+    # Returns true if the time is minimal, i.e. doesn't include a date.
+    # Otherwise returns false.
+    def is_minimal_time?(str)
+      not str.strip.match(MINIMAL_TIME_REGEX).nil?
+    end
+
     # Converts a pidgin datestamp to an Adium one.
     # Returns a string representation of _time_ or
     # nil if it couldn't parse the provided _time_.
     def create_adium_time(time)
       return nil if time.nil?
-      new_time = try_to_parse_time(time)
-      if new_time.nil?
+      if is_minimal_time?(time)
         new_time = try_to_parse_minimal_time(time)
+      else
+        begin
+          new_time = DateTime.parse(time)
+        rescue ArgumentError
+          new_time = try_to_parse_time(time)
+          if new_time.nil?
+            Pidgin2Adium.oops("#{time} couldn't be parsed. Please open an issue on GitHub: https://github.com/gabebw/pidgin2adium/issues")
+            return nil
+          end
+        end
       end
 
       return nil if new_time.nil?

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Pidgin2Adium
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/pidgin2adium.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pidgin2adium}
-  s.version = "3.2.0"
+  s.version = "3.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabe Berke-Williams"]
-  s.date = %q{2010-10-12}
+  s.date = %q{2010-11-08}
   s.default_executable = %q{pidgin2adium}
   s.description = %q{Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the Adium format.}
   s.email = %q{gbw@brandeis.edu}

data/spec/basic_parser_spec.rb

@@ -29,22 +29,22 @@ describe "BasicParser" do
 
     it "should parse a first line time correctly" do
       time = @bp.create_adium_time(@first_line_time)
-      time.should =~ /2007-04-18T11:02:00-\d{2}:00/
+      time.should =~ /2007-04-18T11:02:00[-+]\d{2}:00/
     end
 
     it "should parse a normal time correctly" do
       time = @bp.create_adium_time(@time)
-      time.should =~ /2007-08-20T12:33:13-\d{2}:00/
+      time.should =~ /2007-08-20T12:33:13[-+]\d{2}:00/
     end
 
     it "should parse a minimal time correctly" do
       time = @bp.create_adium_time(@minimal_time)
-      time.should =~ /2008-01-15T04:22:05-\d{2}:00/
+      time.should =~ /2008-01-15T04:22:05[-+]\d{2}:00/
     end
 
     it "should parse a minimal time without AM/PM correctly" do
       time = @bp.create_adium_time(@minimal_time_2)
-      time.should =~ /2008-01-15T04:22:05-\d{2}:00/
+      time.should =~ /2008-01-15T04:22:05[-+]\d{2}:00/
     end
 
     it "should return an array of nils for an invalid time" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 2
-  - 0
-  version: 3.2.0
+  - 1
+  version: 3.2.1
 platform: ruby
 authors: 
 - Gabe Berke-Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -04:00
+date: 2010-11-08 00:00:00 -05:00
 default_executable: pidgin2adium
 dependencies: 
 - !ruby/object:Gem::Dependency