cheezmiz 0.0.1 → 0.0.2

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.email = "parasquid@gmail.com"
     gem.homepage = "http://github.com/parasquid/cheezmiz"
     gem.authors = ["parasquid"]
+    gem.add_dependency "actionpool", ">= 0.2.3"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/cheezmiz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cheezmiz}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["parasquid"]
-  s.date = %q{2010-02-19}
+  s.date = %q{2010-02-20}
   s.description = %q{a ruby library for Chikka}
   s.email = %q{parasquid@gmail.com}
   s.extra_rdoc_files = [
@@ -60,9 +60,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<actionpool>, [">= 0.2.3"])
     else
+      s.add_dependency(%q<actionpool>, [">= 0.2.3"])
     end
   else
+    s.add_dependency(%q<actionpool>, [">= 0.2.3"])
   end
 end
 

data/examples/callbacks.rb

@@ -24,8 +24,7 @@ if __FILE__ == $0
   CHIKKA_PASSWORD = 'password'
   TEST_MESSAGE = 'a test message'
 
-  socket = TCPSocket.open('ctp-a.chikka.com', 6301)
-  broker = Cheezmiz::Broker.new :socket => socket
+  broker = Cheezmiz::Broker.new
   broker.register_callback(:connection_established) do |msg|
     puts 'connection has been established'
     message = Cheezmiz::LoginRequest.new(
@@ -53,14 +52,14 @@ if __FILE__ == $0
     broker.send(Cheezmiz::ClientReady.new)
   end
 
-  broker.register_callback(:keep_alive_request) do |msg|
+  broker.register_callback(:keep_alive_request, :threaded => false) do |msg|
     broker.send(Cheezmiz::KeepAliveResponse.new, :response_to => msg)
     puts 'sending test message'
     message = Cheezmiz::SubmitRequest.new(
       :message => "#{TEST_MESSAGE}",
       :buddy_number => 0
     )
-    broker.send(message)
+    #broker.send(message)
   end
 
   broker.register_callback(:submit_response) do
@@ -71,14 +70,16 @@ if __FILE__ == $0
     if msg.operation == :unknown_operation
       puts "unknown operation: #{msg.prototype}"
     else
-      puts "incoming message #{msg.operation} #{msg.data_fields.inspect}"
+      puts "incoming message: #{msg.operation} #{msg.data_fields.inspect}"
     end
   end
 
   broker.register_callback(:outgoing) do |msg|
     puts "outgoing message: #{msg.operation} #{msg.data_fields.inspect}"
   end
-  
+
+  socket = TCPSocket.open('ctp-a.chikka.com', 6301)
+  broker.connect :socket => socket
   broker.start
-  broker.join
+  sleep
 end

data/lib/broker.rb

@@ -17,6 +17,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 $: << File.expand_path(File.dirname(__FILE__))
+require 'actionpool'
 require 'socket'
 require 'helper'
 require 'protocol'
@@ -25,32 +26,25 @@ module Cheezmiz
   class Broker
     STX = "\x02"
     ETX = "\x03"
+    MIN_THREADS = 5
+    MAX_THREADS = 15
     def initialize(params = {})
-      @socket = params[:socket] || begin
-        params[:host] ||= 'ctp-a.chikka.com'
-        params[:port] ||= 6301
-        TCPSocket.open(params[:host], params[:port])
-      end
       @sequence_number = 1
       @callbacks = Hash.new { |hash, key| hash[key] = [] }
+      @pool = ActionPool::Pool.new(
+        :min_threads => (params[:min_threads] || MIN_THREADS),
+        :max_threads => (params[:max_threads] || MAX_THREADS)
+      )
     end
     
-    def register_callback(operation, &proc)
-      @callbacks[operation] << proc
+    def register_callback(operation, options = {:threaded => true}, &proc)
+      @callbacks[operation] << options.merge({ :callback => proc })
     end
     
-    def register_observer(observer, &proc)
-      @observers[observer] << proc
-    end
-
     def callbacks
       @callbacks
     end
  
-    def observers
-      @observers
-    end
-
    def send(message, params = {})
       raw = encode({ :message => message }.merge(params))
       result = @socket.send(raw, 0)
@@ -58,15 +52,19 @@ module Cheezmiz
       return raw, result
     end
        
+    def connect(params = {})
+      @socket = params[:socket] || begin
+        params[:host] ||= 'ctp-a.chikka.com'
+        params[:port] ||= 6301
+        TCPSocket.open(params[:host], params[:port])
+      end
+    end
+
     def start
-      @thread = Thread.new do
+      @pool.process do
         @socket.while_reading { |buffer| process_messages(buffer) }
       end
     end
-    
-    def join
-      @thread.join
-    end
 
   private
 
@@ -87,8 +85,8 @@ module Cheezmiz
     def encode(options)
       raw = "#{STX}" + options[:message].prototype
       sequence_number = begin
-        options[:response_to].sequence_number
-      rescue NoMethodError
+        options[:response_to].respond_to?(:sequence_number) ?
+        options[:response_to].sequence_number :
         options[:response_to]
       end || @sequence_number
       raw.sub! /NNN/, sequence_number.to_s.rjust(3, '0')
@@ -106,14 +104,14 @@ module Cheezmiz
     end
     
     def process_callbacks(callbacks, message)
-      if callbacks.respond_to? :each_pair
-        callbacks[message.operation].each do |callback|
-          callback.call(message) 
-        end
-      else
-        callbacks.each do |callback|
-          callback.call(message)
-        end
+      (begin
+        callbacks.respond_to?(:each_pair) ?
+        callbacks[message.operation] :
+        callbacks
+      end).each do |callback|
+        callback[:threaded] ?
+        @pool.process { callback[:callback].call(message) } :
+        callback[:callback].call(message)
       end
     end
   end

data/lib/protocol/message.rb

@@ -69,9 +69,7 @@ module Cheezmiz
 
     def data
       data = ''
-      @options.each do |key, value|
-        data << "#{key}:#{value}\t"
-      end
+      @options.each { |key, value| data << "#{key}:#{value}\t" }
       data
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cheezmiz
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - parasquid
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +08:00
+date: 2010-02-20 00:00:00 +08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: actionpool
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.3
+    version: 
 description: a ruby library for Chikka
 email: parasquid@gmail.com
 executables: []