cloudist 0.2.1 → 0.4.1

data/spec/cloudist/messaging_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe Cloudist::Messaging do
+  
+  it "should add queue to queues list" do
+    queue = mock("Cloudist::Queue")
+    queue.stubs(:name).returns("test.queue")
+    Cloudist::Messaging.add_queue(queue)
+    Cloudist::Messaging.active_queues.keys.should include('test.queue')
+  end
+  
+  it "should be able to remove queues from list" do
+    queue = mock("Cloudist::Queue")
+    queue.stubs(:name).returns("test.queue")
+    Cloudist::Messaging.add_queue(queue).keys.should == ['test.queue']
+    Cloudist::Messaging.remove_queue('test.queue').keys.should == []
+  end
+  
+end

data/spec/cloudist/payload_spec.rb

@@ -65,7 +65,7 @@ describe Cloudist::Payload do
   
   it "should format payload for sending" do
     payload = Cloudist::Payload.new({:bread => 'white'}, {:event_hash => 'foo', :message_type => 'reply'})
-    body, popts = payload.formatted
+    body, popts = payload.to_a
     headers = popts[:headers]
     
     body.should == Marshal.dump({:bread => 'white'})
@@ -104,10 +104,10 @@ describe Cloudist::Payload do
     payload.headers[:reply_to].should be_nil
     payload.set_reply_to("my_custom_queue")
     payload.headers[:reply_to].should_not be_nil
-    payload.headers[:reply_to].should match /^temp\.reply\.my_custom_queue\.(.+)/
-    body, headers = payload.formatted
+    payload.headers[:reply_to].should match /^temp\.reply\.my_custom_queue/
+    body, popts = payload.to_a
+    headers = popts[:headers]
     headers[:reply_to].should == payload.headers[:reply_to]
-    
   end
   
   it "should not overwrite passed in headers" do
@@ -128,4 +128,10 @@ describe Cloudist::Payload do
     payload = Cloudist::Payload.new(e, {:message_type => 'error'})
   end
   
+  it "should be able to query payload keys with key?" do
+    payload = Cloudist::Payload.new({:bread => 'white'}, {:ttl => 25, :event_hash => 'foo', :published_on => 12345, :message_id => 1})
+    payload.bread?.should be_true
+    payload.cheese?.should be_false
+  end
+  
 end

data/spec/cloudist/payload_spec_2_spec.rb

@@ -0,0 +1,78 @@
+require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
+
+describe Cloudist::Payload do
+  include Cloudist::Encoding
+  
+  it "should accept a hash for data" do
+    pl = Cloudist::Payload.new({:bread => 'white'})
+    pl.body.bread.should == "white"
+  end
+  
+  it "should accept encoded message" do
+    pl = Cloudist::Payload.new(encode({:bread => 'white'}))
+    pl.body.bread.should == "white"
+  end
+  
+  it "should retrieve id from headers" do
+    pl = Cloudist::Payload.new({:bread => 'white'}, {:message_id => "12345"})
+    pl.id.should == "12345"
+  end
+  
+  it "should prepare headers" do
+    payload = Cloudist::Payload.new({:bread => 'white'})
+    payload.body.bread.should == "white"
+    payload.headers.has_key?("ttl").should be_true
+    # payload.headers.has_key?(:content_type).should be_true
+    # payload.headers[:content_type].should == "application/json"
+    payload.headers.has_key?("published_on").should be_true
+    payload.headers.has_key?("message_id").should be_true
+  end
+  
+  it "should extract published_on from data" do
+    time = Time.now.to_f
+    payload = Cloudist::Payload.new({:bread => 'white', :timestamp => time})
+    payload.headers[:published_on].should == time
+  end
+  
+  it "should not override timestamp if already present in headers" do
+    time = (Time.now.to_f - 10.0)
+    payload = Cloudist::Payload.new({:bread => 'white'}, {:published_on => time})
+    payload.headers[:published_on].should == time
+  end
+  
+  it "should override timestamp if not present" do
+    payload = Cloudist::Payload.new({:bread => 'white'})
+    payload.headers[:published_on].should be_within(0.1).of Time.now.to_f
+    payload.timestamp.should be_within(0.1).of Time.now.to_f
+  end
+  
+  it "should parse custom headers" do
+    payload = Cloudist::Payload.new(Marshal.dump({:bread => 'white'}), {:published_on => 12345, :message_id => "foo"})
+    payload.headers.to_hash.should == { "published_on"=>12345, "message_id"=>"foo", "ttl"=>300 }
+  end
+  
+  it "should create a unique event hash" do
+    payload = Cloudist::Payload.new({:bread => 'white'})
+    payload.id.size.should == 36
+  end
+  
+  it "should not create a new message_id unless it doesn't have one" do
+    payload = Cloudist::Payload.new({:bread => 'white'})
+    payload.id.size.should == 36
+    payload = Cloudist::Payload.new({:bread => 'white'}, {:message_id => 'foo'})
+    payload.id.should == 'foo'
+  end
+  
+  it "should format payload for sending" do
+    payload = Cloudist::Payload.new({:bread => 'white'}, {:message_id => 'foo', :message_type => 'reply'})
+    body, popts = payload.to_a
+    headers = popts[:headers]
+    
+    body.should == encode(Hashie::Mash.new({:bread => 'white'}))
+    headers[:ttl].should == "300"
+    headers[:message_type].should == 'reply'
+  end
+  
+  
+  
+end

data/spec/cloudist/queue_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe Cloudist::Queue do
+  before(:each) do
+    stub_amqp!
+  end
+  
+  it "should cache new queues" do
+    q1 = Cloudist::Queue.new("test.queue")
+    q2 = Cloudist::Queue.new("test.queue")
+    
+    # q1.cached_queues.should == {}
+    q1.q.should == q2.q
+    Cloudist::Queue.cached_queues.should == {}
+  end
+end

data/spec/cloudist_spec.rb

@@ -1,55 +1,59 @@
 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)
+    stub_amqp!
   end
-  
-  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 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
+  it "should start an AMQP instance" do
+    AMQP.expects(:start).once
+    
+    Cloudist.start do
+      
+    end
   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
+  # 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
+  # 
+  # 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 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

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require "moqueue"
 require "mocha"
-
 require 'cloudist'
 
 # Requires supporting files with custom matchers and macros, etc,

data/spec/support/amqp.rb

@@ -0,0 +1,16 @@
+def stub_amqp!
+  AMQP.stubs(:start)
+  mock_queue = mock("AMQP::Queue")
+  mock_queue.stubs(:bind)
+  mock_queue.stubs(:name).returns("test.queue")
+  
+  mock_ex = mock("AMQP::Exchange")
+  mock_ex.stubs(:name).returns("test.queue")
+  
+  mock_channel = mock("AMQP::Channel")
+  mock_channel.stubs(:prefetch).with(1)
+  mock_channel.stubs(:queue).returns(mock_queue)
+  mock_channel.stubs(:direct).returns(mock_ex)
+  
+  AMQP::Channel.stubs(:new).returns(mock_channel)
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: cloudist
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors: 
 - Ivan Vanderbyl
@@ -15,179 +10,174 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +11:00
+date: 2011-05-23 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: amqp
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 6
-        - 7
-        version: 0.6.7
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+        version: 0.8.0.rc12
   type: :runtime
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: json
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
         version: 1.4.6
-  requirement: *id002
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: i18n
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
-  requirement: *id003
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hashie
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: uuid
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
   type: :development
   prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: moqueue
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: mocha
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: reek
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 2
-        - 8
         version: 1.2.8
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: roodi
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
         version: 2.1.0
-  requirement: *id011
+  type: :development
+  prerelease: false
+  version_requirements: *id015
 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,36 +197,53 @@ files:
 - Rakefile
 - VERSION
 - cloudist.gemspec
-- examples/extending_values.rb
+- examples/amqp/Gemfile
+- examples/amqp/Gemfile.lock
+- examples/amqp/amqp_consumer.rb
+- examples/amqp/amqp_publisher.rb
 - examples/queue_message.rb
-- examples/sandwich_client.rb
+- examples/sandwich_client_with_custom_listener.rb
 - examples/sandwich_worker.rb
 - examples/sandwich_worker_with_class.rb
 - lib/cloudist.rb
-- lib/cloudist/callback.rb
-- lib/cloudist/callback_methods.rb
-- lib/cloudist/callbacks/error_callback.rb
+- lib/cloudist/application.rb
+- lib/cloudist/core_ext/class.rb
+- lib/cloudist/core_ext/kernel.rb
+- lib/cloudist/core_ext/module.rb
 - lib/cloudist/core_ext/object.rb
 - lib/cloudist/core_ext/string.rb
+- lib/cloudist/encoding.rb
 - lib/cloudist/errors.rb
 - lib/cloudist/job.rb
 - lib/cloudist/listener.rb
+- lib/cloudist/message.rb
+- lib/cloudist/messaging.rb
 - lib/cloudist/payload.rb
+- lib/cloudist/payload_old.rb
 - lib/cloudist/publisher.rb
+- lib/cloudist/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
+- lib/cloudist_old.rb
+- lib/em/em_timer_utils.rb
+- lib/em/iterator.rb
 - spec/cloudist/basic_queue_spec.rb
 - spec/cloudist/job_spec.rb
+- spec/cloudist/message_spec.rb
+- spec/cloudist/messaging_spec.rb
 - spec/cloudist/payload_spec.rb
+- spec/cloudist/payload_spec_2_spec.rb
+- spec/cloudist/queue_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
+- spec/support/amqp.rb
 has_rdoc: true
 homepage: http://github.com/ivanvanderbyl/cloudist
 licenses: 
@@ -251,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 599422849760493927
       segments: 
       - 0
       version: "0"
@@ -260,28 +267,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Super fast job queue using AMQP
 test_files: 
-- examples/extending_values.rb
+- examples/amqp/amqp_consumer.rb
+- examples/amqp/amqp_publisher.rb
 - examples/queue_message.rb
-- examples/sandwich_client.rb
+- examples/sandwich_client_with_custom_listener.rb
 - examples/sandwich_worker.rb
 - examples/sandwich_worker_with_class.rb
 - spec/cloudist/basic_queue_spec.rb
 - spec/cloudist/job_spec.rb
+- spec/cloudist/message_spec.rb
+- spec/cloudist/messaging_spec.rb
 - spec/cloudist/payload_spec.rb
+- spec/cloudist/payload_spec_2_spec.rb
+- spec/cloudist/queue_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
+- spec/support/amqp.rb