dict 0.2.8 → 0.2.9

data/Gemfile.lock

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

data/lib/dict/cli/runner.rb

@@ -23,8 +23,9 @@ Search WORD in dict, an open source dictionary aggregator.
           on '-t', :time=, 'Set timeout in seconds. Default: 300', :as => :int
           on '-d', :dict=, "Select desired dictionary. Available options: #{Dict.available_dictionaries.join(', ')}"
           on '-v', :version=, "Information about gem, authors, license", :argument => :optional
+          on '-c', :clean=, "Remove examples from translation", :argument => :optional
+          
         end
-        opts
       end
 
       def get_translations(opts, word)
@@ -53,6 +54,20 @@ Search WORD in dict, an open source dictionary aggregator.
       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" 
 
+      def clean_translation(opts, word)
+        translation = get_translations(opts, word)
+        string = String.new
+        string = string + word + " : "
+        if opts.dict?
+          translation[word].each { |x| string << x << ", " }
+        else
+          Dict.available_dictionaries.each do |x|
+            translation[x][word].each { |x| string << x << ", " }
+          end
+        end
+        2.times { string.chop! }
+        string
+      end
       
       def run
         begin
@@ -68,16 +83,18 @@ Search WORD in dict, an open source dictionary aggregator.
           abort(opts.to_s)
         elsif opts.version?
           abort(VERSION)
+        elsif opts.time?
+          if (opts[:time].to_i) == 0
+            abort("Wrong time value.")
+          else
+            puts get_translations(opts, ARGV[0])
+          end
         else
           if !parameters_valid?
             abort(MSG)
           else
-            if opts.time?
-              if (opts[:time].to_i) == 0
-                abort("Wrong time value.")
-              else
-                puts get_translations(opts, ARGV[0])
-              end
+            if opts.clean?
+              puts clean_translation(opts, ARGV[0])
             else
               puts get_translations(opts, ARGV[0])
             end

data/lib/dict/version.rb

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

data/spec/dict/lib_dict_cli_runner_spec.rb

@@ -2,6 +2,7 @@
 
 require_relative './vcr_setup'
 require 'dict/cli/runner'
+require 'slop'
 
 describe "parameters_valid?" do
   it "should return false if ARGV is empty" do
@@ -22,14 +23,14 @@ describe "parse_parameters" do
     stub_const("ARGV", ["słowik", "-t", "36"])
     runner = Dict::CLI::Runner.new
     opts = runner.parse_parameters
-    {:help=>nil, :time=>"36", :dict=>nil, :version=>nil}.should == opts.to_hash
+    {:help=>nil, :time=>"36", :dict=>nil, :version=>nil, :clean=>nil}.should == opts.to_hash
   end
 
   it "should return Hash for parameters słowik" do
     stub_const("ARGV", ["słowik"])
     runner = Dict::CLI::Runner.new
     opts = runner.parse_parameters
-    {:help=>nil, :time=>nil, :dict=>nil, :version=>nil}.should == opts.to_hash
+    {:help=>nil, :time=>nil, :dict=>nil, :version=>nil, :clean=>nil}.should == opts.to_hash
   end
 end
 
@@ -64,7 +65,7 @@ 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"
+  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"
   TIME_MSG = "Missing argument. Expected: number of seconds"
   T_MSG = "Wrong time value."
@@ -105,5 +106,13 @@ describe "CLI::Runner" do
       runner.run
     }.to raise_error(SystemExit)
   end
+
+  it "should return string when you use --clean parameter" 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"
+  end
+
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dict
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop