blather 0.4.4 → 0.4.5

data/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

data/examples/echo.rb

@@ -5,7 +5,7 @@ require 'blather/client'
 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|

data/lib/blather/client/client.rb

@@ -167,8 +167,7 @@ module Blather #:nodoc:
 
   protected
     def stream
-      raise 'Stream not ready!' unless @stream
-      @stream
+      @stream || raise('Stream not ready!')
     end
 
     def check_handler(type, guards)

data/lib/blather/client/dsl.rb

@@ -19,7 +19,7 @@ module Blather
     # 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 @@ module Blather
     ##
     # 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 @@ module Blather
       stanza.node = where
 
       client.register_tmp_handler stanza.id, &callback
-      write stanza
+      client.write stanza
     end
 
     ##

data/lib/blather/stanza/pubsub.rb

@@ -51,11 +51,22 @@ class Stanza
     attribute_accessor :id
 
     def payload=(payload = nil)
-      self.content = payload
+      self.entry.content = payload
     end
 
     def payload
-      content.empty? ? nil : content
+      self.entry.content.empty? ? nil : content
+    end
+
+    def entry
+      e = find_first('ns:entry', :ns => 'http://www.w3.org/2005/Atom') ||
+          find_first('entry', :ns => 'http://www.w3.org/2005/Atom')
+
+      unless e
+        self << (e = XMPPNode.new('entry', self.document))
+        e.namespace = 'http://www.w3.org/2005/Atom'
+      end
+      e
     end
   end
 

data/spec/blather/client/dsl_spec.rb

@@ -89,7 +89,7 @@ describe Blather::DSL do
   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

data/spec/blather/stanza/pubsub_spec.rb

@@ -59,4 +59,9 @@ describe Blather::Stanza::PubSub::PubSubItem do
     item.payload = nil
     item.payload.must_be_nil
   end
+
+  it 'must have an entry child to item' do
+    item = Blather::Stanza::PubSub::Items::PubSubItem.new 'foo', 'payload'
+    item.find_first('ns:entry', :ns => 'http://www.w3.org/2005/Atom').wont_be_nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 -07:00
+date: 2009-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency