droid 1.0.2pre → 1.0.2

data/lib/droid/utils.rb

@@ -2,112 +2,112 @@ require 'socket'
 require 'digest/md5'
 
 class Droid
-	DEFAULT_TTL = 300
+  DEFAULT_TTL = 300
 
-	class BadPayload < RuntimeError; end
-
-	module Utils
-		def self.parse_message(raw)
-			return { } unless raw
-			JSON.parse(raw)
-		end
-
-		def self.parse_custom_headers(headers)
-			return { } unless headers
-
-			h = headers.dup
-
-			h[:published_on] = h[:published_on].to_i
-
-			h[:ttl] = h[:ttl].to_i rescue -1
-			h[:ttl] = -1 if h[:ttl] == 0
-
-			h
-		end
-
-		def self.create_event_hash
-			s = Time.now.to_s + self.object_id.to_s + rand(100).to_s
-			'd' + Digest::MD5.hexdigest(s)
-		end
-
-		def self.extract_custom_headers(hash, opts={}, popts={})
-			popts[:headers] ||= {}
-			headers = popts[:headers]
-
-			headers[:published_on] ||= hash.delete('published_on') || opts[:published_on] || Time.now.getgm.to_i
-			headers[:ttl] ||= hash.delete('ttl') || (opts[:ttl] || Droid::DEFAULT_TTL).to_i
-			headers[:reply_to] ||= opts[:reply_to] if opts[:reply_to]
-
-			# this is the event hash that gets transferred through various publish/reply actions
-			headers[:event_hash] ||= hash.delete('event_hash') || opts[:event_hash] || create_event_hash
-
-			# this value should be unique for each published/received message pair
-			headers[:message_id] ||= create_event_hash
-
-			# some strange behavior with integers makes it better to
-			# convert all amqp headers to strings to avoid any problems
-			headers.each { |k,v| headers[k] = v.to_s }
-
-			[hash, headers]
-		end
-
-		def self.format_publish(data, opts={}, popts={})
-			raise Droid::BadPayload unless data.is_a?(Hash)
-
-			hash, headers = extract_custom_headers(data, opts, popts)
-
-			popts[:content_type] ||= 'application/json'
-
-			[hash.to_json, popts]
-		end
-
-		def self.generate_queue(exchange_name, second_name=nil)
-			second_name ||= $$
-			"#{generate_name_for_instance(exchange_name)}.#{second_name}"
-		end
-
-		def self.generate_name_for_instance(name)
-			"#{name}.#{Socket.gethostname}"
-		end
-
-		def self.generate_reply_to(name)
-			"temp.reply.#{name}.#{self.generate_sym}"
-		end
-
-		def self.generate_sym
-			values = [
-				rand(0x0010000),
-				rand(0x0010000),
-				rand(0x0010000),
-				rand(0x0010000),
-				rand(0x0010000),
-				rand(0x1000000),
-				rand(0x1000000),
-			]
-			"%04x%04x%04x%04x%04x%06x%06x" % values
-		end
-
-		def self.data_summary(json)
-			return '-> (empty)' if json.empty?
-			summary = json.map do |k,v|
-				v = v.to_s
-				v = v[0..37] + '...' if v.size > 40
-				"#{k}=#{v}"
-			end.join(', ')
-			"-> #{summary}"
-		end
-
-		def self.format_data_summary(data, headers)
-			"(data) " + Droid::Utils.data_summary(data) + " (headers) " + Droid::Utils.data_summary(headers)
-		end
-	end
-
-	# Need this to be backwards compatible
-	def self.gen_queue(droid, name)
-		dn = droid
-		dn = dn.name if dn.respond_to?(:name)
-		dn ||= "d"
-		dn = dn.gsub(" ", "")
-		Droid::Utils.generate_queue(name, droid)
-	end
+  class BadPayload < RuntimeError; end
+
+  module Utils
+    def self.parse_message(raw)
+      return { } unless raw
+      JSON.parse(raw)
+    end
+
+    def self.parse_custom_headers(headers)
+      return { } unless headers
+
+      h = headers.dup
+
+      h[:published_on] = h[:published_on].to_i
+
+      h[:ttl] = h[:ttl].to_i rescue -1
+      h[:ttl] = -1 if h[:ttl] == 0
+
+      h
+    end
+
+    def self.create_event_hash
+      s = Time.now.to_s + self.object_id.to_s + rand(100).to_s
+      'd' + Digest::MD5.hexdigest(s)
+    end
+
+    def self.extract_custom_headers(hash, opts={}, popts={})
+      popts[:headers] ||= {}
+      headers = popts[:headers]
+
+      headers[:published_on] ||= hash.delete('published_on') || opts[:published_on] || Time.now.getgm.to_i
+      headers[:ttl] ||= hash.delete('ttl') || (opts[:ttl] || Droid::DEFAULT_TTL).to_i
+      headers[:reply_to] ||= opts[:reply_to] if opts[:reply_to]
+
+      # this is the event hash that gets transferred through various publish/reply actions
+      headers[:event_hash] ||= hash.delete('event_hash') || opts[:event_hash] || create_event_hash
+
+      # this value should be unique for each published/received message pair
+      headers[:message_id] ||= create_event_hash
+
+      # some strange behavior with integers makes it better to
+      # convert all amqp headers to strings to avoid any problems
+      headers.each { |k,v| headers[k] = v.to_s }
+
+      [hash, headers]
+    end
+
+    def self.format_publish(data, opts={}, popts={})
+      raise Droid::BadPayload unless data.is_a?(Hash)
+
+      hash, headers = extract_custom_headers(data, opts, popts)
+
+      popts[:content_type] ||= 'application/json'
+
+      [hash.to_json, popts]
+    end
+
+    def self.generate_queue(exchange_name, second_name=nil)
+      second_name ||= $$
+      "#{generate_name_for_instance(exchange_name)}.#{second_name}"
+    end
+
+    def self.generate_name_for_instance(name)
+      "#{name}.#{Socket.gethostname}"
+    end
+
+    def self.generate_reply_to(name)
+      "temp.reply.#{name}.#{self.generate_sym}"
+    end
+
+    def self.generate_sym
+      values = [
+        rand(0x0010000),
+        rand(0x0010000),
+        rand(0x0010000),
+        rand(0x0010000),
+        rand(0x0010000),
+        rand(0x1000000),
+        rand(0x1000000),
+      ]
+      "%04x%04x%04x%04x%04x%06x%06x" % values
+    end
+
+    def self.data_summary(json)
+      return '-> (empty)' if json.empty?
+      summary = json.map do |k,v|
+        v = v.to_s
+        v = v[0..37] + '...' if v.size > 40
+        "#{k}=#{v}"
+      end.join(', ')
+      "-> #{summary}"
+    end
+
+    def self.format_data_summary(data, headers)
+      "(data) " + Droid::Utils.data_summary(data) + " (headers) " + Droid::Utils.data_summary(headers)
+    end
+  end
+
+  # Need this to be backwards compatible
+  def self.gen_queue(droid, name)
+    dn = droid
+    dn = dn.name if dn.respond_to?(:name)
+    dn ||= "d"
+    dn = dn.gsub(" ", "")
+    Droid::Utils.generate_queue(name, droid)
+  end
 end

data/spec/publish_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
 describe 'AMQP Publish' do
-	before do
-		@json, @publish_opts = Droid::Utils.format_publish({:x => 1, :y => 2}, {}, {})
-		Droid::Utils.stubs(:format_publish).with({:x => 1, :y => 2}, {}, {}).returns([@json, @publish_opts])
-	end
+  before do
+    @json, @publish_opts = Droid::Utils.format_publish({:x => 1, :y => 2}, {}, {})
+    Droid::Utils.stubs(:format_publish).with({:x => 1, :y => 2}, {}, {}).returns([@json, @publish_opts])
+  end
 
-	it "publishes a message to a queue" do
-		@q = mock('queue')
-		::MQ.expects(:queue).with('topic').returns(@q)
-		@q.expects(:publish).with(@json, @publish_opts)
-		Droid.publish_to_q('topic', :x => 1, :y => 2)
-	end
+  it "publishes a message to a queue" do
+    @q = mock('queue')
+    ::MQ.expects(:queue).with('topic').returns(@q)
+    @q.expects(:publish).with(@json, @publish_opts)
+    Droid.publish_to_q('topic', :x => 1, :y => 2)
+  end
 
-	it "publishes a message to an exchange" do
-		@ex = mock('exchange')
-		::MQ.expects(:direct).with('topic').returns(@ex)
-		@ex.expects(:publish).with(@json, @publish_opts)
-		Droid.publish_to_ex('topic', :x => 1, :y => 2)
-	end
+  it "publishes a message to an exchange" do
+    @ex = mock('exchange')
+    ::MQ.expects(:direct).with('topic').returns(@ex)
+    @ex.expects(:publish).with(@json, @publish_opts)
+    Droid.publish_to_ex('topic', :x => 1, :y => 2)
+  end
 
-	it "by default publishes to an exchange" do
-		Droid.expects(:publish_to_ex).with('topic', {:x => 1, :y => 2}, {}, {})
-		Droid.publish('topic', :x => 1, :y => 2)
-	end
+  it "by default publishes to an exchange" do
+    Droid.expects(:publish_to_ex).with('topic', {:x => 1, :y => 2}, {}, {})
+    Droid.publish('topic', :x => 1, :y => 2)
+  end
 end

data/spec/response_spec.rb

@@ -1,47 +1,47 @@
 require 'spec_helper'
 
 describe 'Request' do
-	before do
-		@mq = mock("MQ")
-		@exchange = mock("MQ Exchange")
-		@queue = mock("MQ Queue")
-
-		@qobj = mock("Droid::BasicQueue Instance")
-		@qobj.stubs(:q).returns(@queue)
-		@qobj.stubs(:mq).returns(@mq)
-		@qobj.stubs(:ex).returns(@exchange)
-
-		@header = mock("amqp header", :headers => {})
-
-		@raw_message = '{"x":123,"y":"abc"}'
-
-		@res = Droid::Request.new(@qobj, @header, @raw_message)
-	end
-
-	it "allows access to response via symbols or strings in array access" do
-		@res['x'].should == 123
-		@res[:x].should == 123
-		@res['y'].should == 'abc'
-		@res[:y].should == 'abc'
-	end
-
-	it "calls ack on the header" do
-		@header.expects(:ack)
-		@res.ack
-	end
-
-	it "calls q on the qobj" do
-		@qobj.expects(:q)
-		@res.q
-	end
-
-	it "calls ex on the qobj" do
-		@qobj.expects(:ex)
-		@res.ex
-	end
-
-	it "calls mq on the qobj" do
-		@qobj.expects(:mq)
-		@res.mq
-	end
+  before do
+    @mq = mock("MQ")
+    @exchange = mock("MQ Exchange")
+    @queue = mock("MQ Queue")
+
+    @qobj = mock("Droid::BasicQueue Instance")
+    @qobj.stubs(:q).returns(@queue)
+    @qobj.stubs(:mq).returns(@mq)
+    @qobj.stubs(:ex).returns(@exchange)
+
+    @header = mock("amqp header", :headers => {})
+
+    @raw_message = '{"x":123,"y":"abc"}'
+
+    @res = Droid::Request.new(@qobj, @header, @raw_message)
+  end
+
+  it "allows access to response via symbols or strings in array access" do
+    @res['x'].should == 123
+    @res[:x].should == 123
+    @res['y'].should == 'abc'
+    @res[:y].should == 'abc'
+  end
+
+  it "calls ack on the header" do
+    @header.expects(:ack)
+    @res.ack
+  end
+
+  it "calls q on the qobj" do
+    @qobj.expects(:q)
+    @res.q
+  end
+
+  it "calls ex on the qobj" do
+    @qobj.expects(:ex)
+    @res.ex
+  end
+
+  it "calls mq on the qobj" do
+    @qobj.expects(:mq)
+    @res.mq
+  end
 end

