skype-history-import 1.0.4 → 1.0.5

data/Gemfile

@@ -3,6 +3,9 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
+# russian translate, email from skype nice name
+gem 'stringex', '~> 1.2'
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -9,6 +9,7 @@ GEM
     rake (0.9.2)
     rcov (0.9.9)
     shoulda (2.11.3)
+    stringex (1.2.2)
 
 PLATFORMS
   ruby
@@ -18,3 +19,4 @@ DEPENDENCIES
   jeweler (~> 1.6.2)
   rcov
   shoulda
+  stringex (~> 1.2)

data/README.md

@@ -0,0 +1,34 @@
+# skype-history-import
+
+Open Skype -> Throught context menu Select all message -> Put them in file or string -> run function 'import'
+
+How to use, example
+
+``` ruby
+	require 'rubygems'
+	require 'skype-history-import'
+	
+	file = File.open("/home/msa/real_skype_chat.txt", "rb")
+	messages = file.read			
+	
+	result = import(messages)
+	
+	p "so real messages count is #{result.size}"
+	p "first message #{result[0].inspect}"
+```
+
+## Contributing to skype-history-import
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2011 SergXIIIth. See LICENSE.txt for
+further details.
+

data/README.rdoc

@@ -4,6 +4,7 @@ Open Skype -> Throught context menu Select all message -> Put them in file or st
 
 How to use, example
 
+``` ruby
 	require 'rubygems'
 	require 'skype-history-import'
 	
@@ -14,7 +15,7 @@ How to use, example
 	
 	p "so real messages count is #{result.size}"
 	p "first message #{result[0].inspect}"
-
+```
 
 == Contributing to skype-history-import
  

data/Rakefile

@@ -57,3 +57,8 @@ task :done do
 	sh "git commit -a -m \"#{ENV['m']}\""
 	sh 'git push'
 end
+
+task :up do
+	sh 'git pull origin master'
+end
+

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/skype-history-import.rb

@@ -1,46 +1,84 @@
 require 'date'
+require 'stringex'
 
-def import(text)
-	result = []
-	
-	message = Message.new
-	
-	while text.strip.size > 0
-		if text =~ /^\[(.+)\] (.+?): (.*)/
+module SkypeHistoryImport
+	class Importer
+		attr_accessor :nike_to_email_mapping
+		
+		def nike_to_email_map(nick, email)
+			@nike_to_email_map = Hash.new if @nike_to_email_map.nil?
+			@nike_to_email_map[nick] = email
+		end
+		
+		def run(text)
+			result = []
 			
-			# handle tail of prev multi line message
-			unless $` == nil or message.text == nil or $`.strip == ""
-				message.text += $`
-			end
+			message = Message.new
 			
-			# 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
+			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
+					
+					# 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
+							
+							if @nike_to_email_map.nil? == false && @nike_to_email_map.has_key?(message.nick)
+								message.email = @nike_to_email_map[message.nick]
+							end
+							
+						rescue
+							puts "Exception '#{$!}' on match *** #{$~} ***"
+							raise
+						end
+						
+						result.push(message)
+					end
+					
 				end
 				
-				result.push(message)
+				text = $'
 			end
-			
+		
+			result
+		end
+	end
+
+	class Message
+		attr_accessor :date, :nick, :text
+		
+		# make email from nick, like nick@skype.com
+		def email
+			if @email.nil?
+				@email = nick.to_url.gsub(/\W/,'')
+				@email = "#{@email}@skype.com"
+			end
+			@email
 		end
 		
-		text = $'
+		def email=(value)
+			@email = value
+		end
 	end
+end
 
-	result
+def import(text)
+	importer = SkypeHistoryImport::Importer.new
+	importer.run(text)
 end
 
-class Message
-	attr_accessor :date, :nick, :text
+class Message < SkypeHistoryImport::Message
 end

data/skype-history-import.gemspec

@@ -5,15 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{skype-history-import}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["SergXIIIth"]
-  s.date = %q{2011-06-25}
+  s.date = %q{2011-07-25}
   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 = [
     "LICENSE.txt",
+    "README.md",
     "README.rdoc"
   ]
   s.files = [
@@ -21,6 +22,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
+    "README.md",
     "README.rdoc",
     "Rakefile",
     "VERSION",
@@ -39,17 +41,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<stringex>, ["~> 1.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
+      s.add_dependency(%q<stringex>, ["~> 1.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<stringex>, ["~> 1.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])

data/test/test_skype-history-import.rb

@@ -17,6 +17,7 @@ class TestSkypeHistoryImport < Test::Unit::TestCase
 			di = result[0]
 			
 			assert_equal("Di", di.nick)
+			assert_equal("di@skype.com", di.email)
 			assert_equal(DateTime.new(2011,06,14, 9,25,15), di.date)
 			assert_equal("a deal? are you trading something?", di.text)
 		end
@@ -102,6 +103,19 @@ Exception#to_s was found to be problematic around it. The method can trick safe
 			result = import(messages)[0]
 			assert_equal("Di", result.nick)
 		end
+
+		should "email maping" do
+			messages = <<-message
+[14/06/2011 09:25:15] Di: a deal? are you: trading something?
+			message
+			
+			importer = SkypeHistoryImport::Importer.new
+			
+			importer.nike_to_email_map "Di", "Di@mail.com"
+			
+			result = importer.run(messages)[0]
+			assert_equal("Di@mail.com", result.email)
+		end
 =begin
 file send
 [08/12/2010 17:01:46] *** sam sent ps.js ***

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skype-history-import
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-25 00:00:00.000000000 -07:00
+date: 2011-07-25 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: stringex
+  requirement: &21245640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21245640
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &5653440 !ruby/object:Gem::Requirement
+  requirement: &21245160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5653440
+  version_requirements: *21245160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &5652400 !ruby/object:Gem::Requirement
+  requirement: &21244680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *5652400
+  version_requirements: *21244680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &5650920 !ruby/object:Gem::Requirement
+  requirement: &21244200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +55,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *5650920
+  version_requirements: *21244200
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &5649420 !ruby/object:Gem::Requirement
+  requirement: &21243720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5649420
+  version_requirements: *21243720
 description: Manualy user copy chat history to file or string and after gem import(parse)
   it to class Message
 email: smkrbr@gmail.com
@@ -63,12 +74,14 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
+- README.md
 - README.rdoc
 files:
 - .document
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- README.md
 - README.rdoc
 - Rakefile
 - VERSION
@@ -92,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1625539411613459907
+      hash: -1247341894705888594
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: