redpack-ruby 0.1.0 → 0.2.0

data/TODOs.txt

@@ -4,9 +4,9 @@
 
 * DONE dotted-name dispatcher (obj.method...)
 
-* TODO async-call
+* DONE async-call
 
-* TODO fiber? em? based server request-handling?
+* DONE fiber? em? based server request-handling?
 
-* TODO client-timeout?
+* DONE client-timeout?
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/redpack-ruby.rb

@@ -6,7 +6,7 @@ require 'bundler/setup'
 Bundler.require(:default)
 
 
-
+require 'redpack-ruby/integer-minmax'
 require 'redpack-ruby/consts'
 require 'redpack-ruby/request-context'
 require 'redpack-ruby/method-dispatchers'

data/lib/redpack-ruby/clients.rb

@@ -1,7 +1,48 @@
 
 
+
+
+
 module RedPack
 
+  class ResponseQueueNameGenerator
+
+    SESSION_ID_KEY = 'redpack_response_queue_index'
+
+    def incr_queue_id
+      return @redis.incr(SESSION_ID_KEY)
+    end
+
+
+    attr_accessor :session_id, :msg_id, :redis
+
+    def initialize(redis, session_id=nil, msg_id=nil)
+      @redis = redis
+      @session_id, @msg_id = session_id, msg_id
+    end
+
+    def new_name
+      return "redpack-return-#{self.incr_queue_id}"
+    end
+  end
+
+  class MsgIdGenerator
+    attr_accessor :cur
+
+    def initialize(cur=1)
+      @cur = cur
+    end
+
+    def next
+      if @cur < Integer::MAX then
+        @cur = @cur.succ
+      else
+        @cur = 1
+      end
+      return @cur
+    end
+  end
+
   class SimpleSyncClient
 
     attr_accessor :timeout
@@ -9,38 +50,34 @@ module RedPack
     def initialize(redis, name, transcoder, timeout=0)
       @redis = redis
       @queue_name = RedPack::Consts::queue_name(name)
-      @response_queue_name = RedPack::Consts::new_response_queue_name(@redis)
       @transcoder = transcoder
       @msg_id_seq = 1
       @timeout = timeout
+      @response_queue_name_generator = ResponseQueueNameGenerator.new(@redis)
+      @msg_id_generator = MsgIdGenerator.new
     end
 
-    def new_msg_id
-      if @msg_id_seq < ((2 << 32) - 2) then
-        @msg_id_seq = @msg_id_seq.succ
-        return @msg_id_seq
-      else
-        @msg_id_seq = 1
-        return @msg_id_seq
-      end
-    end
-    
-
     # TODO: forwarding?
 
-    # TODO: result-async?
+    def call_async(method, *params, &cb)
+      Thread.new do
+        result = self.call(method, *params)
+        cb.call(result)
+      end
+    end
 
     def call(method, *params)
-      msg_id = self.new_msg_id
+      msg_id = @msg_id_generator.next
       v = [RedPack::Consts::REQUEST, msg_id, method, params]
+      return_queue_name = @response_queue_name_generator.new_name
       packed = @transcoder.pack({'data' => v,
-                                  'return' => @response_queue_name,})
+                                  'return' => return_queue_name,})
       @redis.multi
       @redis.rpush(@queue_name, packed)
       @redis.exec
       # TODO: refactor...
       while true do
-        popped = @redis.blpop(@response_queue_name, @timeout)
+        popped = @redis.blpop(return_queue_name, @timeout)
         if not popped.nil? then
           unpacked = @transcoder.unpack(popped[1])
           datum = unpacked['data']

data/lib/redpack-ruby/consts.rb

@@ -11,12 +11,6 @@ module RedPack
       return "redpack_request_queue:#{name}" 
     end
 
-    SESSION_ID_KEY = 'redpack_response_queue_index'
-
-    def self.new_response_queue_name(redis)
-      return redis.incr(RedPack::Consts::SESSION_ID_KEY)
-    end
-
   end
 
 

data/lib/redpack-ruby/integer-minmax.rb

@@ -0,0 +1,6 @@
+class Integer
+  N_BYTES = [42].pack('i').size
+  N_BITS = N_BYTES * 8
+  MAX = 2 ** (N_BITS - 2) - 1
+  MIN = -MAX - 1
+end

data/redpack-ruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "redpack-ruby"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jonghyouk yun"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "lib/redpack-ruby.rb",
     "lib/redpack-ruby/clients.rb",
     "lib/redpack-ruby/consts.rb",
+    "lib/redpack-ruby/integer-minmax.rb",
     "lib/redpack-ruby/method-dispatchers.rb",
     "lib/redpack-ruby/method-dispatchers/dotted.rb",
     "lib/redpack-ruby/method-dispatchers/simple.rb",

data/snippets/echo-client.rb

@@ -8,5 +8,16 @@ transcoder = RedPack::BsonTransCoder.new
 client = RedPack::SimpleSyncClient.new(redis, 'echo', transcoder)
 
 
+thr = client.call_async('echo', 'hi') do |result|
+  puts "async-result: #{result}"
+end
+
+p thr
+thr.join
+
 puts client.call('echo', 'hi?')
+
 puts client.notify('echo', 'hi?')
+
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redpack-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &81401090 !ruby/object:Gem::Requirement
+  requirement: &71249700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *81401090
+  version_requirements: *71249700
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &81399840 !ruby/object:Gem::Requirement
+  requirement: &71248560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81399840
+  version_requirements: *71248560
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &81398610 !ruby/object:Gem::Requirement
+  requirement: &71247870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81398610
+  version_requirements: *71247870
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &81397940 !ruby/object:Gem::Requirement
+  requirement: &71247130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81397940
+  version_requirements: *71247130
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81397380 !ruby/object:Gem::Requirement
+  requirement: &71245950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *81397380
+  version_requirements: *71245950
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &81396200 !ruby/object:Gem::Requirement
+  requirement: &71245240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *81396200
+  version_requirements: *71245240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &81395460 !ruby/object:Gem::Requirement
+  requirement: &71244640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *81395460
+  version_requirements: *71244640
 description: Redis + MsgPack RPC Server, Client Library
 email: ageldama@gmail.com
 executables: []
@@ -107,6 +107,7 @@ files:
 - lib/redpack-ruby.rb
 - lib/redpack-ruby/clients.rb
 - lib/redpack-ruby/consts.rb
+- lib/redpack-ruby/integer-minmax.rb
 - lib/redpack-ruby/method-dispatchers.rb
 - lib/redpack-ruby/method-dispatchers/dotted.rb
 - lib/redpack-ruby/method-dispatchers/simple.rb
@@ -137,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -900924625
+      hash: -333440895
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: