dict 0.0.9 → 0.1.0

data/lib/dictpl.rb

@@ -7,13 +7,10 @@ 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)
-	
-	#puts 'word: ' + @word
-	#puts 'uri: ' + @uri.to_s
+    raise ArgumentError, "No given word" if word.empty?
+    @word = word
+    @uri = URI(URI.escape(DICT_URL + @word + "&lang=EN"))	
+    @result = Result.new(word)
   end
   
   #
@@ -26,16 +23,14 @@ class Dictpl
     
     doc = Nokogiri::HTML(open(@uri))
     doc.xpath('//td[@class="resWordCol"]/a').each do |node|
-	  @context_words << node.text
-	  #puts node.text
+      @context_words << node.text
     end
     
-	@mapped_words = {} # hash containing words with matched translations
+    @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
@@ -43,12 +38,3 @@ class Dictpl
 	  
 end
 
-
-# example of usage
-
-word = ARGV[0]
-word ||= "" 
-
-# comment lines below if You want to use rspec
-translation = Dictpl.new word
-puts translation.translate.translations

data/lib/result.rb

@@ -8,21 +8,11 @@ class Result
   end
   
   def add_translation(term, translation)
-    if @translations[term]
-      @translations[term].push(translation)
-    else
-      @translations[term] = [translation]
-    end
-    self
+    add_result(@translations, term, translation)
   end
   
   def add_example(term, example)
-    if @examples[term]
-      @examples[term].push(example)
-    else
-      @examples[term] = [example]
-    end
-    self
+    add_result(@examples, term, example)
   end
   
   def each_translation
@@ -30,4 +20,14 @@ class Result
       yield term, translation
     end
   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

data/lib/wiktionary.rb

@@ -1,62 +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
-    check_arguments
+    check_arguments(word)
+    initialize_instance_arguments(word)
+  end
+  
+  def translate
+    translations = []
+    
+    doc = get_html(@uri)
 
-    initialize_instance_arguments
+    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
 
-    escaped_word = word.downcase.tr(' ', '_')
-    @result = Result.new(escaped_word)
-    @uri = URI(URI.escape(WIKI_URL + escaped_word))
+  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
-  #
-  # 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.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
+  def is_polish?(doc)
+    doc.css('div#mw-content-text h2 .mw-headline').any? do |lang|
+      lang.content == 'Polish'
     end
-   
-    @result
   end
+ 
 end

metadata

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