activemessaging-kestrel-adapter 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.2 / 2012-02-10
+* Scrub queue names of illegal characters (according to kestrel v2.1.5).  The illegal
+  chars are '.', '/', '~'.
+
 == 1.0.1 / 2012-01-18
 * Call load_extensions on ActiveMessaging before registering the adapter. Avoids
   unresolved references to ActiveMessaging::Gateway.

data/lib/active_messaging/adapters/kestrel.rb

@@ -6,6 +6,11 @@ module ActiveMessaging
     # This module contains code to integrate the ActiveMessaging framework with a
     # kestrel message queue server.
     module Kestrel
+      QUEUE_NAME_NORMALIZATIONS = {
+        '/' => '__4S__',
+        '.' => '__D0T__',
+        '~' => '__T1L__'
+      }
       # Simple struct for wrapping received messages
       Message = Struct.new(:headers, :body, :destination) do
         def matches_subscription?(subscription)
@@ -105,7 +110,7 @@ module ActiveMessaging
             queues.each do |queue|
               KESTREL_STATS_QUEUE_KEYS.each do |key|
                 stats_key = "queue_#{queue}_#{key}"
-                denormalized_name = queue.gsub('--FS--', '/') # denormalize the name ...
+                denormalized_name = queue.gsub('FS', '/') # denormalize the name ...
                 return_hash[server_def][denormalized_name][key] = stats_hash[stats_key]
               end
             end
@@ -186,10 +191,27 @@ module ActiveMessaging
             logger
           end
 
+          def denormalize(name)
+            @denormalized_names ||= Hash.new do |h,k|
+              newkey = k
+              QUEUE_NAME_NORMALIZATIONS.each do |bad, good|
+                newkey = newkey.gsub(good, bad)
+              end
+              h[k] = newkey
+            end
+            @denormalized_names[name]
+          end
+
           def normalize(name)
-            # Kestrel doesn't like '/' chars in queue names, so get rid of them
+            # Kestrel doesn't like certain chars in queue names, so get rid of them
             # (and memoize the calculation)
-            @normalized_names ||= Hash.new {|h,k| h[k] = k.gsub('/', '--FS--')}
+            @normalized_names ||= Hash.new do |h,k|
+              newkey = k
+              QUEUE_NAME_NORMALIZATIONS.each do |bad, good|
+                newkey = newkey.gsub(bad, good)
+              end
+              h[k] = newkey
+            end
             @normalized_names[name]
           end
 

data/version.txt

@@ -1 +1 @@
-1.0.1
+1.0.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemessaging-kestrel-adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 -08:00
+date: 2012-02-10 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memcache-client
-  requirement: &70199722819920 !ruby/object:Gem::Requirement
+  requirement: &70195407021820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *70199722819920
+  version_requirements: *70195407021820
 - !ruby/object:Gem::Dependency
   name: activemessaging
-  requirement: &70199722817820 !ruby/object:Gem::Requirement
+  requirement: &70195407020720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70199722817820
+  version_requirements: *70195407020720
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70199722814520 !ruby/object:Gem::Requirement
+  requirement: &70195407019240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70199722814520
+  version_requirements: *70195407019240
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70199722813080 !ruby/object:Gem::Requirement
+  requirement: &70195407018060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70199722813080
+  version_requirements: *70195407018060
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &70199722811940 !ruby/object:Gem::Requirement
+  requirement: &70195407016720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *70199722811940
+  version_requirements: *70195407016720
 description: ! "This is an adapter to the kestrel messaging server for the ActiveMessaging
   framework.  It is \nin the early stages of development."
 email: doug@dseifert.net