qrpc 0.4.0 → 0.9.0

data/lib/qrpc/server/job.rb

@@ -47,16 +47,34 @@ module QRPC
             
             @api
             
+            ##
+            # Indicates API methods synchronicity.
+            # @since 0.4.0
+            #
+            
+            @synchronicity
+            
+            ##
+            # Holds protocol handling instance.
+            # @since 0.9.0
+            #
+            
+            @protocol
+            
             ##
             # Constructor.
             #
             # @param [Object] object which will serve as API
+            # @param [Symbol] synchronicity  API methods synchronicity
             # @param [EM::Beanstalk::Job] job beanstalk job
+            # @param [QRPC::Protocol::Abstract] protocol protocol handling instance
             #
             
-            def initialize(api, job)
-                @api = api
+            def initialize(api, synchronicity, job, protocol = QRPC::default_protocol)
+                @synchronicity = synchronicity
+                @protocol = protocol
                 @job = job
+                @api = api
             end
             
             ##
@@ -68,19 +86,47 @@ module QRPC
                 error = nil
                 request = self.request
                 
-                begin
-                    @api.precall if @api.respond_to? :precall
-                    result = @api.send(request.method, *request.params)
-                    @api.postcall if @api.respond_to? :postcall
-                rescue ::Exception => e
-                    error = self.generate_error(request, e)
+                if not request.notification?
+                    finalize = Proc::new do
+                        options = {
+                            :result => result,
+                            :error => error,
+                            :request => request
+                        }
+                        
+                        response = @protocol.response::new(options)
+                        self.set_deferred_status(:succeeded, response.serialize)
+                    end
                 end
 
-                response = request.class::version.response::create(result, error, :id => request.id)
-                response.qrpc = QRPC::Protocol::QrpcObject::create
                 
-                @job.delete()
-                self.set_deferred_status(:succeeded, response.to_json)
+                if @synchronicity == :synchronous
+                    begin
+                        result = @api.send(request.method, *request.params)
+                    rescue ::Exception => e
+                        if not request.notification?
+                            error = self.generate_error(request, e)
+                        end
+                    end
+                    
+                    if not request.notification?
+                        finalize.call()
+                    end
+                else                
+                    begin
+                        @api.send(request.method, *request.params) do |res|
+                            if not request.notification?
+                                result = res
+                                finalize.call()
+                            end
+                        end
+                    rescue ::Exception => e
+                        if not request.notification?
+                            error = self.generate_error(request, e)
+                            finalize.call()
+                        end
+                    end                    
+                end
             end
 
             ##
@@ -90,10 +136,10 @@ module QRPC
             
             def request
                 if @request.nil?
-                    @request = JsonRpcObjects::Request::parse(@job.body)
+                    @request = @protocol.request::parse(@job)
+                else
+                    @request
                 end
-                
-                return @request
             end
             
             ##
@@ -106,7 +152,7 @@ module QRPC
             #
             
             def priority
-                priority = self.request.qrpc["priority"]
+                priority = self.request.priority
                 if priority.nil?
                     priority = QRPC::DEFAULT_PRIORITY
                 else
@@ -122,7 +168,7 @@ module QRPC
             #
             
             def client
-                self.request.qrpc["client"]
+                self.request.client
             end
             
             
@@ -133,8 +179,12 @@ module QRPC
             #
             
             def generate_error(request, exception)
-                data = QRPC::Protocol::ExceptionData::create(exception)
-                request.class::version.error::create(100, "exception raised during processing the request", :error => data)
+                options = {
+                    :exception => exception,
+                    :request => request
+                }
+                
+                @protocol.error::new(options)
             end
               
         end

data/qrpc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "qrpc"
-  s.version = "0.4.0"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Koz\u{e1}k"]
-  s.date = "2012-02-19"
+  s.date = "2012-05-24"
   s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -30,49 +30,85 @@ Gem::Specification.new do |s|
     "lib/qrpc/client/exception.rb",
     "lib/qrpc/client/job.rb",
     "lib/qrpc/general.rb",
