dict 0.1.5 → 0.1.6

data/bin/translate

@@ -1,33 +1,7 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
-require 'dict'
-require 'slop'
-
-if ARGV.empty? then puts "Please enter the word. (-h for help)" ; exit end
-
-opts = Slop.parse do 
-  banner "Usage: $translate -w word [Options]"
-  on '-w', :word=, 'after this option is a word to translate'
-  on '-h', :help=, 'help', :argument => :optional
-  on '-s', :services=, 'available services', :argument => :optional
-  #on '-t', :time=, 'time in seconds, default: 300 seconds', :as => :int
-  on '-d', :dict=, 'dictionaries: wiktionary, dictpl; default is all dictionaries'
-end
-
-# translation
-if opts.word?
-  if opts.dict?
-    puts Dict.get_single_dictionary_translations(opts[:word],opts[:dict])
-  else
-    puts Dict.get_all_dictionaries_translations(opts[:word])
-  end
-end
-
-# help
-puts opts if opts.help?
-
-# services
-puts Dict.available_services if opts.services?
+require_relative '../lib/module_main.rb'
 
+opts = Hash.new
 
+Main::main(opts)

data/lib/dict.rb

@@ -1,8 +1,8 @@
-#!/usr/bin/ruby -w
 # -*- coding: utf-8 -*-
 
 require_relative 'wiktionary'
 require_relative 'dictpl'
+require 'json'
 
 module Dict
   class << self
@@ -12,20 +12,34 @@ module Dict
       available_services.each do |service|
         dictionaries[service] = get_single_dictionary_translations(word, service)
       end
-      
       dictionaries
     end
     
+    def print_all_dictionaries_translations(word)
+    end
+    
     def get_single_dictionary_translations(word, service)
       case service
       when 'wiktionary'
-        Wiktionary.new(word).translate
+        Wiktionary.new(word, WIKI_URL).translate
       when 'dictpl'
-        Dictpl.new(word).translate
-      else 'There\'s no such dictionary.'
+        Dictpl.new(word, DICT_URL).translate
+      else Dictionary.message
+      end
+    end
+    
+    def print_single_dictionary_translations(word, service)
+      obj = get_single_dictionary_translations(word, service)
+      hash = obj.translate
+      hash.each do |k, v|
+        puts "#{k} - #{v}"
       end
     end
     
+    def to_json(hash)
+      hash.to_json
+    end
+    
     def available_services
       ['wiktionary', 'dictpl']
     end

data/lib/dictionary.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+require 'open-uri'
+
+class Dictionary
+  attr_accessor :translations, :examples
+  def initialize(word, url)
+    check_arguments(word)
+    @translations = []
+    @examples = []
+    @uri = URI(URI.escape(url + word.downcase.tr(' ', '_')))
+  end
+  
+  def make_hash_results(arr)
+    hash = arr.each_slice(2).inject({}) do |h, (key, value)| 
+      if h.has_key?(key)
+        h[key].push(value) ; h
+      else
+        h[key] = [value] ; h
+      end
+    end
+    @translations, @examples = hash.keys, hash.values
+    hash
+  end
+  
+  def check_arguments(word)
+    raise ArgumentError.new("No given word") if word.empty?
+  end
+  
+  def self.message
+    'There\'s no such dictionary in database.'
+  end
+end

data/lib/dictpl.rb

@@ -1,53 +1,17 @@
 # -*- coding: utf-8 -*-
-require 'open-uri'
-require 'nokogiri'
-require_relative 'result'
 
+require 'nokogiri'
+require_relative 'dictionary'
 
-class Dictpl
+DICT_URL = 'http://dict.pl/dict?word='
 
-  DICT_URL = "http://dict.pl/dict?word=" 
-  def initialize(word)    
-    check_arguments(word)
-    initialize_instance_arguments(word)
-  end
-  
-  #
-  # Method returns hash with translations in many context for a word. 
-  # Example: for the word 'krowa' it returns translations in such a form:
-  # {"krowa"=>["cow"], "krowa bliska wycielenia"=>["freshen of cow"], ... }
-  #
+class Dictpl < Dictionary
+  # Method returns hash with translations as keys and examples of using words as values
   def translate
-
-    # Array contatining all words alternately
-    # Example: ["krowa", "cow", "krowa bliska wycielenia", "freshen of cow", ... ]
-    @context_words = [] 
-    
-    doc = get_html(@uri)
-    doc.xpath('//td[@class="resWordCol"]/a').each do |node|
-      @context_words << node.text
+    context_words = [] 
+    Nokogiri::HTML(open(@uri)).xpath('//td[@class="resWordCol"]/a').each do |node|
+      context_words << node.text
     end
-
-    @mapped_words = {} # hash containing words with matched translations
-	
-    @context_words.each_slice(2) do |word|	     
-      @mapped_words[word.first] = word.last
-      @result.add_translation(word.first, word.last)
-    end    
-    @result
-  end
-
-  def check_arguments(word)
-    raise ArgumentError.new("No given word") if word.empty?
-  end
-
-  def initialize_instance_arguments(word)
-    @uri = URI(URI.escape(DICT_URL + word + "&lang=EN"))	
-    @result = Result.new(word)
+    make_hash_results(context_words)
   end
-
-  def get_html(uri)
-    Nokogiri::HTML(open(uri))
-  end
-
 end

data/lib/module_main.rb

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+require 'dict'
+require 'slop'
+require 'timeout'
+
+module Main
+  def self.check_parameters?
+    ARGV.empty?
+  end
+
+  def self.parse_parameters
+    opts = Slop.parse do 
+      banner "Usage: $translate -w word [Options]"
+      on '-w', :word=, 'after this option is a word to translate'
+      on '-h', :help=, 'help', :argument => :optional
+      on '-t', :time=, 'time in seconds, default: 300', :as => :int
+      on '-d', :dict=, 'wiktionary, dictpl', :argument => :optional
+    end
+    opts
+  end
+  
+  def self.get_translations(opts)
+
+      if opts.word?
+        begin
+          Timeout::timeout(opts[:time].to_i || 300) do
+            if opts.dict? && opts[:dict] != nil
+              Dict.get_single_dictionary_translations(opts[:word],opts[:dict])
+            else
+              Dict.get_all_dictionaries_translations(opts[:word])
+            end
+          end
+          
+        rescue 
+          "Timeout for the query."
+        end
+      end
+
+  end
+  
+  def self.main(opts)
+    
+    if check_parameters? == true
+      puts "Please enter the word. (-h for help)"
+      exit
+    end
+    
+    begin
+      opts = parse_parameters
+    rescue Slop::MissingArgumentError
+      puts "Missing argument"
+      exit
+    end
+
+    puts get_translations(opts)
+    
+    begin
+      puts opts if opts.help?
+      puts Dict.available_services if opts.dict?
+    rescue
+      nil
+    end
+  end
+  
+end
+

data/lib/wiktionary.rb

@@ -1,104 +1,24 @@
-#!/usr/bin/ruby -w
 # -*- coding: utf-8 -*-
 
-# Method returns an Result Object containing given word,
-# translations, word usage examples.
-# Usage example:
-# result = Wiktionary.new("samochód").translate
-# result.term         # => "samochód"
-# result.translations # => {"samochód"=> 
-# ["car", "automobile"]}
-# result.examples     # => {"samochód"=>["She drove her
-# car to the mall.", "The conductor linked the cars to 
-# the locomotive.", "The 11:10 to London was operated by
-#  a 4-car diesel multiple unit", "From the front-most 
-# car of the subway, he filmed the progress
-# through the tunnel.", "We ordered five hundred cars of gypsum.", ...]}
-
-require 'net/http'
 require 'nokogiri'
+require_relative 'dictionary'
 
-require_relative 'result'
+WIKI_URL = 'http://en.wiktionary.org/wiki/'
 
-class Wiktionary
-  WIKI_EN = "http://en.wiktionary.org/wiki/"
-  WIKI_PL = "http://pl.wiktionary.org/wiki/"
-  def initialize(word)
-    check_arguments(word)
-    initialize_instance_arguments(word)
-  end
-  
+class Wiktionary < Dictionary
+  # Method returns hash with translations as keys and examples of using words as values
   def translate
-    translations = []    
-    @uri = URI.parse(URI.escape("#{WIKI_EN}#{@word}"))  
-    doc = get_html(@uri)
-    
-    if is_polish?(doc)
-      doc.css('div#mw-content-text[lang=en] ol > li a').each do |link|
-        @result.add_translation(@result.term, link.content)
-      end      
-      
-      doc.css('div#mw-content-text[lang=en] ol > li a').each do |link|
-        translations.push(link.content)
+    context_words = []
+    url = 'http://en.wiktionary.org/wiki/'
+    get_html(@uri).css('p + ol li a').each do |node|
+      get_html(url + node.text.tr(' ', '_')).css('p + ol > li dl dd').each do |example|
+        context_words << node.text << example.text
       end
-
-      get_examples_of_translations_en(@result, translations, WIKI_EN)
-    
-      @result
-    else
-      @uri = URI.parse(URI.escape("#{WIKI_PL}#{@word}"))  
-      doc = get_html(@uri)
-            
-      doc.css('div#mw-content-text dfn a').each do |link|
-        @result.add_translation(@result.term, link.content)
-      end      
-      
-      doc.css('div#mw-content-text dfn a').each do |link|
-        translations.push(link.content)
-      end
-
-      get_examples_of_translations_pl(@result, translations, WIKI_PL)
-      @result
     end
-  end
+    make_hash_results(context_words)
+  end 
   
-  private
-
-  def get_html(uri)
-    Nokogiri::HTML(Net::HTTP.get(uri))
-  end
-
-  def get_examples_of_translations_en(result, translations, adres)
-    translations.each do |item|
-      example = Nokogiri::HTML(Net::HTTP.get(URI(adres + item.tr(' ', '_'))))
-      example.css('div#mw-content-text[lang=en] ol:first > li dl dd i').each do |s|
-        result.add_example(result.term, s.content)
-      end
-    end
-  end
-  
-  def get_examples_of_translations_pl(result, translations, adres)
-    translations.each do |item|
-      example = Nokogiri::HTML(Net::HTTP.get(adres + item))
-      example.css('div#mw-content-text[lang=pl] dl dd').each do |s|
-        result.add_example(result.term, s.content)
-      end
-    end
-  end
-
-  def initialize_instance_arguments(word)
-    @result = Result.new(word.downcase.tr(' ', '_'))
-    @word = word  
-  end
-  
-  def check_arguments(word)
-    if word.empty? then raise ArgumentError.new("No word given.") end
-  end
-
-  def is_polish?(doc)
-    doc.css('div#mw-content-text h2 .mw-headline').any? do |lang|
-      lang.content == 'Polish'
-    end
+  def get_html(url)
+    Nokogiri::HTML(open(url))
   end
- 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dict
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -56,9 +56,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/dict.rb
-- lib/result.rb
+- lib/dictionary.rb
 - lib/wiktionary.rb
 - lib/dictpl.rb
+- lib/module_main.rb
 - bin/translate
 homepage: https://github.com/Ragnarson/dict-gem
 licenses: []

data/lib/result.rb

@@ -1,37 +0,0 @@
-class Result
-  attr_accessor :term, :dictionaries, :translations, :examples
-  def initialize(term, dictionaries = nil)
-    @term = term
-    @dictionaries = dictionaries
-    @translations = {}
-    @examples = {}
-  end
-  
-  def add_translation(term, translation)
-    add_result(@translations, term, translation)
-  end
-  
-  def add_example(term, example)
-    add_result(@examples, term, example)
-  end
-  
-  def each_translation
-    @translations.each_pair do |term,translation|
-      yield term, translation
-    end
-  end
-
-  def to_s
-    "#{@term}\n#{@dictionaries}\n#{@translations}\n#{@examples}\n"
-  end
-  
-  private
-  def add_result(hash, key, value)
-    if hash.has_key?(key)
-      hash[key].push(value)
-    else
-      hash.merge!({ key => [value] })
-    end
-    self
-  end
-end