Change DSL#write to DSL#write_to_stream so it doesn't mess with YAML

CHANGELOG

@@ -1,3 +1,6 @@
+v0.4.5
+	Bugfix: Change DSL#write to DSL#write_to_stream. Previous way was messing with YAML
+
 v0.4.4
   Add "disconnected" handler type to handle connection termination
   Bugfix: Fix error with pubsub using the wrong client connection

README.rdoc

@@ -41,12 +41,12 @@ This will auto-accept any subscription requests and echo back any chat messages.
 
   # Auto approve subscription requests
   subscription :request? do |s|
-    write s.approve!
+    write_to_stream s.approve!
   end
 
   # Echo back what was said
   message :chat?, :body do |m|
-    write m.reply
+    write_to_stream m.reply
   end
 
 == Handlers

examples/echo.rb

@@ -5,7 +5,7 @@
 when_ready { puts "Connected ! send messages to #{jid.stripped}." }
 
 subscription :request? do |s|
-  write s.approve!
+  write_to_stream s.approve!
 end
 
 message :chat?, :body => 'exit' do |m|

lib/blather/client/client.rb

@@ -167,8 +167,7 @@ def setup(jid, password, host = nil, port = nil) # :nodoc:
 
   protected
     def stream
-      raise 'Stream not ready!' unless @stream
-      @stream
+      @stream || raise('Stream not ready!')
     end
 
     def check_handler(type, guards)

lib/blather/client/dsl.rb

@@ -19,7 +19,7 @@ def pubsub
     # This works such that it can be chained:
     #   self << stanza1 << stanza2 << "raw data"
     def <<(stanza)
-      write stanza
+      client.write stanza
       self
     end
 
@@ -83,7 +83,7 @@ def my_roster
     ##
     # Write data to the stream
     # Anything that resonds to #to_s can be paseed to the stream
-    def write(stanza)
+    def write_to_stream(stanza)
       client.write stanza
     end
 
@@ -122,7 +122,7 @@ def discover(what, who, where, &callback)
       stanza.node = where
 
       client.register_tmp_handler stanza.id, &callback
-      write stanza
+      client.write stanza
     end
 
     ##

spec/blather/client/dsl_spec.rb

@@ -89,7 +89,7 @@
   it 'provides a writer' do
     stanza = Blather::Stanza::Iq.new
     @client.expects(:write).with stanza
-    @dsl.write stanza
+    @dsl.write_to_stream stanza
   end
 
   it 'provides a "say" helper' do