em-xmpp 0.0.8 → 0.0.10

data/lib/em-xmpp/handler.rb

@@ -29,43 +29,59 @@ module EM::Xmpp
 
     def stack_decorators
       on_presence_decorator do |ctx| 
-        ctx = ctx.with(:presence) 
-        ctx = ctx.with(:error) if ctx.error?
+        presence = ctx.bit!(:presence) 
+        ctx.bit!(:error) if presence.error?
         ctx
       end
       on_message_decorator  do |ctx| 
-        ctx = ctx.with(:message) 
-        ctx = ctx.with(:error) if ctx.error?
+        msg = ctx.bit!(:message) 
+        ctx.bit!(:error) if msg.error?
         ctx
       end
       on_iq_decorator       do |ctx| 
-        ctx = ctx.with(:iq) 
-        ctx = ctx.with(:error) if ctx.error?
+        iq = ctx.bit!(:iq) 
+        ctx.bit!(:error) if iq.error?
         ctx
       end
       on_decorator('//xmlns:delay', 'xmlns' => Delay) do |ctx|
-        ctx.with(:delay)
+        ctx.bit!(:delay)
+        ctx
       end
       on_decorator('//xmlns:query', 'xmlns' => DiscoverInfos) do |ctx|
-        ctx.with(:discoinfos)
+        ctx.bit!(:discoinfos)
+        ctx
       end
       on_decorator('//xmlns:query', 'xmlns' => DiscoverItems) do |ctx|
-        ctx.with(:discoitems)
+        ctx.bit!(:discoitems)
+        ctx
       end
       on_decorator('//xmlns:query', 'xmlns' => Roster) do |ctx|
-        ctx.with(:roster)
+        ctx.bit!(:roster)
+        ctx
       end
       on_decorator('//xmlns:command', 'xmlns' => Commands) do |ctx|
-        ctx.with(:command)
+        ctx.bit!(:command)
+        ctx
       end
       on_decorator('//xmlns:x', 'xmlns' => DataForms) do |ctx|
-        ctx.with(:dataforms)
+        ctx.bit!(:dataforms)
+        ctx
       end
       on_decorator('//xmlns:nick', 'xmlns' => Nick) do |ctx|
-        ctx.with(:nickname)
+        ctx.bit!(:nickname)
+        ctx
       end
       on_decorator('//xmlns:x', 'xmlns' => MucUser) do |ctx|
-        ctx.with(:mucuser)
+        ctx.bit!(:mucuser)
+        ctx
+      end
+      on_decorator('//xmlns:si', 'xmlns' => StreamInitiation) do |ctx|
+        ctx.bit!(:streaminitiation)
+        ctx
+      end
+      on_decorator('//xmlns:query', 'xmlns' => ByteStreams) do |ctx|
+        ctx.bit!(:bytestreams)
+        ctx
       end
     end
 
@@ -326,7 +342,7 @@ module EM::Xmpp
       end
 
       c.send_stanza(session_request) do |ctx|
-        if ctx.type == 'result'
+        if ctx.bit!(:stanza).type == 'result'
           @connection.negotiation_finished
           ctx.delete_xpath_handler!.done!
         else

data/lib/em-xmpp/helpers.rb

@@ -10,8 +10,8 @@ module EM::Xmpp
         iq.query(:xmlns => Roster)
       end
 
-      send_stanza roster do |rsp|
-        f.resume rsp.items
+      send_stanza(roster) do |response|
+        f.resume response.bit!(:roster).items
       end
 
       Fiber.yield

data/lib/em-xmpp/namespaces.rb

@@ -45,5 +45,15 @@ module EM::Xmpp
     MucOwner = 'http://jabber.org/protocol/muc#owner'
     #Multi user chat - roomconfig
     MucRoomconfig = 'http://jabber.org/protocol/muc#roomconfig'
+    #Stream initiation offer
+    StreamInitiation = 'http://jabber.org/protocol/si'
+    #FileTransfer
+    FileTransfer = 'http://jabber.org/protocol/si/profile/file-transfer'
+    #Feature Negotiation
+    FeatureNeg = 'http://jabber.org/protocol/feature-neg'
+    #ByteStreamTransfer
+    ByteStreams = 'http://jabber.org/protocol/bytestreams'
+    #Extension for Fast byte stream transfers
+    FastByteStreams = 'http://affinix.com/jabber/stream'
   end
 end

data/lib/em-xmpp/version.rb

@@ -1,5 +1,5 @@
 module Em
   module Xmpp
-    VERSION = "0.0.8"
+    VERSION = "0.0.10"
   end
 end

data/samples/hello.rb

@@ -19,22 +19,26 @@ module RosterClient
     puts "***** #{@jid} ready"
 
     on_presence do |ctx|
-      if ctx.subscription_request?
-        puts "**** accepting subscription from #{ctx.from}"
-        send_stanza ctx.reply('type'=>'subscribed')
-        ctx.from.subscribe
-        ctx.from.add_to_roster
+      presence = ctx.bit(:presence)
+
+      if presence.subscription_request?
+        puts "**** accepting subscription from #{presence.from}"
+        send_stanza presence.reply('type'=>'subscribed')
+        presence.from.subscribe
+        presence.from.add_to_roster
       else
-        puts "**** #{ctx.from} is present"
+        puts "**** #{presence.from} is present"
       end
 
       ctx #returns a ctx for subsequent handlers if any
     end
 
     on_message do |ctx|
-      puts "**** message from #{ctx.from}"
-      puts ctx.body
-      hello = ctx.reply do |rep|
+      msg = ctx.bit :message
+
+      puts "**** message from #{msg.from}"
+      puts msg.body
+      hello = msg.reply do |rep|
         rep.body "hello world"
       end
       send_stanza  hello

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-xmpp
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000Z
+date: 2013-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2157880740 !ruby/object:Gem::Requirement
+  requirement: &2156077160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157880740
+  version_requirements: *2156077160
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2157880320 !ruby/object:Gem::Requirement
+  requirement: &2156076480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157880320
+  version_requirements: *2156076480
 - !ruby/object:Gem::Dependency
   name: ruby-sasl
-  requirement: &2157879900 !ruby/object:Gem::Requirement
+  requirement: &2156075840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157879900
+  version_requirements: *2156075840
 description: XMPP client for event machine
 email:
 - crapooze@gmail.com