em-xmpp 0.0.10 → 0.0.11

data/lib/em-xmpp/handler.rb

@@ -43,6 +43,14 @@ module EM::Xmpp
         ctx.bit!(:error) if iq.error?
         ctx
       end
+      on_decorator('//xmlns:pubsub', 'xmlns' => PubSub) do |ctx|
+        ctx.bit!(:pubsub)
+        ctx
+      end
+      on_decorator('//xmlns:event', 'xmlns' => PubSubEvent) do |ctx|
+        ctx.bit!(:pubsubevent)
+        ctx
+      end
       on_decorator('//xmlns:delay', 'xmlns' => Delay) do |ctx|
         ctx.bit!(:delay)
         ctx
@@ -63,6 +71,10 @@ module EM::Xmpp
         ctx.bit!(:command)
         ctx
       end
+      on_decorator('//xmlns:data', 'xmlns' => BoB) do |ctx|
+        ctx.bit!(:bob)
+        ctx
+      end
       on_decorator('//xmlns:x', 'xmlns' => DataForms) do |ctx|
         ctx.bit!(:dataforms)
         ctx
@@ -79,6 +91,10 @@ module EM::Xmpp
         ctx.bit!(:streaminitiation)
         ctx
       end
+      on_decorator('//xmlns:open | //xmlns:data | //xmlns:close', 'xmlns' => IBB) do |ctx|
+        ctx.bit!(:ibb)
+        ctx
+      end
       on_decorator('//xmlns:query', 'xmlns' => ByteStreams) do |ctx|
         ctx.bit!(:bytestreams)
         ctx

data/lib/em-xmpp/helpers.rb

@@ -1,5 +1,6 @@
 
 require 'em-xmpp/nodes'
+require 'em-xmpp/conversation'
 module EM::Xmpp
   module Helpers
     include EM::Xmpp::Namespaces
@@ -16,5 +17,211 @@ module EM::Xmpp
 
       Fiber.yield
     end
+
+    attr_reader :conversations
+
+    def framework_ready(*args,&blk)
+      @conversations = {}
+    end
+
+    def start_conversation(ctx,key,state=nil,&blk)
+      EM::Xmpp::Conversation.start(ctx,state) do |conv|
+        conversations[key] = conv
+        blk.call conv
+        conversations.delete key
+      end
+    end
+
+    def conversation(key)
+      @conversations[key]
+    end
+
+    DataFormState = Struct.new(:form, :answers, :current_idx, :user_input) do
+      def current_field
+        form.fields[current_idx]
+      end
+
+      def current_values
+        current_field.values
+      end
+
+      def current_answer
+        answers.fields[current_idx]
+      end
+
+      def current_response_values
+        if current_answer
+          current_answer.values 
+        else
+          current_values
+        end
+      end
+    end
+
+    def dataform_conversation(initial_ctx,&blk)
+      form = initial_ctx.env['dataform']
+      answers = EM::Xmpp::Context::Contexts::Dataforms::Form.new('submit',[],nil,nil)
+      state = DataFormState.new(form, answers, 0, nil)
+
+      start_conversation(initial_ctx,:dataform,state) do |conv|
+        conv.prepare_callbacks(:start, :ask, :user_answer, :confirm, :submit, :cancel, &blk)
+        finalize = :submit
+
+        conv.callback(:start)
+
+        catch :cancel do
+          fields = state.form.fields.dup
+          cnt = fields.size
+          idx = 0
+          until (idx + 1) > cnt
+            state.current_idx = idx
+            conv.callback(:ask)
+            state.user_input = conv.delay.ctx
+            cb_action = conv.callback(:user_answer)
+            state.user_input = nil
+
+            case cb_action 
+            when :previous
+              idx -= 1
+              idx = [0,idx].max
+            when :next, :modified
+              idx += 1
+            when :repeat
+              #don't touch index
+            when :cancel
+              finalize = :cancel
+              throw :cancel
+            else
+              raise RuntimeError, "no such data-form action: #{cb_action}"
+            end
+          end
+
+          conv.callback(:confirm)
+          state.user_input = conv.delay.ctx
+        end
+        conv.callback(finalize)
+      end
+    end
+
+    CommandFlash = Struct.new(:level, :msg)
+    CommandState = Struct.new(:spec, :status, :current_idx, :flash, :last_answer, :result) do
+      def current_step
+        spec.step current_idx
+      end
+      def form
+        current_step.form
+      end
+      def can_complete?
+        spec.can_complete_command? current_idx
+      end
+      def can_prev?
+        spec.has_previous_command? current_idx
+      end
+      def can_next?
+        spec.has_next_command? current_idx
+      end
+      def finished?
+        spec.finished?(current_idx)
+      end
+    end
+    LinearCommandsSpec = Struct.new(:steps) do
+      def step(idx)
+        steps[idx]
+      end
+      def finished?(idx)
+        (idx + 1) > steps.size 
+      end
+      def has_previous_command?(idx)
+        idx > 0
+      end
+      def has_next_command?(idx)
+        idx + 1 < steps.size
+      end
+      def can_complete_command?(idx)
+        not has_next_command?(idx)
+      end
+    end
+    CommandStep  = Struct.new(:form) do
+    end
+
+    def start_command_conversation(ctx,key,sess_id,spec,&blk)
+      query   = ctx.bit(:command)
+
+      state = CommandState.new(spec, :completed, 0, nil, nil, nil)
+
+      start_conversation(ctx,key,state) do |conv|
+        conv.prepare_callbacks(:start, :answer, :cancel, &blk)
+
+        conv.callback(:start)
+
+        catch :cancel do
+          until state.finished?
+            state.status = 'executing'
+
+            reply = query.reply do |iq|
+              iq.command(:xmlns => EM::Xmpp::Namespaces::Commands, :sessionid => sess_id, :node => query.node, :status => state.status) do |cmd|
+                cmd.actions do |n|
+                  n.prev     if state.can_prev?
+                  n.complete if state.can_complete?
+                  n.next     if state.can_next?
+                end
+                build_form(cmd, state.form,'form')
+                cmd.note({:type => state.flash.level}, state.flash.msg) if state.flash
+              end
+            end
+
+            user_answer       = conv.send_stanza reply
+            state.last_answer = user_answer
+            action            = user_answer.ctx.bit(:command).action
+
+            case action
+            when 'cancel'
+              conv.callback(:cancel)
+              state.status = 'cancel'
+              throw :cancel
+            else
+              conv.callback(:answer)
+            end
+          end #end of until
+
+          state.status = 'completed'
+        end
+
+        finalizer = state.last_answer.ctx.bit(:command).reply do |iq|
+          iq.command(:xmlns => EM::Xmpp::Namespaces::Commands, :sessionid => sess_id, :node => query.node, :status => state.status) do |cmd|
+            cmd.note({:type => state.flash.level}, state.flash.msg) if state.flash
+            build_form(cmd, state.result,'result') if state.result
+          end
+        end
+        send_stanza finalizer
+      end
+    end
+
+    def build_form(xml,form,type='submit')
+      xml.x(:xmlns => DataForms, :type => type) do |x|
+        x.title form.title if form.title
+        x.instructions form.instructions if form.instructions
+        form.fields.each do |field|
+          args = {'var' => field.var}
+          args = args.merge('type' => field.type) unless field.type.nil? or field.type.empty?
+          args = args.merge('label' => field.label) unless field.label.nil? or field.label.empty?
+          x.field(args) do |f|
+            (field.options||[]).each do |opt_value|
+              f.option do |o|
+                o.value opt_value
+              end
+            end
+            (field.values||[]).each do |value|
+              f.value value
+            end
+          end
+        end
+      end
+    end
+
+    def build_submit_form(xml,form)
+      build_form(xml,form,'submit')
+    end
+
   end
 end

data/lib/em-xmpp/jid.rb

@@ -5,7 +5,8 @@ module EM::Xmpp
     def self.parse(str)
       s1,s2 = str.split('@',2)
       if s2.nil?
-        self.new(nil, s1, nil)
+        s1,s3 = s1.split('/',2)
+        self.new(nil, s1, s3)
       else
         s2,s3 = s2.split('/',2)
         self.new(s1,s2,s3)

data/lib/em-xmpp/namespaces.rb

@@ -25,6 +25,11 @@ module EM::Xmpp
     Roster = 'jabber:iq:roster'
     #XMPP commands
     Commands = "http://jabber.org/protocol/commands"
+    #avatar
+    AvatarData     = "urn:xmpp:avatar:data"
+    AvatarMetaData = "urn:xmpp:avatar:metadata"
+    #attention
+    Attention = "urn:xmpp:attention:0"
     #entity nicknames
     Nick = "http://jabber.org/protocol/nick"
     #entity activity
@@ -39,14 +44,32 @@ module EM::Xmpp
     Delay = "urn:xmpp:delay"
     #Jabber Data forms
     DataForms  = 'jabber:x:data'
+    #Pubsub
+    PubSub = 'http://jabber.org/protocol/pubsub'
+    #Pubsub#owner
+    PubSubOwner = 'http://jabber.org/protocol/pubsub#owner'
+    #Pubsub#subscribe-authorization
+    PubSubSubscribeAuthorization = 'http://jabber.org/protocol/pubsub#subscribe_authorization'
+    #Pubsub#get-pending
+    PubSubGetPending = 'http://jabber.org/protocol/pubsub#get-pending'
+    #Pubsub#event
+    PubSubEvent = 'http://jabber.org/protocol/pubsub#event'
+    #Multi user chat
+    Muc     = 'http://jabber.org/protocol/muc'
     #Multi user chat - simple user
     MucUser = 'http://jabber.org/protocol/muc#user'
+    #Multi user chat - admin
+    MucAdmin = 'http://jabber.org/protocol/muc#admin'
     #Multi user chat - owner
     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'
+    #Bits of Binary (bob)
+    BoB = 'urn:xmpp:bob'
+    #In-Band Bytestreams
+    IBB = 'http://jabber.org/protocol/ibb'
     #FileTransfer
     FileTransfer = 'http://jabber.org/protocol/si/profile/file-transfer'
     #Feature Negotiation
@@ -55,5 +78,7 @@ module EM::Xmpp
     ByteStreams = 'http://jabber.org/protocol/bytestreams'
     #Extension for Fast byte stream transfers
     FastByteStreams = 'http://affinix.com/jabber/stream'
+    #xhtml-im
+    XhtmlIM = 'http://jabber.org/protocol/xhtml-im'
   end
 end

data/lib/em-xmpp/version.rb

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

data/samples/hello.rb

@@ -15,7 +15,9 @@ module RosterClient
   attr_reader :roster
 
   include EM::Xmpp::Helpers
+
   def ready
+    super #setup helpers
     puts "***** #{@jid} ready"
 
     on_presence do |ctx|
@@ -37,11 +39,30 @@ module RosterClient
       msg = ctx.bit :message
 
       puts "**** message from #{msg.from}"
-      puts msg.body
-      hello = msg.reply do |rep|
-        rep.body "hello world"
+
+      key = msg.from.to_s
+
+      conv = conversation(key)
+
+      if conv 
+        conv.resume ctx
+      else
+        x = rand(300)
+        y = rand(300)
+        start_conversation(ctx, key) do |c|
+          rep = c.send_stanza(msg.reply{|xml| xml.body("how much is #{x} - #{y} ?")}, 5)
+          greeting = if rep.interrupted?
+                       if rep.ctx.bit(:message).body == (x - y).to_s
+                         "great!"
+                       else
+                         "wrong: #{x - y}"
+                       end
+                     else
+                       "too slow, laggard"
+                     end
+          self.send_stanza(msg.reply{|xml| xml.body(greeting)})
+        end
       end
-      send_stanza  hello
 
       ctx #returns a ctx for subsequent handlers if any
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-xmpp
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000Z
+date: 2013-02-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2156077160 !ruby/object:Gem::Requirement
+  requirement: &2151825840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156077160
+  version_requirements: *2151825840
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156076480 !ruby/object:Gem::Requirement
+  requirement: &2151814740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156076480
+  version_requirements: *2151814740
 - !ruby/object:Gem::Dependency
   name: ruby-sasl
-  requirement: &2156075840 !ruby/object:Gem::Requirement
+  requirement: &2151812280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,11 +43,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156075840
+  version_requirements: *2151812280
 description: XMPP client for event machine
 email:
 - crapooze@gmail.com
-executables: []
+executables:
+- xmig
 extensions: []
 extra_rdoc_files: []
 files:
@@ -56,12 +57,14 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/xmig
 - em-xmpp.gemspec
 - lib/em-xmpp.rb
 - lib/em-xmpp/cert_store.rb
 - lib/em-xmpp/connection.rb
 - lib/em-xmpp/connector.rb
 - lib/em-xmpp/context.rb
+- lib/em-xmpp/conversation.rb
 - lib/em-xmpp/entity.rb
 - lib/em-xmpp/handler.rb
 - lib/em-xmpp/helpers.rb