dict 0.0.6 → 0.0.7

data/bin/translate

@@ -8,33 +8,19 @@ if ARGV.empty? then puts "Please enter the word. (-h for help)" ; exit end
 
 opts = Slop.parse do 
   banner "Usage: $translate -w word [Options]"
-  on '-w', '--word', 'after this option is a word to translate'
-  on '-h', '--help', 'help'
-  on '-t', '--time', 'time in seconds', :as => :int
-  on '-d', '--dict', 'dictonaries: all, wiki etc.'
-  on '-s', '--status', 'status of API'
+  on '-w', :word=, 'after this option is a word to translate'
+  on '-h', :help=, 'help', :argument => :optional
+  on '-t', :time=, 'time in seconds, default: 300 seconds', :as => :int
+  on '-d', :dict=, 'dictionaries: all, wiki etc., default is all dictionaries'
+  on '-s', :status=, 'status of API', :argument => :optional
 end
 
-puts opts.to_hash
-
-=begin
-# problem with situation where first word after
-# translate is --help or -h ...
-unless ARGV[0].nil?
-  puts Dict::Translation.get_response(ARGV[0])
-end
-
-unless opts[:time].nil?
-  puts Dict::Translation.get_response(ARGV[0],opts[:time])
-end
-
-unless opts[:dict].nil?
-  # todo: refactor get_response because it has not a dict
-  # parameter
-end
-=end
-puts opts if opts[:help]
-puts Dict::Translation.status unless opts[:status].nil?
+# translation
+puts Dict::Translation.get_response(opts[:word], opts[:time] || 300, opts[:dict] || "all") if opts.word?
 
+# help
+puts opts if opts.help?
 
+# status
+puts Dict::Translation.status if opts.status?
 

data/lib/dict.rb

@@ -17,8 +17,8 @@ module Dict
       res.message
     end
 
-    def self.get_response(word, time = 3600)
-      uri = URI.parse(URI.escape("http://dict-app-staging.shellyapp.com/#{word}"))
+    def self.get_response(word, time, dict)
+      uri = URI.parse(URI.escape("http://dict-app-staging.shellyapp.com/#{dict}/#{word}"))
       begin
         Timeout::timeout(time.to_i) do
           res = Net::HTTP.get(uri)

data/lib/wiktionary.rb

@@ -9,6 +9,11 @@ class Wiktionary
     @uri = URI(URI.escape(WIKI_URL + escaped_word))
   end
 
+  #
+  # Method returns an array of translations and word usage examples
+  # For instance to given word 'samochód' it returns:
+  # [["car","automobile"],["She drove her car to the mall.", "The conductor linked the cars to the locomotive.", "The 11:10 to    London was operated by a 4-car diesel multiple unit"]
+  #
   def translate
     req = Net::HTTP::Get.new(@uri.path)
     response, translations, sentences = nil, [], []
@@ -16,6 +21,9 @@ class Wiktionary
       response = http.request(req).body
 
       doc = Nokogiri::HTML(response)
+      doc.css('div#mw-content-text h2:first .mw-headline').each do |lang|
+        raise "Given word is not polish." if lang.content != 'Polish'
+      end
       doc.css('div#mw-content-text[lang=en] ol > li a').each do |link|
         translations.push link.content
       end
@@ -23,7 +31,7 @@ class Wiktionary
       translations.each do |item|
         escaped_item = item.tr(' ', '_')
         sentence = Nokogiri::HTML(Net::HTTP.get(URI(WIKI_URL + escaped_item)))
-        sentence.css('div#mw-content-text[lang=en] ol > li dl dd i').each do |s|
+        sentence.css('div#mw-content-text[lang=en] ol:first > li dl dd i').each do |s|
           sentences.push s.content
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dict
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: