qrpc 0.4.0 → 0.9.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qrpc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,44 +9,123 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-rpc-objects
-  requirement: &19394600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *19394600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: depq
-  requirement: &19392680 !ruby/object:Gem::Requirement
+  name: PriorityQueue
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *19392680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: em-jack
-  requirement: &19391280 !ruby/object:Gem::Requirement
+  name: unified-queues
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19391280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: evented-queue
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &19389520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hash-utils
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: em-wrapper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: abstract
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +133,63 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19389520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-jack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &19407260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19407260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19406280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +197,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19406280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler2
-  requirement: &19405460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +213,12 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *19405460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: 
 email: martinkozak@martinkozak.net
 executables: []
@@ -110,20 +241,39 @@ files:
 - 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
 homepage: http://github.com/martinkozak/qrpc
 licenses:
 - MIT
-post_install_message: 
+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"
 rdoc_options: []
 require_paths:
 - lib
@@ -135,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3804582272102704456
+      hash: -3326613635152724256
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,11 +294,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 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,
+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.
 test_files: []

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

@@ -1,227 +0,0 @@
-# encoding: utf-8
-require "json-rpc-objects/generic/object"
-require "qrpc/protocol/qrpc-object"
-require "base64"
-
-##
-# General QRPC module.
-#
-
-module QRPC
-    
-    ##
-    # JSON RPC helper module.
-    # @since 0.2.0
-    #
-
-    module Protocol
-
-        ##
-        # Exception data QRPC JSON-RPC object.
-        # @since 0.2.0
-        #
-        
-        class ExceptionData < JsonRpcObjects::Generic::Object
-        
-            ##
-            # Holds JSON-RPC version indication.
-            #
-            
-            VERSION = QRPC::Protocol::QrpcObject::VERSION
-            
-            ##
-            # Holds exception name.
-            # @return [Symbol]
-            #
-            
-            attr_accessor :name
-            @name
-            
-            ##
-            # Holds exception message.
-            # @return [String]
-            #
-            
-            attr_accessor :message
-            @message
-            
-            ##
-            # Holds backtrace. See readme for structure details.
-            # @return [Array]
-            #
-            
-            attr_accessor :backtrace
-            @backtrace
-            
-            ##
-            # Holds native dump. See readme for structure details.
-            # @return [Class]
-            #
-            
-            attr_accessor :dump
-            @dump
-            
-            ##
-            # Indicates, data are encoded and should be decoded.
-            #
-            
-            @__encoded
-            
-            ##
-            # Creates new QRPC JSON-RPC object.
-            #
-            # @overload create(exception, nil, opts = { })
-            #   Creates from exception.
-            #   @param [Exception] exception exception object
-            #   @param [NilClass] nil (not applicable)
-            #   @param [Hash] opts optional members of object
-            # @overload create(name, message, opts = { })
-            #   Creates from exception description.
-            #   @param [Symbol, String] name exception name
-            #   @param [Object] exception message
-            #   @param [Hash] opts optional members of object
-            # @return [QRPC::Protocol::ExceptionData]  new instance
-            #
-            
-            def self.create(arg1, message = nil, opts = { })
-                if arg1.kind_of? ::Exception
-                    mode = :decoded
-                    data = {
-                        :name => arg1.class.name,
-                        :message => arg1.message,
-                        :backtrace => arg1.backtrace,
-                        :dump => {
-                            "format" => "ruby",
-                            "object" => arg1
-                        }
-                    }
-                else
-                    mode = :encoded
-                    data = {
-                        :name => arg1,
-                        :message => message
-                    }
-                end
-                
-                data.merge! opts
-                return self::new(data, mode)
-            end
-            
-            ##
-            # Constructor.
-            # @param [Hash] data for initializing the object
-            #
-            
-            def initialize(data, mode = :encoded)
-                @__encoded = (mode == :encoded)
-                super(data)
-            end
-            
-            ##
-            # Checks correctness of the object data.
-            #
-            
-            def check!
-                self.normalize!
-
-                if not @name.kind_of? Symbol
-                    raise Exception::new("Exception name is expected to be Symbol or convertable to symbol.")
-                end
-                
-                if not @backtrace.nil? and not @backtrace.kind_of? Array
-                    raise Exception::new("Backtrace is expected to be an Array.")
-                end
-                
-                if not @dump.nil? 
-                    if @dump.object.nil? and @dump.raw.nil?
-                        raise Exception::new("Either object or RAW form of the dump must be set if dump is set.")
-                    elsif @dump.format.nil? or not @dump.format.kind_of? Symbol
-                        raise Exception::new("Dump format must be set and must be Symbol.")
-                    end
-                end
-            end
-                        
-            ##
-            # Renders data to output form.
-            # @return [Hash] with data of object
-            #
-
-            def output
-                result = { 
-                    :name => @name.to_s,
-                    :message => @message,
-                }
-                
-                # Backtrace
-                if @backtrace.kind_of? Array
-                    result[:backtrace] = @backtrace.map { |i| Base64.encode64(i) }
-                end
-                   
-                # Dump
-                if not @dump.nil?
-                    result[:dump] = {
-                        :format => @dump.format,
-                    }
-                    
-                    if not dump.object.nil?
-                        raw = Base64.encode64(Marshal.dump(dump.object))
-                    else
-                        raw = dump.raw
-                    end
-                    
-                    result[:dump][:raw] = raw
-                end
-                
-                return result
-            end
-       
-
-            protected
-            
-            ##
-            # Assigns data.
-            #
-
-            def data=(value, mode = nil)
-                data = __convert_data(value, mode)
-                
-                # Required
-                @name = data[:name]
-                @message = data[:message]
-                
-                # Backtrace
-                backtrace = data[:backtrace]
-                
-                if @__encoded and (backtrace.kind_of? Array)
-                    @backtrace = backtrace.map { |i| Base64.decode64(i) }
-                end
-                
-                # Dump
-                dump = data[:dump]
-                   
-                if dump.kind_of? Hash
-                    @dump = Struct::new(:format, :raw, :object)::new(dump["format"].downcase.to_sym, dump["raw"], dump["object"])
-                    
-                    if not @dump.raw.nil? and @dump.object.nil? and (@dump.format == :ruby)
-                        @dump.object = Marshal.load(Base64.decode64(@dump.raw))
-                    end
-                end
-                
-            end
-
-            ##
-            # Converts data to standard (defined) format.
-            #
-            
-            def normalize!
-                @name = @name.to_sym
-                
-                if not @dump.nil?
-                    @dump.format = @dump.format.to_sym
-                end
-            end
-            
-        end
-                
-    end
-end