qrpc 0.1.0 → 0.1.1

data/TODO.md

@@ -1 +1,3 @@
-* general queue interface for ability to use more queue servers.
+* general queue interface for ability to use more queue servers (starling, redis, ...)
+* copyright headers to all files
+* add @since 0.1.0 to all methods which haven't later @since

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/qrpc/general.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+##
+# General QRPC module.
+#
+
+module QRPC
+
+    ##
+    # Prefix for handled queues.
+    #
+    
+    QUEUE_PREFIX = "qrpc"
+    
+    ##
+    # Input queue postfix.
+    #
+    
+    QUEUE_POSTFIX_INPUT = "input"
+    
+    ##
+    # Output queue postfix.
+    #
+    
+    QUEUE_POSTFIX_OUTPUT = "output"
+
+end

data/lib/qrpc/locator.rb

@@ -62,7 +62,7 @@ module QRPC
         
         ##
         # Parses the locator.
-        # Excpects form <queue>@<host>:<port>. Port is optional.
+        # Excpects form +<queue>@<host>:<port>+. Port is optional.
         #
         # @param [String] string locator in string form
         # @return [QRPC::Locator] new instance

data/lib/qrpc/server.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "qrpc/general"
 require "qrpc/server/job"
 require "qrpc/server/dispatcher"
 require "qrpc/locator"
@@ -6,7 +7,6 @@ require "em-beanstalk"
 require "eventmachine"
 require "base64"
 
-
 ##
 # General QRPC module.
 #
@@ -18,24 +18,27 @@ module QRPC
     #
     
     class Server
-    
+
         ##
         # Prefix for handled queues.
+        # @deprecated (since 0.2.0)
         #
         
-        QRPC_PREFIX = "qrpc"
+        QRPC_PREFIX = QRPC::QUEUE_PREFIX
         
         ##
         # Input queue postfix.
+        # @deprecated (since 0.2.0)
         #
         
-        QRPC_POSTFIX_INPUT = "input"
+        QRPC_POSTFIX_INPUT = QRPC::QUEUE_POSTFIX_INPUT
         
         ##
         # Output queue postfix.
+        # @deprecated (since 0.2.0)
         #
         
-        QRPC_POSTFIX_OUTPUT = "output"
+        QRPC_POSTFIX_OUTPUT = QRPC::QUEUE_POSTFIX_OUTPUT
 
         ##
         # Holds API instance.
@@ -49,6 +52,12 @@ module QRPC
         
         @locator
         
+        ##
+        # Holds input queue name.
+        #
+        
+        @input_name
+        
         ##
         # Holds output queue name.
         #
@@ -121,15 +130,15 @@ module QRPC
         #
         
         def finalize!
-            if @input_queue
+            if not @input_queue.nil?
                 @input_queue.watch("default") do
-                    @input_queue.ignore(@input_name) do
+                    @input_queue.ignore(self.input_name.to_s) do
                         @input_queue.close
                     end
                 end
             end
             
-            if @output_queue
+            if not @output_queue.nil?
                 @output_queue.use("default") do
                     @output_queue.close
                 end
@@ -161,7 +170,6 @@ module QRPC
         
         def start_listening(locator, opts)
             @locator = locator
-            @locator.queue = self.class::QRPC_PREFIX.dup << "-" << @locator.queue << "-" << self.class::QRPC_POSTFIX_INPUT
             @dispatcher = QRPC::Server::Dispatcher::new(opts[:max_jobs])
             
             # Cache cleaning dispatcher
@@ -177,9 +185,6 @@ module QRPC
             end
         end
         
-        ##
-        #
-        
         ##
         # Returns input queue.
         # (Callable from EM only.)
@@ -190,7 +195,7 @@ module QRPC
         def input_queue(&block)
             if not @input_queue
                 @input_queue = EM::Beanstalk::new(:host => @locator.host, :port => @locator.port)
-                @input_queue.watch(@locator.queue) do
+                @input_queue.watch(self.input_name.to_s) do
                     @input_queue.ignore("default") do
                         block.call(@input_queue)
                     end
@@ -208,7 +213,7 @@ module QRPC
         #
         
         def output_queue
-            if not @output_queue
+            if @output_queue.nil?
                 @output_queue = EM::Beanstalk::new(:host => @locator.host, :port => @locator.port)
             end
             
@@ -226,7 +231,7 @@ module QRPC
             client_index = client.to_sym
             
             if not @output_name_cache.include? client_index
-               output_name = self.class::QRPC_PREFIX.dup << "-" << client.to_s << "-" << self.class::QRPC_POSTFIX_OUTPUT
+               output_name = QRPC::QUEUE_PREFIX.dup << "-" << client.to_s << "-" << QRPC::QUEUE_POSTFIX_OUTPUT
                output_name = output_name.to_sym
                @output_name_cache[client_index] = output_name
             else
@@ -236,6 +241,22 @@ module QRPC
             return output_name
         end
         
+        ##
+        # Returns input name.
+        #
+        # @return [Symbol] input name
+        # @since 0.2.0
+        #
+        
+        def input_name
+            if @input_name.nil?
+                @input_name = (QRPC::QUEUE_PREFIX.dup << "-" << @locator.queue << "-" << QRPC::QUEUE_POSTFIX_INPUT).to_sym
+            end
+            
+            return @input_name
+        end
+        
+        
         
         protected
         

data/qrpc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qrpc}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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-18}
+  s.date = %q{2011-01-29}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "TODO.md",
     "VERSION",
+    "lib/qrpc/general.rb",
     "lib/qrpc/locator.rb",
     "lib/qrpc/server.rb",
     "lib/qrpc/server/dispatcher.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 +01:00
+date: 2011-01-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,6 +124,7 @@ files:
 - Rakefile
 - TODO.md
 - VERSION
+- lib/qrpc/general.rb
 - lib/qrpc/locator.rb
 - lib/qrpc/server.rb
 - lib/qrpc/server/dispatcher.rb
@@ -145,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3341094115904611072
+      hash: 3054544507503324892
       segments: 
       - 0
       version: "0"