qrpc 0.3.1 → 0.3.2

data/CHANGES.txt

@@ -1,4 +1,8 @@
 
+0.3.2 (2011-08-28)
+* UUID of the client now generated in compact format
+* compatiblity corrections with OkJson
+
 0.3.1 (2011-08-04)
 * UUID of the jobs now generated in compact format
 

data/Gemfile.lock

@@ -6,9 +6,9 @@ GEM
     depq (0.4)
     em-jack (0.1.3)
       eventmachine
-    eventmachine (0.12.10)
+    eventmachine (1.0.0.beta.3)
     git (1.2.5)
-    hash-utils (0.18.0)
+    hash-utils (0.18.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -18,10 +18,12 @@ GEM
       addressable (>= 2.2.2)
       hash-utils (>= 0.18.0)
       multi_json
-    macaddr (1.0.0)
+    macaddr (1.4.0)
+      systemu (~> 2.2.0)
     multi_json (1.0.3)
     rake (0.9.2)
-    uuid (2.3.2)
+    systemu (2.2.0)
+    uuid (2.3.3)
       macaddr (~> 1.0)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/qrpc/client/dispatcher.rb

@@ -263,7 +263,7 @@ module QRPC
             
             def id
                 if @id.nil?
-                    @id = UUID.generate.to_sym
+                    @id = UUID.generate(:compact).to_sym
                 end
                 
                 return @id

data/lib/qrpc/protocol/qrpc-object.rb

@@ -67,7 +67,7 @@ module QRPC
                 end
                 
                 if not @client.nil?
-                    result["client"] = @client
+                    result["client"] = @client.to_s
                 end
                 
                 return result

data/lib/qrpc/protocol/request.rb

@@ -38,7 +38,7 @@ module QRPC
             
             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)
+                super(method, arguments, :id => id.to_s, :qrpc => qrpc.output)
             end
         end
                 

data/qrpc.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{qrpc}
-  s.version = "0.3.1"
+  s.name = "qrpc"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Martin Kozák}]
-  s.date = %q{2011-08-04}
-  s.email = %q{martinkozak@martinkozak.net}
+  s.authors = ["Martin Koz\u{e1}k"]
+  s.date = "2011-08-28"
+  s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -41,11 +41,11 @@ Gem::Specification.new do |s|
     "test-client.rb",
     "test-server.rb"
   ]
-  s.homepage = %q{http://github.com/martinkozak/qrpc}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  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.}
+  s.homepage = "http://github.com/martinkozak/qrpc"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  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
     s.specification_version = 3

data/test-client.rb

@@ -1,11 +1,13 @@
 # encoding: utf-8
 
+require "rubygems"
+
 $:.push("./lib")
 require "qrpc/client"
 require "qrpc/locator"
 require "eventmachine"
 
-=begin
+
 EM::run do
     client = QRPC::Client::new QRPC::Locator::new :test
 #    puts client.inspect
@@ -18,7 +20,7 @@ EM::run do
 
     10000.times do
         client.subtract(2, 3) do |i|
-#            puts i
+            puts i
             count += 1
             if count >= 10000
                 EM::stop
@@ -30,8 +32,8 @@ EM::run do
 #        puts i
 #    end
 end
-=end
 
+=begin
 require "beanstalk-client"
 require "json-rpc-objects/request"
 
@@ -51,7 +53,7 @@ job.delete
 job = b.reserve
 puts job.body
 job.delete
-
+=end
 =begin
 100.times do
     b.put(req1.to_json)

data/test-server.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+
+require "rubygems"
 $:.push("./lib")
 
 class Foo

metadata

@@ -1,104 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: qrpc
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  version: 0.3.1
 platform: ruby
-authors: 
-- "Martin Koz\xC3\xA1k"
+authors:
+- Martin Kozák
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json-rpc-objects
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &26326300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26326300
+- !ruby/object:Gem::Dependency
   name: depq
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &26325280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26325280
+- !ruby/object:Gem::Dependency
   name: em-jack
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &26324140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26324140
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &26321580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26321580
+- !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &26320640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26320640
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &26319580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26319580
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &26318540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *26318540
 description: 
 email: martinkozak@martinkozak.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - CHANGES.txt
 - Gemfile
@@ -124,34 +121,34 @@ files:
 - test-client.rb
 - test-server.rb
 homepage: http://github.com/martinkozak/qrpc
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3574050090590324114
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2316095507865135214
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-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.
+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: []
-