qrpc 0.3.2 → 0.4.0

data/CHANGES.txt

@@ -1,4 +1,10 @@
 
+0.4.0
+* #precall and #postcall handler support on API object
+* missing default value for options in Server#start_listening
+* in some responses ID isn't available, but tried to be converted to 
+  the symbol
+
 0.3.2 (2011-08-28)
 * UUID of the client now generated in compact format
 * compatiblity corrections with OkJson
@@ -7,8 +13,7 @@
 * UUID of the jobs now generated in compact format
 
 0.3.0 (2011-02-27)
-* bad json-rpc-object dependency (but noncritical, some special cases
-    performance lag only)
+* invalid json-rpc-object dependency
 * all public methods from Client moved to Client::Dispatcher
 
 0.2.2 (2011-02-13)

data/Gemfile

@@ -11,5 +11,5 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.5.2"
+  gem "jeweler2", ">= 2.0.0"
 end

data/Gemfile.lock

@@ -3,27 +3,28 @@ GEM
   specs:
     abstract (1.0.0)
     addressable (2.2.6)
-    depq (0.4)
-    em-jack (0.1.3)
-      eventmachine
-    eventmachine (1.0.0.beta.3)
+    depq (0.6)
+    em-jack (0.1.5)
+      eventmachine (>= 0.12.10)
+    eventmachine (1.0.0.beta.4)
     git (1.2.5)
-    hash-utils (0.18.1)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
+    hash-utils (1.1.0)
+      ruby-version
+    jeweler2 (2.0.9)
       git (>= 1.2.5)
-      rake
-    json-rpc-objects (0.4.2)
+    json-rpc-objects (0.4.3)
       abstract (>= 1.0.0)
       addressable (>= 2.2.2)
       hash-utils (>= 0.18.0)
+      json-rpc-objects-json (>= 0.1.1)
+    json-rpc-objects-json (0.1.1)
       multi_json
-    macaddr (1.4.0)
-      systemu (~> 2.2.0)
-    multi_json (1.0.3)
-    rake (0.9.2)
-    systemu (2.2.0)
-    uuid (2.3.3)
+    macaddr (1.5.0)
+      systemu (>= 2.4.0)
+    multi_json (1.0.4)
+    ruby-version (0.3.1)
+    systemu (2.4.2)
+    uuid (2.3.5)
       macaddr (~> 1.0)
 
 PLATFORMS
@@ -34,6 +35,6 @@ DEPENDENCIES
   depq (>= 0.4)
   em-jack (>= 0.1.3)
   eventmachine
-  jeweler (>= 1.5.2)
+  jeweler2 (>= 2.0.0)
   json-rpc-objects (>= 0.3.3)
   uuid (>= 2.3.2)

data/README.md

@@ -74,6 +74,7 @@ Both `backtrace` and `dump` members are optional.
 Usage is simple. Look example:
 
     require "qrpc/server"
+    require "qrpc/locator"
     
     class Foo
         def subtract(x, y)
@@ -96,6 +97,10 @@ similar to fibers. Default number at one time processed jobs is 20,
 but it can be changed by setting `:max_jobs => <number>` to `#listen!` 
 or `#start_listening`.
 
+The `#precall` and `#postcall` handlers are supported on the API class
+called if API responds to them. Currently, they don't receive any
+parameters and are intended for simple call initialization only.
+
 Reponse will be put to the same queue server, to queue named 
 `qrpc-<client identifier>-output`, with structure described above. 
 
@@ -105,6 +110,7 @@ Client usage is simple too. Look example:
 
     require "eventmachine"
     require "qrpc/client"
+    require "qrpc/locator"
     
     EM::run do
         client = QRPC::Client::new QRPC::Locator::new "test"

data/Rakefile

@@ -11,7 +11,7 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
-require 'jeweler'
+require 'jeweler2'
 
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/qrpc/client/dispatcher.rb

@@ -165,11 +165,13 @@ module QRPC
                 # Results processing logic
                 processor = Proc::new do |job|
                     response = JsonRpcObjects::Response::parse(job.body)
-                    id = response.id.to_sym
                     job.delete()
                     
-                    if @jobs.include? id
-                        @jobs[id].assign_result(response)
+                    if not response.id.nil?
+                        id = response.id.to_sym
+                        if @jobs.include? id
+                            @jobs[id].assign_result(response)
+                        end
                     end
                     
                     @jobs.delete(id)

data/lib/qrpc/server.rb

@@ -169,7 +169,7 @@ module QRPC
         # @param [Hash] opts options for the server
         #
         
-        def start_listening(locator, opts)
+        def start_listening(locator, opts = { })
             @locator = locator
             @dispatcher = QRPC::Server::Dispatcher::new(opts[:max_jobs])
             

data/lib/qrpc/server/job.rb

@@ -69,7 +69,9 @@ module QRPC
                 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)
                 end

data/qrpc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "qrpc"
-  s.version = "0.3.2"
+  s.version = "0.4.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 = "2011-08-28"
+  s.date = "2012-02-19"
   s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/martinkozak/qrpc"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  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."
 
   if s.respond_to? :specification_version then
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<uuid>, [">= 2.3.2"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
+      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"])
@@ -65,7 +65,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<uuid>, [">= 2.3.2"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
     end
   else
     s.add_dependency(%q<json-rpc-objects>, [">= 0.3.3"])
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<uuid>, [">= 2.3.2"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+    s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
   end
 end
 

data/test-server.rb

@@ -4,9 +4,18 @@ require "rubygems"
 $:.push("./lib")
 
 class Foo
+    def precall
+        puts "precall"
+    end
+    
     def subtract(x, y)
+        puts "call"
         x - y
     end
+    
+    def postcall
+        puts "postcall"
+    end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qrpc
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-28 00:00:00.000000000 Z
+date: 2012-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-rpc-objects
-  requirement: &26326300 !ruby/object:Gem::Requirement
+  requirement: &19394600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *26326300
+  version_requirements: *19394600
 - !ruby/object:Gem::Dependency
   name: depq
-  requirement: &26325280 !ruby/object:Gem::Requirement
+  requirement: &19392680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *26325280
+  version_requirements: *19392680
 - !ruby/object:Gem::Dependency
   name: em-jack
-  requirement: &26324140 !ruby/object:Gem::Requirement
+  requirement: &19391280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *26324140
+  version_requirements: *19391280
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &26321580 !ruby/object:Gem::Requirement
+  requirement: &19389520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26321580
+  version_requirements: *19389520
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &26320640 !ruby/object:Gem::Requirement
+  requirement: &19407260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *26320640
+  version_requirements: *19407260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &26319580 !ruby/object:Gem::Requirement
+  requirement: &19406280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,18 +76,18 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *26319580
+  version_requirements: *19406280
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &26318540 !ruby/object:Gem::Requirement
+  name: jeweler2
+  requirement: &19405460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *26318540
+  version_requirements: *19405460
 description: 
 email: martinkozak@martinkozak.net
 executables: []
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2316095507865135214
+      hash: -3804582272102704456
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Queued JSON-RPC client and server. Works as normal RPC server, but through