jubjub 0.0.2 → 0.0.3

data/README.mdown

@@ -62,11 +62,16 @@ Examples
     room = u.mucs.create('customjub'){|c|
       c['muc#roomconfig_allowinvites'] = false
     }
-
+    
     # Destroy a room
     room.destroy
     => true
     
+    # Create a persistent room and exit it
+    u.mucs.create('persistent'){|c|
+      c['muc#roomconfig_persistentroom'] = true
+    }.exit
+    
 TODO
 ====
 

data/lib/jubjub/connection/xmpp_gateway/muc.rb

@@ -327,11 +327,23 @@ module Jubjub
           }
         end
         
+        # http://xmpp.org/extensions/xep-0045.html#exit
+        # <presence
+        #     from='hag66@shakespeare.lit/pda'
+        #     to='darkcave@chat.shakespeare.lit/thirdwitch'
+        #     type='unavailable'/>
+        def exit(full_jid)
+          presence full_jid, :unavailable
+        end
+        
       private
       
-        def presence(full_jid)
+        def presence(full_jid, availability = :available)
+          options = { :to => full_jid }
+          options[:type] = availability unless availability == :available
+          
           request = Nokogiri::XML::Builder.new do |xml|
-            xml.presence_(:to => full_jid) {
+            xml.presence_(options) {
               xml.x_('xmlns' => 'http://jabber.org/protocol/muc')
             }
           end

data/lib/jubjub/muc.rb

@@ -9,6 +9,13 @@ module Jubjub
       @connection = connection
     end 
     
+    def exit(nick = nil)
+      full_jid = Jubjub::Jid.new @jid.node, @jid.domain, nick || @connection.jid.node
+      
+      @connection.muc.exit(full_jid)
+      self
+    end
+    
     def destroy
       @connection.muc.destroy(@jid)
     end

data/spec/connection/xmpp_gateway_spec.rb

@@ -115,6 +115,28 @@ describe Jubjub::Connection::XmppGateway do
       
     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)        
+      end
+      
+    end
+    
     describe "destroy" do
       
       use_vcr_cassette 'muc destroy', :record => :new_episodes

data/spec/fixtures/vcr_cassettes/muc_exit.yml

@@ -0,0 +1,91 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: http://theozaurus%40theo-template.local:secret@127.0.0.1:8000/
+    body: stanza=%3c%3fxml%20version%3d%221.0%22%3f%3e%0a%3cpresence%20to%3d%22extra%40conference.theo-template.local%2fnick%22%3e%0a%20%20%3cx%20xmlns%3d%22http%3a%2f%2fjabber.org%2fprotocol%2fmuc%22%2f%3e%0a%3c%2fpresence%3e%0a
+    headers: 
+      content-type: 
+      - application/x-www-form-urlencoded
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: ...
+    headers: 
+      content-type: 
+      - application/xml
+      content-length: 
+      - "40"
+    body: |
+      #<EventMachine::Timer:0x00000100b29d90>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: http://theozaurus%40theo-template.local:secret@127.0.0.1:8000/
+    body: stanza=%3c%3fxml%20version%3d%221.0%22%3f%3e%0a%3ciq%20type%3d%22set%22%20to%3d%22extra%40conference.theo-template.local%22%3e%0a%20%20%3cquery%20xmlns%3d%22http%3a%2f%2fjabber.org%2fprotocol%2fmuc%23owner%22%3e%0a%20%20%20%20%3cx%20xmlns%3d%22jabber%3ax%3adata%22%20type%3d%22submit%22%2f%3e%0a%20%20%3c%2fquery%3e%0a%3c%2fiq%3e%0a
+    headers: 
+      content-type: 
+      - application/x-www-form-urlencoded
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: ...
+    headers: 
+      content-type: 
+      - application/xml
+      content-length: 
+      - "204"
+    body: |
+      <iq type="result" id="blather0175" from="extra@conference.theo-template.local" to="theozaurus@theo-template.local/7633460851296657831415060">
+        <query xmlns="http://jabber.org/protocol/muc#owner"/>
+      </iq>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: http://theozaurus%40theo-template.local:secret@127.0.0.1:8000/
+    body: stanza=%3c%3fxml%20version%3d%221.0%22%3f%3e%0a%3cpresence%20type%3d%22unavailable%22%20to%3d%22extra%40conference.theo-template.local%2fnick%22%3e%0a%20%20%3cx%20xmlns%3d%22http%3a%2f%2fjabber.org%2fprotocol%2fmuc%22%2f%3e%0a%3c%2fpresence%3e%0a
+    headers: 
+      content-type: 
+      - application/x-www-form-urlencoded
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: ...
+    headers: 
+      content-type: 
+      - application/xml
+      content-length: 
+      - "40"
+    body: |
+      #<EventMachine::Timer:0x00000100ade610>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: http://theozaurus%40theo-template.local:secret@127.0.0.1:8000/
+    body: stanza=%3c%3fxml%20version%3d%221.0%22%3f%3e%0a%3ciq%20type%3d%22set%22%20to%3d%22extra%40conference.theo-template.local%22%3e%0a%20%20%3cquery%20xmlns%3d%22http%3a%2f%2fjabber.org%2fprotocol%2fmuc%23owner%22%3e%0a%20%20%20%20%3cdestroy%2f%3e%0a%20%20%3c%2fquery%3e%0a%3c%2fiq%3e%0a
+    headers: 
+      content-type: 
+      - application/x-www-form-urlencoded
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: ...
+    headers: 
+      content-type: 
+      - application/xml
+      content-length: 
+      - "426"
+    body: |
+      <iq type="error" id="blather0177" from="extra@conference.theo-template.local" to="theozaurus@theo-template.local/7633460851296657831415060" lang="en">
+        <query xmlns="http://jabber.org/protocol/muc#owner">
+          <destroy/>
+        </query>
+      <error code="404" type="cancel"><item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/><text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Conference room does not exist</text></error></iq>
+
+    http_version: "1.1"

data/spec/models/muc_spec.rb

@@ -39,6 +39,34 @@ describe Jubjub::Muc do
       end
     end
     
+    describe "exit" do
+      before do
+        muc_mock = mock
+        muc_mock.stub(:exit) # exit doesn't work in a stub chain, manually build it
+        
+        @mock_connection = mock
+        @mock_connection.stub(:jid).and_return( Jubjub::Jid.new 'nick@foo.com' )
+        @mock_connection.stub(:muc).and_return( muc_mock )
+      end
+      
+      it "should call muc.exit on connection" do
+        @mock_connection.muc.should_receive(:exit).with( Jubjub::Jid.new 'room@conference.foo.com/nick' )
+        
+        Jubjub::Muc.new("room@conference.foo.com",nil,@mock_connection).exit
+      end
+      
+      it "should support custom nick name" do
+        @mock_connection.muc.should_receive(:exit).with( Jubjub::Jid.new 'room@conference.foo.com/custom_nick' )
+        
+        Jubjub::Muc.new("room@conference.foo.com",nil,@mock_connection).exit('custom_nick')
+      end
+      
+      it "should be chainable" do
+        room = Jubjub::Muc.new("room@conference.foo.com",nil,@mock_connection)
+        room.exit.should eql room
+      end
+    end
+    
     describe "destroy" do
       
       it "should call muc.destroy on connection" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jubjub
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Theo Cushion
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +00:00
+date: 2011-02-02 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,7 @@ files:
 - spec/fixtures/vcr_cassettes/muc_create.yml
 - spec/fixtures/vcr_cassettes/muc_create_with_configuration.yml
 - spec/fixtures/vcr_cassettes/muc_destroy.yml
+- spec/fixtures/vcr_cassettes/muc_exit.yml
 - spec/fixtures/vcr_cassettes/muc_list.yml
 - spec/mixins/user_spec.rb
 - spec/models/jid_spec.rb
@@ -165,6 +166,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/muc_create.yml
 - spec/fixtures/vcr_cassettes/muc_create_with_configuration.yml
 - spec/fixtures/vcr_cassettes/muc_destroy.yml
+- spec/fixtures/vcr_cassettes/muc_exit.yml
 - spec/fixtures/vcr_cassettes/muc_list.yml
 - spec/mixins/user_spec.rb
 - spec/models/jid_spec.rb