dict 0.1.2 → 0.1.3

data/lib/dictpl.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'open-uri'
 require 'nokogiri'
 require_relative 'result'
@@ -6,11 +7,9 @@ require_relative 'result'
 class Dictpl
 
   DICT_URL = "http://dict.pl/dict?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)
+  def initialize(word)    
+    check_arguments(word)
+    initialize_instance_arguments(word)
   end
   
   #
@@ -19,22 +18,36 @@ class Dictpl
   # {"krowa"=>["cow"], "krowa bliska wycielenia"=>["freshen of cow"], ... }
   #
   def translate
+
+    # Array contatining all words alternately
+    # Example: ["krowa", "cow", "krowa bliska wycielenia", "freshen of cow", ... ]
     @context_words = [] 
     
-    doc = Nokogiri::HTML(open(@uri))
+    doc = get_html(@uri)
     doc.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
-    
+    end    
     @result
   end
-	  
-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)
+  end
+
+  def get_html(uri)
+    Nokogiri::HTML(open(uri))
+  end
+
+end

data/lib/result.rb

@@ -20,6 +20,10 @@ class Result
       yield term, translation
     end
   end
+
+  def to_s
+    "#{@term}\n#{@dictionaries}\n#{@translations}\n#{@examples}\n"
+  end
   
   private
   def add_result(hash, key, value)

data/lib/wiktionary.rb

@@ -21,31 +21,45 @@ require 'nokogiri'
 require_relative 'result'
 
 class Wiktionary
-  WIKI_URL = "http://en.wiktionary.org/wiki/"
+  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
   
   def translate
-    translations = []
-    
+    translations = []    
+    @uri = URI.parse(URI.escape("#{WIKI_EN}#{@word}"))  
     doc = get_html(@uri)
-
-    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
+    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)
-    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)
+      get_examples_of_translations_en(@result, translations, WIKI_EN)
     
-    @result
+      @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
   
   private
@@ -54,18 +68,27 @@ class Wiktionary
     Nokogiri::HTML(Net::HTTP.get(uri))
   end
 
-  def examples_of_translations(result, translations)
+  def get_examples_of_translations_en(result, translations, adres)
     translations.each do |item|
-      example = Nokogiri::HTML(Net::HTTP.get(URI(WIKI_URL + item.tr(' ', '_'))))
+      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(' ', '_'))
-    @uri = URI(URI.escape(WIKI_URL + word.downcase.tr(' ', '_')))    
+    @word = word  
   end
   
   def check_arguments(word)

metadata

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