minep-request 0.0.5 → 0.0.6

data/lib/minep-request.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'securerandom'
 
 require "minep-request/version"
 require "minep-request/minep"

data/lib/minep-request/minep.rb

@@ -21,6 +21,7 @@ module Minep
         args[k] = read
       end
     end
+    args["id"] = SecureRandom.uuid
     "#{request.upcase}=#{JSON.dump args}"
   end
 end

data/lib/minep-request/requests.rb

@@ -1,5 +1,3 @@
-require 'minep-request/minep'
-
 module Minep
   module Request
     CommandsInfo ||= {
@@ -16,10 +14,42 @@ module Minep
       "quit" => "Disconnect and quit the program"
     }
 
+    Status ||= [
+                "Ok",
+                "Request is unvalid",
+                "Request is unknown",
+                "Request argument is unvalid",
+                "User is unknown",
+                "Signup failed",
+                "Action is forbidden",
+                "Buffer is unknown",
+                "Someone is already logged",
+                "Request ID is missing"
+               ]
+
     def self.CommandsInfo
       CommandsInfo
     end
 
+    def self.readAndParseResponse request, socket
+      responsetab = socket.readpartial(4096).split '='
+      return $stderr.puts "Error while parsing response"if responsetab[0] != "RESPONSE"
+      response = {}
+      begin
+        response = JSON.parse responsetab[1]
+      rescue JSON::ParserError => error
+        return $stderr.puts "Error while parsing response"
+      end
+      if !response["status"] or !response["id"] or !response["info"]
+        return $stderr.puts "Error while parsing response"
+      end
+      status = response["status"]
+      if status != 0
+        return $stderr.puts "Error : #{request.upcase} : #{Status[status]}"
+      end
+      response
+    end
+
     def self.load socket, type
       args = {
         :path => "",
@@ -33,6 +63,7 @@ module Minep
       args[:line] = Minep.read.to_i
       printf "port : "
       args[:port] = Minep.read.to_i
+      args[:id] = SecureRandom.uuid
       if File.exist? args[:path]
         f = File.new args[:path]
         args[:size] = f.size
@@ -56,6 +87,14 @@ module Minep
         end
         sleep 2
         socket.write "LOAD=#{JSON.dump args}"
+        response = readAndParseResponse "LOAD", socket
+        return if response.nil?
+        if response["info"]["uuid"]
+          puts "Buffer id : #{response["info"]["uuid"]}"
+          return response["status"]
+        else
+          return $stderr.puts "Error while parsing response"
+        end
       else
         $stderr.puts "File #{args[:path]} doesn't exists"
       end
@@ -67,6 +106,9 @@ module Minep
         :pass => ""
       }
       socket.write Minep.makeMsg("AUTHENTICATE", args)
+      response = readAndParseResponse "AUTHENTICATE", socket
+      return if response.nil?
+      response["status"]
     end
 
     def self.signup socket
@@ -77,6 +119,9 @@ module Minep
         :website => ""
       }
       socket.write Minep.makeMsg("SIGNUP", args)
+      response = readAndParseResponse "SIGNUP", socket
+      return if response.nil?
+      response["status"]
     end
 
     def self.exec socket
@@ -86,6 +131,9 @@ module Minep
         :args => []
       }
       socket.write Minep.makeMsg("EXEC", args)
+      response = readAndParseResponse "EXEC", socket
+      return if response.nil?
+      response["status"]
     end
 
     def self.insert socket
@@ -94,6 +142,9 @@ module Minep
         :text => ""
       }
       socket.write Minep.makeMsg("INSERT", args)
+      response = readAndParseResponse "INSERT", socket
+      return if response.nil?
+      response["status"]
     end
 
     def self.move socket
@@ -103,6 +154,9 @@ module Minep
         :number => 0
       }
       socket.write Minep.makeMsg("MOVE", args)
+      response = readAndParseResponse "MOVE", socket
+      return if response.nil?
+      response["status"]
     end
 
     def self.backspace socket
@@ -111,6 +165,9 @@ module Minep
         :number => 0
       }
       socket.write Minep.makeMsg("BACKSPACE", args)
+      response = readAndParseResponse "BACKSPACE", socket
+      return if response.nil?
+      response["status"]
     end
 
     def self.delete socket
@@ -119,6 +176,9 @@ module Minep
         :number => 0
       }
       socket.write Minep.makeMsg("DELETE", args)
+      response = readAndParseResponse "DELETE", socket
+      return if response.nil?
+      response["status"]
     end
   end
 end

data/lib/minep-request/version.rb

@@ -1,6 +1,6 @@
 module Minep
   module Request
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
     DATE = Time.now.to_s.split[0]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minep-request
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: WEBSocket