cloudist 0.1.2 → 0.2.0

data/spec/cloudist/request_spec.rb

@@ -3,11 +3,11 @@ require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
 describe Cloudist::Request do
   before {
     @mq_header = mock("MQ::Header")
-    @mq_header.stubs(:properties).returns({:published_on=>Time.now.to_i - 60, :event_hash=>"foo", :content_type=>"application/json", :message_id=>"foo", :ttl=>300})
+    @mq_header.stubs(:headers).returns({:published_on=>Time.now.to_i - 60, :event_hash=>"foo", :message_id=>"foo", :ttl=>300})
     
     q = Cloudist::JobQueue.new('test.queue')
     
-    @request = Cloudist::Request.new(q, {:bread => 'white'}.to_json, @mq_header)
+    @request = Cloudist::Request.new(q, Marshal.dump({:bread => 'white'}), @mq_header)
   }
   
   it "should return ttl" do

data/spec/cloudist/utils_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
+
+describe Cloudist::Utils do
+  it "should return reply queue name" do
+    Cloudist::Utils.reply_prefix('eat.sandwich').should == 'temp.reply.eat.sandwich'
+  end
+  
+  it "should return log queue name" do
+    Cloudist::Utils.log_prefix('eat.sandwich').should == 'temp.log.eat.sandwich'
+  end
+  
+  it "should return stats queue name" do
+    Cloudist::Utils.stats_prefix('eat.sandwich').should == 'temp.stats.eat.sandwich'
+  end
+  
+  # it "should generate queue name" do
+  #   Cloudist::Utils.generate_queue('test').should == ''
+  # end
+end

data/spec/cloudist_spec.rb

@@ -1,24 +1,55 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "moqueue"
+
+class SandwichWorker < Cloudist::Worker
+  def process
+    Cloudist.log.info(job.data.inspect)
+  end
+end
 
 describe "Cloudist" do
   
   before(:each) do
     overload_amqp
     reset_broker
+    Cloudist.remove_workers
+    
+    @mq = mock("MQ")
+    @queue, @exchange = mock_queue_and_exchange('make.sandwich')
+    
+    @qobj = Cloudist::JobQueue.any_instance
+    @qobj.stubs(:q).returns(@queue)
+    @qobj.stubs(:mq).returns(@mq)
+    @qobj.stubs(:ex).returns(@exchange)
+    @qobj.stubs(:setup)
   end
   
-  def run_start
-    Cloudist.start {
-      worker {
-      
-      }
-    }
+  it "should register a worker" do
+    Cloudist.register_worker('make.sandwich', SandwichWorker)
+    Cloudist.workers.should have_key("make.sandwich")
+    Cloudist.workers["make.sandwich"].size.should == 1
   end
   
-  it "should start" do
-    Cloudist.stubs(:worker).returns(true)
-    Cloudist.expects(:worker).once
-    
-    # run_start
+  it "should support handle syntax" do
+    Cloudist.workers.should == {}
+    Cloudist.handle('make.sandwich').with(SandwichWorker)
+    Cloudist.workers.should have_key("make.sandwich")
+    Cloudist.workers["make.sandwich"].size.should == 1
   end
+  
+  # it "should support handle syntax with multiple queues" do
+  #     Cloudist.workers.should == {}
+  #     Cloudist.handle('make.sandwich', 'eat.sandwich').with(SandwichWorker)
+  #     # Cloudist.workers.should == {"make.sandwich"=>[SandwichWorker], "eat.sandwich"=>[SandwichWorker]}
+  #   end
+  
+  it "should call process on worker when job arrives" do
+    job = Cloudist.enqueue('make.sandwich', {:bread => 'white'})
+    job.payload.published?.should be_true
+    SandwichWorker.any_instance.expects(:process)
+    Cloudist.handle('make.sandwich').with(SandwichWorker)
+    Cloudist.workers.should have_key("make.sandwich")
+    Cloudist.workers["make.sandwich"].size.should == 1
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudist
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ivan Vanderbyl
@@ -15,11 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 +11:00
+date: 2011-01-20 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  name: amqp
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +33,12 @@ dependencies:
         - 6
         - 7
         version: 0.6.7
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: amqp
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: json
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +49,12 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: json
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: activesupport
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +65,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
-  name: activesupport
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +81,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rspec
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: moqueue
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,12 +95,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: moqueue
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: mocha
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,12 +109,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: mocha
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,12 +125,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: bundler
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -138,12 +141,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: rcov
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -152,12 +155,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rcov
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: reek
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -168,12 +171,12 @@ dependencies:
         - 2
         - 8
         version: 1.2.8
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: reek
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: roodi
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -184,10 +187,7 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  type: :development
-  name: roodi
-  prerelease: false
-  version_requirements: *id011
+  requirement: *id011
 description: Cloudist is a simple, highly scalable job queue for Ruby applications, it can run within Rails, DaemonKit or your own custom application. Refer to github page for examples
 email: ivanvanderbyl@me.com
 executables: []
@@ -207,21 +207,25 @@ files:
 - Rakefile
 - VERSION
 - cloudist.gemspec
+- examples/extending_values.rb
 - examples/queue_message.rb
 - examples/sandwich_client.rb
 - examples/sandwich_worker.rb
+- examples/sandwich_worker_with_class.rb
 - lib/cloudist.rb
-- lib/cloudist/basic_queue.rb
 - lib/cloudist/callback.rb
 - lib/cloudist/callback_methods.rb
+- lib/cloudist/callbacks/error_callback.rb
+- lib/cloudist/core_ext/object.rb
 - lib/cloudist/core_ext/string.rb
 - lib/cloudist/errors.rb
 - lib/cloudist/job.rb
-- lib/cloudist/job_queue.rb
 - lib/cloudist/listener.rb
 - lib/cloudist/payload.rb
 - lib/cloudist/publisher.rb
-- lib/cloudist/reply_queue.rb
+- lib/cloudist/queues/basic_queue.rb
+- lib/cloudist/queues/job_queue.rb
+- lib/cloudist/queues/reply_queue.rb
 - lib/cloudist/request.rb
 - lib/cloudist/utils.rb
 - lib/cloudist/worker.rb
@@ -229,6 +233,7 @@ files:
 - spec/cloudist/job_spec.rb
 - spec/cloudist/payload_spec.rb
 - spec/cloudist/request_spec.rb
+- spec/cloudist/utils_spec.rb
 - spec/cloudist_spec.rb
 - spec/core_ext/string_spec.rb
 - spec/spec_helper.rb
@@ -267,13 +272,16 @@ signing_key:
 specification_version: 3
 summary: Super fast job queue using AMQP
 test_files: 
+- examples/extending_values.rb
 - examples/queue_message.rb
 - examples/sandwich_client.rb
 - examples/sandwich_worker.rb
+- examples/sandwich_worker_with_class.rb
 - spec/cloudist/basic_queue_spec.rb
 - spec/cloudist/job_spec.rb
 - spec/cloudist/payload_spec.rb
 - spec/cloudist/request_spec.rb
+- spec/cloudist/utils_spec.rb
 - spec/cloudist_spec.rb
 - spec/core_ext/string_spec.rb
 - spec/spec_helper.rb

data/lib/cloudist/basic_queue.rb

@@ -1,92 +0,0 @@
-module Cloudist
-  class UnknownReplyTo < RuntimeError; end
-  class ExpiredMessage < RuntimeError; end
-  
-  class BasicQueue
-    attr_reader :queue_name, :opts
-    attr_reader :q, :ex, :mq
-    
-    def initialize(queue_name, opts = {})
-      opts = {
-        :auto_delete => true,
-        :durable => false,
-        :prefetch => 1
-      }.update(opts)
-      
-      @queue_name, @opts = queue_name, opts
-    end
-    
-    def setup
-      return if @setup == true
-      
-      @mq = MQ.new
-      @q = @mq.queue(queue_name, opts)
-      # if we don't specify an exchange name it defaults to the queue_name
-      @ex = @mq.direct(opts[:exchange_name] || queue_name)
-
-      q.bind(ex) if ex
-      
-      @setup = true
-    end
-    
-    def log
-      Cloudist.log
-    end
-    
-    def tag
-      s = "queue=#{q.name}"
-      s += " exchange=#{ex.name}" if ex
-      s
-    end
-    
-    def subscribe(amqp_opts={}, opts={})
-      setup
-      
-      q.subscribe(amqp_opts) do |queue_header, json_encoded_message|
-        return if Cloudist.closing?
-        
-        request = Cloudist::Request.new(self, json_encoded_message, queue_header)
-        
-        begin
-          raise Cloudist::ExpiredMessage if request.expired?
-          yield request if block_given?
-          finished = Time.now.utc.to_i
-          
-        rescue Cloudist::ExpiredMessage
-          log.info "amqp_message action=timeout #{tag} ttl=#{request.ttl} age=#{request.age} #{request.inspect}"
-          request.ack if amqp_opts[:ack]
-
-        rescue => e
-          request.ack if amqp_opts[:ack]
-          Cloudist.handle_error(e)
-        end
-      end
-      log.info "amqp_subscribe #{tag}"
-      self
-    end
-    
-    def publish(payload)
-      payload.set_reply_to(queue_name)
-      body, headers = payload.formatted
-      ex.publish(body, headers)
-      payload.publish
-    end
-    
-    def publish_to_q(payload)
-      body, headers = payload.formatted
-      q.publish(body, headers)
-      payload.publish
-      return headers
-    end
-    
-    def teardown
-      @q.unsubscribe
-      @mq.close
-      log.debug "amqp_unsubscribe #{tag}"
-    end
-
-    def destroy
-      teardown
-    end
-  end
-end