dict 0.3.3 → 0.3.4

data/lib/dict/dictionary.rb

@@ -1,62 +1,45 @@
-# -*- coding: utf-8 -*-
-
-# It is a base class for classes fetching results from Web dictionaries.
-
-require 'open-uri'
-require 'dict/result'
-
-module Dict
-  class Dictionary
-    attr_accessor :translations, :examples
-
-    def initialize(word)
-      check_arguments(word)
-      @translations = []
-      @examples = []
-      @word = downcase_word(word)
-      @result = Dict::Result.new(@word)
-    end
-
-    # Returns hash with structure as showed below
-    # { 'TRANSLATION' => ['EXAMPLE', ...], ... }
-    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
-    
-    # Returns an instance of URI::HTTP class.
-    def uri(url, word = nil)
-      word == nil ? URI(URI.escape(url)) : URI(URI.escape(url + word.downcase.tr(' ', '_')))
-    end
-
-    # Checks if word was given correctly.
-    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
-
-    class ConnectError < Exception
-      attr_reader :original
-
-      def initialize(original = $!)
-        @original = original
-      end
-    end
-    
-    private
-    # Returns a word with all downcased letters, including polish
-    def downcase_word(word)
-      word.downcase.gsub(/[ĄĆĘŁŃÓŚŹŻ]/, 'Ą' => 'ą', 'Ć' => 'ć', 'Ę' => 'ę', 'Ł' => 'ł', 'Ń' => 'ń', 'Ó' => 'ó', 'Ś' => 'ś', 'Ź' => 'ź', 'Ż' => 'ż')
-    end
-  end
-end
+# -*- coding: utf-8 -*-
+
+# It is a base class for classes fetching results from Web dictionaries.
+
+require 'open-uri'
+require 'dict/result'
+
+module Dict
+  class Dictionary
+
+    def initialize(word)
+      check_arguments(word)
+      @word = downcase_word(word)
+      @result = Dict::Result.new(@word)
+    end
+    
+    # Returns an instance of URI::HTTP class.
+    def uri(url, word = nil)
+      word == nil ? URI(URI.escape(url)) : URI(URI.escape(url + word.downcase.tr(' ', '_')))
+    end
+
+    # Checks if word was given correctly.
+    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
+
+    class ConnectError < Exception
+      attr_reader :original
+
+      def initialize(original = $!)
+        @original = original
+      end
+    end
+    
+    private
+    # Returns a word with all downcased letters, including polish
+    def downcase_word(word)
+      word.downcase.gsub(/[ĄĆĘŁŃÓŚŹŻ]/, 'Ą' => 'ą', 'Ć' => 'ć', 'Ę' => 'ę', 'Ł' => 'ł', 'Ń' => 'ń', 'Ó' => 'ó', 'Ś' => 'ś', 'Ź' => 'ź', 'Ż' => 'ż')
+    end
+  end
+end

data/lib/dict/glosbe.rb

@@ -1,66 +1,68 @@
-# -*- coding: utf-8 -*-
-
-require 'nokogiri'
-require 'dict/dictionary'
-
-GLOSBE_PL = 'http://glosbe.com/pl/en/' # polish - english
-GLOSBE_EN = 'http://glosbe.com/en/pl/' # english - polish
-
-module Dict
-  class Glosbe < Dictionary
-    # returns an Dict::Result object 
-    def translate
-      begin
-        if is_polish?(doc = get_content(GLOSBE_PL, @word))
-          add_translations(get_translations(doc))
-          add_examples(get_examples(doc, 'en'))
-        else
-          doc = get_content(GLOSBE_EN, @word) 
-          add_translations(get_translations(doc))
-          add_examples(get_examples(doc, 'pl'))
-        end
-
-        @result
-      rescue OpenURI::HTTPError
-        raise Dictionary::ConnectError
-      end
-    end
-
-    private
-
-    # checks if given word is polish
-    def is_polish?(doc)
-      doc.at_css('.content_box_rounded p').nil?
-    end
-
-    # returns a html structure of visited site
-    def get_content(url, word)
-      Nokogiri::HTML(open(uri(url, word))).css('.wordDetails')
-    end
-
-    # returns array with structure as shown below from the given dictionary link
-    # ['TRANSLATION1', 'TRANSLATION2', ...]
-    def get_translations(doc)
-      doc.css('.phrase-container > .translation').each { |translation| translations.push(translation.text.downcase) }
-      translations
-    end
-
-    # add obtained translations to Dict::Result object
-    def add_translations(translations)
-      translations.each { |translation| @result.add_translation(@result.term, translation) }
-    end
-
-    # returns array with structure as shown below from the given dictionary link
-    # ['EXAMPLE1', 'EXAMPLE2', ...]
-    # the default length of given example is 60 characters
-    def get_examples(doc, lang, length = 60)
-      doc.css(".tranlastionMemory td[lang=#{lang}]").each { |example| examples.push(example.text.capitalize) if example.text.length < length }
-      examples
-    end
-
-    # add obtained examples to Dict::Result object
-    def add_examples(examples)
-      examples.each { |example| @result.add_example(@result.term, example) }
-    end
-  end
-end
+# -*- coding: utf-8 -*-
+
+require 'nokogiri'
+require 'dict/dictionary'
+
+GLOSBE_PL = 'http://glosbe.com/pl/en/' # polish - english
+GLOSBE_EN = 'http://glosbe.com/en/pl/' # english - polish
+
+module Dict
+  class Glosbe < Dictionary
+    # returns an Dict::Result object 
+    def translate
+        if is_polish?(doc = get_content(GLOSBE_PL, @word))
+          add_translations(get_translations(doc))
+          add_examples(get_examples(doc, 'en'))
+        else
+          doc = get_content(GLOSBE_EN, @word) 
+          add_translations(get_translations(doc))
+          add_examples(get_examples(doc, 'pl'))
+        end
+
+        @result
+    end
+
+    private
+
+    # checks if given word is polish
+    def is_polish?(doc)
+      !doc.empty? && doc.at_css('.content_box_rounded p').nil?
+    end
+
+    # returns instance of Nokogiri::HTML module
+    def get_content(url, word)
+      begin
+        Nokogiri::HTML(open(uri(url, word))).css('.wordDetails')
+      rescue => e
+        ""
+      end
+    end
+
+    # returns array with structure as shown below from the given dictionary link
+    # ['TRANSLATION1', 'TRANSLATION2', ...]
+    def get_translations(doc)
+      translations = []
+      doc.css('.phrase-container > .translation').each { |translation| translations.push(translation.text.downcase) } if !doc.empty?
+      translations
+    end
+
+    # add obtained translations to Dict::Result object
+    def add_translations(translations)
+      translations.each { |translation| @result.add_translation(@result.term, translation) }
+    end
+
+    # returns array with structure as shown below from the given dictionary link
+    # ['EXAMPLE1', 'EXAMPLE2', ...]
+    # the default length of given example is 60 characters
+    def get_examples(doc, lang, length = 60)
+      examples = []
+      doc.css(".tranlastionMemory td[lang=#{lang}]").each { |example| examples.push(example.text.capitalize) if example.text.length < length } if !doc.empty?
+      examples
+    end
+
+    # add obtained examples to Dict::Result object
+    def add_examples(examples)
+      examples.each { |example| @result.add_example(@result.term, example) }
+    end
+  end
+end

data/lib/dict/result.rb

@@ -1,38 +1,38 @@
-# Objects of this class are returned by methods retrieving translations 
-# from Web dictionaries.
-
-module Dict
-  class Result
-    attr_reader :term, :translations, :examples
-    
-    def initialize(term)
-      @term = term
-      @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
-    
-    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
-end
+# Objects of this class are returned by methods retrieving translations 
+# from Web dictionaries.
+
+module Dict
+  class Result
+    attr_reader :term, :translations, :examples
+    
+    def initialize(term)
+      @term = term
+      @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
+    
+    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
+end

data/lib/dict/version.rb

@@ -1,3 +1,3 @@
-module Dict
-  VERSION = "0.3.3"
-end
+module Dict
+  VERSION = "0.3.4"
+end

data/lib/dict/wiktionary.rb

@@ -1,91 +1,91 @@
-# -*- coding: utf-8 -*-
-
-# Class fetching translations of given word from wiktionary.org.
-
-require 'nokogiri'
-require 'dict/dictionary'
-
-module Dict
-  class Wiktionary < Dictionary
-
-    # Returns an Dict::Result object.
-	  def translate
-      translations.each do |translation|
-        @result.add_translation(@result.term, translation.gsub(/(\s[^|\s]+\|)/,' '))
-        examples(translation).each { |example| @result.add_example(translation, example) }
-      end
-
-      @result
-    end
-
-    def get_html(url)
-      begin
-        Nokogiri::HTML(open(URI.encode(url)))
-      rescue OpenURI::HTTPError
-        raise Dictionary::ConnectError
-      end
-    end
-
-    private
-    def polish?(content)
-      ! /==Polish==/i.match(content).nil?
-    end
-
-    # Returns an array containing translations.
-    def translations
-      url_pl = "http://en.wiktionary.org/w/index.php?title=#{@word}&action=edit"
-      url_en = "http://pl.wiktionary.org/w/index.php?title=#{@word}&action=edit"
-
-      content_pl = get_html(url_pl).css('textarea#wpTextbox1').first
-      if polish?(content_pl)
-        @is_polish = true
-        extract_polish_translations(content_pl)
-      else
-        @is_polish = false
-        extract_english_translations(get_html(url_en).css('textarea#wpTextbox1').first.content)
-      end
-    end
-
-    # Returns an array containing polish translations.
-    def extract_polish_translations(content)
-      translations = /Noun[^\{]+\{\{(?:head\|pl|pl\-noun)[^#]+#\s*\[\[([^\n]+)/.match(content)
-      translations = (translations && translations[1].gsub(/\[|\]/,'').split(', ')) || []
-    end
-
-    # Returns an array containing english translations.
-    def extract_english_translations(content)
-      translations_block = /język\s+angielski(?:.|\n)+\{\{znaczenia\}\}(.|\n)+(?:\{\{odmiana){1,}/.match(content)
-      return [] unless translations_block.instance_of?(MatchData)
-      translations_block = translations_block[0].gsub(/odmiana(.|\n)+$/,'')
-      translations = translations_block.scan(/:\s*\(\d\.?\d?\)\s*([^\n]+)/)
-      translations.map! do |translation|
-        translation[0].gsub(/\[|\]|\{\{[^\}]+\}\}|'|<.*/,'').strip
-      end
-      translations.delete_if(&:empty?)
-      translations ||= []
-    end
-
-    def examples(word)
-      url_pl = "http://pl.wiktionary.org/w/index.php?title=#{word}&action=edit"
-      
-      if @is_polish
-        extract_english_examples(word)
-      else
-        []
-      end
-    end
-    
-    # Returns an array containing usage examples of translated polish word to english.
-    def extract_english_examples(word)
-      word = word.gsub(/\s+\(.+$/,'') || ''
-      url_en = "http://en.wiktionary.org/w/index.php?title=#{word}&action=edit"
-      examples = /Noun[^\{]+\{\{en\-noun[^=]+/.match(get_html(url_en.gsub('{word}',word)).css('textarea#wpTextbox1').first)
-      return [] unless examples.instance_of?(MatchData)
-      examples = examples[0].scan(/#: ''([^\n]+)\n/)
-      examples.map! do |translation|
-        translation[0].gsub(/'{2,}/,'')
-      end
-      examples
-    end
-  end
-end
+# -*- coding: utf-8 -*-
+
+# Class fetching translations of given word from wiktionary.org.
+
+require 'nokogiri'
+require 'dict/dictionary'
+
+module Dict
+  class Wiktionary < Dictionary
+
+    # Returns an Dict::Result object.
+    def translate 
+      translations.each do |translation|
+        @result.add_translation(@result.term, translation.gsub(/(\s[^|\s]+\|)/,' '))
+        examples(translation).each { |example| @result.add_example(translation, example) }
+      end
+
+      @result
+    end
+
+    def get_html(url)
+      begin
+        Nokogiri::HTML(open(URI.encode(url)))
+      rescue OpenURI::HTTPError
+        raise Dictionary::ConnectError
+      end
+    end
+
+    private
+    def polish?(content)
+      ! /==Polish==/i.match(content).nil?
+    end
+
+    # Returns an array containing translations.
+    def translations
+      url_pl = "http://en.wiktionary.org/w/index.php?title=#{@word}&action=edit"
+      url_en = "http://pl.wiktionary.org/w/index.php?title=#{@word}&action=edit"
+
+      content_pl = get_html(url_pl).css('textarea#wpTextbox1').first
+      if polish?(content_pl)
+        @is_polish = true
+        extract_polish_translations(content_pl)
+      else
+        @is_polish = false
+        extract_english_translations(get_html(url_en).css('textarea#wpTextbox1').first.content)
+      end
+    end
+
+    # Returns an array containing polish translations.
+    def extract_polish_translations(content)
+      translations = /Noun[^\{]+\{\{(?:head\|pl|pl\-noun)[^#]+#\s*\[\[([^\n]+)/.match(content)
+      translations = (translations && translations[1].gsub(/\[|\]/,'').split(', ')) || []
+    end
+
+    # Returns an array containing english translations.
+    def extract_english_translations(content)
+      translations_block = /język\s+angielski(?:.|\n)+\{\{znaczenia\}\}(.|\n)+(?:\{\{odmiana){1,}/.match(content)
+      return [] unless translations_block.instance_of?(MatchData)
+      translations_block = translations_block[0].gsub(/odmiana(.|\n)+$/,'')
+      translations = translations_block.scan(/:\s*\(\d\.?\d?\)\s*([^\n]+)/)
+      translations.map! do |translation|
+        translation[0].gsub(/\[|\]|\{\{[^\}]+\}\}|'|<.*/,'').strip
+      end
+      translations.delete_if(&:empty?)
+      translations ||= []
+    end
+
+    def examples(word)
+      url_pl = "http://pl.wiktionary.org/w/index.php?title=#{word}&action=edit"
+      
+      if @is_polish
+        extract_english_examples(word)
+      else
+        []
+      end
+    end
+    
+    # Returns an array containing usage examples of translated polish word to english.
+    def extract_english_examples(word)
+      word = word.gsub(/\s+\(.+$/,'') || ''
+      url_en = "http://en.wiktionary.org/w/index.php?title=#{word}&action=edit"
+      examples = /Noun[^\{]+\{\{en\-noun[^=]+/.match(get_html(url_en.gsub('{word}',word)).css('textarea#wpTextbox1').first)
+      return [] unless examples.instance_of?(MatchData)
+      examples = examples[0].scan(/#: ''([^\n]+)\n/)
+      examples.map! do |translation|
+        translation[0].gsub(/'{2,}/,'')
+      end
+      examples
+    end
+  end
+end

data/lib/dict.rb

@@ -1,5 +1,5 @@
-require 'dict/dict'
-
-module Dict
-  autoload :VERSION, "dict/version"
-end
+require 'dict/dict'
+
+module Dict
+  autoload :VERSION, "dict/version"
+end