dict 0.0.7 → 0.0.8

data/lib/dict.rb

@@ -7,8 +7,8 @@ require 'timeout'
 
 module Dict
   class Translation
-    def initialize
-        @word = ARGV[0]
+    def initialize(word)
+        @word = word#ARGV[0]
     end
     
     def self.status(adres = "http://dict-app-staging.shellyapp.com/")
@@ -25,11 +25,10 @@ module Dict
           "Success" unless res.empty?
         end
         
-        rescue => ex
+        rescue #=> ex
           puts "Timeout for the query."
           {:code => 408, :describe => "Request Timeout"}
-        end
       end
+    end
   end
 end
-

data/lib/dictpl.rb

@@ -1,5 +1,7 @@
 require 'open-uri'
 require 'nokogiri'
+require_relative 'result'
+
 
 class Dictpl
 
@@ -7,28 +9,46 @@ class Dictpl
   def initialize(word)
 	raise ArgumentError, "No given word" if word.empty?
 	@word = word
-	@uri = URI(URI.escape(DICT_URL + @word + "&lang=EN"))
+	@uri = URI(URI.escape(DICT_URL + @word + "&lang=EN"))	
+	@result = Result.new(word)
 	
 	#puts 'word: ' + @word
 	#puts 'uri: ' + @uri.to_s
   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"], ... }
+  #
   def translate
-    res = []
+    @context_words = [] 
+    
     doc = Nokogiri::HTML(open(@uri))
-    doc.xpath('//td[@class="resWordCol"]/a')[0..1].each do |node|
-	  res = node.text
-      #puts res
+    doc.xpath('//td[@class="resWordCol"]/a').each do |node|
+	  @context_words << node.text
+	  #puts node.text
     end
-    res
+    
+	@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)
+      puts word.first + ' : ' + word.last
+    end
+    
+    @result
   end
-  
+	  
 end
 
 
 # example of usage
+
 word = ARGV[0]
-word ||= ""
+word ||= "" 
 
+# comment lines below if You want to use rspec
 translation = Dictpl.new word
-puts translation.translate
+puts translation.translate.translations

data/lib/result.rb

@@ -0,0 +1,33 @@
+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)
+    if @translations[term]
+      @translations[term].push(translation)
+    else
+      @translations[term] = [translation]
+    end
+    self
+  end
+  
+  def add_example(term, example)
+    if @examples[term]
+      @examples[term].push(example)
+    else
+      @examples[term] = [example]
+    end
+    self
+  end
+  
+  def each_translation
+    @translations.each_pair do |term,translation|
+      yield term, translation
+    end
+  end
+end

data/lib/wiktionary.rb

@@ -1,42 +1,54 @@
+#!/usr/bin/ruby -w
+# -*- coding: utf-8 -*-
 require 'net/http'
 require 'nokogiri'
+require_relative 'result'
 
 class Wiktionary
   WIKI_URL = "http://en.wiktionary.org/wiki/"
   def initialize(word)
     if word.empty? then raise ArgumentError, "No word given." end
     escaped_word = word.downcase.tr(' ', '_')
+    @result = Result.new(escaped_word)
     @uri = URI(URI.escape(WIKI_URL + escaped_word))
   end
 
   #
-  # Method returns an array of translations and word usage examples
-  # For instance to given word 'samochód' it returns:
-  # [["car","automobile"],["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"]
+  # 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 # => ["car","automobile"]
+  # result.examples     # => ["She drove her car to the mall.","The conductor linked the cars to the locomotive.", ...]
   #
   def translate
     req = Net::HTTP::Get.new(@uri.path)
-    response, translations, sentences = nil, [], []
+    response, translations = nil, []
     Net::HTTP.start(@uri.host, @uri.port) do |http|
       response = http.request(req).body
 
       doc = Nokogiri::HTML(response)
-      doc.css('div#mw-content-text h2:first .mw-headline').each do |lang|
-        raise "Given word is not polish." if lang.content != 'Polish'
+      polish = false
+      doc.css('div#mw-content-text h2 .mw-headline').each do |lang|
+        #raise "Given word is not polish." if lang.content != 'Polish'
+        (polish = true) if lang.content == 'Polish'
       end
+      return @result if !polish
+      #raise "Given word is not polish." if !polish
       doc.css('div#mw-content-text[lang=en] ol > li a').each do |link|
-        translations.push link.content
+        translations.push(link.content)
+        @result.add_translation(@result.term,link.content)
       end
 
-      translations.each do |item|
+     translations.each do |item|
         escaped_item = item.tr(' ', '_')
-        sentence = Nokogiri::HTML(Net::HTTP.get(URI(WIKI_URL + escaped_item)))
-        sentence.css('div#mw-content-text[lang=en] ol:first > li dl dd i').each do |s|
-          sentences.push s.content
+        example = Nokogiri::HTML(Net::HTTP.get(URI(WIKI_URL + escaped_item)))
+        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
-    [translations, sentences]
+    
+    @result
   end
 end

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dict
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
 - Aleksander Gozdek
 - Mateusz Czerwinski
+- Michał Podlecki
+- Rafał Ośko
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -54,7 +56,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/dict.rb
-- lib/google.rb
+- lib/result.rb
 - lib/wiktionary.rb
 - lib/dictpl.rb
 - bin/translate

data/lib/google.rb

@@ -1,19 +0,0 @@
-require 'net/https'
-require 'uri'
-require 'json'
-
-API_KEY = 'AIzaSyB2EQUnNtZycF_xyoyOSm0QJU0dfMGEr44'
-
-class GoogleTranslator
-  def initialize(uri)
-    @uri = URI(uri)
-    @req = Net::HTTP::Get.new(@uri.path << "?" << @uri.query)
-    Net::HTTP.start(@uri.host, @uri.port, :use_ssl => @uri.scheme == 'https', :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
-      p JSON.parse(http.request(@req).body)
-    end
-  end
-end
-
-word = ARGV[0]
-
-GoogleTranslator.new("https://www.googleapis.com/language/translate/v2?key=#{API_KEY}&q=#{word}&source=pl&target=en")