lingvo 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 151c38291271ca86091ba8427695aedbb5dc9d71
-  data.tar.gz: a1761229c5b0aa0d66dd6cc99ff075d55ea2fcd8
+  metadata.gz: 15e28bdde10ad7b90d0f0b1305ac90ea8ed55884
+  data.tar.gz: 720354fa2d7383439f58ee5895b964f3f8507bb8
 SHA512:
-  metadata.gz: 00eb0bc2db5822cf2776b44d087aa7e72aaaedd5c5439d04cd06959a0e85d00397c339ad1cd059cf21f169a2c7d522ad210c5b42038ebbeb18a5d91bb0eecd51
-  data.tar.gz: 8e237c6192e08142dffcbabf5687a22dad6ea1bfc0280e2fcd94b92f59ab64a81ba00a16e80b5f42985fca50d79ac2d16f9257d41d6fa77ca65a67e9898cb2cf
+  metadata.gz: de5dc24fce0c5059c0977bb191ef48926a2f56b325faf43eb95bc0effed959aa612abbb88aab65dfefeeb434867b1f7b7a8bd544c393ce438d857395edf29be4
+  data.tar.gz: 23704a26eada3b3925950eb8361c5fa82ce285f07bf891e504897e7fe4a2a4408986aa05436d3d33c4caba79dd4a5f4da3f9a81babbdf09156a88dae6be6b2b6

data/README.md

@@ -7,24 +7,34 @@
     $ gem install lingvo
 
 ## Usage
+First you need parse some LinguaLeo word print page.
 
 Options:
+  >  `--parse file`  - parse lingvoleo HTML file with words
 
-  > --parse file  - parse lingovleo HTML file with words
+  >  `--rand count`  - show 'n' random records
 
-  > --rand count  - show 'n' random records
+  >  `--notify`      - show `word - translation` with your notification
 
-  > --nitify      - send show word - translation with your notification
+  >  `--gui`         - show words in simpe window
 
-  > --gui         - show words in simpe window
+  >                  key:  n - show next word
 
-  >                 key:  n - show next word
+  >                        q - close window
 
-  >                       q - close window
+  >  `--wc f1 [f2]`  - parse text file(f1), and write statistic to file(f2) or show if file(f2) isn't specify
 
-  > --size        - show words count
+  >  `--size`        - show words count
 
-  > -h            - show this help
+  >  `-v`            - show version
+
+  >  `-h`            - show this help
+
+Setup as cronjob:
+
+`*/5 * * * * lingvo --notify`
+
+`*/7 * * * * env DISPLAY=:0 lingvo --gui`
 
 ## Contributing
 

data/bin/lingvo

@@ -7,10 +7,12 @@ module Lingvo
     case ARGV[0]
     when '--parse' then Command.parse ARGV[1]
     when '--rand' then Command.rand ARGV[1]
+    when '--wc' then Command.words_counter ARGV[1], ARGV[2]
     when '--size' then Command.size
     when '--notify'then  Command.notify
     when '--gui'then  Command.gui
     when '-h' then Command.help
+    when '-v' then puts VERSION
 
     else
       Command.help

data/lib/lingvo.rb

@@ -4,6 +4,7 @@ require 'lingvo/config/config'
 
 require 'lingvo/console/command'
 require 'lingvo/parsers/lingualeo_parser'
+require 'lingvo/parsers/words_counter_parser'
 
 require 'lingvo/db/connection'
 require 'lingvo/models/english'

data/lib/lingvo/config/config.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'yaml'
 
+
 module Lingvo
   module Config
     class << self
@@ -16,6 +17,8 @@ module Lingvo
     DB_FILE = File.join BASE_DIR, 'english_words.sqlite3'
     CUSTOM_CONFIG = File.join BASE_DIR, 'config.yaml'
 
+    $stderr = File.open File.join(BASE_DIR + 'app.log'), 'w'
+
     unless File.exists? BASE_DIR
       FileUtils.mkdir BASE_DIR, mode: 0755
     end

data/lib/lingvo/console/command.rb

@@ -4,14 +4,17 @@ module Lingvo
 Lingvo #{VERSION}
 
 Options:
-  --parse file  - parse lingovleo HTML file with words
+  --parse file  - parse lingvoleo HTML file with words
   --rand count  - show 'n' random records
-  --nitify      - send show word - translation with your notification
+  --notify      - show `word - translation` with your notification
   --gui         - show words in simpe window
                   key:  n - show next word
                         q - close window
 
+  --wc f1 [f2]   - parse text file(f1), and write statistic to file(f2) or show if file(f2) isn't specify
+
   --size        - show words count
+  -v            - show version
   -h            - show this help
 
 """
@@ -37,27 +40,25 @@ Options:
     class Command
       class << self
         def parse(path)
-          if File.exists? path
-            parser = Parsers::Lingualeo.new path
-            Models::English.create parser.words
-            size
-          else
-            puts "File not found!"
-            help
-          end
+          return file_not_found unless File.exists? path
+          Parsers::Lingualeo.new(path) { |word| Models::English.create word }
+          size
+        end
+
+        def words_counter(from, to)
+          return file_not_found if !File.exists?(from) || (to && !File.exist?(to))
+          Parsers::WordsCounter.new from, to
         end
 
         def rand(count)
           count = (count || 1).to_i
-
-          words = Models::English.rand count
-          words.each do |word|
-            puts "#{word.eng} - #{word.transcr} - #{word.ru}"
+          Models::English.rand(count).each do |word|
+            printf "%-20s  %-20s  %s\n", word.eng, word.transcr, word.ru
           end
         end
 
         def size
-          puts "You have #{Models::English.count} words"
+          puts "\nYou have #{Models::English.count} words\n"
         end
 
         def notify
@@ -71,6 +72,12 @@ Options:
         def help
           puts HELP
         end
+
+        private
+
+        def file_not_found
+          puts "\nFile not found!\n"
+        end
       end
     end
   end

data/lib/lingvo/db/connection.rb

@@ -8,6 +8,7 @@ module Lingvo
         database: Config::DB_FILE
       )
 
+      ActiveRecord::Migration.verbose = false
       ActiveRecord::Migrator.migrate "#{Config::LINGVO_DIR}/db/migration/"
     end
   end

data/lib/lingvo/models/english.rb

@@ -6,6 +6,8 @@ module Lingvo
       validates :eng, :ru, presence: true, uniqueness: true
 
       scope :rand, -> (count) { order("RANDOM()").limit(count) }
+
+      after_save -> { print "·" }
     end
   end
 end

data/lib/lingvo/parsers/lingualeo_parser.rb

@@ -3,20 +3,20 @@ require 'nokogiri'
 module Lingvo
   module Parsers
     class Lingualeo
-      attr_reader :words
-
-      def initialize(path)
-        @words = []
-        resource = Nokogiri::HTML(File.open(path))
+      def initialize(path, &block)
+        resource = Nokogiri::HTML File.open(path)
         resource.xpath('//body/table/tbody/tr').each do |tr|
           tds = tr.css('td')
 
           next if tds[0].nil?
-          @words << {
-            eng: tds[1].content.strip,
-            transcr: tds[2].content.strip,
-            ru: tds[3].content.strip,
-          }
+
+          eng     = tds[1].content.strip
+          transcr = tds[2].content.strip
+          ru      = tds[3].content.strip
+
+          if eng.size < 20 && transcr.size < 20 && ru.size < 20
+            block.call eng: eng, transcr: transcr, ru: ru
+          end
         end
       end
     end

data/lib/lingvo/parsers/words_counter_parser.rb

@@ -0,0 +1,36 @@
+module Lingvo
+  module Parsers
+    class WordsCounter
+      def initialize(from, to=nil)
+        @words = read from
+
+        if to
+          write to
+        else
+          show
+        end
+      end
+
+      def count
+        counter = {}
+        @words.each { |word| counter[word] = counter[word].to_i + 1 }
+        counter.sort_by { |word, count| count }.reverse
+      end
+
+      def show
+        count.each { |data| puts "#{data[1]} : #{data[0]}" }
+      end
+
+      def read from
+        file = File.open(from).read
+        file.downcase.scan(/([a-z']+)/).flatten
+      end
+
+      def write(to)
+        File.open to, 'w' do |file|
+          count.each { |data| file.write "#{data[1]} : #{data[0]}\n" }
+        end
+      end
+    end
+  end
+end

data/lib/lingvo/version.rb

@@ -1,3 +1,3 @@
 module Lingvo
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: lingvo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Igor G
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: qtbindings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Will help don't forget english words
@@ -130,7 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -147,6 +147,7 @@ files:
 - lib/lingvo/gui/widget.rb
 - lib/lingvo/models/english.rb
 - lib/lingvo/parsers/lingualeo_parser.rb
+- lib/lingvo/parsers/words_counter_parser.rb
 - lib/lingvo/version.rb
 - lingvo.gemspec
 homepage: https://github.com/igor04/lingvo
@@ -159,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Lingvo - easy helper in learning english words