dict 0.1.9 → 0.2.0

data/lib/dict.rb

@@ -8,16 +8,16 @@ module Dict
   class << self
     def get_all_dictionaries_translations(word)
       dictionaries = Hash.new
-      
+
       available_services.each do |service|
         dictionaries[service] = get_single_dictionary_translations(word, service)
       end
       dictionaries
     end
-    
+
     def print_all_dictionaries_translations(word)
     end
-    
+
     def get_single_dictionary_translations(word, service)
       case service
       when 'wiktionary'
@@ -26,8 +26,10 @@ module Dict
         Dictpl.new(word, DICT_URL).translate
       else Dictionary.message
       end
+    rescue Dictionary::ConnectError
+      "Couldn't connect to the service."
     end
-    
+
     def print_single_dictionary_translations(word, service)
       obj = get_single_dictionary_translations(word, service)
       hash = obj.translate
@@ -35,11 +37,11 @@ module Dict
         puts "#{k} - #{v}"
       end
     end
-    
+
     def to_json(hash)
       hash.to_json
     end
-    
+
     def available_services
       ['wiktionary', 'dictpl']
     end

data/lib/dictionary.rb

@@ -10,9 +10,9 @@ class Dictionary
     @examples = []
     @uri = URI(URI.escape(url + word.downcase.tr(' ', '_')))
   end
-  
+
   def make_hash_results(arr)
-    hash = arr.each_slice(2).inject({}) do |h, (key, value)| 
+    hash = arr.each_slice(2).inject({}) do |h, (key, value)|
       if h.has_key?(key)
         h[key].push(value) ; h
       else
@@ -22,12 +22,19 @@ class Dictionary
     @translations, @examples = hash.keys, hash.values
     hash
   end
-  
+
   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
 end

data/lib/dictpl.rb

@@ -8,10 +8,12 @@ DICT_URL = 'http://dict.pl/dict?word='
 class Dictpl < Dictionary
   # Method returns hash with translations as keys and examples of using words as values
   def translate
-    context_words = [] 
+    context_words = []
     Nokogiri::HTML(open(@uri)).xpath('//td[@class="resWordCol"]/a').each do |node|
       context_words << node.text
     end
     make_hash_results(context_words)
+  rescue OpenURI::HTTPError
+    raise Dictionary::ConnectError
   end
 end

data/lib/module_main.rb

@@ -5,56 +5,50 @@ require 'slop'
 require 'timeout'
 
 module Main
-  def self.check_parameters?
-    ARGV.empty?
+  def self.parameters_valid?
+    not ARGV.empty?
   end
 
   def self.parse_parameters
-    opts = Slop.parse! do 
+    available_dictionaries = Dict.available_services.join(', ')
+
+    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=, 'timeout in seconds, default: 300', :as => :int
-      on '-d', :dict=, 'wiktionary|dictpl', :argument => :optional
+
+      on '-h', :help, 'Display this help message'
+      on '-t', :time=, 'Set timeout in seconds. Default: 300', :as => :int
+      on '-d', :dict=, "Select desired dictionary. Available options: #{available_dictionaries}"
     end
     opts
   end
-  
+
   def self.get_translations(opts, word)
     Timeout::timeout(opts[:time].to_i || 300) do
-      if opts.dict? && opts[:dict] != nil
+      if opts.dict?
         Dict.get_single_dictionary_translations(word, opts[:dict])
       else
         Dict.get_all_dictionaries_translations(word)
       end
     end
-  rescue 
+  rescue Timeout::Error
     "Timeout for the query."
   end
-  
+
   def self.main(opts)
     begin
       opts = parse_parameters
     rescue Slop::MissingArgumentError
-      puts "Missing argument"
-      exit
+      abort("Missing argument")
     end
 
-    if opts.help?
-      puts opts
-    elsif opts.dict? && !opts[:dict]
-      puts Dict.available_services
-    else
-      if check_parameters? == true
-        puts "Please enter a word. (-h for help)"
-        exit
-      end
-      puts get_translations(opts, ARGV[0])
-    end
+    abort(opts.to_s) if opts.help?
+    parameters_valid? or abort("Please enter a word. (-h for help)")
+
+    puts get_translations(opts, ARGV[0])
   end
-  
+
 end
 

data/lib/wiktionary.rb

@@ -16,9 +16,11 @@ class Wiktionary < Dictionary
       end
     end
     make_hash_results(context_words)
-  end 
-  
+  end
+
   def get_html(url)
     Nokogiri::HTML(open(url))
+  rescue OpenURI::HTTPError
+    raise Dictionary::ConnectError
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dict
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop