dict 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dict (0.3.1)
+    dict (0.3.3)
       nokogiri (~> 1.5.5)
       slop (~> 3.3.2)
 

data/lib/dict/cli/runner.rb

@@ -54,7 +54,7 @@ Search WORD in dict, an open source dictionary aggregator.
       end
 
       MSG = "Usage: dict WORD [OPTIONS]\nTry `dict --help for more information.\n"
-      VERSION = "dict version #{Dict::VERSION}\nSearch WORD in dict, an open source dictionary aggregator.\nCopyright (C) 2012 by Mateusz Czerwiński, Michał Podlecki,\nAleksander Gozdek, Rafał Ośko, Jan Borwin, Kosma Dunikowski\nMentors: Grzegorz Kołodziejski, Michał Kwiatkowski\nMade during intership at Ragnarson http://ragnarson.com\nHosted by Shelly Cloud https://shellycloud.com\nLicense: MIT\nHomepage: https://github.com/Ragnarson/dict-gem\nSources dictionaries: http://dict.pl, http://pl.wiktionary.org" 
+      VERSION = "dict version #{Dict::VERSION}\nSearch WORD in dict, an open source dictionary aggregator.\nCopyright (C) 2012 by\nTrainees:\n  Jan Borwin\n  Mateusz Czerwiński\n  Kosma Dunikowski\n  Aleksander Gozdek\n  Rafał Ośko\n  Michał Podlecki\nMentors:\n  Grzegorz Kołodziejski\n  Michał Kwiatkowski\nLicense: MIT\nMade during intership at Ragnarson : http://ragnarson.com/\nHosted by Shelly Cloud : http://shellycloud.com/\nHomepage: http://github.com/Ragnarson/dict-gem/\nSources of dictionaries: http://wiktionary.org/\n                         http://glosbe.com/\n" 
 
       # Returns only translations of the given word, without example sentences.
       def clean_translation(opts, word)

data/lib/dict/dictionary.rb

@@ -13,7 +13,7 @@ module Dict
       check_arguments(word)
       @translations = []
       @examples = []
-      @word = word
+      @word = downcase_word(word)
       @result = Dict::Result.new(@word)
     end
 
@@ -52,5 +52,11 @@ module Dict
         @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/version.rb

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

data/lib/dict/wiktionary.rb

@@ -10,15 +10,20 @@ module Dict
 
     # Returns an Dict::Result object.
 	  def translate
-      translations.each { |item| @result.add_translation(@result.term, item) }
+      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)
-      Nokogiri::HTML(open(URI.encode(url)))
-    rescue OpenURI::HTTPError
-      raise Dictionary::ConnectError
+      begin
+        Nokogiri::HTML(open(URI.encode(url)))
+      rescue OpenURI::HTTPError
+        raise Dictionary::ConnectError
+      end
     end
 
     private
@@ -33,8 +38,10 @@ module Dict
 
       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
@@ -58,8 +65,27 @@ module Dict
       translations ||= []
     end
 
-    def get_examples(content, polish = true)
-      # todo
+    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/spec/dict/lib_wiktionary_spec.rb

@@ -42,4 +42,21 @@ describe Dict::Wiktionary do
       Dict::Wiktionary.new("dragon").translate.translations.should eq({'dragon' => ['smok']})
     end
   end
+  
+  it "should return translations for word written with uppercase letters" do
+    result = Dict::Wiktionary.new('SaMoCHÓd').translate.translations
+    result.should eq({"samochód"=>["car", "automobile"]})
+  end
+  
+  describe "#examples" do
+    it "should return a empty hash of usage examples to 'assdd' word" do
+      result = Dict::Wiktionary.new('field').translate.examples
+      result.should eq({})
+    end
+    
+    it "should return a hash containing usage examples to 'kot' word" do
+      result = Dict::Wiktionary.new('kot').translate.examples
+      result.should eq({"cat" => ["No room to swing a cat."]})
+    end
+  end
 end