data/spec/utils_spec.rb

@@ -1,43 +1,43 @@
 require 'spec_helper'
 
 describe 'Utils' do
-	before do
-	end
-
-	it "parses a json message" do
-		Droid::Utils.parse_message('{"x":1,"y":2}').should == {'x' => 1, 'y' => 2}
-	end
-
-	it "parses custom headers and force integers on a few values" do
-		headers = {
-			:x => '1',
-			:y => '2',
-			:reply_to => 'q.random.reply',
-			:published_on => '12345',
-			:event_hash => 'x123'
-		}
-
-		h = Droid::Utils.parse_custom_headers(headers)
-
-		h.size.should == 6
-		h[:ttl].should == -1
-		h[:reply_to].should == 'q.random.reply'
-		h[:published_on].should == 12345
-		h[:event_hash].should == 'x123'
-	end
-
-	it "raises an exception if the data to format for publish is not a hash" do
-		lambda { Droid::Utils.format_publish('bad payload') }.should.raise Droid::BadPayload
-	end
-
-	it "generates a name for the instance" do
-		Socket.stubs(:gethostname).returns('deepblue.123')
-		Droid::Utils.generate_name_for_instance('woo').should == 'woo.deepblue.123'
-	end
-
-	it "generates queue name, really more like a generic identifier" do
-		Socket.stubs(:gethostname).returns('deepblue.123')
-		Droid::Utils.generate_queue('topic').should == "topic.deepblue.123.#{$$}"
-		Droid::Utils.generate_queue('topic', 'local').should == "topic.deepblue.123.local"
-	end
+  before do
+  end
+
+  it "parses a json message" do
+    Droid::Utils.parse_message('{"x":1,"y":2}').should == {'x' => 1, 'y' => 2}
+  end
+
+  it "parses custom headers and force integers on a few values" do
+    headers = {
+      :x => '1',
+      :y => '2',
+      :reply_to => 'q.random.reply',
+      :published_on => '12345',
+      :event_hash => 'x123'
+    }
+
+    h = Droid::Utils.parse_custom_headers(headers)
+
+    h.size.should == 6
+    h[:ttl].should == -1
+    h[:reply_to].should == 'q.random.reply'
+    h[:published_on].should == 12345
+    h[:event_hash].should == 'x123'
+  end
+
+  it "raises an exception if the data to format for publish is not a hash" do
+    lambda { Droid::Utils.format_publish('bad payload') }.should.raise Droid::BadPayload
+  end
+
+  it "generates a name for the instance" do
+    Socket.stubs(:gethostname).returns('deepblue.123')
+    Droid::Utils.generate_name_for_instance('woo').should == 'woo.deepblue.123'
+  end
+
+  it "generates queue name, really more like a generic identifier" do
+    Socket.stubs(:gethostname).returns('deepblue.123')
+    Droid::Utils.generate_queue('topic').should == "topic.deepblue.123.#{$$}"
+    Droid::Utils.generate_queue('topic', 'local').should == "topic.deepblue.123.local"
+  end
 end

data/spec/wait_for_port_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 Thread.new do
-	sleep 2
-	TCPServer.new('localhost', 20_001).accept.close
+  sleep 2
+  TCPServer.new('localhost', 20_001).accept.close
 end
 
 describe 'Connectivity' do
-	it "waits for the rabbitmq server to come up before opening the amqp connection" do
-		start = Time.now
-		Droid.wait_for_tcp_port('localhost', 20_001)
-		finish = Time.now
-		(finish - start).should > 1
-		(finish - start).should < 3
-	end
+  it "waits for the rabbitmq server to come up before opening the amqp connection" do
+    start = Time.now
+    Droid.wait_for_tcp_port('localhost', 20_001)
+    finish = Time.now
+    (finish - start).should > 1
+    (finish - start).should < 3
+  end
 end