adamhenry-vincent 0.0.2 → 0.0.3

data/lib/vincent.rb

@@ -1,43 +1,54 @@
-
 require 'mq'
 require 'uri'
 require 'json'
 
 module Vincent
+  def self.cast(key,data)
+    Vincent::Client.cast(key,data)
+  end
+
+  def self.call(key,data)
+    raise "dont do this"
+  end
 
-	def self.method_missing(method,data = {})
-		key = method.to_s.gsub(/_/,".")
-		Vincent::Client.cast(key,data)
-	end
+  def self.method_missing(method,data = {})
+    key = method.to_s.gsub(/_/,".")
+    Vincent::Client.cast(key,data)
+  end
 
-	module Core
+  module Core
     def exchange
        @exchange ||= MQ.topic
     end
 
-		def cast(key,args = {})
-			args['kill_by'] = Time.now.to_i + args['ttl'] if args['ttl'].to_i > 0
-			exchange.publish(encode(args), :routing_key => key)
-			nil
-		end
+    def cast(key,args = {})
+      args['kill_by'] = Time.now.to_i + args['ttl'] if args['ttl'].to_i > 0
+      args.delete('ttl') if args['ttl'].to_i > 0
+      mq_publish(encode(args), :routing_key => key)
+      nil
+    end
+
+    def mq_publish(data, opts)
+      exchange.publish(data, opts)
+    end
 
-		def encode(data)
-			data.to_json
-		end
+    def encode(data)
+      data.to_json
+    end
 
-		def decode(data)
-			begin
-				JSON.parse(data)
-			rescue 
+    def decode(data)
+      begin
+        JSON.parse(data)
+      rescue 
         # log error
-				{}
-			end
-		end
-	end
-
-	class Client
-		extend Core
-	end
+        {}
+      end
+    end
+  end
+
+  class Client
+    extend Core
+  end
 end
 
 config = URI.parse(ENV['AMQP_URI'] || 'amqp://guest:guest@localhost/')

data/lib/vincent/base.rb

@@ -1,6 +1,7 @@
-
-require 'vincent'
+require 'lib/vincent'
 require 'fiber'
+require 'socket'
+require 'neverblock'
 
 ### TODO
 
@@ -11,7 +12,6 @@ require 'fiber'
 ### autodelete queues?
 
 module Vincent
-
   class RejectMessage < RuntimeError ; end
   class MissingCallHandler < RuntimeError ; end
   class MissingCastHandler < RuntimeError ; end
@@ -19,32 +19,27 @@ module Vincent
   module Core
     def call(key, args = {})
       args['reply_to'] = "reply_to.#{rand 99_999_999}"
-      reply = receive(args['reply_to']) do
-        cast(key, args)
+      fiber = Fiber.current 
+      subscribe(args['reply_to']) do |result|
+        fiber.resume(result)
       end
+      cast(key, args)
+      reply = Fiber.yield
       raise unpack(reply["exception"]) if reply["exception"]
       return unpack(reply["results"]) if reply["results"]
       return reply
     end
 
-    def receive(q)
-      f = Fiber.current
-      subscribe(q) do |result|
-        ## maybe we can destroy the queue here - unsubscribe - autodelete
-        f.resume(result)
-      end
-      yield
-      Fiber.yield
-    end
-
     def listen4(key, options = {}, &block)
       q = options[:queue]
-      q ||= "q.#{ENV['HOSTNAME']}" 
+      q ||= "q.#{key}.#{Socket.gethostname}" 
 
       bind(q, key)
-      subscribe(q) do |args|
-        block.call(Vincent::Base.new(args, args))
-      end
+      Fiber.new do
+        subscribe(q) do |args|
+          block.call(Vincent::Base.new(args, args))
+        end
+      end.resume
     end
 
     def bind(q, key)
@@ -65,18 +60,16 @@ module Vincent
           info.ack
           return
         end
-
         begin
           results = block.call(args)
         rescue RejectMessage
           info.reject
           next
-        rescue Object => e
+        rescue Exception => e
           puts "got exception #{e} - packing it for return"
           ## just display the exception if there's not reply_to
           results = { :exception => pack(e) } 
         end
-
         results = { :results => pack(results) } unless results.is_a?(Hash)
         MQ.queue(args['reply_to']).publish(encode(results)) if args['reply_to']
         info.ack
@@ -117,10 +110,17 @@ module Vincent
   module Routes
     def bind_to(key, options = {})
       key = key.to_s
-      q = "q.#{key}" if options[:route_to] == :one 
-      q = "q.#{ENV['HOSTNAME']}" if options[:route_to] == :host 
-      q = "q.#{rand 9_999_999}" if options[:route_to] == :all
-      raise "route_to => :one, :all or :host" unless q
+
+      case options[:route_to]
+      when :one
+        q = "q.#{key}" 
+      when :host
+        q = "q.#{key}.#{Socket.gethostname}" 
+      when :all
+        q = "q.#{key}.#{Socket.gethostname}.#{Process.pid}" 
+      else
+        raise "route_to => :one, :all or :host" 
+      end
 
       active = options[:active]
       active ||= :active
@@ -178,11 +178,13 @@ module Vincent
     end
 
     def handle
-      if params['reply_to']
-        handle_call
-      else
-        handle_cast
-      end
+      Fiber.new do
+        if params['reply_to']
+          handle_call
+        else
+          handle_cast
+        end
+      end .resume
     end
 
     def handle_call
@@ -192,7 +194,6 @@ module Vincent
     def handle_cast
       raise MissingCastHandler
     end
-
   end
 end
 

data/lib/vincent/server.rb

@@ -1,21 +1,33 @@
-require 'vincent/base'
+require 'lib/vincent/base'
+require 'neverblock'
 
 module Vincent
-	class Server
-		extend Core
+  class Server
+    extend Core
 
-		def self.start(&block)
-			EM.run { 
-				Signal.trap('INT') { AMQP.stop{ EM.stop } }
-				Signal.trap('TERM'){ AMQP.stop{ EM.stop } }
+    def self.start(&block)
+      error = nil
+      EM.run { 
+        Signal.trap('INT')  { stop }
+        Signal.trap('TERM') { stop }
 
-				Fiber.new {
-					Vincent::Routes.bind
-					EM.add_periodic_timer(60) { Vincent::Routes.check }
-					block.call(Vincent::Server) if block
-				}.resume
-			}
-		end
-	end
+        Fiber.new {
+          Vincent::Routes.bind
+          EM.add_periodic_timer(60) { Vincent::Routes.check }
+          begin
+            block.call(Vincent::Server) if block
+          rescue Object => e
+            error = e
+            EM.stop
+          end
+        }.resume
+      }
+      raise error if error
+    end
+
+    def self.stop
+      EM.next_tick { AMQP.stop { EM.stop } }
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adamhenry-vincent
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Adam Henry
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-20 00:00:00 -07:00
+date: 2009-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,8 +25,8 @@ extra_rdoc_files: []
 files: 
 - lib/vincent.rb
 - lib/vincent/server.rb
-- README
 - lib/vincent/base.rb
+- README
 has_rdoc: false
 homepage: http://www.vincent.com/
 post_install_message: