dict 0.0.4 → 0.0.5

data/bin/translate

@@ -4,20 +4,34 @@
 require 'dict'
 require 'slop'
 
-if ARGV.empty?
-  puts "Please, enter the word to translate."
-  exit
+if ARGV.empty? then puts "Please enter the word. (-h for help)" ; exit end
+
+opts = Slop.parse do 
+  banner "Usage: $translate word [Options] (-h for help)"
+  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'
+end
+
+# 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
 
-if ARGV[0] == "status"
-  print "Status API: "
-  print Dict::Translation.status
-elsif ARGV[1] == "time"
-  if !ARGV[2].nil?
-    Dict::Translation.getResponse(ARGV[0], ARGV[2])
-  else
-    Dict::Translation.getResponse(ARGV[0])
-  end
-else
-  Dict::Translation.getResponse(ARGV[0])
+unless opts[:dict].nil?
+  # todo: refactor get_response because it has not a dict
+  # parameter
 end
+
+puts opts if opts[:help]
+puts Dict::Translation.status unless opts[:status].nil?
+
+
+
+

data/lib/dict.rb

@@ -7,24 +7,29 @@ require 'timeout'
 
 module Dict
   class Translation
-    def initialize(word)
+    def initialize
         @word = ARGV[0]
     end
     
     def self.status(adres = "http://dict-app-staging.shellyapp.com/")
       uri = URI(adres)
       res = Net::HTTP.get_response(uri)
-      puts res.message
+      res.message
     end
 
-    def self.getResponse(word, time = 3600)
-      uri = URI.parse(URI.escape("http://dict-app-staging.shellyapp.com/#{word}")) 
-      Timeout::timeout(time.to_i) do
-        puts Net::HTTP.get(uri)
+    def self.get_response(word, time = 3600)
+      uri = URI.parse(URI.escape("http://dict-app-staging.shellyapp.com/#{word}"))
+      begin
+        Timeout::timeout(time.to_i) do
+          res = Net::HTTP.get(uri)
+          "Success" unless res.empty?
+        end
+        
+        rescue => ex
+          puts "Timeout for the query."
+          {:code => 408, :describe => "Request Timeout"}
+        end
       end
-    end
-
-
   end
 end
 

data/lib/wiktionary.rb

@@ -1,40 +1,32 @@
-require 'net/http' # requires 'uri'
+require 'net/http'
+require 'nokogiri'
 
 class Wiktionary
-	WIKI_URL = "http://en.wiktionary.org/wiki/" # #{word}
-	def initialize(word)
-		if word.empty? then puts "No word given."; exit end
-		@word = word
-		@uri = URI(URI.escape(WIKI_URL << @word))
-	end
-	
-	def translate
-		req = Net::HTTP::Get.new(@uri.path)
-		response, array = nil, []
-		Net::HTTP.start(@uri.host, @uri.port) do |http|
-			response = http.request(req).body
-			regexp = Regexp.new('<li>[^<]*<a href="/wiki/([^"]+)"\s+title="\1">\1<\/a>', Regexp::IGNORECASE)
-			results = regexp.match(response)
-			
-			return array if !results # no translation found
-			
-			array.push results[1]
-		end
-	end
-	
-	def uri_debug
-		puts "--- DEBUG start ---"
-		puts "uri:\t\t" << @uri.to_s
-		puts "scheme:\t\t" << @uri.scheme
-		puts "host:\t\t" << @uri.host
-		puts "query:\t\t" << @uri.query if @uri.query
-		puts "path:\t\t" << @uri.path if @uri.path
-		puts "fragment:\t" << @uri.fragment if @uri.fragment
-		puts "--- DEBUG end ---"
-	end
+  WIKI_URL = "http://en.wiktionary.org/wiki/"
+  def initialize(word)
+    if word.empty? then raise ArgumentError, "No word given." end
+    @uri = URI(URI.escape(WIKI_URL + word.downcase))
+  end
+  
+  def translate
+    req = Net::HTTP::Get.new(@uri.path)
+    response, translations, sentences = nil, [], []
+    Net::HTTP.start(@uri.host, @uri.port) do |http|
+      response = http.request(req).body
+      
+      doc = Nokogiri::HTML(response)
+      doc.css('div#mw-content-text[lang=en] ol > li a').each do |link|
+        translations.push link.content
+      end
+      
+      translations.each do |item|
+        sentence = Nokogiri::HTML(Net::HTTP.get(URI(WIKI_URL + item)))
+        sentence.css('div#mw-content-text[lang=en] ol > li dl dd i').each do |s|
+          sentences.push s.content
+        end
+      end
+      
+    end
+    [translations, sentences]
+  end
 end
-
-word = ARGV[0]
-word ||= ''
-translation = Wiktionary.new word
-puts translation.translate.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dict
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -28,8 +28,24 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "    Dict is a client of API which you lets you use multiple dictionaries.\n
-  \   Dict is a OpenSource Project.\n"
+  \   Dict is an open source project.\n"
 email:
 - mtczerwinski@gmail.com
 executables: