omf_common 6.0.0.pre.2 → 6.0.0.pre.3

data/lib/omf_common/core_ext/blather/stream/features.rb

@@ -0,0 +1,34 @@
+module Blather
+  class Stream
+    # @private
+    class Features
+      def next!
+        @idx = @idx ? @idx+1 : 0
+        if stanza = @features.children[@idx]
+          if stanza.namespaces['xmlns'] && (klass = self.class.from_namespace(stanza.namespaces['xmlns']))
+            @feature = klass.new(
+              @stream,
+              proc {
+              if (klass == Blather::Stream::Register && @features && !@features.children.find { |v| v.element_name == "mechanisms" }.nil?)
+                stanza = @features.children.find { |v| v.element_name == "mechanisms" }
+                @idx = @features.children.index(stanza)
+                klass = self.class.from_namespace(stanza.namespaces['xmlns'])
+                @feature = klass.new @stream, proc { next! }, @fail
+                @feature.receive_data stanza
+              else
+                next!
+              end
+            },
+              (klass == Blather::Stream::SASL && @features && !@features.children.find { |v| v.element_name == "register" }.nil?) ? proc { next! } : @fail
+            )
+            @feature.receive_data stanza
+          else
+            next!
+          end
+        else
+          succeed!
+        end
+      end
+    end
+  end #Stream
+end #Blather

data/lib/omf_common/core_ext/blather/stream/features/register.rb

@@ -0,0 +1,40 @@
+module Blather
+  class Stream
+    class Register < Features
+      REGISTER_NS = "http://jabber.org/features/iq-register".freeze
+
+      register REGISTER_NS
+
+      def initialize(stream, succeed, fail)
+        super
+        @jid = @stream.jid
+        @pass = @stream.password
+      end
+
+      def receive_data(stanza)
+        error_node = stanza.xpath('//error').first
+
+        if error_node
+          fail!(error_node)
+        elsif stanza['type'] == 'result' && (stanza.content.empty? || !stanza.children.find { |v| v.element_name == "query" }.nil?)
+          succeed!
+        else
+          @stream.send register_node
+        end
+      end
+
+      def register_node
+        node = Blather::Stanza::Iq::Query.new(:set)
+        query_node = node.xpath('//query').first
+        query_node['xmlns'] = 'jabber:iq:register'
+        username_node = Nokogiri::XML::Node.new('username', node)
+        username_node.content = @jid.node
+        password_node = Nokogiri::XML::Node.new('password', node)
+        password_node.content = @pass
+        query_node.add_child(username_node)
+        query_node.add_child(password_node)
+        node
+      end
+    end
+  end
+end

data/lib/omf_common/dsl/xmpp_blather.rb

@@ -1,7 +1,8 @@
 require 'blather/client/dsl'
 require 'omf_common/core_ext/blather/dsl'
 require 'omf_common/core_ext/blather/dsl/pubsub'
-require 'omf_common/core_ext/blather/stanza/registration'
+require 'omf_common/core_ext/blather/stream/features'
+require 'omf_common/core_ext/blather/stream/features/register'
 
 module OmfCommon
   module DSL

data/lib/omf_common/version.rb

@@ -1,4 +1,4 @@
 module OmfCommon
-  VERSION = "6.0.0.pre.2"
+  VERSION = "6.0.0.pre.3"
   PROTOCOL_VERSION = "6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.2
+  version: 6.0.0.pre.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -91,7 +91,8 @@ files:
 - lib/omf_common/command.rb
 - lib/omf_common/core_ext/blather/dsl.rb
 - lib/omf_common/core_ext/blather/dsl/pubsub.rb
-- lib/omf_common/core_ext/blather/stanza/registration.rb
+- lib/omf_common/core_ext/blather/stream/features.rb
+- lib/omf_common/core_ext/blather/stream/features/register.rb
 - lib/omf_common/core_ext/string.rb
 - lib/omf_common/dsl/xmpp_blather.rb
 - lib/omf_common/message.rb

data/lib/omf_common/core_ext/blather/stanza/registration.rb

@@ -1,18 +0,0 @@
-require 'blather/stanza/iq'
-
-module Blather
-  class Stanza
-    class Registration < Iq
-      def self.new(username, password)
-        node = super :set
-        Nokogiri::XML::Builder.with(node) do |xml|
-          xml.query('xmlns' => 'jabber:iq:register') do
-            xml.username username
-            xml.password password
-          end
-        end
-        node
-      end
-    end
-  end
-end