sarb 0.1.0 → 0.1.1

data/.gitignore

@@ -4,3 +4,12 @@
 # Version Manager files
 .rvmrc
 
+# RSpec
+.rspec
+
+# Bundler
+Gemfile.lock
+
+# Gem
+sarb-*.gem
+

data/README.md

@@ -2,6 +2,20 @@
 
 Framework for em-websocket that uses actions and triggers for real-time communication with your app.
 
+## Install
+
+For latest rubygems version:
+
+```ruby
+gem "sarb"
+```
+
+For latest github commit:
+
+```ruby
+gem "sarb", :git => "https://github.com/craigjackson/sarb.git"
+```
+
 ## Example
 
 ```ruby

data/lib/sarb/application.rb

@@ -11,7 +11,7 @@ module Sarb
         :connection_open => [method(:connection_open)],
         :connection_close => [method(:connection_close)]
       }
-      @connections = []
+      @connections = Set.new
     end
 
     def action(name, &block)
@@ -35,6 +35,10 @@ module Sarb
       @connections.delete(args[:connection])
     end
 
+    def message_all(message, exceptions=Set.new)
+      @connections.each { |c| c.message(message) unless exceptions.include?(c) }
+    end
+
     def run(options = {})
       EventMachine::WebSocket.start(DEFAULTS.merge(options), &method(:new_connection))
     end

data/lib/sarb/connection.rb

@@ -26,6 +26,7 @@ module Sarb
       ws.onopen &connection.method(:onopen)
       ws.onmessage &connection.method(:onmessage)
       ws.onclose &connection.method(:onclose)
+      connection
     end
   end
 end

data/sarb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sarb"
-  s.version     = "0.1.0"
+  s.version     = "0.1.1"
   s.summary     = "Socket Action Ruby"
   s.description = "Framework for em-websocket that uses actions and triggers for real-time communication with your app."
   s.authors     = ["Craig Jackson"]

data/spec/lib/sarb/application_spec.rb

@@ -12,7 +12,7 @@ describe Sarb::Application do
         :connection_open => [@app.method(:connection_open)],
         :connection_close => [@app.method(:connection_close)]
       }
-      @app.instance_variable_get(:@connections).should == []
+      @app.instance_variable_get(:@connections).should == Set.new
     end
   end
 
@@ -63,9 +63,9 @@ describe Sarb::Application do
 
   context "new_connection" do
     it "should pass along the websocket to the Connection and set onmessage event" do
-      @connection = Sarb::Connection.new(@app, "ws")
-      Sarb::Connection.should_receive(:setup).with(@app, "ws").and_return(@connection)
-      @app.new_connection("ws").should === @connection
+      connection = Sarb::Connection.new(@app, "ws")
+      Sarb::Connection.should_receive(:setup).with(@app, "ws").and_return(connection)
+      @app.new_connection("ws").should === connection
     end
   end
 
@@ -73,7 +73,7 @@ describe Sarb::Application do
     it "should add to @connections" do
       connection = "connection"
       @app.connection_open({:connection => connection})
-      @app.instance_variable_get(:@connections).should == [connection]
+      @app.instance_variable_get(:@connections).should == Set.new([connection])
     end
   end
 
@@ -81,35 +81,58 @@ describe Sarb::Application do
     it "should remove from @connections" do
       connection1 = "connection1"
       connection2 = "connection2"
-      @app.instance_variable_set(:@connections, [connection1, connection2])
+      @app.instance_variable_set(:@connections, Set.new([connection1, connection2]))
       @app.connection_close({:connection => connection1})
-      @app.instance_variable_get(:@connections).should == [connection2]
+      @app.instance_variable_get(:@connections).should == Set.new([connection2])
+    end
+  end
+
+  context "message_all" do
+    it "should send message to all connections" do
+      connection1 = Sarb::Connection.new(@app, "ws")
+      connection2 = Sarb::Connection.new(@app, "ws")
+      connection1.should_receive(:message).with("message")
+      connection2.should_receive(:message).with("message")
+      @app.instance_variable_set(:@connections, Set.new([connection1, connection2]))
+      @app.message_all "message"
+    end
+
+    it "should allow exceptions to message_all" do
+      connection1 = Sarb::Connection.new(@app, "ws")
+      connection2 = Sarb::Connection.new(@app, "ws")
+      connection1.should_receive(:message).with("message")
+      connection2.should_not_receive(:message)
+      @app.instance_variable_set(:@connections, Set.new([connection1, connection2]))
+      @app.message_all "message", Set.new([connection2])
     end
   end
 
   context "run" do
     it "should start an EventMachine::WebSocket with defaults" do
       method = Proc.new {}
-      @app.stub(:method => method)
-      # TODO: Not really sure how to test &method is passed. "with" does not actually test &method.
-      EventMachine::WebSocket.should_receive(:start).with(Sarb::Application::DEFAULTS, &method)
+      method_expected = false
+      @app.stub(:method).with(:new_connection).and_return(method)
+      EventMachine::WebSocket.should_receive(:start){|&block| method_expected = (block == method)}.with(Sarb::Application::DEFAULTS)
       @app.run
+      method_expected.should be_true
     end
 
     it "should start an EventMachine::WebSocket with given host and default port" do
       method = Proc.new {}
-      @app.stub(:method => method)
-      # TODO: Not really sure how to test &method is passed. "with" does not actually test &method.
-      EventMachine::WebSocket.should_receive(:start).with(:host => "testhost", :port => Sarb::Application::DEFAULTS[:port], &method)
+      method_expected = false
+      @app.stub(:method).with(:new_connection).and_return(method)
+      EventMachine::WebSocket.should_receive(:start){|&block| method_expected = (block == method)}.with(:host => "testhost", :port => Sarb::Application::DEFAULTS[:port])
       @app.run :host => "testhost"
+      method_expected.should be_true
     end
 
     it "should start an EventMachine::WebSocket with default host and given port" do
       method = Proc.new {}
-      @app.stub(:method => method)
-      # TODO: Not really sure how to test &method is passed. "with" does not actually test &method.
-      EventMachine::WebSocket.should_receive(:start).with(:host => Sarb::Application::DEFAULTS[:host], :port => "testport", &method)
+      method_expected = false
+      @app.stub(:method).with(:new_connection).and_return(method)
+      EventMachine::WebSocket.should_receive(:start){|&block| method_expected = (block == method)}.with(:host => Sarb::Application::DEFAULTS[:host], :port => "testport")
       @app.run :port => "testport"
+      method_expected.should be_true
     end
   end
 

data/spec/lib/sarb/connection_spec.rb

@@ -51,11 +51,26 @@ describe Sarb::Connection do
   context "setup" do
     it "should create new Connection and add 'on' events" do
       Sarb::Connection.should_receive(:new).with(@app, @ws).and_return(@connection)
-      # TODO: Putting the intended blocks in the 'with' method on the following stubs causes an error.
-      @ws.should_receive(:onopen)
-      @ws.should_receive(:onmessage)
-      @ws.should_receive(:onclose)
-      Sarb::Connection.setup(@app, @ws)
+
+      onopen_expected = false
+      onopen_method = Proc.new{ :onopen }
+      @connection.should_receive(:method).with(:onopen).and_return(onopen_method)
+      @ws.should_receive(:onopen) { |&block| onopen_expected = (block == onopen_method) }
+
+      onmessage_expected = false
+      onmessage_method = Proc.new{ :onmessage }
+      @connection.should_receive(:method).with(:onmessage).and_return(onmessage_method)
+      @ws.should_receive(:onmessage) { |&block| onmessage_expected = (block == onmessage_method) }
+
+      onclose_expected = false
+      onclose_method = Proc.new{ :onclose }
+      @connection.should_receive(:method).with(:onclose).and_return(onclose_method)
+      @ws.should_receive(:onclose) { |&block| onclose_expected = (block == onclose_method) }
+
+      Sarb::Connection.setup(@app, @ws).should be_equal(@connection)
+      onopen_expected.should be_true
+      onmessage_expected.should be_true
+      onclose_expected.should be_true
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sarb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &7758080 !ruby/object:Gem::Requirement
+  requirement: &5988340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *7758080
+  version_requirements: *5988340
 description: Framework for em-websocket that uses actions and triggers for real-time
   communication with your app.
 email: tapocol@gmail.com
@@ -30,9 +30,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - lib/sarb.rb

data/.rspec

@@ -1,2 +0,0 @@
---color
-

data/Gemfile.lock

@@ -1,24 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.2)
-    em-websocket (0.5.0)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.5.3)
-    eventmachine (1.0.3)
-    http_parser.rb (0.5.3)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  em-websocket
-  rspec