Permalink
Browse files

Merge branch 'release/0.5.6'

  • Loading branch information...
2 parents 456571f + dd4be27 commit 54e3bacec9a524f1bc61bc5cbc447827910526c8 @benlangfeld benlangfeld committed Sep 23, 2011
Showing with 12 additions and 4 deletions.
  1. +4 −1 CHANGELOG
  2. +1 −1 lib/blather/client/dsl.rb
  3. +1 −1 lib/blather/version.rb
  4. +6 −1 spec/blather/client/dsl_spec.rb
View
@@ -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
@@ -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
View
@@ -1,4 +1,4 @@
module Blather
# Blather version number
- VERSION = '0.5.5'
+ VERSION = '0.5.6'
end
@@ -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

0 comments on commit 54e3bac

Please sign in to comment.