jubjub 0.0.7 → 0.0.8

data/spec/models/pubsub_collection_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
 describe Jubjub::Pubsub::Collection do
-  
+
   describe "that are proxied like" do
-    
+
     before do
       @mock_connection = mock
       @nodes = [
         Jubjub::Pubsub.new('pubsub.foo.com', 'node_1', @mock_connection),
-        Jubjub::Pubsub.new('pubsub.foo.com', 'node_2', @mock_connection)        
+        Jubjub::Pubsub.new('pubsub.foo.com', 'node_2', @mock_connection)
       ]
       @mock_connection.stub_chain( :pubsub, :list ).and_return(@nodes)
     end
-    
+
     describe "inspect" do
 
       it "should show the list of rooms, not Muc::Collection" do
@@ -29,42 +29,42 @@ describe Jubjub::Pubsub::Collection do
       end
 
     end
-    
+
   end
-  
+
   describe "instance method" do
-    
+
     describe "jid" do
       it "should return the jid" do
         p = Jubjub::Pubsub::Collection.new "pubsub.foo.com", mock
         p.jid.should == Jubjub::Jid.new('pubsub.foo.com')
       end
     end
-         
+
     describe "subscribe" do
       it "should call pubsub.subscribe on connection" do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :subscribe
         @mock_connection.pubsub.should_receive(:subscribe).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node' )
-    
+
         p = Jubjub::Pubsub::Collection.new "pubsub.foo.com", @mock_connection
-        p.subscribe "node"       
+        p.subscribe "node"
       end
     end
-    
+
     describe "unsubscribe" do
       before do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :unsubscribe
       end
-      
+
       it "without subid should call pubsub.unsubscribe on connection" do
         @mock_connection.pubsub.should_receive(:unsubscribe).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', nil )
 
         p = Jubjub::Pubsub::Collection.new "pubsub.foo.com", @mock_connection
-        p.unsubscribe "node"       
+        p.unsubscribe "node"
       end
-      
+
       it "with subid should call pubsub.unsubscribe on connection" do
         @mock_connection.pubsub.should_receive(:unsubscribe).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', '123' )
 
@@ -72,109 +72,125 @@ describe Jubjub::Pubsub::Collection do
         p.unsubscribe "node", "123"
       end
     end
-    
+
     describe "create" do
       before do
         @mock_connection = mock
-        @mock_connection.stub_chain :pubsub, :create        
+        @mock_connection.stub_chain :pubsub, :create
       end
-      
+
       it "should call pubsub.create on connection" do
         @mock_connection.pubsub.should_receive(:create).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', nil )
-        
+
         p = Jubjub::Pubsub::Collection.new "pubsub.foo.com", @mock_connection
         p.create "node"
       end
-      
+
       it "should yield a Pubsub::Configuration if a block is given" do
         @config = Jubjub::Pubsub::Configuration.new( "foo" => { :type => "boolean", :value => "1", :label => "Foo" } )
-        
+
         @mock_connection.pubsub.should_receive( :default_configuration ).with( Jubjub::Jid.new( 'pubsub.foo.com' ) ).and_return( @config )
         @mock_connection.pubsub.should_receive( :create ).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', @config )
-        
+
         Jubjub::Pubsub::Collection.new( "pubsub.foo.com", @mock_connection ).create( 'node' ){|config|
           config.should == @config
         }
       end
     end
-    
+
     describe "[]" do
       before do
         @mock_connection = mock
         @nodes = [
           Jubjub::Pubsub.new('pubsub.foo.com', 'node_1', @mock_connection),
-          Jubjub::Pubsub.new('pubsub.foo.com', 'node_2', @mock_connection)        
+          Jubjub::Pubsub.new('pubsub.foo.com', 'node_2', @mock_connection)
         ]
         @mock_connection.stub_chain( :pubsub, :list ).and_return(@nodes)
       end
-      
+
       subject { Jubjub::Pubsub::Collection.new "pubsub.foo.com", @mock_connection }
-      
+
       it "should work like a normal array when passed a Fixnum" do
         subject[1].should == @nodes[1]
       end
-      
-      it "should search by node if a String" do
-        subject["node_1"].should == @nodes[0]
-      end
-      
-      it "should return Jubjub::Pubsub item if nothing found as it may still exist" do
-        subject['made-up'].should == Jubjub::Pubsub.new( 'pubsub.foo.com', 'made-up', @mock_connection )
+
+      describe "searching by node if a String" do
+
+        it "should return cached result if it has already searched" do
+          # Trigger lookup
+          @mock_connection.pubsub.should_receive(:list)
+          subject.first
+          subject["node_1"].should equal @nodes[0]
+        end
+
+        it "should return default result if it has already searched and does not exist" do
+          # Trigger lookup
+          @mock_connection.pubsub.should_receive(:list)
+          subject.first
+          subject['made-up'].should == Jubjub::Pubsub.new( 'pubsub.foo.com', 'made-up', @mock_connection )
+        end
+
+        it "should return default result if it has not already searched" do
+          @mock_connection.pubsub.should_not_receive(:list)
+          subject['node_1'].should_not equal @nodes[0]
+          subject['node_1'].should == Jubjub::Pubsub.new( 'pubsub.foo.com', 'node_1', @mock_connection )
+        end
+
       end
     end
-    
-    
+
+
     describe "destroy" do
       it "with redirect should call pubsub.destroy on connection" do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :destroy
-        
-        @mock_connection.pubsub.should_receive(:destroy).with( 
+
+        @mock_connection.pubsub.should_receive(:destroy).with(
           Jubjub::Jid.new('pubsub.foo.com'),
           'node',
           Jubjub::Jid.new('pubsub.new.com'),
           'node_2'
         )
-        
+
         p = Jubjub::Pubsub::Collection.new "pubsub.foo.com", @mock_connection
         p.destroy "node", "pubsub.new.com", "node_2"
       end
-      
+
       it "without redirect should call pubsub.destroy on connection" do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :destroy
-        
-        @mock_connection.pubsub.should_receive(:destroy).with( 
+
+        @mock_connection.pubsub.should_receive(:destroy).with(
           Jubjub::Jid.new('pubsub.foo.com'),
           'node',
           nil,
           nil
         )
-        
+
         p = Jubjub::Pubsub::Collection.new "pubsub.foo.com", @mock_connection
         p.destroy "node"
       end
     end
-    
+
     describe "purge" do
-      
+
       before do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :purge
       end
-      
+
       it "should call pubsub.purge on connection" do
         @mock_connection.pubsub.should_receive(:purge).with(
           Jubjub::Jid.new('pubsub.foo.com'),
           'node'
         )
-        
+
         m = Jubjub::Pubsub::Collection.new 'pubsub.foo.com', @mock_connection
         m.purge('node')
       end
-      
+
     end
-    
+
   end
-  
-end
+
+end

data/spec/models/pubsub_item_collection_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
 describe Jubjub::Pubsub::ItemCollection do
-  
+
   describe "that are proxied like" do
-    
+
     before do
       @mock_connection = mock
       @items = [
         Jubjub::Pubsub::Item.new('pubsub.foo.com', 'node_1', 'abc', '<foo></foo>', @mock_connection),
-        Jubjub::Pubsub::Item.new('pubsub.foo.com', 'node_1', 'efg', '<bar></bar>', @mock_connection)        
+        Jubjub::Pubsub::Item.new('pubsub.foo.com', 'node_1', 'efg', '<bar></bar>', @mock_connection)
       ]
       @mock_connection.stub_chain( :pubsub, :retrieve_items ).and_return(@items)
     end
-    
+
     describe "inspect" do
 
       it "should show the list of items, not Pubsub::ItemCollection" do
@@ -29,48 +29,48 @@ describe Jubjub::Pubsub::ItemCollection do
       end
 
     end
-    
+
   end
-  
+
   describe "instance method" do
-    
+
     describe "jid" do
       it "should return the jid" do
         Jubjub::Pubsub::ItemCollection.new("pubsub.foo.com", "node", mock).jid.should == Jubjub::Jid.new("pubsub.foo.com")
       end
     end
-    
+
     describe "node" do
       it "should return the node" do
         Jubjub::Pubsub::ItemCollection.new("pubsub.foo.com", "node", mock).node.should == 'node'
       end
     end
-    
+
     describe "[]" do
       before do
         @mock_connection = mock
         @nodes = [
           Jubjub::Pubsub::Item.new('pubsub.foo.com', 'node_1', 'abc', '<foo></foo>', @mock_connection),
-          Jubjub::Pubsub::Item.new('pubsub.foo.com', 'node_1', 'efg', '<bar></bar>', @mock_connection)        
+          Jubjub::Pubsub::Item.new('pubsub.foo.com', 'node_1', 'efg', '<bar></bar>', @mock_connection)
         ]
         @mock_connection.stub_chain( :pubsub, :retrieve_items ).and_return(@nodes)
       end
-      
+
       subject { Jubjub::Pubsub::ItemCollection.new "pubsub.foo.com", "node_1", @mock_connection }
-      
+
       it "should work like a normal array when passed a Fixnum" do
         subject[1].should == @nodes[1]
       end
-      
+
       it "should search by node if a String" do
         subject["abc"].should == @nodes[0]
       end
-      
+
       it "should return nil if nothing found" do
         subject['made-up'].should be_nil
       end
     end
-    
+
   end
-  
-end
+
+end

data/spec/models/pubsub_item_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Jubjub::Pubsub::Item do
-  
+
   def pubsub_item_factory(override = {})
     options = {
       :jid        => Jubjub::Jid.new("pubsub.foo.com"),
@@ -10,7 +10,7 @@ describe Jubjub::Pubsub::Item do
       :data       => 'foo',
       :connection => "SHHHH CONNECTION OBJECT"
     }.merge( override )
-    
+
     Jubjub::Pubsub::Item.new(
       options[:jid],
       options[:node],
@@ -19,76 +19,76 @@ describe Jubjub::Pubsub::Item do
       options[:connection]
     )
   end
-  
+
   describe "instance method" do
-    
+
     describe "jid" do
       it "should return the jid" do
         p = pubsub_item_factory :jid => 'foo.com'
         p.jid.should == Jubjub::Jid.new('foo.com')
       end
     end
-    
+
     describe "node" do
       it "should return the node" do
         p = pubsub_item_factory :node => 'node_1'
         p.node.should == 'node_1'
       end
     end
-    
+
     describe "data" do
       it "should return the data" do
         p = pubsub_item_factory :data => 'hello'
         p.data.should == 'hello'
       end
     end
-    
+
     describe "item_id" do
       it "should return the item_id" do
         p = pubsub_item_factory :item_id => 'as12'
         p.item_id.should == 'as12'
       end
     end
-    
+
     describe "uri" do
       it "should return the uri of the item" do
         item = pubsub_item_factory :jid => "theozaurus@foo.com", :node => "blah", :item_id => "123"
         item.uri.should == "xmpp:theozaurus@foo.com?;node=blah;item=123"
       end
     end
-    
+
     describe "retract" do
       it "should call pubsub.retract on connection" do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :retract
         @mock_connection.pubsub.should_receive(:retract).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', '123' )
-    
+
         p = pubsub_item_factory :jid => 'pubsub.foo.com', :node => 'node', :item_id => '123', :connection => @mock_connection
         p.retract
       end
     end
-    
+
     describe "==" do
       it "should match equivalent objects" do
         pubsub_item_factory.should == pubsub_item_factory
       end
-      
+
       it "should not distinguish between connections" do
         pubsub_item_factory(:connection => 'wibble').should == pubsub_item_factory(:connection => 'wobble')
       end
-      
+
       it "should still match no matter how jid is initialized" do
         pubsub_item_factory(:jid => 'foo@bar.com').should == pubsub_item_factory(:jid => Jubjub::Jid.new('foo@bar.com'))
       end
-      
+
       it "should not match objects with different attributes" do
-        pubsub_item_factory(:jid     => 'a.b.com').should_not == pubsub_item_factory   
+        pubsub_item_factory(:jid     => 'a.b.com').should_not == pubsub_item_factory
         pubsub_item_factory(:node    => 'adsafsd').should_not == pubsub_item_factory
         pubsub_item_factory(:item_id => '23').should_not == pubsub_item_factory
         pubsub_item_factory(:data    => '<wibble></wibble').should_not == pubsub_item_factory
       end
     end
-    
+
   end
-  
-end
+
+end

data/spec/models/pubsub_spec.rb

@@ -1,49 +1,49 @@
 require 'spec_helper'
 
 describe Jubjub::Pubsub do
-  
+
   describe "instance method" do
-    
+
     describe "inspect" do
-      
+
       it "should not show connection information" do
         m = Jubjub::Pubsub.new(Jubjub::Jid.new("pubsub.foo.com"),'node',"SHHHH CONNECTION OBJECT")
         m.inspect.should_not match 'SHHHH CONNECTION OBJECT'
       end
-      
+
       it "should show string version of jid" do
         m = Jubjub::Pubsub.new(Jubjub::Jid.new("pubsub.foo.com"),'node',mock)
         m.inspect.should match '@jid="pubsub.foo.com"'
       end
-      
+
       it "should show node" do
         m = Jubjub::Pubsub.new(Jubjub::Jid.new("pubsub.foo.com"),nil,mock)
         m.inspect.should match '@node=nil'
-        
+
         m = Jubjub::Pubsub.new(Jubjub::Jid.new("pubsub.foo.com"),'node',mock)
         m.inspect.should match '@node="node"'
       end
-      
+
     end
-    
+
     describe "jid" do
       it "should return the jid" do
         Jubjub::Pubsub.new('pubsub.foo.com','node', mock).jid.should == Jubjub::Jid.new('pubsub.foo.com')
       end
     end
-    
+
     describe "node" do
       it "should return the node" do
         Jubjub::Pubsub.new('pubsub.foo.com','node', mock).node.should == 'node'
       end
     end
-    
+
     describe "uri" do
       it "should return the uri of the node" do
         Jubjub::Pubsub.new(Jubjub::Jid.new('theozaurus@foo.com'), 'blah', mock ).uri.should == "xmpp:theozaurus@foo.com?;node=blah"
       end
     end
-    
+
     describe "subscribe" do
       it "should call pubsub.subscribe on connection" do
         @mock_connection = mock
@@ -54,14 +54,14 @@ describe Jubjub::Pubsub do
         m.subscribe
       end
     end
-    
+
     describe "unsubscribe" do
-      
+
       before do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :unsubscribe
       end
-      
+
       describe "with subid" do
         it "should call pubsub.unsubscribe on connection" do
           @mock_connection.pubsub.should_receive(:unsubscribe).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', 'wibble' )
@@ -70,7 +70,7 @@ describe Jubjub::Pubsub do
           m.unsubscribe 'wibble'
         end
       end
-      
+
       describe "without subid" do
         it "should call pubsub.unsubscribe on connection" do
           @mock_connection.pubsub.should_receive(:unsubscribe).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', nil )
@@ -79,16 +79,16 @@ describe Jubjub::Pubsub do
           m.unsubscribe
         end
       end
-      
+
     end
-    
+
     describe "publish" do
-      
+
       before do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :publish
       end
-      
+
       describe "with item id" do
         it "should call pubsub.publish on connection" do
           @mock_connection.pubsub.should_receive(:publish).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', 'data', '123' )
@@ -97,7 +97,7 @@ describe Jubjub::Pubsub do
           m.publish 'data', '123'
         end
       end
-      
+
       describe "without item id" do
         it "should call pubsub.publish on connection" do
           @mock_connection.pubsub.should_receive(:publish).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', 'data', nil )
@@ -106,36 +106,36 @@ describe Jubjub::Pubsub do
           m.publish 'data'
         end
       end
-      
+
     end
-    
+
     describe "retract" do
       it "should call pubsub.retract on connection" do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :retract
         @mock_connection.pubsub.should_receive(:retract).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', '123' )
-    
+
         m = Jubjub::Pubsub.new 'pubsub.foo.com', 'node', @mock_connection
         m.retract('123')
       end
     end
-    
+
     describe "destroy" do
-      
+
       before do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :destroy
       end
-      
+
       it "without redirect should call pubsub.destroy on connection" do
         @mock_connection.pubsub.should_receive(:destroy).with( Jubjub::Jid.new( 'pubsub.foo.com' ), 'node', nil, nil )
 
         m = Jubjub::Pubsub.new 'pubsub.foo.com', 'node', @mock_connection
         m.destroy
       end
-      
+
       it "with redirect should call pubsub.destroy on connection" do
-        @mock_connection.pubsub.should_receive(:destroy).with( 
+        @mock_connection.pubsub.should_receive(:destroy).with(
           Jubjub::Jid.new('pubsub.foo.com'),
           'node',
           Jubjub::Jid.new('pubsub.new.com'),
@@ -144,43 +144,43 @@ describe Jubjub::Pubsub do
         m = Jubjub::Pubsub.new 'pubsub.foo.com', 'node', @mock_connection
         m.destroy 'pubsub.new.com', 'node_2'
       end
-      
+
     end
-    
+
     describe "purge" do
-      
+
       before do
         @mock_connection = mock
         @mock_connection.stub_chain :pubsub, :purge
       end
-      
+
       it "should call pubsub.purge on connection" do
         @mock_connection.pubsub.should_receive(:purge).with(
           Jubjub::Jid.new('pubsub.foo.com'),
           'node'
         )
-        
+
         m = Jubjub::Pubsub.new 'pubsub.foo.com', 'node', @mock_connection
         m.purge
       end
-      
+
     end
-    
+
     describe "items" do
-      
+
       before do
         @mock_connection = mock
       end
-      
+
       it 'should return Jubjub::Pubsub::ItemCollection' do
         @pubsub_node = Jubjub::Pubsub.new 'pubsub.foo.com', 'node', @mock_connection
         @pubsub_node.items.should be_a Jubjub::Pubsub::ItemCollection
         @pubsub_node.items.jid.should  == Jubjub::Jid.new('pubsub.foo.com')
         @pubsub_node.items.node.should == 'node'
       end
-      
+
     end
-    
+
   end
-  
-end
+
+end