droid 0.9.5 → 1.0.0

data/lib/memcache_cluster.rb

@@ -1,129 +1 @@
-require 'memcache'
-require 'yaml'
-require 'digest/sha1'
-
-# Manages a pool of memcache servers. This class should not be called
-# outside of the reactor - it does not account for asynchronous access
-# to the server list.
-module MemcacheCluster
-	extend self
-
-	HEROKU_NAMESPACE = '0Xfa15837Z' # heroku's internal memcache namespace
-
-	# A MemCache object configured with heroku's internal memcache namespace.
-	def heroku
-		cache(HEROKU_NAMESPACE)
-	end
-
-	def cache_retry(prefix, opts={})
-		opts[:retries] ||= 5
-		opts[:delay] ||= 0.5
-
-		retried = 0
-		begin
-			c = cache(prefix)
-			yield c if block_given?
-		rescue MemCache::MemCacheError => e
-			Log.error "#{e.class} -> #{e.message}", :exception => e
-			raise if retried > opts[:retries]
-			retried += 1
-			sleep opts[:delay]
-			@caches = { }
-			retry
-		end
-	end
-
-	def set(prefix, *args)
-		res = nil
-		cache_retry(prefix) do |c|
-			res = c.set(*args)
-		end
-		res
-	end
-
-	def get(prefix, *args)
-		res = nil
-		cache_retry(prefix) do |c|
-			res = c.get(*args)
-		end
-		res
-	end
-
-	# Create listeners for standard memcache cluster related topics.
-	def attach(droid, file='memcached.yml')
-		load_from_file(file)
-
-		droid.listen4('memcache.up', :queue => "memcache.up.#{LocalStats.this_instance_name}.#$$") { |msg| add(msg['address'], msg['port']) }
-		droid.listen4('instance.down', :queue => "instance.down.#{LocalStats.this_instance_name}.#$$") { |msg| remove(msg['local_ip']) if msg['slot'] == 'memcache' }
-		EM.add_timer(1) { droid.publish('memcache.needed', {}) }
-	end
-
-	# A MemCache object configured with the given prefix.
-	def cache(prefix, options={})
-		caches[prefix] ||=
-			MemCache.new(servers, options.merge(:namespace => prefix))
-	end
-
-	alias_method :[], :cache
-
-	def caches
-		reload_if_stale
-		@caches ||= {}
-	end
-
-	def servers
-		reload_if_stale
-		@servers ||= []
-	end
-
-	def add(ip, port)
-		host = [ip, port].join(':')
-		return if servers.include?(host)
-
-		log { "#{host} added" }
-		@servers.push host
-		@servers.sort!
-		@caches = {}
-		write_to_file
-		@last_read = Time.now
-	end
-
-	def remove(host)
-		if servers.reject!{ |s| s =~ /^#{host}/ }
-			log { "#{host} removed" }
-			caches.clear
-			write_to_file
-		end
-	end
-
-	def reload_if_stale
-		if @last_read &&
-			(Time.now - @last_read) > 5 &&
-			File.mtime(@file) > @last_read
-			log { "server list modified. reloading." }
-			load_from_file(@file)
-		end
-	rescue => boom
-		# ignore errors accessing/reading file.
-	end
-
-	def load_from_file(file)
-		@file = file
-		@last_read = Time.now
-		@servers = YAML.load(File.read(file)) rescue []
-		@caches = {}
-	end
-
-	def write_to_file
-		log { "writing server list: #{@file}" }
-		File.open(@file, 'w') do |f|
-			f.flock(File::LOCK_EX)
-			f.write YAML.dump(@servers)
-			f.flock(File::LOCK_UN)
-		end
-	end
-
-	def log(type=:debug)
-		Log.send(type, "memcached: #{yield}")
-	end
-end
+require 'droid/heroku/memcache_cluster'

data/lib/stats.rb

@@ -1,30 +1 @@
-module Stats
-	# The MemCache instance used to manipulate stats.
-	def cache
-		MemcacheCluster.cache("heroku:stats")
-	end
-
-	# Increment a stat counter. If the counter does not exist,
-	# yield to the block and use the result as the current counter
-	# value. With no block, the counter will be started at zero.
-	def increment(key, amount=1)
-		if (value = cache.incr(key, amount)).nil?
-			value = yield if block_given?
-			value = (value || 0) + amount
-			cache.add(key, value.to_s, 0, true)
-		end
-	rescue => boom
-		Log.default_error(boom)
-		nil
-	end
-
-	# Set the stat counter to a specific value.
-	def sample(key, value)
-		cache.set(key, value.to_s, 0, true)
-	rescue => boom
-		Log.default_error(boom)
-		nil
-	end
-
-	extend self
-end
+require 'droid/heroku/stats'

data/spec/publish_spec.rb

@@ -0,0 +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
+
+	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 "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

@@ -0,0 +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
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'baconmocha'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'droid'
+
+Droid.log.level = Logger::FATAL
+
+Bacon.summary_on_exit

data/spec/utils_spec.rb

@@ -0,0 +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
+end

data/{test/wait_for_port_test.rb → spec/wait_for_port_spec.rb}

@@ -1,18 +1,11 @@
-require File.dirname(__FILE__) + '/../lib/droid'
-require File.dirname(__FILE__) + '/base'
-
-require 'rubygems'
-require 'thread'
-require 'bacon'
-
-Bacon.summary_on_exit
+require 'spec_helper'
 
 Thread.new do
 	sleep 2
 	TCPServer.new('localhost', 20_001).accept.close
 end
 
-describe Droid do
+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)

metadata

@@ -3,22 +3,22 @@ name: droid
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 9
-  - 5
-  version: 0.9.5
+  - 0
+  version: 1.0.0
 platform: ruby
-authors: []
-
+authors: 
+- Ricardo Chimal, Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 -07:00
-default_executable: 
+date: 2010-10-21 00:00:00 -07:00
+default_executable: bleedq
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: baconmocha
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -27,67 +27,136 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: amqp
+  name: json_pure
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 2
         - 0
-        version: "0"
+        version: 1.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bunny
+  name: rest-client
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 2
         - 0
-        version: "0"
+        version: 1.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: amqp
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 6
+        - 7
+        version: 0.6.7
   type: :runtime
   version_requirements: *id004
-description: 
-email: 
-executables: []
-
+- !ruby/object:Gem::Dependency 
+  name: bunny
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: SystemTimer
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: eventmachine_httpserver
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id007
+description: Easy to use AMQP Library with constructs for typical usage patterns
+email: ricardo@heroku.com
+executables: 
+- bleedq
 extensions: []
 
-extra_rdoc_files: 
-- README.md
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Rakefile
+- VERSION
+- bin/bleedq
+- droid.gemspec
+- examples/async_reply.rb
+- examples/heroku_async_reply.rb
+- examples/sync.rb
+- examples/worker.rb
 - lib/droid.rb
+- lib/droid/em.rb
+- lib/droid/heroku.rb
+- lib/droid/heroku/local_stats.rb
+- lib/droid/heroku/logger_client.rb
+- lib/droid/heroku/memcache_cluster.rb
+- lib/droid/heroku/stats.rb
+- lib/droid/json_server.rb
+- lib/droid/monkey.rb
+- lib/droid/publish.rb
+- lib/droid/queue.rb
+- lib/droid/request.rb
 - lib/droid/sync.rb
+- lib/droid/utilization.rb
+- lib/droid/utils.rb
 - lib/heroku_droid.rb
 - lib/local_stats.rb
 - lib/memcache_cluster.rb
 - lib/stats.rb
-- lib/utilization.rb
-- vendor/logger_client/Rakefile
-- vendor/logger_client/init.rb
-- vendor/logger_client/lib/logger_client.rb
-- vendor/logger_client/test.rb
-- README.md
+- spec/publish_spec.rb
+- spec/response_spec.rb
+- spec/spec_helper.rb
+- spec/utils_spec.rb
+- spec/wait_for_port_spec.rb
 has_rdoc: true
-homepage: 
+homepage: http://heroku.com
 licenses: []
 
 post_install_message: 
@@ -111,13 +180,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: droid
+rubyforge_project: 
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: AMQP wrapper
+summary: AMQP Wrapper Library
 test_files: 
-- test/base.rb
-- test/droid_test.rb
-- test/heroku_droid_test.rb
-- test/wait_for_port_test.rb
+- spec/publish_spec.rb
+- spec/response_spec.rb
+- spec/spec_helper.rb
+- spec/utils_spec.rb
+- spec/wait_for_port_spec.rb
+- examples/async_reply.rb
+- examples/heroku_async_reply.rb
+- examples/sync.rb
+- examples/worker.rb