blather 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a85d8fb5a9772eeec0acbfa01a8209eca2e75444
-  data.tar.gz: 45ddd3d5a7f0cadb2dc77092d60ddc126e7edc8f
+  metadata.gz: 26cf5c0a6d1dba72a71b5c0b48696354f78c421b
+  data.tar.gz: f1bd35632f6b5b809dcf6fa062da13f750eae39b
 SHA512:
-  metadata.gz: dc515219630366c9c16ea6dca0df9760bd3a524cc3af1e7548b915ff32acadc85b5b691404c0da258093bf7bfe414b01b4b263e9a6d42af585ffbd6fcebc0141
-  data.tar.gz: c099266674663efada77e9daf5b1884633b2bf5f5b8cb2a2419003d1f6d2652d945d67e507b16497f24a5bb942159cae4f154aa6c51aaf1e54415944a5d1507c
+  metadata.gz: 92884baac11b0f449f6b87b2a52f55534bca13f1638783c5c4c2f50c160af35b30712d47a89395455aeb6fbe6585c87ee0b0ad5b81b84782415605f28c80662d
+  data.tar.gz: eeb47327e6496182a286311a0873c1347679fa09f1ed827c5e71b35843aa6c117a299dc64e93fc1bb340b14c3100f64ad3e9a2c871b03752fb7c66c414371ae4

data/.travis.yml

@@ -11,5 +11,7 @@ matrix:
     - rvm: jruby
     - rvm: ruby-head
     - rvm: rbx-2.1.1
+before_install:
+  - gem install bundler
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # [develop](https://github.com/adhearsion/blather/compare/master...develop)
 
+# [v1.2.0](https://github.com/adhearsion/blather/compare/v1.1.4...v1.2.0) - [2016-01-07](https://rubygems.org/gems/blather/versions/1.2.0)
+  * Bugfix: Properly sort resources with the same priority but different status
+  * Bugfix: Lock to Nokogiri <= 1.6.1 because new versions are more broken than old ones
+  * Bugfix: Avoid repeatedly parsing nodes which are already parsed
+  * Feature: Implement Blather::Roster#version, which returns version of last processed roster stanza
+
 # [v1.1.4](https://github.com/adhearsion/blather/compare/v1.1.4...v1.1.4) - [2015-06-12](https://rubygems.org/gems/blather/versions/1.1.4)
   * Bugfix: Typo in passing through connection options
   * Today was a very dark day. I am ashamed of myself.

data/blather.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w{LICENSE README.md}
 
   s.add_dependency "eventmachine", [">= 1.0.0"]
-  s.add_dependency "nokogiri", ["~> 1.5", ">= 1.5.6"]
+  s.add_dependency "nokogiri", ["~> 1.5", ">= 1.5.6", "<= 1.6.1"]
   s.add_dependency "niceogiri", ["~> 1.0"]
   s.add_dependency "activesupport", [">= 2.3.11"]
   s.add_dependency "girl_friday"
@@ -46,7 +46,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha", ["~> 0.9"]
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "yard", ["~> 0.6"]
-  s.add_development_dependency "jruby-openssl", ["~> 0.7"] if jruby?
   s.add_development_dependency "bluecloth" unless jruby? || rbx?
   s.add_development_dependency "countdownlatch"
   s.add_development_dependency 'rb-fsevent', ['~> 0.9']

data/lib/blather/roster.rb

@@ -5,24 +5,27 @@ module Blather
   class Roster
     include Enumerable
 
+    attr_reader :version
+
     # Create a new roster
     #
     # @param [Blather::Stream] stream the stream the roster should use to
     # update roster entries
-    # @param [Blather::Stanza::Roster] stanza a roster stanza used to preload
+    # @param [Blather::Stanza::Iq::Roster] stanza a roster stanza used to preload
     # the roster
     # @return [Blather::Roster]
     def initialize(stream, stanza = nil)
       @stream = stream
       @items = {}
-      stanza.items.each { |i| push i, false } if stanza
+      process(stanza) if stanza
     end
 
     # Process any incoming stanzas and either adds or removes the
     # corresponding RosterItem
     #
-    # @param [Blather::Stanza::Roster] stanza a roster stanza
+    # @param [Blather::Stanza::Iq::Roster] stanza a roster stanza
     def process(stanza)
+      @version = stanza.version
       stanza.items.each do |i|
         case i.subscription
         when :remove then @items.delete(key(i.jid))

data/lib/blather/stanza/disco/disco_info.rb

@@ -84,6 +84,8 @@ class Stanza
       #   @param [String, nil] type the type of the Identity
       #   @param [String, nil] category the category of the Identity
       def self.new(name, type = nil, category = nil, xml_lang = nil)
+        return name if name.class == self
+
         new_node = super :identity
 
         case name
@@ -170,6 +172,8 @@ class Stanza
       #   @param [String] var a the Feautre's var
       # @return [DiscoInfo::Feature]
       def self.new(var)
+        return var if var.class == self
+
         new_node = super :feature
         case var
         when Nokogiri::XML::Node

data/lib/blather/stanza/disco/disco_items.rb

@@ -62,6 +62,8 @@ class Stanza
       #   @param [#to_s] node the node the item is attached to
       #   @param [#to_s] name the name of the Item
       def self.new(jid, node = nil, name = nil)
+        return jid if jid.class == self
+
         new_node = super :item
 
         case jid

data/lib/blather/stanza/iq/roster.rb

@@ -42,6 +42,13 @@ class Iq
       end
     end
 
+    # The provided roster version if available
+    #
+    # @return [String]
+    def version
+      query[:ver]
+    end
+
     # # RosterItem Fragment
     #
     # Individual roster items.

data/lib/blather/stanza/presence/status.rb

@@ -76,9 +76,13 @@ class Presence
   # @handler :status
   class Status < Presence
     # @private
+    # The spec requires only the following 4 states
     VALID_STATES = [:away, :chat, :dnd, :xa].freeze
     VALID_TYPES = [:unavailable].freeze
 
+    # ...but this is the sorted list of possible states
+    POSSIBLE_STATES = [:unavailable, :dnd, :xa, :away, :available, :chat].freeze
+
     include Comparable
 
     register :status, :status
@@ -200,7 +204,11 @@ class Presence
         end
 
         if (self.type.nil? && o.type.nil?) || (!self.type.nil? && !o.type.nil?)
-          self.priority <=> o.priority
+          if self.priority == o.priority
+            POSSIBLE_STATES.index(self.state) <=> POSSIBLE_STATES.index(o.state)
+          else
+            self.priority <=> o.priority
+          end
         elsif self.type.nil? && !o.type.nil?
           1
         elsif !self.type.nil? && o.type.nil?

data/lib/blather/stanza/pubsub.rb

@@ -72,6 +72,8 @@ class Stanza
     # @param [XML::Document, nil] document the document the node should be
     # attached to. This should be the document of the parent PubSub node.
     def self.new(id = nil, payload = nil, document = nil)
+      return id if id.class == self
+
       new_node = super 'item', document
       new_node.id = id
       new_node.payload = payload if payload

data/lib/blather/version.rb

@@ -1,3 +1,3 @@
 module Blather
-  VERSION = '1.1.4'
+  VERSION = '1.2.0'
 end

data/spec/blather/roster_spec.rb

@@ -6,14 +6,15 @@ describe Blather::Roster do
     @stream.stubs(:write)
 
     @stanza = mock()
-    items = []; 4.times { |n| items << Blather::JID.new("n@d/#{n}r") }
+    items = 4.times.map { |n| Blather::Stanza::Iq::Roster::RosterItem.new(jid: "n@d/#{n}r") }
     @stanza.stubs(:items).returns(items)
+    @stanza.stubs(:version).returns('24d091d0dcfab1b3')
 
     @roster = Blather::Roster.new(@stream, @stanza)
   end
 
   it 'initializes with items' do
-    @roster.items.map { |_,i| i.jid.to_s }.should == (@stanza.items.map { |i| i.stripped.to_s }.uniq)
+    @roster.items.map { |_,i| i.jid.to_s }.should == (@stanza.items.map { |i| i.jid.stripped.to_s }.uniq)
   end
 
   it 'processes @stanzas with remove requests' do
@@ -104,4 +105,8 @@ describe Blather::Roster do
       'group3' => [item2]
     })
   end
+
+  it 'has a version' do
+    expect(@roster.version).to eq @stanza.version
+  end
 end

data/spec/blather/stanza/iq/roster_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 def roster_xml
 <<-XML
 <iq to='juliet@example.com/balcony' type='result' id='roster_1'>
-  <query xmlns='jabber:iq:roster'>
+  <query xmlns='jabber:iq:roster' ver='3bb607aa4fa0bc9e'>
     <item jid='romeo@example.net'
           name='Romeo'
           subscription='both'>
@@ -38,6 +38,12 @@ describe Blather::Stanza::Iq::Roster do
   it 'can be created with #import' do
     Blather::XMPPNode.parse(roster_xml).should be_instance_of Blather::Stanza::Iq::Roster
   end
+
+  it 'retrieves version' do
+    n = parse_stanza roster_xml
+    r = Blather::Stanza::Iq::Roster.new.inherit n.root
+    expect(r.version).to eq '3bb607aa4fa0bc9e'
+  end
 end
 
 describe Blather::Stanza::Iq::Roster::RosterItem do

data/spec/blather/stanza/presence/status_spec.rb

@@ -118,6 +118,20 @@ describe Blather::Stanza::Presence::Status do
     (status1 <=> status2).should == 0
   end
 
+  it 'must should sort by status if priorities are equal' do
+    jid = Blather::JID.new 'a@b/c'
+
+    status1 = Blather::Stanza::Presence::Status.new :away
+    status1.from = jid
+
+    status2 = Blather::Stanza::Presence::Status.new :available
+    status2.from = jid
+
+    status1.priority = status2.priority = 1
+    (status1 <=> status2).should == -1
+    (status2 <=> status1).should == 1
+  end
+
   it 'raises an argument error if compared to a status with a different Blather::JID' do
     status1 = Blather::Stanza::Presence::Status.new
     status1.from = 'a@b/c'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blather
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeff Smick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -35,6 +35,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,6 +48,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: niceogiri
   requirement: !ruby/object:Gem::Requirement
@@ -392,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simpler XMPP built for speed