orionz-minion 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/minion.rb

@@ -47,7 +47,7 @@ module Minion
 				begin
 					log "recv: #{queue}:#{m}"
 
-					args = JSON.load(m)
+					args = decode_json(m)
 
 					result = yield(args)
 
@@ -65,6 +65,14 @@ module Minion
 		@@handlers << handler
 	end
 
+	def decode_json(string)
+		if defined? ActiveSupport
+			ActiveSupport::JSON.decode string
+		else
+			JSON.load string
+		end
+	end
+
 	def check_all
 		@@handlers.each { |h| h.check }
 	end
@@ -85,12 +93,12 @@ module Minion
 
 	private
 
-	def amqp_uri
-		ENV["AMQP_URI"] || "amqp://guest:guest@localhost/"
+	def amqp_url
+		ENV["AMQP_URL"] || "amqp://guest:guest@localhost/"
 	end
 
 	def amqp_config
-		uri = URI.parse(amqp_uri)
+		uri = URI.parse(amqp_url)
 		{
 			:vhost => uri.path,
 			:host => uri.host,
@@ -99,7 +107,7 @@ module Minion
 			:pass => uri.password
 		}
 	rescue
-		raise "invalid AMQP_URI: #{uri.inspect}"
+		raise "invalid AMQP_URL: #{uri.inspect} (#{e})"
 	end
 
 	def new_bunny

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orionz-minion
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Orion Henry
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-09 00:00:00 -07:00
+date: 2009-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - lib/minion/handler.rb
 has_rdoc: false
 homepage: http://github.com/orionz/minion
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: minion
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Super simple job queue over AMQP