Add classes of commands

Author: MeowNya

Diff for: Client.rb

@@ -8,20 +8,25 @@ def send_command(command, args='')
   s = TCPSocket.open(hostname, port)
   msg = merge_command(command, args)
   send_all(s, msg)
-  puts recv_all(s)
+  rs = recv_all(s)
+  puts rs
   s.close
+
+  return rs
 end
 
-send_command('random')
-send_command('random')
-send_command('color')
-send_command('color')
-send_command('color')
-send_command('timenow')
-send_command('uuid')
-send_command('md5', '0123456')
-send_command('sha256', '0123456')
-send_command('valute_USD')
-send_command('valute','USD')
-send_command('valute', 'EUR')
 
+if __FILE__ == $0 then
+  send_command('random')
+  send_command('random')
+  send_command('color')
+  send_command('color')
+  send_command('color')
+  send_command('timenow')
+  send_command('uuid')
+  send_command('md5', '0123456')
+  send_command('sha256', '0123456')
+  send_command('valute_USD')
+  send_command('valute','USD')
+  send_command('valute', 'EUR')
+end

Diff for: common.rb

@@ -1,11 +1,19 @@
 def recv_all(s)
-  raw_msg_len = s.read(8).unpack('Q').first # Unpack is 8 byte to number
-  return s.read(raw_msg_len)
+  begin
+    raw_msg_len = s.read(8).unpack('Q').first # Unpack is 8 byte to number
+    return s.read(raw_msg_len)
+  rescue
+    return ''
+  end
 end
 
 def send_all(s, msg)
-  msg = msg.to_s
-  s.write [msg.length].pack('Q') + msg # Q is 8 byte (long long int)
+  begin
+    msg = msg.to_s
+    s.write [msg.length].pack('Q') + msg # Q is 8 byte (long long int)
+  rescue
+    return
+  end
 end
 
 def parse_command(msg)
@@ -15,5 +23,8 @@ def parse_command(msg)
 end
 
 def merge_command(command, args)
+  if args.nil?
+    args = ''
+  end
   return command.ljust(10) + args
 end

Diff for: server_commands.rb

@@ -3,44 +3,161 @@
 require 'securerandom'
 require 'digest'
 
-# class Server_commands
-# end
+class BaseCommand
+  def run(args)
+    raise NotImplementedError.new ('Not Implemented')
+  end
+
+  def get_name
+    raise NotImplementedError.new ('Not Implemented')
+  end
+
+  def get_description
+    raise NotImplementedError.new ('Not Implemented')
+  end
+end
+
+
+
+class RandomCommand < BaseCommand
+  def run(args='')
+    rand(0...1000000)
+  end
+
+  def get_name
+    'random'
+  end
+
+  def get_description
+    'Return Random Value'
+  end
+end
 
-def get_currency_exchange(currency)
-  url = "http://www.cbr.ru/scripts/XML_daily.asp"
+class TimeNowCommand < BaseCommand
+  def run(args='')
+    Time.now.ctime
+  end
 
-  doc = Nokogiri::XML(URI.open(url))
+  def get_name
+    'timenow'
+  end
 
-  doc.css('Valute').each do |node|
-    ccy = node.css('CharCode').text
-    value = node.css('Value').text
-    return value.sub(',', '.').to_f.round(2).to_s if ccy == currency
+  def get_description
+    'Return Current Time'
+  end
+end
+
+class ColorCommand < BaseCommand
+  def run(args='')
+    "#%06X" % (rand * 0xffffff)
+  end
+
+  def get_name
+    'color'
+  end
+
+  def get_description
+    'Return random color in hex'
+  end
+end
+
+class UUidCommand < BaseCommand
+  def run(args='')
+    SecureRandom.uuid
+  end
+
+  def get_name
+    'uuid'
+  end
+
+  def get_description
+    'Return uuid'
+  end
+end
+
+class MD5Command < BaseCommand
+  def run(args='')
+    Digest::MD5.hexdigest(args)
+  end
+
+  def get_name
+    'md5'
+  end
+
+  def get_description
+    'Return md5'
+  end
+end
+
+class SHA254Command < BaseCommand
+  def run(args='')
+    Digest::SHA256.hexdigest(args)
+  end
+
+  def get_name
+    'sha256'
+  end
+
+  def get_description
+    'Return sha256'
+  end
+end
+
+class ValuteCommand < BaseCommand
+  def run(args='')
+    get_currency_exchange(args)
+  end
+
+  def get_name
+    'valute'
+  end
+
+  def get_description
+    'Return Valute'
+  end
+
+  private def get_currency_exchange(currency)
+    url = "http://www.cbr.ru/scripts/XML_daily.asp"
+
+    doc = Nokogiri::XML(URI.open(url))
+
+    doc.css('Valute').each do |node|
+      ccy = node.css('CharCode').text
+      value = node.css('Value').text
+      return value.sub(',', '.').to_f.round(2).to_s if ccy == currency
+    end
+    return "Not found currency #{currency}"
   end
-  return "Not found currency #{currency}"
 end
 
 
 def process_command(command, args)
   rs = ''
   case command
   when 'random' then
-    rs = rand(0...1000000)
+    rs = RandomCommand.new.run(0...1000000)
   when 'timenow' then
-    rs = Time.now.ctime
+    rs = TimeNowCommand.new.run
   when 'color' then
-    rs = "#%06X" % (rand * 0xffffff)
+    rs = ColorCommand.new.run
   when 'uuid' then
-    rs = SecureRandom.uuid
+    rs = UUidCommand.new.run
   when 'md5' then
-    rs = Digest::MD5.hexdigest(args)
+    rs = MD5Command.new.run(args)
   when 'sha256' then
-    rs = Digest::SHA256.hexdigest(args)
+    rs = SHA254Command.new.run(args)
   when 'valute' then
-    rs = get_currency_exchange(args)
+    rs = ValuteCommand.new.run(args)
   when 'valute_USD' then
-    rs = get_currency_exchange('USD')
+    rs = ValuteCommand.new.run('USD')
   else
     rs = "Unrecognized command '#{command}'"
   end
   return rs
 end
+
+
+if __FILE__ == $0 then
+  command = RandomCommand.new
+  puts command.run
+end