blather 0.4.0 → 0.4.1

data/lib/blather/roster.rb

@@ -40,7 +40,7 @@ module Blather
       jid = elem.respond_to?(:jid) ? elem.jid : JID.new(elem)
       @items[key(jid)] = node = RosterItem.new(elem)
 
-      @stream.send_data(node.to_stanza(:set)) if send
+      @stream.write(node.to_stanza(:set)) if send
     end
     alias_method :add, :push
 
@@ -49,7 +49,7 @@ module Blather
     # Sends a remove query stanza to the server
     def delete(jid)
       @items.delete key(jid)
-      @stream.send_data Stanza::Iq::Roster.new(:set, Stanza::Iq::Roster::RosterItem.new(jid, nil, :remove))
+      @stream.write Stanza::Iq::Roster.new(:set, Stanza::Iq::Roster::RosterItem.new(jid, nil, :remove))
     end
     alias_method :remove, :delete
 

data/lib/blather/stanza/iq.rb

@@ -27,9 +27,7 @@ class Stanza
       node
     end
 
-    VALID_TYPES.each do |valid_type|
-      define_method("#{valid_type}?") { self.type == valid_type }
-    end
+    attribute_helpers_for :type, VALID_TYPES
 
     ##
     # Ensures type is :get, :set, :result or :error

data/lib/blather/stanza/message.rb

@@ -27,9 +27,7 @@ class Stanza
       node
     end
 
-    VALID_TYPES.each do |valid_type|
-      define_method("#{valid_type}?") { self.type == valid_type }
-    end
+    attribute_helpers_for :type, VALID_TYPES
 
     ##
     # Ensures type is :chat, :error, :groupchat, :headline or :normal

data/spec/blather/roster_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
 describe Blather::Roster do
   before do
     @stream = mock()
-    @stream.stubs(:send_data)
+    @stream.stubs(:write)
 
     @stanza = mock()
     items = []; 4.times { |n| items << Blather::JID.new("n@d/#{n}r") }
@@ -51,9 +51,8 @@ describe Blather::Roster do
   end
 
   it 'sends a @roster addition over the wire' do
-    stream = mock()
-    stream.expects(:send_data)
-    roster = Blather::Roster.new stream, @stanza
+    client = mock(:write => nil)
+    roster = Blather::Roster.new client, @stanza
     roster.push('a@b/c')
   end
 
@@ -62,8 +61,8 @@ describe Blather::Roster do
   end
 
   it 'sends a @roster removal over the wire' do
-    stream = mock(:send_data => nil)
-    roster = Blather::Roster.new stream, @stanza
+    client = mock(:write => nil)
+    roster = Blather::Roster.new client, @stanza
     roster.delete('a@b/c')
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 -07:00
+date: 2009-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency