qrpc 0.1.1 → 0.2.0

data/lib/qrpc/protocol/request.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+require "json-rpc-objects/request"
+require "qrpc/general"
+require "qrpc/protocol/qrpc-object"
+
+##
+# General QRPC module.
+#
+
+module QRPC
+    
+    ##
+    # JSON RPC helper module.
+    # @since 0.2.0
+    #
+    
+    module Protocol
+
+        ##
+        # QRPC JSON-RPC request. Extends +JsonRpcObjects::Request+.
+        # See its documentation for additional reference.
+        #
+        # @since 0.2.0
+        #
+        
+        class Request < JsonRpcObjects::Request
+            
+            ##
+            # Creates new QRPC request.
+            #
+            # @param [Symbol] client_id  client (session) ID
+            # @param [Symbol] method  job method name
+            # @param [Array] arguments  array of arguments for job
+            # @param [Integer] priority  job priority
+            # @param [Proc] callback  result callback
+            # @return [QRPC::Protocol::Request] new protocol request object
+            #
+            
+            def self.create(client_id, id, method, arguments = [ ], priority = QRPC::DEFAULT_PRIORITY)
+                qrpc = QRPC::Protocol::QrpcObject::create(:client => client_id, :priority => priority)
+                super(method, arguments, :id => id, :qrpc => qrpc)
+            end
+        end
+                
+    end
+end

data/lib/qrpc/server.rb

@@ -3,7 +3,8 @@ require "qrpc/general"
 require "qrpc/server/job"
 require "qrpc/server/dispatcher"
 require "qrpc/locator"
-require "em-beanstalk"
+require "qrpc/protocol/qrpc-object"
+require "em-jack"
 require "eventmachine"
 require "base64"
 
@@ -132,7 +133,7 @@ module QRPC
         def finalize!
             if not @input_queue.nil?
                 @input_queue.watch("default") do
-                    @input_queue.ignore(self.input_name.to_s) do
+                    @input_queue.ignore(@input_name.to_s) do
                         @input_queue.close
                     end
                 end
@@ -187,14 +188,12 @@ module QRPC
         
         ##
         # Returns input queue.
-        # (Callable from EM only.)
-        #
         # @param [Proc] block block to which will be input queue given
         #
         
         def input_queue(&block)
             if not @input_queue
-                @input_queue = EM::Beanstalk::new(:host => @locator.host, :port => @locator.port)
+                @input_queue = EMJack::Connection::new(:host => @locator.host, :port => @locator.port)
                 @input_queue.watch(self.input_name.to_s) do
                     @input_queue.ignore("default") do
                         block.call(@input_queue)
@@ -207,14 +206,12 @@ module QRPC
         
         ##
         # Returns output queue.
-        # (Callable from EM only.)
-        #
-        # @return [EM::Beanstalk] output queue Beanstalk connection
+        # @return [EMJack::Connection] output queue Beanstalk connection
         #
         
         def output_queue
             if @output_queue.nil?
-                @output_queue = EM::Beanstalk::new(:host => @locator.host, :port => @locator.port)
+                @output_queue = EMJack::Connection::new(:host => @locator.host, :port => @locator.port)
             end
             
             return @output_queue
@@ -245,7 +242,7 @@ module QRPC
         # Returns input name.
         #
         # @return [Symbol] input name
-        # @since 0.2.0
+        # @since 0.1.1
         #
         
         def input_name

data/lib/qrpc/server/job.rb

@@ -3,6 +3,9 @@ require "eventmachine"
 require "json-rpc-objects/request"
 require "json-rpc-objects/response"
 require "json-rpc-objects/error"
+require "qrpc/general"
+require "qrpc/protocol/qrpc-object"
+require "qrpc/protocol/exception-data"
 
 
 ##
@@ -21,9 +24,10 @@ module QRPC
             
             ##
             # Indicates default priority.
+            # @deprecated (since 0.2.0)
             #
             
-            DEFAULT_PRIORITY = 50
+            DEFAULT_PRIORITY = QRPC::DEFAULT_PRIORITY
             
             ##
             # Holds beanstalk job.
@@ -71,12 +75,12 @@ module QRPC
                 end
 
                 response = request.class::version.response::create(result, error, :id => request.id)
-                response.qrpc = { :version => :"1.0" }
+                response.qrpc = QRPC::Protocol::QrpcObject::create
                 
                 @job.delete()
                 self.set_deferred_status(:succeeded, response.to_json)
             end
-            
+
             ##
             # Returns job in request form.
             # @return [JsonRpcObjects::Generic::Object] request associated to job
@@ -102,7 +106,7 @@ module QRPC
             def priority
                 priority = self.request.qrpc["priority"]
                 if priority.nil?
-                    priority = self.class::DEFAULT_PRIORITY
+                    priority = QRPC::DEFAULT_PRIORITY
                 else
                     priority = priority.to_i
                 end
@@ -127,16 +131,7 @@ module QRPC
             #
             
             def generate_error(request, exception)
-                data = {
-                    :name => exception.class.name,
-                    :message => exception.message,
-                    :backtrace => exception.backtrace.map { |s| Base64.encode64(s) },
-                    :dump => {
-                        :raw => Base64.encode64(Marshal.dump(exception)),
-                        :format => :Ruby,
-                    }
-                }
-                
+                data = QRPC::Protocol::ExceptionData::create(exception)
                 request.class::version.error::create(100, "exception raised during processing the request", :error => data)
             end
               

data/qrpc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qrpc}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Kozák"]
-  s.date = %q{2011-01-29}
+  s.date = %q{2011-02-04}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    "CHANGES.txt",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -24,8 +25,14 @@ Gem::Specification.new do |s|
     "Rakefile",
     "TODO.md",
     "VERSION",
+    "lib/qrpc/client.rb",
+    "lib/qrpc/client/exception.rb",
+    "lib/qrpc/client/job.rb",
     "lib/qrpc/general.rb",
     "lib/qrpc/locator.rb",
+    "lib/qrpc/protocol/exception-data.rb",
+    "lib/qrpc/protocol/qrpc-object.rb",
+    "lib/qrpc/protocol/request.rb",
     "lib/qrpc/server.rb",
     "lib/qrpc/server/dispatcher.rb",
     "lib/qrpc/server/job.rb",
@@ -36,32 +43,31 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/martinkozak/qrpc}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Queued JSON-RPC 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 = %q{1.5.0}
+  s.summary = %q{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.}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     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.1.2"])
+      s.add_runtime_dependency(%q<json-rpc-objects>, [">= 0.3.1"])
       s.add_runtime_dependency(%q<depq>, [">= 0.4"])
-      s.add_runtime_dependency(%q<em-beanstalk>, [">= 0.0.10"])
+      s.add_runtime_dependency(%q<em-jack>, [">= 0.1.3"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
     else
-      s.add_dependency(%q<json-rpc-objects>, [">= 0.1.2"])
+      s.add_dependency(%q<json-rpc-objects>, [">= 0.3.1"])
       s.add_dependency(%q<depq>, [">= 0.4"])
-      s.add_dependency(%q<em-beanstalk>, [">= 0.0.10"])
+      s.add_dependency(%q<em-jack>, [">= 0.1.3"])
       s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     end
   else
-    s.add_dependency(%q<json-rpc-objects>, [">= 0.1.2"])
+    s.add_dependency(%q<json-rpc-objects>, [">= 0.3.1"])
     s.add_dependency(%q<depq>, [">= 0.4"])
-    s.add_dependency(%q<em-beanstalk>, [">= 0.0.10"])
+    s.add_dependency(%q<em-jack>, [">= 0.1.3"])
     s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/test-client.rb

@@ -1,4 +1,28 @@
 # encoding: utf-8
+
+$:.push("./lib")
+require "qrpc/client"
+require "qrpc/locator"
+require "eventmachine"
+
+EM::run do
+    client = QRPC::Client::new QRPC::Locator::new :test
+    puts client.inspect
+
+    client.subtract(2, 3) do |i|
+        puts i
+    end
+    
+    client.subtract(3, 2) do |i|
+        puts i
+    end
+    
+    client.something_bad do |i|
+        puts i
+    end
+end
+
+=begin
 require "beanstalk-client"
 require "json-rpc-objects/request"
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: qrpc
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 +01:00
+date: 2011-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,11 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -39,25 +31,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
         version: "0.4"
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: em-beanstalk
+  name: em-jack
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 10
-        version: 0.0.10
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: *id003
@@ -68,10 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 10
         version: 0.12.10
   type: :runtime
   prerelease: false
@@ -83,10 +64,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   prerelease: false
@@ -98,10 +75,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :development
   prerelease: false
@@ -117,6 +90,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- CHANGES.txt
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -124,8 +98,14 @@ files:
 - Rakefile
 - TODO.md
 - VERSION
+- lib/qrpc/client.rb
+- lib/qrpc/client/exception.rb
+- lib/qrpc/client/job.rb
 - lib/qrpc/general.rb
 - lib/qrpc/locator.rb
+- lib/qrpc/protocol/exception-data.rb
+- lib/qrpc/protocol/qrpc-object.rb
+- lib/qrpc/protocol/request.rb
 - lib/qrpc/server.rb
 - lib/qrpc/server/dispatcher.rb
 - lib/qrpc/server/job.rb
@@ -146,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3054544507503324892
+      hash: -3127609250093073389
       segments: 
       - 0
       version: "0"
@@ -155,15 +135,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: Queued JSON-RPC 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.
+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.
 test_files: []