+    "lib/qrpc/generator/object-id.rb",
+    "lib/qrpc/generator/uuid.rb",
     "lib/qrpc/locator.rb",
-    "lib/qrpc/protocol/exception-data.rb",
-    "lib/qrpc/protocol/qrpc-object.rb",
-    "lib/qrpc/protocol/request.rb",
+    "lib/qrpc/locator/em-jack.rb",
+    "lib/qrpc/locator/evented-queue.rb",
+    "lib/qrpc/protocol/abstract.rb",
+    "lib/qrpc/protocol/abstract/error.rb",
+    "lib/qrpc/protocol/abstract/object.rb",
+    "lib/qrpc/protocol/abstract/request.rb",
+    "lib/qrpc/protocol/abstract/response.rb",
+    "lib/qrpc/protocol/json-rpc.rb",
+    "lib/qrpc/protocol/json-rpc/error.rb",
+    "lib/qrpc/protocol/json-rpc/native/exception-data.rb",
+    "lib/qrpc/protocol/json-rpc/native/qrpc-object.rb",
+    "lib/qrpc/protocol/json-rpc/request.rb",
+    "lib/qrpc/protocol/json-rpc/response.rb",
+    "lib/qrpc/protocol/object.rb",
+    "lib/qrpc/protocol/object/error.rb",
+    "lib/qrpc/protocol/object/request.rb",
+    "lib/qrpc/protocol/object/response.rb",
     "lib/qrpc/server.rb",
     "lib/qrpc/server/dispatcher.rb",
     "lib/qrpc/server/job.rb",
     "qrpc.gemspec",
+    "test-both.rb",
     "test-client.rb",
     "test-server.rb"
   ]
   s.homepage = "http://github.com/martinkozak/qrpc"
   s.licenses = ["MIT"]
+  s.post_install_message = "\nQRPC: API of the 0.9.x version (and 1.0 in future) is partialy incompatible with the older versions. Modifications of your current applications may be necessary for upgrading them to the latest version. \n\n"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
-  s.summary = "Queued JSON-RPC client and server. Works as normal RPC server, but through queue interface, so allows highly scalable, distributed and asynchronous remote API implementation and fast data processing. It's based on eventmachine and beanstalkd, so it's fast and thread safe."
+  s.rubygems_version = "1.8.24"
+  s.summary = "Queued RPC client and server. Works as normal RPC server, but through queue interface, so allows highly scalable, distributed and asynchronous remote API implementation and fast data processing. It's based on EventMachine and typically on Beanstalk, so it's fast and thread safe."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json-rpc-objects>, [">= 0.3.3"])
-      s.add_runtime_dependency(%q<depq>, [">= 0.4"])
-      s.add_runtime_dependency(%q<em-jack>, [">= 0.1.3"])
+      s.add_runtime_dependency(%q<json-rpc-objects>, [">= 0.4.1"])
+      s.add_runtime_dependency(%q<PriorityQueue>, [">= 0.1.2"])
+      s.add_runtime_dependency(%q<unified-queues>, [">= 0"])
+      s.add_runtime_dependency(%q<evented-queue>, [">= 0"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
-      s.add_runtime_dependency(%q<uuid>, [">= 2.3.2"])
+      s.add_runtime_dependency(%q<hash-utils>, [">= 1.1.0"])
+      s.add_runtime_dependency(%q<em-wrapper>, [">= 0"])
+      s.add_runtime_dependency(%q<abstract>, [">= 0"])
+      s.add_runtime_dependency(%q<em-jack>, [">= 0.1.3"])
+      s.add_runtime_dependency(%q<hashie>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<uuid>, [">= 2.0.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler2>, [">= 2.0.0"])
     else
-      s.add_dependency(%q<json-rpc-objects>, [">= 0.3.3"])
-      s.add_dependency(%q<depq>, [">= 0.4"])
-      s.add_dependency(%q<em-jack>, [">= 0.1.3"])
+      s.add_dependency(%q<json-rpc-objects>, [">= 0.4.1"])
+      s.add_dependency(%q<PriorityQueue>, [">= 0.1.2"])
+      s.add_dependency(%q<unified-queues>, [">= 0"])
+      s.add_dependency(%q<evented-queue>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0"])
-      s.add_dependency(%q<uuid>, [">= 2.3.2"])
+      s.add_dependency(%q<hash-utils>, [">= 1.1.0"])
+      s.add_dependency(%q<em-wrapper>, [">= 0"])
+      s.add_dependency(%q<abstract>, [">= 0"])
+      s.add_dependency(%q<em-jack>, [">= 0.1.3"])
+      s.add_dependency(%q<hashie>, [">= 1.0.0"])
+      s.add_dependency(%q<uuid>, [">= 2.0.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
     end
   else
-    s.add_dependency(%q<json-rpc-objects>, [">= 0.3.3"])
-    s.add_dependency(%q<depq>, [">= 0.4"])
-    s.add_dependency(%q<em-jack>, [">= 0.1.3"])
+    s.add_dependency(%q<json-rpc-objects>, [">= 0.4.1"])
+    s.add_dependency(%q<PriorityQueue>, [">= 0.1.2"])
+    s.add_dependency(%q<unified-queues>, [">= 0"])
+    s.add_dependency(%q<evented-queue>, [">= 0"])
     s.add_dependency(%q<eventmachine>, [">= 0"])
-    s.add_dependency(%q<uuid>, [">= 2.3.2"])
+    s.add_dependency(%q<hash-utils>, [">= 1.1.0"])
+    s.add_dependency(%q<em-wrapper>, [">= 0"])
+    s.add_dependency(%q<abstract>, [">= 0"])
+    s.add_dependency(%q<em-jack>, [">= 0.1.3"])
+    s.add_dependency(%q<hashie>, [">= 1.0.0"])
+    s.add_dependency(%q<uuid>, [">= 2.0.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
   end

data/test-both.rb

@@ -0,0 +1,85 @@
+# encoding: utf-8
+
+$:.unshift("./lib")
+$:.push("./lib")
+
+require "rubygems"
+require "qrpc/server"
+require "qrpc/client"
+require "qrpc/locator/evented-queue"
+require "qrpc/locator/em-jack"
+require "eventmachine"
+
+#require "qrpc/generator/uuid"
+require "qrpc/generator/object-id"
+require "qrpc/protocol/object"
+
+#require "json-rpc-objects/serializer/bson"
+require "json-rpc-objects/serializer/json"
+#require "json-rpc-objects/serializer/yaml"
+#require "json-rpc-objects/serializer/psych"
+#require "json-rpc-objects/serializer/marshal"
+require "json-rpc-objects/serializer/msgpack"
+
+EM::run do
+    generator = QRPC::Generator::ObjectID::new
+    queue = QRPC::Locator::EventedQueueLocator::new("test")
+    #queue1 = QRPC::Locator::EMJackLocator::new("test")
+    #queue2 = QRPC::Locator::EMJackLocator::new("test")
+    protocol = QRPC::Protocol::Object::new
+
+    ###############
+    # Server
+    ###############
+    
+    class Foo
+        def subtract(x, y)
+            puts "response"
+            x - y
+        end
+    end
+
+    server = QRPC::Server::new(Foo::new, :synchronous, protocol)
+    server.listen! queue
+    
+    ###############
+    # Client
+    ###############
+    
+    client = QRPC::Client::new(queue, generator, protocol)
+#    puts client.inspect
+
+#    client.something_bad do |i|
+#        puts i
+#    end
+
+    count = 0
+
+    make = Proc::new do
+        puts "request"
+        
+        client.subtract(2, 3) do |i|
+            puts "x", i
+            count += 1
+        end
+
+        #count += 1  
+        #p queue.queue
+
+        if count < 7  
+            EM::next_tick do
+                make.call()
+            end
+        else
+            #EM::stop
+        end
+    end
+    
+    make.call()
+    
+#    client.subtract(2, 3) do |i|
+#        puts "x"
+#        puts i
+#    end
+    
+end

data/test-client.rb

@@ -3,13 +3,28 @@
 require "rubygems"
 
 $:.push("./lib")
+$:.unshift("./lib")
 require "qrpc/client"
-require "qrpc/locator"
+require "qrpc/locator/em-jack"
 require "eventmachine"
 
+#require "qrpc/generator/uuid"
+require "qrpc/generator/object-id"
+
+require "qrpc/protocol/json-rpc"
+#require "json-rpc-objects/serializer/bson"
+#require "json-rpc-objects/serializer/psych"
+require "json-rpc-objects/serializer/json"
+#require "json-rpc-objects/serializer/yaml"
+#require "json-rpc-objects/serializer/marshal"
+require "json-rpc-objects/serializer/msgpack"
 
 EM::run do
-    client = QRPC::Client::new QRPC::Locator::new :test
+    generator = QRPC::Generator::ObjectID::new
+    locator = QRPC::Locator::EMJackLocator::new(:test)
+    serializer = JsonRpcObjects::Serializer::JSON::new
+    protocol = QRPC::Protocol::JsonRpc::new(:serializer => serializer)
+    client = QRPC::Client::new(locator, generator, protocol)
 #    puts client.inspect
 
 #    client.something_bad do |i|
@@ -18,16 +33,25 @@ EM::run do
 
     count = 0
 
-    10000.times do
+    make = Proc::new do
         client.subtract(2, 3) do |i|
             puts i
-            count += 1
-            if count >= 10000
-                EM::stop
+            if i == 4
+                count += 1
+            end
+        end
+
+        if count < 10
+            EM::next_tick do
+                make.call()
             end
+        else
+            EM::stop
         end
     end
     
+    make.call()
+    
 #    client.subtract(3, 2) do |i|
 #        puts i
 #    end
@@ -41,10 +65,13 @@ b = Beanstalk::Pool::new(["localhost:11300"])
 req1 = JsonRpcObjects::Request::create(:subtract, [2, 3], :id => "job1", :qrpc => { :version => "1.0", :client => :cc })
 req2 = JsonRpcObjects::Request::create(:something_bad, nil, :id => "job2", :qrpc => { :version => "1.0", :client => :cc, :priority => 20 })
 
+req1.serializer = JsonRpcObjects::Serializer::BSON::new
+req2.serializer = JsonRpcObjects::Serializer::BSON::new
+
 b.use("qrpc-test-input")
 b.watch("qrpc-cc-output")
-b.put(req1.to_json)
-b.put(req2.to_json)
+b.put(req1.serialize)
+b.put(req2.serialize)
 
 job = b.reserve
 puts job.body
@@ -54,6 +81,7 @@ job = b.reserve
 puts job.body
 job.delete
 =end
+
 =begin
 100.times do
     b.put(req1.to_json)

data/test-server.rb

@@ -1,24 +1,29 @@
 # encoding: utf-8
 
 require "rubygems"
+
 $:.push("./lib")
+$:.unshift("./lib")
+
+require "qrpc/protocol/json-rpc"
+#require "json-rpc-objects/serializer/bson"
+require "json-rpc-objects/serializer/json"
+#require "json-rpc-objects/serializer/yaml"
+#require "json-rpc-objects/serializer/psych"
+#require "json-rpc-objects/serializer/marshal"
+require "json-rpc-objects/serializer/msgpack"
 
 class Foo
-    def precall
-        puts "precall"
-    end
-    
     def subtract(x, y)
-        puts "call"
-        x - y
-    end
-    
-    def postcall
-        puts "postcall"
+        x - y + 5
     end
 end
 
 
 require "qrpc/server"
-server = QRPC::Server::new(Foo::new)
-server.listen! QRPC::Locator::new("test"), :max_jobs => 0
+require "qrpc/locator/em-jack"
+
+serializer = JsonRpcObjects::Serializer::JSON::new
+protocol = QRPC::Protocol::JsonRpc::new(:serializer => serializer)
+server = QRPC::Server::new(Foo::new, :synchronous, protocol)
+server.listen! QRPC::Locator::EMJackLocator::new("test")