dict 0.1.1 → 0.1.2

data/lib/dict.rb

@@ -1,36 +1,33 @@
 #!/usr/bin/ruby -w
 # -*- coding: utf-8 -*-
 
-require 'uri'
-require 'net/http'
-require 'timeout'
+require_relative 'wiktionary'
+require_relative 'dictpl'
 
 module Dict
-  class Translation
-    def initialize(word)
-        @word = word
+  class << self
+    def get_all_dictionaries_translations(word)
+      dictionaries = Hash.new
+      
+      available_services.each do |service|
+        dictionaries[service] = get_single_dictionary_translations(word, service)
+      end
+      
+      dictionaries
     end
     
-    def self.status(adres = "http://dict-app-staging.shellyapp.com/")
-      uri = URI(adres)
-      res = Net::HTTP.get_response(uri)
-      res.message
-    end
-
-    def self.get_response(word, time, dict)
-      uri = URI.parse(URI.escape("http://dict-app-staging.shellyapp.com/#{dict}/#{word}"))
-      begin
-        Timeout::timeout(time.to_i) do
-          res = Net::HTTP.get(uri)
-          "Success" unless res.empty?
-        end
-        
-        rescue
-          puts "Timeout for the query."
-          {:code => 408, :describe => "Request Timeout"}
+    def get_single_dictionary_translations(word, service)
+      case service
+      when 'wiktionary'
+        Wiktionary.new(word).translate
+      when 'dictpl'
+        Dictpl.new(word).translate
+      else 'There\'s no such dictionary.'
       end
     end
+    
+    def available_services
+      ['wiktionary', 'dictpl']
+    end
   end
-	#t = Translation.new "samochód"
-  #puts Translation.status
 end

data/lib/dictpl.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'open-uri'
 require 'nokogiri'
 require_relative 'result'
@@ -7,9 +6,11 @@ require_relative 'result'
 class Dictpl
 
   DICT_URL = "http://dict.pl/dict?word=" 
-  def initialize(word)    
-		check_arguments(word)
-		initialize_instance_arguments(word)
+  def initialize(word)
+    raise ArgumentError, "No given word" if word.empty?
+    @word = word
+    @uri = URI(URI.escape(DICT_URL + @word + "&lang=EN"))	
+    @result = Result.new(word)
   end
   
   #
@@ -30,22 +31,10 @@ class Dictpl
     @context_words.each_slice(2) do |word|	     
       @mapped_words[word.first] = word.last
       @result.add_translation(word.first, word.last)
-    end    
+    end
+    
     @result
   end
-
-	def check_arguments(word)												
-    if word.empty? then raise ArgumentError.new("No word given.") end
-  end
-	
-	def initialize_instance_arguments(word)
-		@word = word
-    @uri = URI(URI.escape(DICT_URL + @word + "&lang=EN"))	
-    @result = Result.new(word)
-  end
+	  
 end
 
-a = Dictpl.new "samochód"
-a.translate.translations.each_pair do |key, value|
-  puts key + value.to_s
-end

data/lib/wiktionary.rb

@@ -1,54 +1,81 @@
 #!/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 '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))
+    check_arguments(word)
+    initialize_instance_arguments(word)
   end
-
-  #
-  # 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.", ...]}
-  #
+  
   def translate
-    req = Net::HTTP::Get.new(@uri.path)
-    response, translations = nil, []
-    Net::HTTP.start(@uri.host, @uri.port) do |http|
-      response = http.request(req).body
-
-      doc = Nokogiri::HTML(response)
-      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)
-        @result.add_translation(@result.term,link.content)
-      end
+    translations = []
+    
+    doc = get_html(@uri)
 
-     translations.each do |item|
-        escaped_item = item.tr(' ', '_')
-        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
+    return @result unless 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)
+    end
+
+    examples_of_translations(@result, translations)
     
     @result
   end
+  
+  private
+
+  def get_html(uri)
+    Nokogiri::HTML(Net::HTTP.get(uri))
+  end
+
+  def examples_of_translations(result, translations)
+    translations.each do |item|
+      example = Nokogiri::HTML(Net::HTTP.get(URI(WIKI_URL + 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 initialize_instance_arguments(word)
+    @result = Result.new(word.downcase.tr(' ', '_'))
+    @uri = URI(URI.escape(WIKI_URL + word.downcase.tr(' ', '_')))    
+  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
+  end
+ 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dict
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: