blather 0.4.13 → 0.4.14

data/README.md

@@ -169,6 +169,7 @@ than a change set made directly on master.
 * [Nolan Darilek](http://github.com/thewordnerd)
 * [Tim Carey-Smith](http://github.com/halorgium)
 * [Ben Langfeld](http://github.com/benlangfeld)
+* [Anton Mironov](http://github.com/mironov)
 
 # Copyright
 

data/lib/blather/roster.rb

@@ -90,8 +90,8 @@ module Blather
     #
     # @return [Hash<group => Array<RosterItem>>]
     def grouped
-      self.inject(Hash.new{|h,k|h[k]=[]}) do |hash, item|
-        item[1].groups.each { |group| hash[group] << item[1] }
+      @items.values.sort.inject(Hash.new{|h,k|h[k]=[]}) do |hash, item|
+        item.groups.each { |group| hash[group] << item }
         hash
       end
     end
@@ -108,4 +108,4 @@ module Blather
     end
   end  # Roster
 
-end  # Blather
+end  # Blather

data/lib/blather/roster_item.rb

@@ -117,6 +117,17 @@ module Blather
       n.groups = groups
       r
     end
+
+    def <=>(o)
+      self.jid.to_s <=> o.jid.to_s
+    end
+
+    def eql?(o)
+      o.is_a?(RosterItem) &&
+      o.jid == self.jid &&
+      o.groups == self.groups
+    end
+    alias_method :==, :eql?
   end #RosterItem
 
-end
+end

data/lib/blather/stanza/message.rb

@@ -159,6 +159,9 @@ class Stanza
   class Message < Stanza
     VALID_TYPES = [:chat, :error, :groupchat, :headline, :normal].freeze
 
+    VALID_CHAT_STATES = [:active, :composing, :gone, :inactive, :paused].freeze
+    CHAT_STATE_NS = 'http://jabber.org/protocol/chatstates'.freeze
+
     HTML_NS = 'http://jabber.org/protocol/xhtml-im'.freeze
     HTML_BODY_NS = 'http://www.w3.org/1999/xhtml'.freeze
 
@@ -189,6 +192,7 @@ class Stanza
       node.to = to
       node.type = type
       node.body = body
+      node.chat_state = :active if [:chat, :groupchat].include?(type)
       node
     end
 
@@ -262,8 +266,9 @@ class Stanza
       end
 
       unless b = h.find_first('ns:body', :ns => HTML_BODY_NS)
-        h << (b = XMPPNode.new('body', self.document))
+        b = XMPPNode.new('body', self.document)
         b.namespace = HTML_BODY_NS
+        h << b
       end
 
       b
@@ -273,7 +278,7 @@ class Stanza
     #
     # @return [String]
     def xhtml
-      self.xhtml_node.content.strip
+      self.xhtml_node.inner_html.strip
     end
 
     # Set the message xhtml
@@ -281,7 +286,7 @@ class Stanza
     #
     # @param [#to_s] valid xhtml
     def xhtml=(xhtml_body)
-      self.xhtml_node.content = Nokogiri::XML(xhtml_body).to_xhtml
+      self.xhtml_node.inner_html = Nokogiri::XML::DocumentFragment.parse(xhtml_body)
     end
 
     # Get the message subject
@@ -331,6 +336,32 @@ class Stanza
     def form
       X.find_or_create self
     end
+
+    # Get the message chat state
+    #
+    # @return [Symbol]
+    def chat_state
+      if (elem = find_first('ns:*', :ns => CHAT_STATE_NS)) && VALID_CHAT_STATES.include?(name = elem.name.to_sym)
+        name
+      end
+    end
+
+    # Set the message chat state
+    #
+    # @param [#to_s] chat_state the message chat state. Must be one of VALID_CHAT_STATES
+    def chat_state=(chat_state)
+      if chat_state && !VALID_CHAT_STATES.include?(chat_state.to_sym)
+        raise ArgumentError, "Invalid Chat State (#{chat_state}), use: #{VALID_CHAT_STATES*' '}"
+      end
+
+      xpath('ns:*', :ns => CHAT_STATE_NS).remove
+
+      if chat_state
+        state = XMPPNode.new(chat_state, self.document)
+        state.namespace = CHAT_STATE_NS
+        self << state
+      end
+    end
   end
 
 end

data/lib/blather/stream.rb

@@ -113,8 +113,9 @@ module Blather
     #
     # @param [#to_xml, #to_s] stanza the stanza to send over the wire
     def send(stanza)
-      Blather.logger.debug "SENDING: (#{caller[1]}) #{stanza}"
-      send_data stanza.respond_to?(:to_xml) ? stanza.to_xml : stanza.to_s
+      data = stanza.respond_to?(:to_xml) ? stanza.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XML) : stanza.to_s
+      Blather.logger.debug "SENDING: (#{caller[1]}) #{data}"
+      send_data data
     end
 
     # Called by EM.connect to initialize stream variables

data/lib/blather/stream/parser.rb

@@ -37,11 +37,6 @@ class Stream # :nodoc:
         node[attr.localname] = attr.value
       end
 
-      if !@receiver.stopped?
-        @current << node if @current
-        @current = node
-      end
-
       ns_keys = namespaces.map { |pre, href| pre }
       namespaces.delete_if { |pre, href| NS_TO_IGNORE.include? href }
       @namespace_definitions.push []
@@ -53,6 +48,11 @@ class Stream # :nodoc:
       @namespaces[[prefix, uri]] ||= node.add_namespace(prefix, uri) if prefix && !ns_keys.include?(prefix)
       node.namespace = @namespaces[[prefix, uri]]
 
+      if !@receiver.stopped?
+        @current << node if @current
+        @current = node
+      end
+
       deliver(node) if elem == 'stream'
 
       # $stderr.puts "\n\n"

data/lib/blather/xmpp_node.rb

@@ -33,7 +33,7 @@ module Blather
     # @return [Class, nil] the class appropriate for the name/ns combination
     def self.class_from_registration(name, ns = nil)
       name = name.to_s
-      @@registrations[[name, ns]] || @@registrations[[name, nil]]
+      @@registrations[[name, ns]]
     end
 
     # Import an XML::Node to the appropriate class

data/spec/blather/roster_item_spec.rb

@@ -93,4 +93,12 @@ describe Blather::RosterItem do
     i = Blather::RosterItem.new 'n@d'
     i.groups.must_equal [nil]
   end
+
+  it 'can determine equality' do
+    item1 = Blather::RosterItem.new 'n@d'
+    item2 = Blather::RosterItem.new 'n@d'
+    item1.groups = %w[group1 group2]
+    item2.groups = %w[group1 group2]
+    (item1 == item2).must_equal true
+  end
 end

data/spec/blather/stanza/message_spec.rb

@@ -109,8 +109,9 @@ describe Blather::Stanza::Message do
     msg = Blather::Stanza::Message.new
     msg << (h = Blather::XMPPNode.new('html', msg.document))
     h.namespace = Blather::Stanza::Message::HTML_NS
-    h << (b = Blather::XMPPNode.new('body', msg.document))
+    b = Blather::XMPPNode.new('body', msg.document)
     b.namespace = Blather::Stanza::Message::HTML_BODY_NS
+    h << b
 
     msg.xhtml_node.must_equal(b)
   end
@@ -119,14 +120,21 @@ describe Blather::Stanza::Message do
     msg = Blather::Stanza::Message.new
     xhtml = "<some>xhtml</some>"
     msg.xhtml = xhtml
-    msg.xhtml_node.content.strip.must_equal(xhtml)
+    msg.xhtml_node.inner_html.strip.must_equal(xhtml)
   end
 
   it 'sets valid xhtml even if the input is not valid' do
     msg = Blather::Stanza::Message.new
     xhtml = "<some>xhtml"
     msg.xhtml = xhtml
-    msg.xhtml_node.content.strip.must_equal("<some>xhtml</some>")
+    msg.xhtml_node.inner_html.strip.must_equal("<some>xhtml</some>")
+  end
+
+  it 'sets xhtml with more than one root node' do
+    msg = Blather::Stanza::Message.new
+    xhtml = "<i>xhtml</i> more xhtml"
+    msg.xhtml = xhtml
+    msg.xhtml_node.inner_html.strip.must_equal("<i>xhtml</i> more xhtml")
   end
 
   it 'has an xhtml getter' do
@@ -136,6 +144,45 @@ describe Blather::Stanza::Message do
     msg.xhtml.must_equal(xhtml)
   end
 
+  it 'has a chat state setter' do
+    msg = Blather::Stanza::Message.new
+    msg.chat_state = :composing
+    msg.xpath('ns:composing', :ns => Blather::Stanza::Message::CHAT_STATE_NS).wont_be_empty
+  end
+
+  it 'will only add one chat state at a time' do
+    msg = Blather::Stanza::Message.new
+    msg.chat_state = :composing
+    msg.chat_state = :paused
+
+    msg.xpath('ns:*', :ns => Blather::Stanza::Message::CHAT_STATE_NS).size.must_equal(1)
+  end
+  
+  it 'ensures chat state setter accepts strings' do
+    msg = Blather::Stanza::Message.new
+    msg.chat_state = "gone"
+    msg.xpath('ns:gone', :ns => Blather::Stanza::Message::CHAT_STATE_NS).wont_be_empty
+  end
+
+  it 'ensures chat state is one of Blather::Stanza::Message::VALID_CHAT_STATES' do
+    lambda do
+      msg = Blather::Stanza::Message.new
+      msg.chat_state = :invalid_chat_state
+    end.must_raise(Blather::ArgumentError)
+
+    Blather::Stanza::Message::VALID_CHAT_STATES.each do |valid_chat_state|
+      msg = Blather::Stanza::Message.new
+      msg.chat_state = valid_chat_state
+      msg.chat_state.must_equal valid_chat_state
+    end
+  end
+
+  it 'has a chat state getter' do
+    msg = Blather::Stanza::Message.new
+    msg.chat_state = :paused
+    msg.chat_state.must_equal(:paused)
+  end
+
   it 'makes a form child available' do
     n = Blather::XMPPNode.import(parse_stanza(message_xml).root)
     n.form.fields.size.must_equal 1

data/spec/blather/stream/client_spec.rb

@@ -1008,4 +1008,17 @@ describe Blather::Stream::Client do
     comp.expects(:send_data).with { |s| s.wont_match(/^<message[^>]*from=/); true }
     comp.send msg
   end
+  
+  it 'sends xml without formatting' do
+    client = mock()
+    client.stubs(:jid)
+    client.stubs(:jid=)
+    
+    msg = Blather::Stanza::Message.new 'to@jid.com', 'body'
+    msg.xhtml = '<i>xhtml</i> body'
+
+    comp = Blather::Stream::Client.new nil, client, 'node@jid.com/resource', 'pass'
+    comp.expects(:send_data).with { |s| s.wont_match(/\n/); true }
+    comp.send msg
+  end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), *%w[.. lib]))
 
 require 'blather'
 require 'rubygems'
+gem 'minitest', '>=1.7.1'
 require 'minitest/spec'
 require 'mocha'
 require 'mocha/expectation_error'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 4
-  - 13
-  version: 0.4.13
+  - 14
+  version: 0.4.14
 platform: ruby
 authors: 
 - Jeff Smick
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -07:00
+date: 2010-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,22 @@ dependencies:
         version: 1.4.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 7
+        - 1
+        version: 1.7.1
+  type: :development
+  version_requirements: *id003
 description: An XMPP DSL for Ruby written on top of EventMachine and Nokogiri
 email: sprsquish@gmail.com
 executables: []
@@ -122,49 +138,6 @@ files:
 - lib/blather/xmpp_node.rb
 - LICENSE
 - README.md
-- spec/blather/client/client_spec.rb
-- spec/blather/client/dsl/pubsub_spec.rb
-- spec/blather/client/dsl_spec.rb
-- spec/blather/core_ext/nokogiri_spec.rb
-- spec/blather/errors/sasl_error_spec.rb
-- spec/blather/errors/stanza_error_spec.rb
-- spec/blather/errors/stream_error_spec.rb
-- spec/blather/errors_spec.rb
-- spec/blather/jid_spec.rb
-- spec/blather/roster_item_spec.rb
-- spec/blather/roster_spec.rb
-- spec/blather/stanza/discos/disco_info_spec.rb
-- spec/blather/stanza/discos/disco_items_spec.rb
-- spec/blather/stanza/iq/command_spec.rb
-- spec/blather/stanza/iq/query_spec.rb
-- spec/blather/stanza/iq/roster_spec.rb
-- spec/blather/stanza/iq_spec.rb
-- spec/blather/stanza/message_spec.rb
-- spec/blather/stanza/presence/status_spec.rb
-- spec/blather/stanza/presence/subscription_spec.rb
-- spec/blather/stanza/presence_spec.rb
-- spec/blather/stanza/pubsub/affiliations_spec.rb
-- spec/blather/stanza/pubsub/create_spec.rb
-- spec/blather/stanza/pubsub/event_spec.rb
-- spec/blather/stanza/pubsub/items_spec.rb
-- spec/blather/stanza/pubsub/publish_spec.rb
-- spec/blather/stanza/pubsub/retract_spec.rb
-- spec/blather/stanza/pubsub/subscribe_spec.rb
-- spec/blather/stanza/pubsub/subscription_spec.rb
-- spec/blather/stanza/pubsub/subscriptions_spec.rb
-- spec/blather/stanza/pubsub/unsubscribe_spec.rb
-- spec/blather/stanza/pubsub_owner/delete_spec.rb
-- spec/blather/stanza/pubsub_owner/purge_spec.rb
-- spec/blather/stanza/pubsub_owner_spec.rb
-- spec/blather/stanza/pubsub_spec.rb
-- spec/blather/stanza/x_spec.rb
-- spec/blather/stanza_spec.rb
-- spec/blather/stream/client_spec.rb
-- spec/blather/stream/component_spec.rb
-- spec/blather/stream/parser_spec.rb
-- spec/blather/xmpp_node_spec.rb
-- spec/fixtures/pubsub.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/sprsquish/blather
 licenses: []
@@ -195,32 +168,41 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: squishtech
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simpler XMPP built for speed
 test_files: 
+- spec/spec_helper.rb
+- spec/blather/errors_spec.rb
+- spec/blather/jid_spec.rb
+- spec/blather/roster_item_spec.rb
+- spec/blather/roster_spec.rb
+- spec/blather/stanza_spec.rb
+- spec/blather/xmpp_node_spec.rb
+- spec/fixtures/pubsub.rb
 - spec/blather/client/client_spec.rb
-- spec/blather/client/dsl/pubsub_spec.rb
 - spec/blather/client/dsl_spec.rb
 - spec/blather/core_ext/nokogiri_spec.rb
 - spec/blather/errors/sasl_error_spec.rb
 - spec/blather/errors/stanza_error_spec.rb
 - spec/blather/errors/stream_error_spec.rb
-- spec/blather/errors_spec.rb
-- spec/blather/jid_spec.rb
-- spec/blather/roster_item_spec.rb
-- spec/blather/roster_spec.rb
+- spec/blather/stanza/iq_spec.rb
+- spec/blather/stanza/message_spec.rb
+- spec/blather/stanza/presence_spec.rb
+- spec/blather/stanza/pubsub_owner_spec.rb
+- spec/blather/stanza/pubsub_spec.rb
+- spec/blather/stanza/x_spec.rb
+- spec/blather/stream/client_spec.rb
+- spec/blather/stream/component_spec.rb
+- spec/blather/stream/parser_spec.rb
 - spec/blather/stanza/discos/disco_info_spec.rb
 - spec/blather/stanza/discos/disco_items_spec.rb
 - spec/blather/stanza/iq/command_spec.rb
 - spec/blather/stanza/iq/query_spec.rb
 - spec/blather/stanza/iq/roster_spec.rb
-- spec/blather/stanza/iq_spec.rb
-- spec/blather/stanza/message_spec.rb
 - spec/blather/stanza/presence/status_spec.rb
 - spec/blather/stanza/presence/subscription_spec.rb
-- spec/blather/stanza/presence_spec.rb
 - spec/blather/stanza/pubsub/affiliations_spec.rb
 - spec/blather/stanza/pubsub/create_spec.rb
 - spec/blather/stanza/pubsub/event_spec.rb
@@ -233,13 +215,4 @@ test_files:
 - spec/blather/stanza/pubsub/unsubscribe_spec.rb
 - spec/blather/stanza/pubsub_owner/delete_spec.rb
 - spec/blather/stanza/pubsub_owner/purge_spec.rb
-- spec/blather/stanza/pubsub_owner_spec.rb
-- spec/blather/stanza/pubsub_spec.rb
-- spec/blather/stanza/x_spec.rb
-- spec/blather/stanza_spec.rb
-- spec/blather/stream/client_spec.rb
-- spec/blather/stream/component_spec.rb
-- spec/blather/stream/parser_spec.rb
-- spec/blather/xmpp_node_spec.rb
-- spec/fixtures/pubsub.rb
-- spec/spec_helper.rb
+- spec/blather/client/dsl/pubsub_spec.rb