faye 0.8.8 → 0.8.9

data/spec/ruby/engine_examples.rb

@@ -23,7 +23,7 @@ EngineSteps = EM::RSpec.async_steps do
       resume.call
     end
   end
-  
+
   def connect(name, engine, &resume)
     engine.connect(@clients[name]) do |m|
       m.each do |message|
@@ -33,38 +33,38 @@ EngineSteps = EM::RSpec.async_steps do
     end
     EM.add_timer(0.01, &resume)
   end
-  
+
   def destroy_client(name, &resume)
     engine.destroy_client(@clients[name], &resume)
   end
-  
+
   def check_client_id(name, pattern, &resume)
     @clients[name].should =~ pattern
     resume.call
   end
-  
+
   def check_num_clients(n, &resume)
     ids = Set.new
     @clients.each { |name,id| ids.add(id) }
     ids.size.should == n
     resume.call
   end
-  
+
   def check_client_exists(name, exists, &resume)
     engine.client_exists(@clients[name]) do |actual|
       actual.should == exists
       resume.call
     end
   end
-  
+
   def subscribe(name, channel, &resume)
     engine.subscribe(@clients[name], channel, &resume)
   end
-  
+
   def unsubscribe(name, channel, &resume)
     engine.unsubscribe(@clients[name], channel, &resume)
   end
-  
+
   def publish(messages, &resume)
     messages = [messages].flatten
     messages.each do |message|
@@ -73,7 +73,7 @@ EngineSteps = EM::RSpec.async_steps do
     end
     EM.add_timer(0.01, &resume)
   end
-  
+
   def publish_by(name, message, &resume)
     message = {"clientId" => @clients[name], "id" => Faye::Engine.random}.merge(message)
     engine.publish(message)
@@ -84,12 +84,12 @@ EngineSteps = EM::RSpec.async_steps do
     engine.ping(@clients[name])
     resume.call
   end
-  
+
   def clock_tick(time, &resume)
     clock.tick(time)
     resume.call
   end
-  
+
   def expect_event(name, event, args, &resume)
     params  = [@clients[name]] + args
     handler = lambda { |*a| }
@@ -110,12 +110,12 @@ EngineSteps = EM::RSpec.async_steps do
     @inboxes[name].should == messages
     resume.call
   end
-  
+
   def expect_no_message(name, &resume)
     @inboxes[name].should == []
     resume.call
   end
-  
+
   def check_different_messages(a, b, &resume)
     @inboxes[a].first.should_not be_equal(@inboxes[b].first)
     resume.call
@@ -126,15 +126,15 @@ describe "Pub/sub engines" do
   shared_examples_for "faye engine" do
     include EncodingHelper
     include EngineSteps
-    
+
     def create_engine
       opts = options.merge(engine_opts)
       Faye::Engine::Proxy.new(opts)
     end
-    
+
     let(:options) { {:timeout => 1} }
     let(:engine) { create_engine }
-    
+
     before do
       Faye.stub(:logger)
       Faye::Engine.ensure_reactor_running!
@@ -142,13 +142,13 @@ describe "Pub/sub engines" do
       create_client :bob
       create_client :carol
     end
-    
+
     describe :create_client do
       it "returns a client id" do
         create_client :dave
         check_client_id :dave, /^[a-z0-9]+$/
       end
-      
+
       it "returns a different id every time" do
         1.upto(7) { |i| create_client "client#{i}" }
         check_num_clients 10
@@ -159,12 +159,12 @@ describe "Pub/sub engines" do
         create_client :dave
       end
     end
-    
+
     describe :client_exists do
       it "returns true if the client id exists" do
         check_client_exists :alice, true
       end
-      
+
       it "returns false if the client id does not exist" do
         check_client_exists :anything, false
       end
@@ -175,7 +175,7 @@ describe "Pub/sub engines" do
         clock_tick 2
         check_client_exists :alice, false
       end
-      
+
       it "prolongs the life of a client" do
         clock_tick 1
         ping :alice
@@ -191,7 +191,7 @@ describe "Pub/sub engines" do
         destroy_client :alice
         check_client_exists :alice, false
       end
-      
+
       it "publishes an event" do
         expect_event :alice, :disconnect, []
         destroy_client :alice
@@ -202,7 +202,7 @@ describe "Pub/sub engines" do
           @message = {"channel" => "/messages/foo", "data" => "ok"}
           subscribe :alice, "/messages/foo"
         end
-        
+
         it "stops the client receiving messages" do
           connect :alice, engine
           destroy_client :alice
@@ -222,10 +222,10 @@ describe "Pub/sub engines" do
         expect_event :alice, :subscribe, ["/messages/foo"]
         subscribe :alice, "/messages/foo"
       end
-      
+
       describe "when the client is subscribed to the channel" do
         before { subscribe :alice, "/messages/foo" }
-        
+
         it "does not publish an event" do
           expect_no_event :alice, :subscribe, ["/messages/foo"]
           subscribe :alice, "/messages/foo"
@@ -235,7 +235,7 @@ describe "Pub/sub engines" do
 
     describe :unsubscribe do
       before { subscribe :alice, "/messages/bar" }
-      
+
       it "does not publish an event" do
         expect_no_event :alice, :unsubscribe, ["/messages/foo"]
         unsubscribe :alice, "/messages/foo"
@@ -250,7 +250,7 @@ describe "Pub/sub engines" do
         end
       end
     end
-    
+
     describe :publish do
       before do
         @message = {"channel" => "/messages/foo", "data" => "ok", "blank" => nil}
@@ -258,7 +258,7 @@ describe "Pub/sub engines" do
         connect :bob,   engine
         connect :carol, engine
       end
-      
+
       describe "with no subscriptions" do
         it "delivers no messages" do
           publish @message
@@ -277,15 +277,15 @@ describe "Pub/sub engines" do
           publish @message
         end
       end
-      
+
       describe "with a subscriber" do
         before { subscribe :alice, "/messages/foo" }
-        
+
         it "delivers messages to the subscribed client" do
           publish @message
           expect_message :alice, [@message]
         end
-        
+
         it "delivers multibyte messages correctly" do
           @message["data"] = encode "Apple = "
           publish @message
@@ -297,13 +297,13 @@ describe "Pub/sub engines" do
           publish_by :bob, @message
         end
       end
-      
+
       describe "with a subscriber that is removed" do
         before do
           subscribe :alice, "/messages/foo"
           unsubscribe :alice, "/messages/foo"
         end
-        
+
         it "does not deliver messages to unsubscribed clients" do
           publish @message
           expect_no_message :alice
@@ -316,14 +316,14 @@ describe "Pub/sub engines" do
           publish_by :bob, @message
         end
       end
-      
+
       describe "with multiple subscribers" do
         before do
           subscribe :alice, "/messages/foo"
           subscribe :bob,   "/messages/bar"
           subscribe :carol, "/messages/foo"
         end
-        
+
         it "delivers messages to the subscribed clients" do
           publish @message
           expect_message    :alice, [@message]
@@ -331,14 +331,14 @@ describe "Pub/sub engines" do
           expect_message    :carol, [@message]
         end
       end
-      
+
       describe "with a single wildcard" do
         before do
           subscribe :alice, "/messages/*"
           subscribe :bob,   "/messages/bar"
           subscribe :carol, "/*"
         end
-        
+
         it "delivers messages to matching subscriptions" do
           publish @message
           expect_message    :alice, [@message]
@@ -346,38 +346,38 @@ describe "Pub/sub engines" do
           expect_no_message :carol
         end
       end
-      
+
       describe "with a double wildcard" do
         before do
           subscribe :alice, "/messages/**"
           subscribe :bob,   "/messages/bar"
           subscribe :carol, "/**"
         end
-        
+
         it "delivers messages to matching subscriptions" do
           publish @message
           expect_message    :alice, [@message]
           expect_no_message :bob
           expect_message    :carol, [@message]
         end
-        
+
         it "delivers a unique copy of the message to each client" do
           publish @message
           check_different_messages :alice, :carol
         end
       end
-      
+
       describe "with multiple matching subscriptions for the same client" do
         before do
           subscribe :alice, "/messages/foo"
           subscribe :alice, "/messages/*"
         end
-        
+
         it "delivers each message once to each client" do
           publish @message
           expect_message :alice, [@message]
         end
-        
+
         it "delivers the message as many times as it is published" do
           publish [@message, @message]
           expect_message :alice, [@message, @message]
@@ -385,36 +385,36 @@ describe "Pub/sub engines" do
       end
     end
   end
-  
+
   shared_examples_for "distributed engine" do
     include EngineSteps
-    
+
     def create_engine
       opts = options.merge(engine_opts)
       Faye::Engine::Proxy.new(opts)
     end
-    
+
     let(:options) { {} }
     let(:left)  { create_engine }
     let(:right) { create_engine }
-    
+
     alias :engine :left
-    
+
     before do
       Faye.stub(:logger)
       Faye::Engine.ensure_reactor_running!
       create_client :alice
       create_client :bob
-      
+
       connect :alice, left
     end
-    
+
     describe :publish do
       before do
         subscribe :alice, "/foo"
         publish "channel" => "/foo", "data" => "first"
       end
-      
+
       it "only delivers each message once" do
         expect_message :alice, ["channel" => "/foo", "data" => "first"]
         publish "channel" => "/foo", "data" => "second"

data/spec/ruby/faye_spec.rb

@@ -5,24 +5,24 @@ describe Faye do
     it "returns a 128-bit random number in base 36" do
       Faye.random.should =~ /^[a-z0-9]+$/
     end
-    
+
     it "always produces the same length of string" do
       ids = (1..100).map { Faye.random }
       ids.should be_all { |id| id.size == 31 }
     end
   end
-  
+
   describe :copy_obect do
     let(:object) { {"foo" => "bar", "qux" => 42, "hey" => nil, "obj" => {"bar" => 67}} }
-    
+
     it "returns an equal object" do
       Faye.copy_object(object).should == {"foo" => "bar", "qux" => 42, "hey" => nil, "obj" => {"bar" => 67}}
     end
-    
+
     it "does not return the same object" do
       Faye.copy_object(object).should_not be_equal(object)
     end
-    
+
     it "performs a deep clone" do
       Faye.copy_object(object)["obj"].should_not be_equal(object["obj"])
     end

data/spec/ruby/grammar_spec.rb

@@ -5,61 +5,61 @@ describe Faye::Grammar do
     it "matches valid channel names" do
       Faye::Grammar::CHANNEL_NAME.should =~ "/fo_o/$@()bar"
     end
-    
+
     it "does not match channel patterns" do
       Faye::Grammar::CHANNEL_NAME.should_not =~ "/foo/**"
     end
-    
+
     it "does not match invalid channel names" do
       Faye::Grammar::CHANNEL_NAME.should_not =~ "foo/$@()bar"
       Faye::Grammar::CHANNEL_NAME.should_not =~ "/foo/$@()bar/"
       Faye::Grammar::CHANNEL_NAME.should_not =~ "/fo o/$@()bar"
     end
   end
-  
+
   describe :CHANNEL_PATTERN do
     it "does not match channel names" do
       Faye::Grammar::CHANNEL_PATTERN.should_not =~ "/fo_o/$@()bar"
     end
-    
+
     it "matches valid channel patterns" do
       Faye::Grammar::CHANNEL_PATTERN.should =~ "/foo/**"
       Faye::Grammar::CHANNEL_PATTERN.should =~ "/foo/*"
     end
-    
+
     it "does not match invalid channel patterns" do
       Faye::Grammar::CHANNEL_PATTERN.should_not =~ "/foo/**/*"
     end
   end
-  
+
   describe :ERROR do
     it "matches an error with an argument" do
       Faye::Grammar::ERROR.should =~ "402:xj3sjdsjdsjad:Unknown Client ID"
     end
-    
+
     it "matches an error with many arguments" do
       Faye::Grammar::ERROR.should =~ "403:xj3sjdsjdsjad,/foo/bar:Subscription denied"
     end
-    
+
     it "matches an error with no arguments" do
       Faye::Grammar::ERROR.should =~ "402::Unknown Client ID"
     end
-    
+
     it "does not match an error with no code" do
       Faye::Grammar::ERROR.should_not =~ ":xj3sjdsjdsjad:Unknown Client ID"
     end
-    
+
     it "does not match an error with an invalid code" do
       Faye::Grammar::ERROR.should_not =~ "40:xj3sjdsjdsjad:Unknown Client ID"
     end
   end
-  
+
   describe :VERSION do
     it "matches a version number" do
       Faye::Grammar::VERSION.should =~ "9"
       Faye::Grammar::VERSION.should =~ "9.0.a-delta1"
     end
-    
+
     it "does not match invalid version numbers" do
       Faye::Grammar::VERSION.should_not =~ "9.0.a-delta1."
       Faye::Grammar::VERSION.should_not =~ ""