skype-history-import 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/skype-history-import.rb

@@ -7,28 +7,34 @@ def import(text)
 	
 	while text.strip.size > 0
 		if text =~ /^\[(.*)\] (.*): (.*)/
-
+			
 			# handle tail of prev multi line message
 			unless $` == nil or message.text == nil or $`.strip == ""
 				message.text += $`
 			end
 			
-			# message start
-			message = Message.new
-			
-			begin
-				message.date = DateTime.strptime($1, "%d/%m/%Y %H:%M:%S")
-				message.nick = $2
-				message.text = $3
-			rescue
-				puts "Exception '#{$!}' on match *** #{$~} ***"
-				raise
+			# if date is only time, then found string is boby of prev message
+			time = DateTime.strptime($1, "%H:%M:%S") rescue nil
+			if time
+				message.text += $&
+			else
+				# message start
+				message = Message.new
+				
+				begin
+					message.date = DateTime.strptime($1, "%d/%m/%Y %H:%M:%S")
+					message.nick = $2
+					message.text = $3
+				rescue
+					puts "Exception '#{$!}' on match *** #{$~} ***"
+					raise
+				end
+				
+				result.push(message)
 			end
 			
-			result.push(message)
 		end
 		
-		
 		text = $'
 	end
 

data/skype-history-import.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{skype-history-import}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["SergXIIIth"]
-  s.date = %q{2011-06-23}
+  s.date = %q{2011-06-24}
   s.description = %q{Manualy user copy chat history to file or string and after gem import(parse) it to class Message}
   s.email = %q{smkrbr@gmail.com}
   s.extra_rdoc_files = [

data/test/test_skype-history-import.rb

@@ -59,11 +59,39 @@ Exception#to_s was found to be problematic around it. The method can trick safe
 			assert_equal(DateTime.new(2011,06,22, 16,26,57), result.date)
 		end
 		
-		should "import real chat" do
-			file = File.open("/home/msa/real_skype_chat.txt", "rb")
-			messages = file.read			
+		should "message with only time go to prev message" do
+			messages = <<-message
+[22/06/2011 16:26:57] sam: This message has been removed.
+[16:26:57] mtv: Boby of prev message.
+			message
+			
 			result = import(messages)
-			p "so real messages count is #{result.size}"
+			
+			assert_equal(1, result.size, "should be one message")
+			
+			result = result[0]
+			
+			assert_equal("sam", result.nick)
+			assert_equal(DateTime.new(2011,06,22, 16,26,57), result.date)
+			assert(result.text =~ /\[16:26:57\] mtv/, "message text have second line")
+		end
+
+		should "import real chat" do
+			#return
+			pattern = "#{Dir.home}/skype_history/*.txt"
+			
+			Dir[pattern].each do |file_path|
+				p ""
+				p "Importing #{file_path} ... " 
+				
+				file = File.open(file_path, "rb")
+				messages = file.read
+				file.close
+				
+				result = import(messages)
+				
+				p "ok. Messages count is #{result.size}"
+			end
 		end
 		
 =begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skype-history-import
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-23 00:00:00.000000000 -07:00
+date: 2011-06-24 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &10114580 !ruby/object:Gem::Requirement
+  requirement: &13539880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10114580
+  version_requirements: *13539880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10113920 !ruby/object:Gem::Requirement
+  requirement: &13539240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10113920
+  version_requirements: *13539240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &10113160 !ruby/object:Gem::Requirement
+  requirement: &13538420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *10113160
+  version_requirements: *13538420
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &10111760 !ruby/object:Gem::Requirement
+  requirement: &13537100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10111760
+  version_requirements: *13537100
 description: Manualy user copy chat history to file or string and after gem import(parse)
   it to class Message
 email: smkrbr@gmail.com
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2147095837222939454
+      hash: 1262013932544102761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: