dict 0.2.9 → 0.3.0

data/Gemfile.lock

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

data/README.md

@@ -12,6 +12,8 @@ To search for `WORD`:
   - `-t` or `--time` 	- used to set timeout in seconds. Default value: 300
   - `-d` or `--dict` 	- used to select desired dictionary
   - `-v` or `--version`	- used to show version, authors, license
+  - `-c` or `--clean`	- used to delete examples from translation
+
 
 
 ## People
@@ -28,8 +30,6 @@ To search for `WORD`:
 - [Grzegorz Kołodziejczyk](https://github.com/grk)
 - [Michał Kwiatkowski](https://github.com/mkwiatkowski)
 
-## Made during intership at Ragnarson
-[Ragnarson](http://ragnarson.com/)
+## Made during internship at [Ragnarson](http://ragnarson.com/)
 
-## Hosted by
-[Shelly Cloud](https://shellycloud.com/)
+## Hosted by [Shelly Cloud](https://shellycloud.com/)

data/lib/dict/dict.rb

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 require 'dict/wiktionary'
-require 'dict/dictpl'
 require "yaml"
 
 module Dict
@@ -30,8 +29,6 @@ module Dict
       case dictionary
       when 'wiktionary'
         Wiktionary.new(word).translate.translations
-      when 'dictpl'
-        Dictpl.new(word).translate
       else Dictionary.message
       end
     rescue Dictionary::ConnectError
@@ -46,7 +43,7 @@ module Dict
 
     # returns array of currently available dictionaries
     def available_dictionaries
-      ['wiktionary', 'dictpl']
+      ['wiktionary']
     end
   end
 end

data/lib/dict/version.rb

@@ -1,3 +1,3 @@
 module Dict
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/lib/dict/wiktionary.rb

@@ -3,24 +3,22 @@
 require 'nokogiri'
 require 'dict/dictionary'
 
-WIKI_URL = 'http://en.wiktionary.org/wiki/'
-
 module Dict
   class Wiktionary < Dictionary
-  
+
     # Returns an Dict::Result object
 	  def translate
       translations.each { |item| @result.add_translation(@result.term, item) }
-      
+
       @result
-    end 
-    
+    end
+
     def get_html(url)
       Nokogiri::HTML(open(URI.encode(url)))
     rescue OpenURI::HTTPError
       raise Dictionary::ConnectError
     end
-    
+
     private
     def polish?(content)
       ! /==Polish==/i.match(content).nil?
@@ -30,7 +28,7 @@ module Dict
     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)
         extract_polish_translations(content_pl)
@@ -38,13 +36,13 @@ module Dict
         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)
@@ -57,7 +55,7 @@ module Dict
       translations.delete_if(&:empty?)
       translations ||= []
     end
-    
+
     def get_examples(content, polish = true)
       # todo
     end

data/spec/dict/lib_dict_cli_runner_spec.rb

@@ -37,21 +37,21 @@ end
 
 describe "get_translations" do
   it "should return results from wiktionary and dictpl for word 'słowik'" do
-    VCR.use_cassette('translations_slownik_cassette') do      
+    VCR.use_cassette('translations_slownik_cassette') do
       stub_const("ARGV", ["słowik"])
       runner = Dict::CLI::Runner.new
       opts = runner.parse_parameters
-      runner.get_translations(opts, "słowik").should == {"wiktionary"=>{"słowik"=>["nightingale"]}, "dictpl"=>{"słowik"=>["nightingale"], "słowik białobrewy; Luscinia indicus; Tarsiger indicus (gatunek ptaka)"=>["white-browed bush-robin"], "słowik białosterny; Luscinia pectoralis (gatunek ptaka)"=>["Himalayan rubythroat", "white-tailed rubythroat"], "słowik chiński; pekińczyk żółty; Leiothrix lutea"=>["Pekin robin", "red-billed leiothrix"], "słowik chiński; pekińczyk żółty; pekińczyk koralodzioby; Leiothrix lutea"=>["Peking robin"], "słowik czarnogardły; Luscinia obscura"=>["black-throated blue robin"], "słowik himalajski; Luscinia brunnea (gatunek ptaka)"=>["Indian blue chat", "Indian blue robin"], "słowik modry; Luscinia cyane"=>["Siberian blue robin"], "słowik obrożny; Luscinia johnstoniae; Tarsiger johnstoniae (gatunek ptaka)"=>["collared bush-robin"]}}
-    end 
+      runner.get_translations(opts, "słowik").should == {"wiktionary"=>{"słowik"=>["nightingale"]}}
+    end
   end
 
   it "should return results from selected dictionary for word 'słowik'" do
-    VCR.use_cassette('translations_slownik_cassette') do      
-      stub_const("ARGV", ["słowik", "-d", "dictpl"])
+    VCR.use_cassette('translations_slownik_cassette') do
+      stub_const("ARGV", ["słowik", "-d", "wiktionary"])
       runner = Dict::CLI::Runner.new
       opts = runner.parse_parameters
-      runner.get_translations(opts, "słowik").should == {"słowik"=>["nightingale"], "słowik białobrewy; Luscinia indicus; Tarsiger indicus (gatunek ptaka)"=>["white-browed bush-robin"], "słowik białosterny; Luscinia pectoralis (gatunek ptaka)"=>["Himalayan rubythroat", "white-tailed rubythroat"], "słowik chiński; pekińczyk żółty; Leiothrix lutea"=>["Pekin robin", "red-billed leiothrix"], "słowik chiński; pekińczyk żółty; pekińczyk koralodzioby; Leiothrix lutea"=>["Peking robin"], "słowik czarnogardły; Luscinia obscura"=>["black-throated blue robin"], "słowik himalajski; Luscinia brunnea (gatunek ptaka)"=>["Indian blue chat", "Indian blue robin"], "słowik modry; Luscinia cyane"=>["Siberian blue robin"], "słowik obrożny; Luscinia johnstoniae; Tarsiger johnstoniae (gatunek ptaka)"=>["collared bush-robin"]}
-    end 
+      runner.get_translations(opts, "słowik").should == {"słowik"=>["nightingale"]}
+    end
   end
 
   it "should return timeout message for word słowik and -t 5" do
@@ -65,8 +65,8 @@ describe "get_translations" do
 end
 
 describe "CLI::Runner" do
-  HELP_MSG = "Usage: dict WORD [OPTIONS]\nSearch WORD in dict, an open source dictionary aggregator.\n\n    -h, --help         Display this help message\n    -t, --time         Set timeout in seconds. Default: 300\n    -d, --dict         Select desired dictionary. Available options: wiktionary, dictpl\n    -v, --version      Information about gem, authors, license\n    -c, --clean        Remove examples from translation"
-  DICT_MSG = "Missing argument. Expected: wiktionary, dictpl"
+  HELP_MSG = "Usage: dict WORD [OPTIONS]\nSearch WORD in dict, an open source dictionary aggregator.\n\n    -h, --help         Display this help message\n    -t, --time         Set timeout in seconds. Default: 300\n    -d, --dict         Select desired dictionary. Available options: wiktionary\n    -v, --version      Information about gem, authors, license\n    -c, --clean        Remove examples from translation"
+  DICT_MSG = "Missing argument. Expected: wiktionary"
   TIME_MSG = "Missing argument. Expected: number of seconds"
   T_MSG = "Wrong time value."
 
@@ -111,8 +111,8 @@ describe "CLI::Runner" do
     stub_const("ARGV",["słowik","--clean"])
     runner = Dict::CLI::Runner.new
     opts = runner.parse_parameters
-    runner.clean_translation(opts, ARGV[0]).should == "słowik : nightingale, nightingale"
+    runner.clean_translation(opts, ARGV[0]).should == "słowik : nightingale"
   end
 
-  
+
 end

data/spec/dict/lib_dict_spec.rb

@@ -10,19 +10,16 @@ describe Dict do
     arr.size.should_not == 0
   end
 
-  it "should return array of available services, which contains wiktionary and dictpl" do        
-    Dict.available_dictionaries.should == ['wiktionary', 'dictpl']
-  end  
- 
-  it "should return hash with translations from all dictionaries" do       
+  it "should return array of available services, which contains wiktionary and dictpl" do
+    Dict.available_dictionaries.should == ['wiktionary']
+  end
+
+  it "should return hash with translations from all dictionaries" do
     wiktionary = stub(:translate => stub(:translations => {'WORD' => 'WIKTIONARY_RESULTS'}))
-    Dict::Wiktionary.should_receive(:new).with('WORD').and_return(wiktionary)    
-    
-    dictpl = stub(:translate =>{'WORD' => 'DICTPL_RESULTS'})
-    Dict::Dictpl.should_receive(:new).with('WORD').and_return(dictpl)
-       
+    Dict::Wiktionary.should_receive(:new).with('WORD').and_return(wiktionary)
+
     results = Dict::get_all_dictionaries_translations('WORD')
-    results.should == {'dictpl' => {'WORD' => 'DICTPL_RESULTS'}, 'wiktionary' => {'WORD' => 'WIKTIONARY_RESULTS'}}    
+    results.should == {'wiktionary' => {'WORD' => 'WIKTIONARY_RESULTS'}}
   end
 
   it "should return whatever Wiktionary returns embedded in a hash" do
@@ -30,10 +27,4 @@ describe Dict do
     Dict::Wiktionary.should_receive(:new).with('WORD').and_return(wiktionary)
     Dict.get_single_dictionary_translations('WORD', 'wiktionary').should == 'WIKTIONARY_RESULTS'
   end
-
-  it "should return whatever Dictpl returns embedded in a hash" do
-    dictpl = stub(:translate => 'DICTPL_RESULTS')
-    Dict::Dictpl.should_receive(:new).with('WORD').and_return(dictpl)
-    Dict.get_single_dictionary_translations('WORD', 'dictpl').should == 'DICTPL_RESULTS'
-  end
 end