cloudist 0.4.4 → 0.5.0

data/lib/cloudist/publisher.rb

@@ -1,22 +1,22 @@
 module Cloudist
   class Publisher
-    
+
     class << self
       def enqueue(queue_name, data)
         payload = Cloudist::Payload.new(data)
-        
+
         queue = Cloudist::JobQueue.new(queue_name)
-        
+
         queue.setup
-        
+
         # send_message = proc {
           queue.publish(payload)
         # }
         # EM.next_tick(&send_message)
-        
+
         return Job.new(payload)
       end
     end
-    
+
   end
 end

data/lib/cloudist/queues/basic_queue.rb

@@ -1,19 +1,19 @@
 module Cloudist
   class UnknownReplyTo < RuntimeError; end
   class ExpiredMessage < RuntimeError; end
-  
+
   module Queues
     class BasicQueue
       attr_reader :queue_name, :options
       attr_reader :queue, :exchange, :channel, :prefetch
-      
+
       alias :q :queue
       alias :ex :exchange
       alias :mq :channel
-      
+
       def initialize(queue_name, options = {})
         @prefetch ||= options.delete(:prefetch) || 1
-        
+
         options = {
           :auto_delete => true,
           :durable => false,
@@ -21,28 +21,28 @@ module Cloudist
         }.update(options)
 
         @queue_name, @options = queue_name, options
-        
+
         setup
       end
-      
+
       def inspect
         "<#{self.class.name} queue_name=#{queue_name}>"
       end
 
       def setup
         return if @setup.eql?(true)
-        
+
         @channel ||= AMQP::Channel.new(Cloudist.connection) do
-          channel.prefetch(self.prefetch, false) if self.prefetch.present?
+          channel.prefetch(self.prefetch, false) if self.prefetch
         end
-        
+
         @queue = @channel.queue(queue_name, options)
-        
+
         setup_exchange
-        
+
         @setup = true
       end
-      
+
       def setup_exchange
         @exchange = channel.direct("")
       end
@@ -61,13 +61,13 @@ module Cloudist
         s += " exchange=#{exchange.name}" if exchange
         s
       end
-      
+
       def subscribe(&block)
         queue.subscribe(:ack => true) do |queue_header, encoded_message|
           # next if Cloudist.closing?
 
           request = Cloudist::Request.new(self, encoded_message, queue_header)
-          
+
           handle_request = proc {
             begin
               raise Cloudist::ExpiredMessage if request.expired?
@@ -86,11 +86,11 @@ module Cloudist
               # log.debug("Finished Job in #{finished - request.start} seconds")
             end
           }
-          
+
           handle_ack = proc {
             request.ack
           }
-          
+
           EM.defer(handle_request, handle_ack)
         end
         log.info "AMQP Subscribed: #{tag}"
@@ -128,4 +128,4 @@ module Cloudist
       end
     end
   end
-end
+end

data/lib/cloudist/queues/job_queue.rb

@@ -1,26 +1,26 @@
 module Cloudist
   class JobQueue < Cloudist::Queues::BasicQueue
-    
+
     def initialize(queue_name, options={})
       options[:auto_delete] = false
       options[:nowait] = false
-      
+
       @prefetch = Cloudist.worker_prefetch
       puts "Prefetch: #{@prefetch}"
       super(queue_name, options)
     end
-    
+
     # def initialize(queue_name, options={})
     #   @prefetch = 1
     #   # opts[:auto_delete] = false
-    #   
+    #
     #   super(queue_name, options)
     # end
-    
+
     # def setup_exchange
     #   @exchange = channel.direct(queue_name)
     #   queue.bind(exchange)
     # end
-    
+
   end
 end

data/lib/cloudist/queues/reply_queue.rb

@@ -3,23 +3,23 @@ module Cloudist
     def initialize(queue_name, options={})
       options[:auto_delete] = true
       options[:nowait] = false
-      
+
       @prefetch = Cloudist.listener_prefetch
-      
+
       super(queue_name, options)
     end
-    
+
     # def subscribe(&block)
     #   super do |request|
     #     yield request if block_given?
     #     teardown
     #   end
     # end
-    
+
     # def teardown
     #   queue.delete
     #   super
     # end
-    
+
   end
 end

data/lib/cloudist/request.rb

@@ -1,7 +1,7 @@
 module Cloudist
   class Request
     include Cloudist::Encoding
-    
+
     attr_reader :queue_header, :qobj, :payload, :start, :headers, :body
 
     def initialize(queue, encoded_body, queue_header)
@@ -9,13 +9,13 @@ module Cloudist
 
       @body = decode(encoded_body)
       @headers = parse_custom_headers(queue_header)
-      
+
       @payload = Cloudist::Payload.new(encoded_body, queue_header.headers.dup)
       @headers = @payload.headers
 
       @start = Time.now.utc.to_f
     end
-    
+
     def parse_custom_headers(amqp_headers)
       h = amqp_headers.headers.dup
 
@@ -26,7 +26,7 @@ module Cloudist
 
       h
     end
-    
+
     def for_message
       [body.dup, queue_header.headers.dup]
     end
@@ -42,7 +42,7 @@ module Cloudist
     def mq
       qobj.channel
     end
-    
+
     def channel
       mq
     end

data/lib/cloudist/utils.rb

@@ -22,7 +22,7 @@ module Cloudist
     def generate_name_for_instance(name)
       "#{name}.#{Socket.gethostname}"
     end
-    
+
     # DEPRECATED
     def generate_reply_to(name)
       "#{reply_prefix(name)}.#{generate_sym}"
@@ -40,15 +40,15 @@ module Cloudist
       ]
       "%04x%04x%04x%04x%04x%06x%06x" % values
     end
-    
+
     def encode_message(object)
       Marshal.dump(object).to_s
     end
-    
+
     def decode_message(string)
       Marshal.load(string)
     end
-    
+
     def decode_json(string)
       if defined? ActiveSupport::JSON
         ActiveSupport::JSON.decode string
@@ -56,6 +56,6 @@ module Cloudist
         JSON.load string
       end
     end
-    
+
   end
 end

data/lib/cloudist/worker.rb

@@ -1,37 +1,37 @@
 module Cloudist
   class Worker
-    
+
     attr_reader :job, :queue, :payload
-    
+
     def initialize(job, queue)
       @job, @queue, @payload = job, queue, job.payload
-      
+
       # Do custom initialization
       self.setup if self.respond_to?(:setup)
     end
-    
+
     def data
       job.data
     end
-    
+
     def headers
       job.headers
     end
-    
+
     def id
       job.id
     end
-    
+
     def process
       raise NotImplementedError, "Your worker class must subclass this method"
     end
-    
+
     def log
       Cloudist.log
     end
-    
+
   end
-  
+
   class GenericWorker < Worker
     def process(&block)
       instance_eval(&block)

data/spec/cloudist/basic_queue_spec.rb

@@ -6,28 +6,28 @@ describe "Cloudist" do
       overload_amqp
       reset_broker
     end
-    
+
     it "should create a queue and exchange" do
       # MQ.stubs(:direct).with(:name).returns(true)
       @mq = mock("MQ")
       @exchange = mock("MQ Exchange")
       @queue = mock("MQ Queue")
-      
+
       @queue.expects(:bind).with(@exchange)
       # @mq.expects(:queue).with("make.sandwich")
-      
+
       bq = Cloudist::Queues::BasicQueue.new("make.sandwich")
-      bq.stubs(:q).returns(@queue)
-      bq.stubs(:mq).returns(@mq)
-      bq.stubs(:ex).returns(@exchange)
-      
+      bq.stub(:q).and_return(@queue)
+      bq.stub(:mq).and_return(@mq)
+      bq.stub(:ex).and_return(@exchange)
+
       bq.setup
-      
+
       bq.q.should_not be_nil
       bq.ex.should_not be_nil
       bq.mq.should_not be_nil
     end
-    
+
   end
-  
+
 end

data/spec/cloudist/job_spec.rb

@@ -4,20 +4,20 @@ describe Cloudist::Job do
   before(:each) do
     @payload = Cloudist::Payload.new({:bread => 'white'})
   end
-  
+
   it "should be constructable with payload" do
     job = Cloudist::Job.new(@payload)
     job.payload.should == @payload
   end
-  
+
   it "should be constructable with payload and return ID" do
     job = Cloudist::Job.new(@payload)
     job.id.should == @payload.id
   end
-  
+
   it "should be constructable with payload and return data" do
     job = Cloudist::Job.new(@payload)
     job.data.should == @payload.body
   end
-  
+
 end

data/spec/cloudist/payload_spec_2_spec.rb

@@ -2,22 +2,22 @@ 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"
@@ -27,52 +27,52 @@ describe Cloudist::Payload do
     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
+
+
+
+end