dict 0.3.3 → 0.3.4

data/.gitignore

@@ -1,2 +1,2 @@
-*~
+*~
 *.gem

data/.rspec

@@ -1,2 +1,2 @@
---color
---format progress
+--color
+--format progress

data/.travis.yml

@@ -1,14 +1,14 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 1.9.2
-notifications:
-  email:
-    - gozdek.aleksander@gmail.com
-    - grk@ragnarson.com
-    - jan.borwin@gmail.com
-    - kosmadunikowski@gmail.com
-    - mtczerwinski@gmail.com
-    - michalk@ragnarson.com
-    - m.podlecki@op.pl
-    - rafal.osko@gmail.com
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+notifications:
+  email:
+    - gozdek.aleksander@gmail.com
+    - grk@ragnarson.com
+    - jan.borwin@gmail.com
+    - kosmadunikowski@gmail.com
+    - mtczerwinski@gmail.com
+    - michalk@ragnarson.com
+    - m.podlecki@op.pl
+    - rafal.osko@gmail.com

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in dict.gemspec
-gemspec
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in dict.gemspec
+gemspec

data/Gemfile.lock

@@ -1,40 +1,40 @@
-PATH
-  remote: .
-  specs:
-    dict (0.3.3)
-      nokogiri (~> 1.5.5)
-      slop (~> 3.3.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    diff-lcs (1.1.3)
-    fakeweb (1.3.0)
-    i18n (0.6.0)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.0)
-    rspec-expectations (2.11.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    slop (3.3.2)
-    vcr (2.2.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  dict!
-  fakeweb
-  rake
-  rspec (~> 2.11)
-  vcr
+PATH
+  remote: .
+  specs:
+    dict (0.3.4)
+      nokogiri (~> 1.5.5)
+      slop (~> 3.3.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    fakeweb (1.3.0)
+    i18n (0.6.0)
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
+    rake (0.9.2.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.0)
+    rspec-expectations (2.11.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
+    slop (3.3.2)
+    vcr (2.2.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  dict!
+  fakeweb
+  rake
+  rspec (~> 2.11)
+  vcr

data/README.md

@@ -1,35 +1,35 @@
-# dict [![Build Status](https://secure.travis-ci.org/Ragnarson/dict-gem.png?branch=master)](http://travis-ci.org/Ragnarson/dict-gem)
-CLI and backend for dict - an open source dictionary aggregator.
-
-## Usage ##
-To search for `WORD`:
-
-    dict WORD [OPTIONS]
-
-### Available options ###
-
-  - `-h` or `--help` 	- displays help message
-  - `-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
-
-### Trainees
-- [Jan Borwin](https://github.com/janiuuuu)
-- [Mateusz Czerwiński](https://github.com/mrfustrr)
-- [Kosma Dunikowski](https://github.com/kdunee)
-- [Aleksander Gozdek](https://github.com/alexgozdek)
-- [Rafał Ośko](https://github.com/rekosko)
-- [Michał Podlecki](https://github.com/michalpodlecki)
-
-### Mentors
-- [Grzegorz Kołodziejczyk](https://github.com/grk)
-- [Michał Kwiatkowski](https://github.com/mkwiatkowski)
-
-## Made during internship at [Ragnarson](http://ragnarson.com/)
-
+# dict [![Build Status](https://secure.travis-ci.org/Ragnarson/dict-gem.png?branch=master)](http://travis-ci.org/Ragnarson/dict-gem)
+CLI and backend for dict - an open source dictionary aggregator.
+
+## Usage ##
+To search for `WORD`:
+
+    dict WORD [OPTIONS]
+
+### Available options ###
+
+  - `-h` or `--help` 	- displays help message
+  - `-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
+
+### Trainees
+- [Jan Borwin](https://github.com/janiuuuu)
+- [Mateusz Czerwiński](https://github.com/mrfustrr)
+- [Kosma Dunikowski](https://github.com/kdunee)
+- [Aleksander Gozdek](https://github.com/alexgozdek)
+- [Rafał Ośko](https://github.com/rekosko)
+- [Michał Podlecki](https://github.com/michalpodlecki)
+
+### Mentors
+- [Grzegorz Kołodziejczyk](https://github.com/grk)
+- [Michał Kwiatkowski](https://github.com/mkwiatkowski)
+
+## Made during internship at [Ragnarson](http://ragnarson.com/)
+
 ## Hosted by [Shelly Cloud](https://shellycloud.com/)

data/Rakefile

@@ -1,8 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-task :default => :spec
-desc "Run specs"
-RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = %w(-fp --color)
-end
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+task :default => :spec
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w(-fp --color)
+end

data/bin/dict

@@ -1,7 +1,7 @@
-#!/usr/bin/ruby
-# -*- coding: utf-8 -*-
-
-require 'dict/cli/runner'
-
-runner = Dict::CLI::Runner.new
-runner.run
+#!/usr/bin/ruby
+# -*- coding: utf-8 -*-
+
+require 'dict/cli/runner'
+
+runner = Dict::CLI::Runner.new
+runner.run

data/dict.gemspec

@@ -1,28 +1,28 @@
-$:.push File.expand_path("../lib", __FILE__)
-require "dict/version"
-
-Gem::Specification.new do |s|
-  s.add_dependency 'slop', '~> 3.3.2'
-  s.add_dependency 'nokogiri', '~>1.5.5'
-  s.add_development_dependency "rspec", "~> 2.11"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "vcr"
-  s.add_development_dependency "activesupport"
-  s.add_development_dependency "fakeweb"
-
-  s.name = %q{dict}
-  s.version = Dict::VERSION
-  s.authors = ['Aleksander Gozdek', 'Mateusz Czerwinski', 'Michał Podlecki', 'Rafał Ośko', 'Kosma Dunikowski', 'Jan Borwin']
-  s.email = ['mtczerwinski@gmail.com']
-  s.date = Time.now.strftime('%Y-%m-%d')
-  s.summary = %q{Gem made for dictionary application}
-  s.description = <<-END
-    Dict is an open source dictionary aggregator.
-  END
-  s.homepage = 'https://github.com/Ragnarson/dict-gem'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end
+$:.push File.expand_path("../lib", __FILE__)
+require "dict/version"
+
+Gem::Specification.new do |s|
+  s.add_dependency 'slop', '~> 3.3.2'
+  s.add_dependency 'nokogiri', '~>1.5.5'
+  s.add_development_dependency "rspec", "~> 2.11"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "vcr"
+  s.add_development_dependency "activesupport"
+  s.add_development_dependency "fakeweb"
+
+  s.name = %q{dict}
+  s.version = Dict::VERSION
+  s.authors = ['Aleksander Gozdek', 'Mateusz Czerwinski', 'Michał Podlecki', 'Rafał Ośko', 'Kosma Dunikowski', 'Jan Borwin']
+  s.email = ['mtczerwinski@gmail.com']
+  s.date = Time.now.strftime('%Y-%m-%d')
+  s.summary = %q{Gem stworzony dla aplikacji słownikowej}
+  s.description = <<-END
+    Dict to open-source'owy agregator słowników.
+  END
+  s.homepage = 'https://github.com/Ragnarson/dict-gem'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/dict/cli/runner.rb

@@ -1,115 +1,137 @@
-# -*- coding: utf-8 -*-
-
-# Class, which provides using application in Command Line Interface.
-
-require 'dict/dict'
-require 'dict/version'
-require 'slop'
-require 'timeout'
-
-module Dict
-  module CLI
-    class Runner
-      def parameters_valid?
-        not ARGV.empty?
-      end
-
-      def parse_parameters
-        opts = Slop.parse! do
-          banner <<-END
-Usage: dict WORD [OPTIONS]
-Search WORD in dict, an open source dictionary aggregator.
-          END
-
-          on '-h', :help=, 'Display this help message', :argument => :optional
-          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
-      end
-
-      def get_translations(opts, word)
-         Timeout::timeout(opts[:time].to_i || 300) do
-          if opts.dict?
-            Dict.get_single_dictionary_translations(word, opts[:dict])
-          else
-            Dict.get_all_dictionaries_translations(word)
-          end
-        end
-      rescue Timeout::Error
-        "Timeout for the query."
-      end
-
-      def expected_argument_description(option)
-        case option
-        when "dict"
-          Dict.available_dictionaries.join(', ')
-        when "time"
-          "number of seconds"
-        else
-          "?"
-        end
-      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\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)
-        translation = get_translations(opts, word)
-        string = String.new
-        string += word + " : "
-        if opts.dict?
-          translation[word].each { |x| string << x << ", " }
-        else
-          begin
-            Dict.available_dictionaries.each do |x|
-              translation[x][word].each { |y| string << y << ", " }
-            end
-          rescue NoMethodError
-            return "No translation found."
-          end
-          
-        end
-        2.times { string.chop! }
-        string
-      end
-      
-      def run
-        begin
-          opts = parse_parameters
-        rescue Slop::MissingArgumentError => e
-          incomplete_option = /(.*?) expects an argument/.match(e.to_s)[1]
-          description = expected_argument_description(incomplete_option)
-          abort("Missing argument. Expected: #{description}")
-
-        end
-            
-        if opts.help?
-          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.clean?
-              puts clean_translation(opts, ARGV[0])
-            else
-              puts get_translations(opts, ARGV[0])
-            end
-          end
-        end
-
-      end
-    end
-  end
-end
+# -*- coding: utf-8 -*-
+
+# Class, which provides using application in Command Line Interface.
+
+require 'dict/dict'
+require 'dict/version'
+require 'slop'
+require 'timeout'
+
+module Dict
+  module CLI
+    class Runner
+
+      def parameters_valid?
+        not ARGV.empty?
+      end
+
+      def parse_parameters
+        opts = Slop.parse! do
+          banner <<-END
+Przykład użycia: dict SŁOWO [OPCJE]
+Wyszukaj SŁOWO w dict, open-source'owym agregatorze słowników. 
+          END
+
+          on '-h', :help=, 'Wyświetl pomoc', :argument => :optional
+          on '-t', :time=, 'Ustaw limit czasu żądania w sekundach. Domyślnie: 300', :as => :int
+          on '-d', :dict=, "Wybierz słownik. Dostępne są : #{Dict.available_dictionaries.join(', ')}"
+          on '-v', :version=, "Informacje o gemie, autorach, licencji", :argument => :optional
+          on '-c', :clean=, "Nie wyświetlaj przykładów użycia", :argument => :optional
+          
+        end
+      end
+
+      def get_translations(opts, word)
+         Timeout::timeout(opts[:time].to_i || 300) do
+          if opts.dict?
+            Dict.get_single_dictionary_translations(word, opts[:dict])
+          else
+            Dict.get_all_dictionaries_translations(word)
+          end
+        end
+      rescue Timeout::Error
+        "Upłynął limit czasu żądania."
+      end
+
+      def expected_argument_description(option)
+        case option
+        when "dict"
+          Dict.available_dictionaries.join(', ')
+        when "time"
+          "liczba sekund"
+        else
+          "?"
+        end
+      end
+
+      MSG = "Przykład użycia: dict SŁOWO [OPCJE]\n `dict --help, aby uzyskać więcej informacji.\n"
+      VERSION = "dict wersja #{Dict::VERSION}\nWyszukaj SŁOWO w dict, open-source'owym agregatorze słowników. \nCopyright (C) 2012 by\nZespół:\n  Jan Borwin\n  Mateusz Czerwiński\n  Kosma Dunikowski\n  Aleksander Gozdek\n  Rafał Ośko\n  Michał Podlecki\nMentorzy:\n  Grzegorz Kołodziejski\n  Michał Kwiatkowski\nLicencja: MIT\nStworzono na praktykach w : http://ragnarson.com/\nHosting: Shelly Cloud :\t http://shellycloud.com/\nStrona domowa:\t\t http://github.com/Ragnarson/dict-gem/\nSłowniki:\t\t http://wiktionary.org/\n\t\t\t http://glosbe.com/\n" 
+
+     # Returns array without duplicates
+      def clean_translation(results)
+        clean = []
+        results.each do |_, translations_hash|
+          translations_hash.each do |_, translations|
+            clean.concat(translations)
+          end
+        end
+        clean.uniq
+      end
+      
+      # Prints translations from all dictionaries
+      def print_all_dictionaries_translations(results)
+        results.each do |dictionary, translations_hash|
+          puts "Nazwa słownika - #{dictionary.upcase}"
+          print_translations(translations_hash)
+        end
+      end
+
+      # Prints translations for given Hash or Array
+      def print_translations(results)
+        if results.empty?
+          puts 'Przepraszamy, ale w wybranym słowniku nie znaleziono tłumaczenia.'
+        else
+          if results.instance_of?(Hash)
+            results.each do |_, translations|
+              print_array(translations)
+            end
+          elsif results.instance_of?(Array)
+            print_array(results)
+          end
+        end
+      end
+      
+      # Prints array elements one by one vertically
+      def print_array(arr)
+        puts "Znaleziono: #{arr.size} tłumaczeń"
+        arr.each { |el| puts "- #{el}" }
+      end
+     
+      def run
+        begin
+          opts = parse_parameters
+        rescue Slop::MissingArgumentError => e
+          incomplete_option = /(.*?) expects an argument/.match(e.to_s)[1]
+          description = expected_argument_description(incomplete_option)
+          abort("Brakujący argument. Spodziewano: #{description}")
+        end
+            
+        if opts.help?
+          abort(opts.to_s)
+        elsif opts.version?
+          abort(VERSION)
+        elsif opts.time?
+          if (opts[:time].to_i) == 0
+            abort("Nieprawidłowa wartość czasu.")
+          else
+            print_all_dictionaries_translations(get_translations(opts, ARGV[0]))
+          end
+        else
+          if !parameters_valid?
+            abort(MSG)
+          else
+            if opts.clean? && !opts.dict?
+              print_translations(clean_translation(get_translations(opts, ARGV[0])))
+            else
+              if opts.dict?
+                print_translations(get_translations(opts, ARGV[0]))
+              else 
+                print_all_dictionaries_translations(get_translations(opts, ARGV[0]))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dict/dict.rb

@@ -1,53 +1,40 @@
-# -*- coding: utf-8 -*-
-
-require 'dict/wiktionary'
-require 'dict/glosbe'
-
-require "yaml"
-
-module Dict
-  class << self
-    # Returns hash with structure as showed below
-    # { 'DICTIONARY_NAME' => { 'TRANSLATION' => ['EXAMPLE', ...], ... }, ... }
-    def get_all_dictionaries_translations(word)
-      dictionaries = Hash.new
-
-      available_dictionaries.each do |dictionary|
-        dictionaries[dictionary] = get_single_dictionary_translations(word, dictionary)
-      end
-      dictionaries
-    end
-
-    # Prints translations from all dictionaries.
-    def print_all_dictionaries_translations(word)
-      available_dictionaries.each do |dictionary|
-        print_single_dictionary_translations(word, dictionary)
-      end
-    end
-
-    # Returns hash with structure as showed below
-    # { 'TRANSLATION' => ['EXAMPLE', ...], ... }
-    def get_single_dictionary_translations(word, dictionary)
-      case dictionary
-        when 'wiktionary'
-          Wiktionary.new(word).translate.translations
-        when 'glosbe'
-          Glosbe.new(word).translate.translations
-        else Dictionary.message
-      end
-    rescue Dictionary::ConnectError
-      "Couldn't connect to the dictionary."
-    end
-
-    # Prints translations from single dictionary.
-    def print_single_dictionary_translations(word, dictionary)
-      puts "Word '#{word.upcase}' translations from #{dictionary.upcase} dictionary."
-      puts get_single_dictionary_translations(word, dictionary).to_yaml
-    end
-
-    # Returns array of currently available dictionaries.
-    def available_dictionaries
-      ['wiktionary', 'glosbe']
-    end
-  end
-end
+# -*- coding: utf-8 -*-
+
+require 'dict/wiktionary'
+require 'dict/glosbe'
+
+require "yaml"
+
+module Dict
+  class << self
+    # Returns hash with structure as showed below
+    # { 'DICTIONARY_NAME' => { 'TRANSLATION' => ['EXAMPLE', ...], ... }, ... }
+    def get_all_dictionaries_translations(word)
+      dictionaries = Hash.new
+
+      available_dictionaries.each do |dictionary|
+        dictionaries[dictionary] = get_single_dictionary_translations(word, dictionary)
+      end
+      dictionaries
+    end
+
+    # Returns hash with structure as showed below
+    # { 'TRANSLATION' => ['EXAMPLE', ...], ... }
+    def get_single_dictionary_translations(word, dictionary)
+      case dictionary
+        when 'wiktionary'
+          Wiktionary.new(word).translate.translations
+        when 'glosbe'
+          Glosbe.new(word).translate.translations
+        else Dictionary.message
+      end
+    rescue Dictionary::ConnectError
+      "Couldn't connect to the dictionary."
+    end
+
+    # Returns array of currently available dictionaries.
+    def available_dictionaries
+      ['wiktionary', 'glosbe']
+    end
+  end
+end