websocket-rails 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    websocket-rails (0.1.0)
+    websocket-rails (0.1.1)
       faye-websocket
       rack
       thin

data/README.md

@@ -2,6 +2,10 @@
 
 [![Build Status](https://secure.travis-ci.org/DanKnox/websocket-rails.png)](https://secure.travis-ci.org/DanKnox/websocket-rails)
 
+If you haven't done so yet, check out the [Project Page](http://danknox.github.com/websocket-rails/) to get a feel for the project direction. Feedback is very much appreciated. Post an issue on the issue tracker or [shoot us an email](mailto://support@threedotloft.com) to give us your thoughts.
+
+## Overview
+
 Plug and play WebSocket support for ruby on rails. Includes event router for mapping javascript events to controller actions. There is no need for a separate WebSocket server process. Requests to `/websocket` will be passed through to the `ConnectionManager` class which is a simple Rack based WebSocket server developed using the `Faye::WebSocket` library.
 
 *Important Note*

data/lib/websocket_rails/events.rb

@@ -3,7 +3,7 @@ module WebsocketRails
   # number of controllers and actions. You can define your event routes by creating an +events.rb+ file in
   # your application's +initializers+ directory. The DSL currently consists of a single method, {#subscribe},
   # which takes a symbolized event name as the first argument, and a Hash with the controller and method
-  # name as the second arguments.
+  # name as the second argument.
   #
   # == Example events.rb file
   #   # located in config/initializers/events.rb

data/lib/websocket_rails/version.rb

@@ -1,3 +1,3 @@
 module WebsocketRails
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/integration/connection_manager_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module WebsocketRails
+  describe ConnectionManager do
+    
+    def define_test_events
+      WebsocketRails.route_block = nil
+      WebsocketRails::Events.describe_events do
+        subscribe :client_connected, to: ChatController, with_method: :new_user
+        subscribe :change_username, to: ChatController, with_method: :change_username
+      end
+    end
+    
+    before(:all) { define_test_events }
+    
+    let(:env) { Hash.new }
+    let(:socket) { MockWebSocket.new }
+    
+    before(:each) do
+      Faye::WebSocket.stub(:new).and_return(MockWebSocket.new)
+      @server = ConnectionManager.new
+    end
+    
+    context "new connections" do
+      it "should execute the controller action associated with the 'client_connected' event" do
+        ChatController.any_instance.should_receive(:new_user)
+        define_test_events
+        @server.call( env )
+        #ChatController.new.send(:new_user)
+      end
+      
+      it "should have a ChatController present" do
+        ChatController.new.should be_present
+      end
+    end
+    
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 ENV["RAILS_ENV"] ||= 'test'
 
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start if ENV["COVERAGE"]
 
 require File.expand_path("../../spec/dummy/config/environment", __FILE__)
 require 'rspec/rails'

data/spec/unit/connection_manager_spec.rb

@@ -40,21 +40,7 @@ module WebsocketRails
       it "should return an Async Rack response" do
         open_connection.should == [ -1, {}, [] ]
       end
-    end
-    
-    context "new event on an open connection" do
-      before(:all) { MockEvent = Struct.new(:data) }
-      before(:each) { open_connection }      
-      
-      it "should dispatch the appropriate event through the Dispatcher" do
-        mock_event = MockEvent.new(:new_message)
-        @dispatcher.should_receive(:receive) do |event,connection|
-          event.should == :new_message
-          connection.should == @mock_socket
-        end
-        @mock_socket.onmessage(mock_event)
-      end
-    end
+    end    
     
     context "open connections" do
       before(:each) do
@@ -62,6 +48,20 @@ module WebsocketRails
         4.times { open_connection }
       end
       
+      context "when receiving a new event" do
+        before(:all) { MockEvent = Struct.new(:data) }
+        before(:each) { open_connection }      
+
+        it "should dispatch the appropriate event through the Dispatcher" do
+          mock_event = MockEvent.new(:new_message)
+          @dispatcher.should_receive(:receive) do |event,connection|
+            event.should == :new_message
+            connection.should == @mock_socket
+          end
+          @mock_socket.onmessage(mock_event)
+        end
+      end
+      
       context "when closing" do      
         it "should remove the connection object from the @connections array" do
           @mock_socket.onclose

data/websocket-rails.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name         = "websocket-rails"
   s.summary      = "Plug and play websocket support for ruby on rails. Includes event router for mapping javascript events to controller actions."
   s.description  = "Seamless Ruby on Rails websocket integration."
-  s.homepage     = "https://github.com/DanKnox/websocket-rails"
+  s.homepage     = "http://danknox.github.com/websocket-rails/"
   s.files        = Dir["{lib,config}/**/*"] + ["MIT-LICENSE", "Rakefile", "Gemfile", "README.rdoc"]
   s.version      = WebsocketRails::VERSION
   s.platform     = Gem::Platform::RUBY

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000Z
+date: 2012-06-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -189,6 +189,7 @@ files:
 - spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/integration/connection_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_web_socket.rb
 - spec/unit/connection_manager_spec.rb
@@ -196,7 +197,7 @@ files:
 - spec/unit/dispatcher_spec.rb
 - spec/unit/events_spec.rb
 - websocket-rails.gemspec
-homepage: https://github.com/DanKnox/websocket-rails
+homepage: http://danknox.github.com/websocket-rails/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -210,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1264610493169323064
+      hash: -481953751813438507
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1264610493169323064
+      hash: -481953751813438507
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.19