blather 1.2.0 → 2.0.0

data/spec/blather/stanza/presence_spec.rb

@@ -2,34 +2,34 @@ require 'spec_helper'
 
 describe Blather::Stanza::Presence do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:presence, nil).should == Blather::Stanza::Presence
+    expect(Blather::XMPPNode.class_from_registration(:presence, nil)).to eq(Blather::Stanza::Presence)
   end
 
   it 'must be importable' do
-    Blather::XMPPNode.parse('<presence type="probe"/>').should be_instance_of Blather::Stanza::Presence
+    expect(Blather::XMPPNode.parse('<presence type="probe"/>')).to be_instance_of Blather::Stanza::Presence
   end
 
   it 'ensures type is one of Blather::Stanza::Presence::VALID_TYPES' do
     presence = Blather::Stanza::Presence.new
-    lambda { presence.type = :invalid_type_name }.should raise_error(Blather::ArgumentError)
+    expect { presence.type = :invalid_type_name }.to raise_error(Blather::ArgumentError)
 
     Blather::Stanza::Presence::VALID_TYPES.each do |valid_type|
       presence.type = valid_type
-      presence.type.should == valid_type
+      expect(presence.type).to eq(valid_type)
     end
   end
 
   Blather::Stanza::Presence::VALID_TYPES.each do |valid_type|
     it "provides a helper (#{valid_type}?) for type #{valid_type}" do
-      Blather::Stanza::Presence.new.should respond_to :"#{valid_type}?"
+      expect(Blather::Stanza::Presence.new).to respond_to :"#{valid_type}?"
     end
 
     it "returns true on call to (#{valid_type}?) if type == #{valid_type}" do
       method = "#{valid_type}?".to_sym
       pres = Blather::Stanza::Presence.new
       pres.type = valid_type
-      pres.should respond_to method
-      pres.__send__(method).should == true
+      expect(pres).to respond_to method
+      expect(pres.__send__(method)).to eq(true)
     end
   end
 
@@ -43,30 +43,30 @@ describe Blather::Stanza::Presence do
       </presence>
     XML
     s = Blather::Stanza::Presence.parse string
-    s.should be_kind_of Blather::Stanza::Presence::C::InstanceMethods
-    s.node.should == 'http://www.chatopus.com'
-    s.handler_hierarchy.should include(:c)
+    expect(s).to be_kind_of Blather::Stanza::Presence::C::InstanceMethods
+    expect(s.node).to eq('http://www.chatopus.com')
+    expect(s.handler_hierarchy).to include(:c)
   end
 
   it 'creates a Status object when importing a node with type == nil' do
     s = Blather::Stanza::Presence.parse('<presence/>')
-    s.should be_kind_of Blather::Stanza::Presence::Status::InstanceMethods
-    s.state.should == :available
-    s.handler_hierarchy.should include(Blather::Stanza::Presence::Status.registered_name.to_sym)
+    expect(s).to be_kind_of Blather::Stanza::Presence::Status::InstanceMethods
+    expect(s.state).to eq(:available)
+    expect(s.handler_hierarchy).to include(Blather::Stanza::Presence::Status.registered_name.to_sym)
   end
 
   it 'creates a Status object when importing a node with type == "unavailable"' do
     s = Blather::Stanza::Presence.parse('<presence type="unavailable"/>')
-    s.should be_kind_of Blather::Stanza::Presence::Status::InstanceMethods
-    s.state.should == :unavailable
-    s.handler_hierarchy.should include(Blather::Stanza::Presence::Status.registered_name.to_sym)
+    expect(s).to be_kind_of Blather::Stanza::Presence::Status::InstanceMethods
+    expect(s.state).to eq(:unavailable)
+    expect(s.handler_hierarchy).to include(Blather::Stanza::Presence::Status.registered_name.to_sym)
   end
 
   it 'creates a Subscription object when importing a node with type == "subscribe"' do
     s = Blather::Stanza::Presence.parse('<presence type="subscribe"/>')
-    s.should be_kind_of Blather::Stanza::Presence::Subscription::InstanceMethods
-    s.type.should == :subscribe
-    s.handler_hierarchy.should include(Blather::Stanza::Presence::Subscription.registered_name.to_sym)
+    expect(s).to be_kind_of Blather::Stanza::Presence::Subscription::InstanceMethods
+    expect(s.type).to eq(:subscribe)
+    expect(s.handler_hierarchy).to include(Blather::Stanza::Presence::Subscription.registered_name.to_sym)
   end
 
   it 'creates a MUC object when importing a node with a form in the MUC namespace' do
@@ -76,7 +76,7 @@ describe Blather::Stanza::Presence do
       </presence>
     XML
     s = Blather::Stanza::Presence.parse string
-    s.should be_kind_of Blather::Stanza::Presence::MUC::InstanceMethods
+    expect(s).to be_kind_of Blather::Stanza::Presence::MUC::InstanceMethods
   end
 
   it 'creates a MUCUser object when importing a node with a form in the MUC#user namespace' do
@@ -86,15 +86,15 @@ describe Blather::Stanza::Presence do
       </presence>
     XML
     s = Blather::Stanza::Presence.parse string
-    s.should be_kind_of Blather::Stanza::Presence::MUCUser::InstanceMethods
+    expect(s).to be_kind_of Blather::Stanza::Presence::MUCUser::InstanceMethods
   end
 
   it 'creates a Presence object when importing a node with type equal to something unknown' do
     string = "<presence from='bard@shakespeare.lit/globe' type='foo'/>"
     s = Blather::Stanza::Presence.parse string
-    s.should be_kind_of Blather::Stanza::Presence
-    s.type.should == :foo
-    s.handler_hierarchy.should include(Blather::Stanza::Presence.registered_name.to_sym)
+    expect(s).to be_kind_of Blather::Stanza::Presence
+    expect(s.type).to eq(:foo)
+    expect(s.handler_hierarchy).to include(Blather::Stanza::Presence.registered_name.to_sym)
   end
 
   it 'behaves like a C, a Status, and a MUCUser when all types of children are present' do
@@ -116,11 +116,11 @@ describe Blather::Stanza::Presence do
       </presence>
     XML
     s = Blather::Stanza::Presence.parse string
-    s.state.should == :chat
-    s.node.should == 'http://www.chatopus.com'
-    s.role.should == :participant
-    s.handler_hierarchy.should include(Blather::Stanza::Presence::C.registered_name.to_sym)
-    s.handler_hierarchy.should include(Blather::Stanza::Presence::Status.registered_name.to_sym)
+    expect(s.state).to eq(:chat)
+    expect(s.node).to eq('http://www.chatopus.com')
+    expect(s.role).to eq(:participant)
+    expect(s.handler_hierarchy).to include(Blather::Stanza::Presence::C.registered_name.to_sym)
+    expect(s.handler_hierarchy).to include(Blather::Stanza::Presence::Status.registered_name.to_sym)
   end
 
   it "handle stanzas with nested elements that don't have a decorator module or are not stanzas" do
@@ -146,6 +146,6 @@ describe Blather::Stanza::Presence do
       </presence>
     XML
     s = Blather::Stanza::Presence.parse string
-    s.should be_a Blather::Stanza::Presence
+    expect(s).to be_a Blather::Stanza::Presence
   end
 end

data/spec/blather/stanza/pubsub/affiliations_spec.rb

@@ -11,47 +11,47 @@ end
 
 describe Blather::Stanza::PubSub::Affiliations do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:affiliations, Blather::Stanza::PubSub.registered_ns).should == Blather::Stanza::PubSub::Affiliations
+    expect(Blather::XMPPNode.class_from_registration(:affiliations, Blather::Stanza::PubSub.registered_ns)).to eq(Blather::Stanza::PubSub::Affiliations)
   end
 
   it 'can be imported' do
-    Blather::XMPPNode.parse(affiliations_xml).should be_instance_of Blather::Stanza::PubSub::Affiliations
+    expect(Blather::XMPPNode.parse(affiliations_xml)).to be_instance_of Blather::Stanza::PubSub::Affiliations
   end
 
   it 'ensures an affiliations node is present on create' do
     affiliations = Blather::Stanza::PubSub::Affiliations.new
-    affiliations.find_first('//ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_nil
+    expect(affiliations.find_first('//ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns)).not_to be_nil
   end
 
   it 'ensures an affiliations node exists when calling #affiliations' do
     affiliations = Blather::Stanza::PubSub::Affiliations.new
     affiliations.pubsub.remove_children :affiliations
-    affiliations.find_first('//ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns).should be_nil
+    expect(affiliations.find_first('//ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns)).to be_nil
 
-    affiliations.affiliations.should_not be_nil
-    affiliations.find_first('//ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_nil
+    expect(affiliations.affiliations).not_to be_nil
+    expect(affiliations.find_first('//ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns)).not_to be_nil
   end
 
   it 'defaults to a get node' do
-    Blather::Stanza::PubSub::Affiliations.new.type.should == :get
+    expect(Blather::Stanza::PubSub::Affiliations.new.type).to eq(:get)
   end
 
   it 'sets the host if requested' do
     aff = Blather::Stanza::PubSub::Affiliations.new :get, 'pubsub.jabber.local'
-    aff.to.should == Blather::JID.new('pubsub.jabber.local')
+    expect(aff.to).to eq(Blather::JID.new('pubsub.jabber.local'))
   end
 
   it 'can import an affiliates result node' do
     node = parse_stanza(affiliations_xml).root
 
     affiliations = Blather::Stanza::PubSub::Affiliations.new.inherit node
-    affiliations.size.should == 5
-    affiliations.list.should == control_affiliations
+    expect(affiliations.size).to eq(5)
+    expect(affiliations.list).to eq(control_affiliations)
   end
 
   it 'will iterate over each affiliation' do
     Blather::XMPPNode.parse(affiliations_xml).each do |type, nodes|
-      nodes.should == control_affiliations[type]
+      expect(nodes).to eq(control_affiliations[type])
     end
   end
 end

data/spec/blather/stanza/pubsub/create_spec.rb

@@ -3,11 +3,11 @@ require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Create do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:create, 'http://jabber.org/protocol/pubsub').should == Blather::Stanza::PubSub::Create
+    expect(Blather::XMPPNode.class_from_registration(:create, 'http://jabber.org/protocol/pubsub')).to eq(Blather::Stanza::PubSub::Create)
   end
 
   it 'can be imported' do
-    Blather::XMPPNode.parse(<<-NODE).should be_instance_of Blather::Stanza::PubSub::Create
+    expect(Blather::XMPPNode.parse(<<-NODE)).to be_instance_of Blather::Stanza::PubSub::Create
     <iq type='set'
         from='hamlet@denmark.lit/elsinore'
         to='pubsub.shakespeare.lit'
@@ -22,35 +22,35 @@ describe Blather::Stanza::PubSub::Create do
 
   it 'ensures a create node is present on create' do
     create = Blather::Stanza::PubSub::Create.new
-    create.find('//ns:pubsub/ns:create', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    expect(create.find('//ns:pubsub/ns:create', :ns => Blather::Stanza::PubSub.registered_ns)).not_to be_empty
   end
 
   it 'ensures a configure node is present on create' do
     create = Blather::Stanza::PubSub::Create.new
-    create.find('//ns:pubsub/ns:configure', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    expect(create.find('//ns:pubsub/ns:configure', :ns => Blather::Stanza::PubSub.registered_ns)).not_to be_empty
   end
 
   it 'ensures a create node exists when calling #create_node' do
     create = Blather::Stanza::PubSub::Create.new
     create.pubsub.remove_children :create
-    create.find('//ns:pubsub/ns:create', :ns => Blather::Stanza::PubSub.registered_ns).should be_empty
+    expect(create.find('//ns:pubsub/ns:create', :ns => Blather::Stanza::PubSub.registered_ns)).to be_empty
 
-    create.create_node.should_not be_nil
-    create.find('//ns:pubsub/ns:create', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    expect(create.create_node).not_to be_nil
+    expect(create.find('//ns:pubsub/ns:create', :ns => Blather::Stanza::PubSub.registered_ns)).not_to be_empty
   end
 
   it 'defaults to a set node' do
     create = Blather::Stanza::PubSub::Create.new
-    create.type.should == :set
+    expect(create.type).to eq(:set)
   end
 
   it 'sets the host if requested' do
     create = Blather::Stanza::PubSub::Create.new :set, 'pubsub.jabber.local'
-    create.to.should == Blather::JID.new('pubsub.jabber.local')
+    expect(create.to).to eq(Blather::JID.new('pubsub.jabber.local'))
   end
 
   it 'sets the node' do
     create = Blather::Stanza::PubSub::Create.new :set, 'host', 'node-name'
-    create.node.should == 'node-name'
+    expect(create.node).to eq('node-name')
   end
 end

data/spec/blather/stanza/pubsub/event_spec.rb

@@ -3,56 +3,56 @@ require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Event do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:event, 'http://jabber.org/protocol/pubsub#event').should == Blather::Stanza::PubSub::Event
+    expect(Blather::XMPPNode.class_from_registration(:event, 'http://jabber.org/protocol/pubsub#event')).to eq(Blather::Stanza::PubSub::Event)
   end
 
   it 'is importable' do
-    Blather::XMPPNode.parse(event_notification_xml).should be_instance_of Blather::Stanza::PubSub::Event
+    expect(Blather::XMPPNode.parse(event_notification_xml)).to be_instance_of Blather::Stanza::PubSub::Event
   end
 
   it 'ensures a query node is present on create' do
     evt = Blather::Stanza::PubSub::Event.new
-    evt.find('ns:event', :ns => Blather::Stanza::PubSub::Event.registered_ns).should_not be_empty
+    expect(evt.find('ns:event', :ns => Blather::Stanza::PubSub::Event.registered_ns)).not_to be_empty
   end
 
   it 'ensures an event node exists when calling #event_node' do
     evt = Blather::Stanza::PubSub::Event.new
     evt.remove_children :event
-    evt.find('*[local-name()="event"]').should be_empty
+    expect(evt.find('*[local-name()="event"]')).to be_empty
 
-    evt.event_node.should_not be_nil
-    evt.find('ns:event', :ns => Blather::Stanza::PubSub::Event.registered_ns).should_not be_empty
+    expect(evt.event_node).not_to be_nil
+    expect(evt.find('ns:event', :ns => Blather::Stanza::PubSub::Event.registered_ns)).not_to be_empty
   end
 
   it 'ensures an items node exists when calling #items_node' do
     evt = Blather::Stanza::PubSub::Event.new
     evt.remove_children :items
-    evt.find('*[local-name()="items"]').should be_empty
+    expect(evt.find('*[local-name()="items"]')).to be_empty
 
-    evt.items_node.should_not be_nil
-    evt.find('ns:event/ns:items', :ns => Blather::Stanza::PubSub::Event.registered_ns).should_not be_empty
+    expect(evt.items_node).not_to be_nil
+    expect(evt.find('ns:event/ns:items', :ns => Blather::Stanza::PubSub::Event.registered_ns)).not_to be_empty
   end
 
   it 'knows the associated node name' do
     evt = Blather::XMPPNode.parse(event_with_payload_xml)
-    evt.node.should == 'princely_musings'
+    expect(evt.node).to eq('princely_musings')
   end
 
   it 'ensures newly inherited items are PubSubItem objects' do
     evt = Blather::XMPPNode.parse(event_with_payload_xml)
-    evt.items?.should == true
-    evt.retractions?.should == false
-    evt.items.map { |i| i.class }.uniq.should == [Blather::Stanza::PubSub::PubSubItem]
+    expect(evt.items?).to eq(true)
+    expect(evt.retractions?).to eq(false)
+    expect(evt.items.map { |i| i.class }.uniq).to eq([Blather::Stanza::PubSub::PubSubItem])
   end
 
   it 'will iterate over each item' do
     evt = Blather::XMPPNode.parse(event_with_payload_xml)
-    evt.items.each { |i| i.class.should == Blather::Stanza::PubSub::PubSubItem }
+    evt.items.each { |i| expect(i.class).to eq(Blather::Stanza::PubSub::PubSubItem) }
   end
 
   it 'handles receiving subscription ids' do
     evt = Blather::XMPPNode.parse(event_subids_xml)
-    evt.subscription_ids.should == ['123-abc', '004-yyy']
+    expect(evt.subscription_ids).to eq(['123-abc', '004-yyy'])
   end
 
   it 'can have a list of retractions' do
@@ -65,9 +65,9 @@ describe Blather::Stanza::PubSub::Event do
       </event>
     </message>
     NODE
-    evt.retractions?.should == true
-    evt.items?.should == false
-    evt.retractions.should == %w[ae890ac52d0df67ed7cfdf51b644e901]
+    expect(evt.retractions?).to eq(true)
+    expect(evt.items?).to eq(false)
+    expect(evt.retractions).to eq(%w[ae890ac52d0df67ed7cfdf51b644e901])
   end
 
   it 'can be a purge' do
@@ -78,8 +78,8 @@ describe Blather::Stanza::PubSub::Event do
       </event>
     </message>
     NODE
-    evt.purge?.should_not be_nil
-    evt.node.should == 'princely_musings'
+    expect(evt.purge?).not_to be_nil
+    expect(evt.node).to eq('princely_musings')
   end
 
   it 'can be a subscription notification' do
@@ -90,9 +90,9 @@ describe Blather::Stanza::PubSub::Event do
       </event>
     </message>
     NODE
-    evt.subscription?.should_not be_nil
-    evt.subscription[:jid].should == 'francisco@denmark.lit'
-    evt.subscription[:subscription].should == 'subscribed'
-    evt.subscription[:node].should == '/example.com/test'
+    expect(evt.subscription?).not_to be_nil
+    expect(evt.subscription[:jid]).to eq('francisco@denmark.lit')
+    expect(evt.subscription[:subscription]).to eq('subscribed')
+    expect(evt.subscription[:node]).to eq('/example.com/test')
   end
 end

data/spec/blather/stanza/pubsub/items_spec.rb

@@ -3,43 +3,43 @@ require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Items do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:items, 'http://jabber.org/protocol/pubsub').should == Blather::Stanza::PubSub::Items
+    expect(Blather::XMPPNode.class_from_registration(:items, 'http://jabber.org/protocol/pubsub')).to eq(Blather::Stanza::PubSub::Items)
   end
 
   it 'can be imported' do
-    Blather::XMPPNode.parse(items_all_nodes_xml).should be_instance_of Blather::Stanza::PubSub::Items
+    expect(Blather::XMPPNode.parse(items_all_nodes_xml)).to be_instance_of Blather::Stanza::PubSub::Items
   end
 
   it 'ensures an items node is present on create' do
     items = Blather::Stanza::PubSub::Items.new
-    items.find('//ns:pubsub/ns:items', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    expect(items.find('//ns:pubsub/ns:items', :ns => Blather::Stanza::PubSub.registered_ns)).not_to be_empty
   end
 
   it 'ensures an items node exists when calling #items' do
     items = Blather::Stanza::PubSub::Items.new
     items.pubsub.remove_children :items
-    items.find('//ns:pubsub/ns:items', :ns => Blather::Stanza::PubSub.registered_ns).should be_empty
+    expect(items.find('//ns:pubsub/ns:items', :ns => Blather::Stanza::PubSub.registered_ns)).to be_empty
 
-    items.items.should_not be_nil
-    items.find('//ns:pubsub/ns:items', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    expect(items.items).not_to be_nil
+    expect(items.find('//ns:pubsub/ns:items', :ns => Blather::Stanza::PubSub.registered_ns)).not_to be_empty
   end
 
   it 'defaults to a get node' do
     aff = Blather::Stanza::PubSub::Items.new
-    aff.type.should == :get
+    expect(aff.type).to eq(:get)
   end
 
   it 'ensures newly inherited items are PubSubItem objects' do
     items = Blather::XMPPNode.parse(items_all_nodes_xml)
-    items.map { |i| i.class }.uniq.should == [Blather::Stanza::PubSub::PubSubItem]
+    expect(items.map { |i| i.class }.uniq).to eq([Blather::Stanza::PubSub::PubSubItem])
   end
 
   it 'will iterate over each item' do
     n = parse_stanza items_all_nodes_xml
     items = Blather::Stanza::PubSub::Items.new.inherit n.root
     count = 0
-    items.each { |i| i.should be_instance_of Blather::Stanza::PubSub::PubSubItem; count += 1 }
-    count.should == 4
+    items.each { |i| expect(i).to be_instance_of Blather::Stanza::PubSub::PubSubItem; count += 1 }
+    expect(count).to eq(4)
   end
 
   it 'can create an items request node to request all items' do
@@ -47,9 +47,9 @@ describe Blather::Stanza::PubSub::Items do
     node = 'princely_musings'
 
     items = Blather::Stanza::PubSub::Items.request host, node
-    items.find("//ns:items[@node=\"#{node}\"]", :ns => Blather::Stanza::PubSub.registered_ns).size.should == 1
-    items.to.should == Blather::JID.new(host)
-    items.node.should == node
+    expect(items.find("//ns:items[@node=\"#{node}\"]", :ns => Blather::Stanza::PubSub.registered_ns).size).to eq(1)
+    expect(items.to).to eq(Blather::JID.new(host))
+    expect(items.node).to eq(node)
   end
 
   it 'can create an items request node to request some items' do
@@ -60,9 +60,9 @@ describe Blather::Stanza::PubSub::Items do
     items_xpath = items.map { |i| "@id=\"#{i}\"" } * ' or '
 
     items = Blather::Stanza::PubSub::Items.request host, node, items
-    items.find("//ns:items[@node=\"#{node}\"]/ns:item[#{items_xpath}]", :ns => Blather::Stanza::PubSub.registered_ns).size.should == 2
-    items.to.should == Blather::JID.new(host)
-    items.node.should == node
+    expect(items.find("//ns:items[@node=\"#{node}\"]/ns:item[#{items_xpath}]", :ns => Blather::Stanza::PubSub.registered_ns).size).to eq(2)
+    expect(items.to).to eq(Blather::JID.new(host))
+    expect(items.node).to eq(node)
   end
 
   it 'can create an items request node to request "max_number" of items' do
@@ -71,9 +71,9 @@ describe Blather::Stanza::PubSub::Items do
     max = 3
 
     items = Blather::Stanza::PubSub::Items.request host, node, nil, max
-    items.find("//ns:pubsub/ns:items[@node=\"#{node}\" and @max_items=\"#{max}\"]", :ns => Blather::Stanza::PubSub.registered_ns).size.should == 1
-    items.to.should == Blather::JID.new(host)
-    items.node.should == node
-    items.max_items.should == max
+    expect(items.find("//ns:pubsub/ns:items[@node=\"#{node}\" and @max_items=\"#{max}\"]", :ns => Blather::Stanza::PubSub.registered_ns).size).to eq(1)
+    expect(items.to).to eq(Blather::JID.new(host))
+    expect(items.node).to eq(node)
+    expect(items.max_items).to eq(max)
   end
 end