jubjub 0.0.7 → 0.0.8

data/lib/jubjub/user.rb

@@ -1,4 +1,5 @@
 require 'jubjub/errors'
+require 'jubjub/helpers'
 require 'jubjub/response'
 require 'jubjub/jid'
 require 'jubjub/connection/xmpp_gateway'
@@ -7,13 +8,13 @@ require 'jubjub/muc'
 require 'jubjub/data_form'
 
 module Jubjub
-  
+
   module User
-        
+
     def self.included base
       base.extend ClassMethods
     end
-    
+
     module ClassMethods
       def jubjub_client options = {}
         # Setup defaults
@@ -21,49 +22,49 @@ module Jubjub
           :host => '127.0.0.1',
           :port => '8000'
         }.merge options[:connection_settings] || {}
-        
+
         [:jid, :password].each do |key|
           raise Jubjub::ArgumentError.new("missing :#{key} option") unless options.has_key? key
         end
-        
+
         define_method "jubjub_jid" do
           Jubjub::Jid.new(send(options[:jid]))
         end
-        
+
         define_method "jubjub_password" do
           send(options[:password])
         end
-        
+
         define_method "jubjub_connection_settings" do
           default_connection_settings
         end
-        
+
         include InstanceMethods
       end
     end
-    
+
     module InstanceMethods
       def jubjub_connection
         @jubjub_connection ||= Jubjub::Connection::XmppGateway.new(jubjub_jid, jubjub_password, jubjub_connection_settings)
       end
-      
+
       def authenticated?
         jubjub_connection.authenticated?
       end
-      
+
       # List muc rooms
       # if no jid is specified will default to 'connection.JID_DOMAIN'
       def mucs(jid = nil)
         jid ||= "conference.#{jubjub_jid.domain}"
         Jubjub::Muc::Collection.new jid, jubjub_connection
       end
-      
+
       def pubsub(jid = nil)
         jid ||= "pubsub.#{jubjub_jid.domain}"
         Jubjub::Pubsub::Collection.new jid, jubjub_connection
       end
     end
-    
+
   end
-  
-end
+
+end

data/spec/connection/xmpp_gateway_muc_spec.rb

@@ -1,54 +1,59 @@
 require 'spec_helper'
 
 describe Jubjub::Connection::XmppGateway do
-  
+
   before do
     @connection = Jubjub::Connection::XmppGateway.new('theozaurus@theo-template.local','secret', {:host => '127.0.0.1', :port => '8000'})
   end
-  
+
   describe "muc" do
-    
+
     describe "create" do
-      
+
       use_vcr_cassette 'muc create', :record => :new_episodes
-      
+
       it "return a Jubjub::Muc" do
         @room = @connection.muc.create( Jubjub::Jid.new 'room@conference.theo-template.local/nick' )
         @room.should be_a_kind_of_response_proxied Jubjub::Muc
         @room.jid.should == Jubjub::Jid.new( 'room@conference.theo-template.local' )
       end
-      
+
       after do
         @room.destroy
       end
-      
+
     end
-    
+
     describe "create with configuration" do
-      
+
       use_vcr_cassette 'muc create with configuration', :record => :new_episodes
-      
+
       it "return a Jubjub::Muc" do
         @config = Jubjub::Muc::Configuration.new("allow_query_users" => { :type => "boolean", :value => "1", :label => "Allow users to query other users" })
-        
+
         @room = @connection.muc.create( Jubjub::Jid.new( 'room@conference.theo-template.local/nick' ), @config )
         @room.should be_a_kind_of_response_proxied Jubjub::Muc
         @room.jid.should == Jubjub::Jid.new( 'room@conference.theo-template.local' )
       end
-      
+
       after do
         @room.destroy
       end
-      
+
     end
-    
+
     describe "configuration" do
-      
+
       use_vcr_cassette 'muc configuration', :record => :new_episodes
-      
+
+      before do
+        @jid = Jubjub::Jid.new 'configuration@conference.theo-template.local/nick'
+        @room = @connection.muc.create @jid
+      end
+
       it "return a Jubjub::Muc::Configuration" do
-        config = @connection.muc.configuration( Jubjub::Jid.new 'room@conference.theo-template.local/nick' )
-        
+        config = @connection.muc.configuration @jid
+
         expected_config = {
           "allow_query_users"                     => { :type => "boolean", :value => "1", :label => "Allow users to query other users" },
           "allow_private_messages"                => { :type => "boolean", :value => "1", :label => "Allow users to send private messages" },
@@ -87,72 +92,201 @@ describe Jubjub::Connection::XmppGateway do
               { :value => "100", :label => "100" },
               { :value => "200", :label => "200" }]}
         }
-        
+
         config.should == Jubjub::Muc::Configuration.new(expected_config)
       end
-      
+
+      after do
+        @room.destroy
+      end
+
     end
-    
+
     describe "list" do
-      
+
       use_vcr_cassette 'muc list', :record => :new_episodes
-      
+
       before do
         @connection.muc.create Jubjub::Jid.new( 'test_1@conference.theo-template.local/nick' )
         @connection.muc.create Jubjub::Jid.new( 'test_2@conference.theo-template.local/nick' )
       end
-      
+
       it "return an array of Jubjub::Muc" do
         list = @connection.muc.list( Jubjub::Jid.new 'conference.theo-template.local' )
         list.should be_a_kind_of_response_proxied Array
-        
+
         list.size.should eql(2)
         list[0].should be_a_kind_of Jubjub::Muc
         list[0].jid.should == Jubjub::Jid.new( 'test_1@conference.theo-template.local' )
         list[1].should be_a_kind_of Jubjub::Muc
         list[1].jid.should == Jubjub::Jid.new( 'test_2@conference.theo-template.local' )
       end
-      
+
     end
-    
+
+    describe "retrieve_affiliations" do
+
+      use_vcr_cassette 'muc retrieve_affiliations', :record => :new_episodes
+
+      before do
+        @room_full = Jubjub::Jid.new( 'retrieve_affiliations@conference.theo-template.local/theozaurus' )
+        @room = Jubjub::Jid.new @room_full.node, @room_full.domain
+
+        @connection.muc.create @room_full
+      end
+
+      it "return an array of Jubjub::Muc::Affiliation" do
+        list = @connection.muc.retrieve_affiliations @room, 'owner'
+        list.should be_a_kind_of_response_proxied Array
+
+        list.size.should eql(1)
+        list[0].should be_a_kind_of Jubjub::Muc::Affiliation
+        list[0].jid.should == Jubjub::Jid.new( 'theozaurus@theo-template.local' )
+        list[0].role.should == nil
+        list[0].affiliation.should == "owner"
+        list[0].nick.should == nil
+      end
+
+      after do
+        @connection.muc.destroy @room
+      end
+
+    end
+
+    describe "modify_affiliations" do
+
+      use_vcr_cassette 'muc modify_affiliations', :record => :new_episodes
+
+      it "should return true when successful" do
+        room_full = Jubjub::Jid.new 'modify_affiliations_1@conference.theo-template.local/foo'
+        room = Jubjub::Jid.new room_full.node, room_full.domain
+        @connection.muc.create room_full
+
+        affiliation = muc_affiliation_factory :muc_jid => room,
+                                              :jid => 'ed@theo-template.local',
+                                              :affiliation => 'owner',
+                                              :connection => @connection
+
+        @connection.muc.modify_affiliations( room, affiliation).should equal(true)
+
+        @connection.muc.destroy room
+      end
+
+      it "should allow affiliations to be specified as an array" do
+        room_full = Jubjub::Jid.new 'modify_affiliations_2@conference.theo-template.local/foo'
+        room = Jubjub::Jid.new room_full.node, room_full.domain
+        @connection.muc.create room_full
+
+        affiliation_1 = muc_affiliation_factory :muc_jid => room,
+                                                :jid => 'ed@theo-template.local',
+                                                :affiliation => 'owner',
+                                                :connection => @connection
+        affiliation_2 = muc_affiliation_factory :muc_jid => room,
+                                                :jid => 'bob@theo-template.local',
+                                                :affiliation => 'member',
+                                                :connection => @connection
+
+        @connection.muc.modify_affiliations room, [affiliation_1, affiliation_2]
+
+        @connection.muc.destroy room
+      end
+
+      it "should allow affiliations to be specified as arguments" do
+        room_full = Jubjub::Jid.new 'modify_affiliations_3@conference.theo-template.local/foo'
+        room = Jubjub::Jid.new room_full.node, room_full.domain
+        @connection.muc.create room_full
+
+        affiliation_1 = muc_affiliation_factory :muc_jid => room,
+                                                :jid => 'ed@theo-template.local',
+                                                :affiliation => 'owner',
+                                                :connection => @connection
+        affiliation_2 = muc_affiliation_factory :muc_jid => room,
+                                                :jid => 'bob@theo-template.local',
+                                                :affiliation => 'member',
+                                                :connection => @connection
+
+        @connection.muc.modify_affiliations room, affiliation_1, affiliation_2
+
+        @connection.muc.destroy room
+      end
+
+      it "should return false if unsuccessful" do
+        room_full = Jubjub::Jid.new 'modify_affiliations_4@conference.theo-template.local/foo'
+        room = Jubjub::Jid.new room_full.node, room_full.domain
+        @connection.muc.create room_full
+
+        affiliation = muc_affiliation_factory :muc_jid => room,
+                                              :jid => 'ed@theo-template.local',
+                                              :affiliation => 'WIBBLE',
+                                              :connection => @connection
+
+        @connection.muc.modify_affiliations( room, affiliation ).should equal(false)
+
+        @connection.muc.destroy room
+      end
+
+    end
+
+    describe "message" do
+      use_vcr_cassette 'muc message', :record => :new_episodes
+
+      before do
+        @full_jid = Jubjub::Jid.new 'message@conference.theo-template.local/nick'
+        @jid = Jubjub::Jid.new 'message@conference.theo-template.local'
+        @connection.muc.create(@full_jid)
+      end
+
+      it "should send correct stanza" do
+        # will attempt to create new vcr cassette if the stanza is wrong
+        # relies on cassette being manually checked
+        @connection.muc.message(@jid, "Jubjub here!")
+      end
+
+      after do
+        # Just incase the room is persistent
+        @connection.muc.destroy(@jid)
+      end
+
+    end
+
     describe "exit" do
       use_vcr_cassette 'muc exit', :record => :new_episodes
-      
+
       before do
         @full_jid = Jubjub::Jid.new 'extra@conference.theo-template.local/nick'
         @jid = Jubjub::Jid.new 'extra@conference.theo-template.local'
         @connection.muc.create(@full_jid)
       end
-      
+
       it "should send correct stanza" do
         # will attempt to create new vcr cassette if the stanza is wrong
         # relies on cassette being manually checked
         @connection.muc.exit(@full_jid)
       end
-      
+
       after do
         # Just incase the room is persistent
-        @connection.muc.destroy(@jid)        
+        @connection.muc.destroy(@jid)
       end
-      
+
     end
-    
+
     describe "destroy" do
-      
+
       use_vcr_cassette 'muc destroy', :record => :new_episodes
-      
+
       before do
         @jid      = Jubjub::Jid.new 'extra@conference.theo-template.local'
         @full_jid = Jubjub::Jid.new 'extra@conference.theo-template.local/nick'
         @connection.muc.create @full_jid
       end
-      
+
       it "return true" do
         @connection.muc.destroy( @jid ).should be_true
       end
-      
+
     end
-    
+
   end
-  
-end
+
+end

data/spec/connection/xmpp_gateway_pubsub_spec.rb

@@ -1,34 +1,34 @@
 require 'spec_helper'
 
 describe Jubjub::Connection::XmppGateway do
-  
+
   before do
     @jid = Jubjub::Jid.new('theozaurus@theo-template.local')
     @connection = Jubjub::Connection::XmppGateway.new(@jid, 'secret', {:host => '127.0.0.1', :port => '8000'})
   end
-  
+
   describe "pubsub" do
-    
+
     describe "create" do
       use_vcr_cassette 'pubsub create', :record => :new_episodes
 
       it "return a Jubjub::Pubsub" do
         @pubsub = @connection.pubsub.create 'pubsub.theo-template.local', 'node_1'
-        
+
         @pubsub.should be_a_kind_of_response_proxied Jubjub::Pubsub
         @pubsub.jid.should == Jubjub::Jid.new('pubsub.theo-template.local')
         @pubsub.node.should == 'node_1'
       end
-      
+
       after do
         # Clean up the node
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_1'
       end
     end
-    
+
     describe "default_configuration" do
       use_vcr_cassette 'pubsub default configuration', :record => :new_episodes
-      
+
       it "should return a Jubjub::Pubsub::Configuration" do
         expected_config = {
           "pubsub#deliver_payloads" => { :type => "boolean", :value => "1", :label => "Deliver payloads with event notifications" },
@@ -79,77 +79,73 @@ describe Jubjub::Connection::XmppGateway do
               { :value => "headline", :label => nil },
               { :value => "normal",   :label => nil }]}
         }
-        
+
         config = @connection.pubsub.default_configuration 'pubsub.theo-template.local'
-        
+
         config.should be_a_kind_of_response_proxied Jubjub::Pubsub::Configuration
-        config.should == Jubjub::Pubsub::Configuration.new( expected_config ) 
+        config.should == Jubjub::Pubsub::Configuration.new( expected_config )
       end
     end
-    
+
     describe "destroy" do
       use_vcr_cassette 'pubsub destroy', :record => :new_episodes
-      
+
       before do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_1'
       end
-      
+
       it "should send correct stanza" do
         # will attempt to create new vcr cassette if the stanza is wrong
         # relies on cassette being manually checked
         @connection.pubsub.destroy('pubsub.theo-template.local', 'node_1').should be_true
       end
     end
-    
+
     describe "purge" do
       use_vcr_cassette 'pubsub purge', :record => :new_episodes
-      
+
       before do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_pubsub_purge'
       end
-      
+
       it "should send correct stanza" do
         # will attempt to create new vcr cassette if the stanza is wrong
         # relies on cassette being manually checked
         @connection.pubsub.purge('pubsub.theo-template.local', 'node_pubsub_purge').should be_true
       end
-      
+
       after do
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_pubsub_purge'
       end
     end
-    
+
     describe "list" do
-      
+
       use_vcr_cassette 'pubsub list', :record => :new_episodes
-      
+
       before do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_1'
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_2'
       end
-      
+
       it "return an array of Jubjub::Muc" do
         list = @connection.pubsub.list 'pubsub.theo-template.local'
         list.should be_a_kind_of_response_proxied Array
-        
-        list.size.should eql(2)
-        list[0].should be_a_kind_of Jubjub::Pubsub
-        list[0].node.should == 'node_1'
-        list[1].should be_a_kind_of Jubjub::Pubsub
-        list[1].node.should == 'node_2'
-      end
-      
+
+        list.map{|item| item.node }.to_set.should == ['node_1', 'node_2'].to_set
+      end
+
       after do
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_1'
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_2'
       end
-      
+
     end
-    
+
     describe "destroy with redirect" do
       use_vcr_cassette 'pubsub destroy with redirect', :record => :new_episodes
-      
-      before do        
+
+      before do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_1'
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_2'
       end
@@ -157,22 +153,22 @@ describe Jubjub::Connection::XmppGateway do
       it "should support redirects" do
         @connection.pubsub.destroy('pubsub.theo-template.local', 'node_1', 'pubsub.theo-template.local', 'node_2').should be_true
       end
-      
+
       after do
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_2'
       end
     end
-    
+
     describe "subscribe" do
       use_vcr_cassette 'pubsub subscribe', :record => :new_episodes
-      
+
       before do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_1'
       end
-      
+
       it "return a Jubjub::Pubsub::Subscription" do
         @subscription = @connection.pubsub.subscribe( 'pubsub.theo-template.local', 'node_1' )
-        
+
         @subscription.should be_a_kind_of_response_proxied Jubjub::Pubsub::Subscription
         @subscription.jid.should == Jubjub::Jid.new('pubsub.theo-template.local')
         @subscription.node.should == 'node_1'
@@ -180,232 +176,232 @@ describe Jubjub::Connection::XmppGateway do
         @subscription.subscription.should == "subscribed"
         @subscription.subid.should be_kind_of(String)
       end
-            
+
       after do
         # Clean up the node
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_1'
       end
-      
+
     end
-    
+
     describe "unsubscribe" do
-      
+
       use_vcr_cassette 'pubsub unsubscribe', :record => :new_episodes
-      
+
       before do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_1'
         @connection.pubsub.subscribe 'pubsub.theo-template.local', 'node_1'
       end
-      
+
       it "return true" do
         @connection.pubsub.unsubscribe( 'pubsub.theo-template.local', 'node_1' ).should be_true
       end
-      
+
       after do
         # Clean up the node
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_1'
       end
-      
+
     end
-    
+
     describe "unsubscribe with subid" do
       use_vcr_cassette 'pubsub unsubscribe with subid', :record => :new_episodes
-      
+
       before do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_1'
         @subscription = @connection.pubsub.subscribe 'pubsub.theo-template.local', 'node_1'
       end
-      
+
       it "return true" do
         @connection.pubsub.unsubscribe( 'pubsub.theo-template.local', 'node_1', @subscription.subid ).should be_true
       end
-      
+
       after do
         # Clean up the node
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_1'
       end
-      
+
     end
-    
+
     describe "publish" do
       use_vcr_cassette 'pubsub setup node', :record => :new_episodes
-      
+
       before do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_1'
       end
-      
+
       describe "with id" do
         use_vcr_cassette 'pubsub publish with id', :record => :new_episodes
-        
+
         it "should return a Jubjub::Pubsub::Item" do
           i = @connection.pubsub.publish 'pubsub.theo-template.local', 'node_1', Jubjub::DataForm.new, '123'
           i.should be_a_kind_of_response_proxied Jubjub::Pubsub::Item
           i.item_id.should == '123'
-          i.data.should == "<x xmlns=\"jabber:x:data\" type=\"submit\"/>"
+          i.data.should be_equivalent_to('<x xmlns="jabber:x:data" type="submit"/>')
         end
-        
+
       end
-      
+
       describe "with string payload" do
         use_vcr_cassette 'pubsub publish with string payload', :record => :new_episodes
-        
+
         it "should return a Jubjub::Pubsub::Item" do
-          item = "<x xmlns=\"jabber:x:data\" type=\"submit\"><field var=\"foo\"><value>true</value></field></x>"
+          item = '<x xmlns="jabber:x:data" type="submit"><field var="foo"><value>true</value></field></x>'
           i = @connection.pubsub.publish 'pubsub.theo-template.local', 'node_1', item
           i.should be_a_kind_of_response_proxied Jubjub::Pubsub::Item
           i.item_id.should be_a_kind_of String
-          i.data.should == "<x xmlns=\"jabber:x:data\" type=\"submit\">\n  <field var=\"foo\">\n    <value>true</value>\n  </field>\n</x>"
+          i.data.should be_equivalent_to( item )
         end
-        
+
       end
-      
+
       describe "with dataform payload" do
         use_vcr_cassette 'pubsub publish with dataform payload', :record => :new_episodes
-        
+
         it "should return a Jubjub::Pubsub::Item" do
           i = @connection.pubsub.publish 'pubsub.theo-template.local', 'node_1', Jubjub::DataForm.new({ :foo => {:type => "boolean", :value => true }})
           i.should be_a_kind_of_response_proxied Jubjub::Pubsub::Item
           i.item_id.should be_a_kind_of String
-          i.data.should == "<x xmlns=\"jabber:x:data\" type=\"submit\">\n  <field var=\"foo\">\n    <value>true</value>\n  </field>\n</x>"
+          i.data.should be_equivalent_to('<x xmlns="jabber:x:data" type="submit"><field var="foo" type="boolean"><value>true</value></field></x>')
         end
-        
+
       end
-      
+
       after do
         # Clean up the node
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_1'
       end
 
     end
-    
+
     describe "retract" do
       use_vcr_cassette 'pubsub retract', :record => :new_episodes
-      
+
       before do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_pubsub_retract'
       end
-      
+
       it "should return true when successful" do
         item = @connection.pubsub.publish 'pubsub.theo-template.local', 'node_pubsub_retract', Jubjub::DataForm.new()
-        
+
         @connection.pubsub.retract( 'pubsub.theo-template.local', 'node_pubsub_retract', item.item_id ).should be_true
       end
-      
+
       it "should return false when not successful" do
-        @connection.pubsub.retract( 'pubsub.theo-template.local', 'node_pubsub_retract', "wibble" ).should equal(false)        
+        @connection.pubsub.retract( 'pubsub.theo-template.local', 'node_pubsub_retract', "wibble" ).should equal(false)
       end
-      
+
       after do
         # Clean up the node
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_pubsub_retract'
       end
     end
-    
+
     describe "retrieve_items" do
       use_vcr_cassette 'pubsub retrieve items', :record => :new_episodes
-      
+
       before do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_retrieve_items'
         @connection.pubsub.publish 'pubsub.theo-template.local', 'node_retrieve_items', Jubjub::DataForm.new(:bar => {:type => :boolean, :value => true}), 'efg'
         @connection.pubsub.publish 'pubsub.theo-template.local', 'node_retrieve_items', Jubjub::DataForm.new(:foo => {:type => :boolean, :value => false}), 'abc'
       end
-      
+
       it "should return array of Pubsub::Item when successful" do
         expected = [
-          Jubjub::Pubsub::Item.new( 'pubsub.theo-template.local', 'node_retrieve_items', 'abc', "<x xmlns=\"jabber:x:data\" type=\"submit\">\n          <field var=\"foo\">\n            <value>false</value>\n          </field>\n        </x>", @connection ),
-          Jubjub::Pubsub::Item.new( 'pubsub.theo-template.local', 'node_retrieve_items', 'efg', "<x xmlns=\"jabber:x:data\" type=\"submit\">\n          <field var=\"bar\">\n            <value>true</value>\n          </field>\n        </x>", @connection )
+          Jubjub::Pubsub::Item.new( 'pubsub.theo-template.local', 'node_retrieve_items', 'abc', "<x xmlns=\"jabber:x:data\" type=\"submit\">\n          <field type=\"boolean\" var=\"foo\">\n            <value>false</value>\n          </field>\n        </x>", @connection ),
+          Jubjub::Pubsub::Item.new( 'pubsub.theo-template.local', 'node_retrieve_items', 'efg', "<x xmlns=\"jabber:x:data\" type=\"submit\">\n          <field type=\"boolean\" var=\"bar\">\n            <value>true</value>\n          </field>\n        </x>", @connection )
         ]
-        
+
         @connection.pubsub.retrieve_items( 'pubsub.theo-template.local', 'node_retrieve_items' ).should == expected
       end
-      
+
       it "should return empty array when not successful" do
         @connection.pubsub.retrieve_items( 'pubsub.theo-template.local', 'node_retrieve_items_wibble' ).should == []
       end
-      
+
       after do
         # Clean up the node
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_retrieve_items'
       end
     end
-    
+
     describe "retrieve_affiliations" do
       use_vcr_cassette 'pubsub retrieve affiliations', :record => :new_episodes
-      
+
       it "should return array of Pubsub::Affiliation when successful" do
         @connection.pubsub.create 'pubsub.theo-template.local', 'node_retrieve_affiliations'
-        
+
         expected = [
           Jubjub::Pubsub::Affiliation.new(
             'pubsub.theo-template.local',
             'node_retrieve_affiliations',
             Jubjub::Jid.new('theozaurus@theo-template.local'),
             'owner',
-            @connection 
+            @connection
           )
         ]
-        
+
         @connection.pubsub.retrieve_affiliations( 'pubsub.theo-template.local', 'node_retrieve_affiliations' ).should == expected
 
         # Clean up the node
         @connection.pubsub.destroy 'pubsub.theo-template.local', 'node_retrieve_affiliations'
       end
-      
+
       it "should return empty array when not successful" do
         @connection.pubsub.retrieve_affiliations( 'pubsub.theo-template.local', 'made-up' ).should == []
       end
     end
-    
+
     describe "modify_affiliations" do
       use_vcr_cassette 'pubsub modify affiliations', :record => :new_episodes
-            
+
       it "should return true when successful" do
         pubsub = 'pubsub.theo-template.local'
         node = 'node_modify_affiliations_1'
         @connection.pubsub.create pubsub, node
-        
+
         affiliation = Jubjub::Pubsub::Affiliation.new pubsub, node, 'theozaurus@theo-template.local', 'owner', @connection
         @connection.pubsub.modify_affiliations( pubsub, node, affiliation).should equal(true)
-        
+
         @connection.pubsub.destroy pubsub, node
       end
-      
+
       it "should allow affiliations to be specified as an array" do
         pubsub = 'pubsub.theo-template.local'
         node = 'node_modify_affiliations_2'
         @connection.pubsub.create pubsub, node
-        
+
         affiliation_1 = Jubjub::Pubsub::Affiliation.new pubsub, node, 'theozaurus@theo-template.local','owner', @connection
         affiliation_2 = Jubjub::Pubsub::Affiliation.new pubsub, node, 'trex@theo-template.local', 'publisher', @connection
         @connection.pubsub.modify_affiliations pubsub, node, [affiliation_1, affiliation_2]
-        
+
         @connection.pubsub.destroy pubsub, node
       end
-      
+
       it "should allow affiliations to be specified as arguments" do
         pubsub = 'pubsub.theo-template.local'
         node = 'node_modify_affiliations_3'
         @connection.pubsub.create pubsub, node
-        
+
         affiliation_1 = Jubjub::Pubsub::Affiliation.new pubsub, node, 'theozaurus@theo-template.local', 'owner', @connection
         affiliation_2 = Jubjub::Pubsub::Affiliation.new pubsub, node, 'trex@theo-template.local', 'publisher', @connection
         @connection.pubsub.modify_affiliations pubsub, node, affiliation_1, affiliation_2
-        
+
         @connection.pubsub.destroy pubsub, node
       end
-      
+
       it "should return false if unsuccessful" do
         pubsub = 'pubsub.theo-template.local'
         node = 'node_modify_affiliations_4'
         @connection.pubsub.create pubsub, node
-        
+
         affiliation = Jubjub::Pubsub::Affiliation.new pubsub, node, 'theozaurus@theo-template.local', 'WIBBLE', @connection
         @connection.pubsub.modify_affiliations( pubsub, node, affiliation ).should equal(false)
-        
+
         @connection.pubsub.destroy pubsub, node
       end
     end
-    
+
   end
-  
-end
+
+end