Merge branch 'release/0.5.6'

jmazzi · Sep 23, 2011 · 54e3bac · 54e3bac
2 parents 456571f + dd4be27
commit 54e3bac
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,7 @@
-v0.5.5
+v0.5.6
+  Changes from 0.5.5, this time without a bug when using the namespaced DSL approach
+
+v0.5.5 (yanked)
   Bugfix(benlangfeld/kibs): ActiveSupport was overriding the presence DSL method
   Feature(fyafighter): Adds SSL peer verification to TLS
 

diff --git a/lib/blather/client/dsl.rb b/lib/blather/client/dsl.rb
@@ -85,7 +85,7 @@ module DSL
 
     def self.append_features(o)
       Blather::Stanza.handler_list.each do |handler_name|
-        o.__send__ :remove_method, handler_name if o.method_defined? handler_name
+        o.__send__ :remove_method, handler_name if !o.is_a?(Class) && o.method_defined?(handler_name)
       end
       super
     end

diff --git a/lib/blather/version.rb b/lib/blather/version.rb
@@ -1,4 +1,4 @@
 module Blather
   # Blather version number
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end
diff --git a/spec/blather/client/dsl_spec.rb b/spec/blather/client/dsl_spec.rb
@@ -1,4 +1,4 @@
-require '../../spec_helper'
+require 'spec_helper'
 require 'blather/client/dsl'
 
 describe Blather::DSL do
@@ -73,6 +73,11 @@
     @dsl.handle type, *guards
   end
 
+  it 'sets up handler methods' do
+    @client.expects(:register_handler).with :presence, :unavailable?
+    @dsl.presence :unavailable?
+  end
+
   it 'provides a helper for ready state' do
     @client.expects(:register_handler).with :ready
     @dsl.when_ready