learn_words 0.1.1 → 0.1.2

data/README.rdoc

@@ -4,7 +4,7 @@
   === Installation
   Installation process is quite simple (notice, that ruby could be already installed)
 
-  * install ruby from http://www.ruby-lang.org/en/downloads/
+  * install ruby from http://www.ruby-lang.org/en/downloads
 
   * install rubygems from http://rubygems.org/pages/download
 
@@ -15,7 +15,7 @@
   === Words file
   To use this application you need to have a file in a special format:
 
-  * any number of lines with foreign word and it's translation separated by <tt><Tab></tt>
+  * any number of lines with foreign word and it's translation separated by <tt><Tab></tt> or two or more spaces
 
   * if there are more than one variant for foreign word, separate them by "/"
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('learn_words', '0.1.1') do |p|
+Echoe.new('learn_words', '0.1.2') do |p|
   p.description    = "Simple script for learning foreign language words"
   p.url            = "http://github.com/cypok/learn_words"
   p.author         = "Vladimir Parfinenko"

data/learn_words.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{learn_words}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Parfinenko"]
   s.cert_chain = ["/Users/cypok/.gem/gem-public_cert.pem"]
-  s.date = %q{2010-10-09}
+  s.date = %q{2010-10-10}
   s.default_executable = %q{learn_words}
   s.description = %q{Simple script for learning foreign language words}
   s.email = %q{vladimir.parfinenko@gmail.com}

data/lib/learn_words.rb

@@ -103,9 +103,14 @@ class LearnWords
     begin
       open(words_file) do |file|
         file.lines.each do |line|
-          next if line.strip.empty? # pass blank lines
-          parts = line.split( "\t" ).map{ |x| x.strip }.delete_if{ |x| x.empty? }
-          words << Word.new( parts[1], parts[0], limit ) unless line.start_with? '#'
+          # pass blank lines
+          next if line.strip.empty? or line.strip.start_with? '#'
+
+          # split into two parts by first tab or double space
+          parts = line.split( /\t| {2,}/, 2 ).map(&:strip)
+          next if parts.count < 2
+
+          words << Word.new( parts[1], parts[0], limit )
         end
       end
     rescue Exception => e
@@ -135,7 +140,7 @@ class LearnWords
     say %{ <%= color('             Learn Words !           ', GREEN+UNDERLINE) %>}
     say %{ <%= color('made by Vladimir Parfinenko aka cypok', GREEN) %>}
     say %{ <%= color(' some fixes by Ivan Novikov aka NIA  ', GREEN) %>}
-    say %{ <%= color('             version 0.1.1           ', GREEN) %>}
+    say %{ <%= color('             version 0.1.2           ', GREEN) %>}
     STDOUT.write "\n"
     say %{Note: if there are more than one variant,}
     say %{separate them by "/" or enter one by one}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: learn_words
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Vladimir Parfinenko
@@ -36,7 +36,7 @@ cert_chain:
   78F0qvtLjR0DAnN6uYs98PR+jHE+0ckLX3D9sw==
   -----END CERTIFICATE-----
 
-date: 2010-10-09 00:00:00 +07:00
+date: 2010-10-10 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency