websocket-rails 0.1.2 → 0.1.3

data/spec/unit/event_map_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+module WebsocketRails
+  describe EventMap do
+
+    class ProductController < WebsocketRails::BaseController
+      def update_product
+        true
+      end
+    end
+    
+    def define_test_events
+      WebsocketRails.route_block = nil
+      WebsocketRails::EventMap.describe do
+        subscribe :client_connected, to: ChatController, with_method: :new_user
+
+        namespace :product do
+          subscribe :update, to: ProductController, with_method: :update_product
+        end
+      end
+    end
+    
+    let(:dispatcher) { double('dispatcher').as_null_object }
+    subject { EventMap.new(dispatcher) }
+    before { define_test_events }
+
+    context "EventMap.describe" do
+      it "should store the event route block in the global configuration" do
+        WebsocketRails.route_block.should be_present
+      end
+    end
+    
+    context "Events in the global namespace" do
+      
+      it "should store the event in the correct namespace" do
+        subject.namespace.actions[:client_connected].should be_present
+        subject.namespace.name.should == :global
+      end
+      
+      it "should store the instantiated controller in the classes hash" do
+        subject.namespace.controllers[ChatController].class.should == ChatController
+      end
+      
+      it "should set the dispatcher on the instantiated controller" do
+        subject.namespace.controllers[ChatController].instance_variable_get(:@_dispatcher).should == dispatcher
+      end
+      
+      it "should store the class constant and method name in the events hash" do
+        subject.namespace.actions[:client_connected].should == [[ChatController,:new_user]]
+      end
+
+    end
+
+    context "Events in a child namespace" do
+
+      before { @namespace = subject.namespace }
+      
+      it "should store the event in the correct namespace" do
+        @namespace.namespaces[:product].actions[:update].should be_present
+      end
+      
+    end
+
+    context "#routes_for" do
+
+      let(:event) { double('event') }
+      
+      context "with events in the global namespace" do
+        it "should yield the controller and action name for each route defined for an event" do
+          event.stub(:name).and_return(:client_connected)
+          event.stub(:namespace).and_return([:global])
+
+          subject.routes_for(event) do |controller,method|
+            controller.class.should == ChatController
+            method.should == :new_user
+          end
+        end
+      end
+
+      context "with events in a child namespace" do
+        it "should yield the controller and action name for each route defined for an event" do
+          ProductController.any_instance.should_receive(:action_executed)
+          event = HelperMethods::MockEvent.new :update, [:global,:product]
+          
+          subject.routes_for(event) do |controller,method|
+            controller.action_executed
+            controller.class.should == ProductController
+            method.should == :update_product
+          end
+        end 
+      end
+
+    end
+
+  end
+end

data/spec/unit/event_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+module WebsocketRails
+  describe Event do
+    let(:encoded_message) { '["new_message",{"message":"this is a message"}]' }
+    let(:encoded_message_string) { '["new_message","this is a message"]' }
+    let(:namespace_encoded_message_string) { '["product.new_message","this is a message"]' }
+    let(:namespace_encoded_message) { '["product.new_message",{"message":"this is a message"}]' }
+    let(:connection) { double('connection') }
+
+    before { connection.stub!(:id).and_return(1) }
+
+    describe ".new_from_json" do
+      context "messages in the global namespace" do
+        it "should decode a new message and store it" do
+          event = Event.new_from_json( encoded_message, connection )
+          event.connection.should == connection
+          event.name.should == :new_message
+          event.namespace.should == [:global]
+          event.data[:message].should == 'this is a message'
+        end
+      end
+
+      context "messages in a child namespace" do
+        it "should store the event with the correct namesapce" do
+          event = Event.new_from_json( namespace_encoded_message, connection )
+          event.namespace.should == [:global,:product]
+          event.name.should == :new_message
+          event.data[:message].should == 'this is a message'
+        end
+      end
+    end
+
+    describe ".new_on_open" do
+      before { @event = Event.new_on_open connection, {message: 'connected'} }
+
+      it "should create an event named :client_connected" do
+        @event.name.should == :client_connected
+      end
+
+      it "should send the connection id to the client" do
+        @event.data[:connection_id].should == 1
+      end
+
+      it "should merge the optional data with the connection id" do
+        @event.data[:message].should == 'connected'
+      end
+    end
+
+    describe ".new_on_close" do
+      it "should create an event named :client_disconnected" do
+        event = Event.new_on_close( connection, "optional_data" )
+        event.name.should == :client_disconnected
+        event.data.should == "optional_data"
+        event.connection.should == connection
+      end
+    end
+
+    describe ".new_on_error" do
+      it "should create an event named :client_error" do
+        event = Event.new_on_error( connection, "optional_data" )
+        event.name.should == :client_error
+        event.data.should == "optional_data"
+        event.connection.should == connection
+      end
+    end
+
+    context "new namespaced events" do
+      it "should store the namespace in the namespace attribute" do
+        event = Event.new "event", {}, connection, :namespace => :product
+        event.namespace.should == [:global,:product]
+        event.name.should == :event
+      end
+
+      it "should store nested namespaces in the namespace attribute" do
+        event = Event.new "event", {}, connection, :namespace => [:product,:x_ray_vision]
+        event.namespace.should == [:global,:product,:x_ray_vision]
+        event.name.should == :event
+      end
+    end
+
+    describe "#serialize" do
+      context "messages in the global namespace" do
+        it "should not add the global namespace to the event name" do
+          event = Event.new_from_json encoded_message_string, connection
+          event.serialize.should == encoded_message_string
+        end
+      end
+
+      context "messages in a child namespace" do
+        it "should add the namespace to the front of the event name" do
+          event = Event.new_from_json namespace_encoded_message_string, connection
+          event.serialize.should == namespace_encoded_message_string
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000Z
+date: 2012-06-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -133,36 +133,26 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- Gemfile
-- Gemfile.lock
-- Guardfile
-- MIT-LICENSE
-- README.md
-- Rakefile
-- assets/javascripts/http_dispatcher.js
-- assets/javascripts/websocket_dispatcher.js
-- bin/thin-socketrails
-- config/routes.rb
 - lib/websocket-rails.rb
 - lib/websocket_rails/base_controller.rb
-- lib/websocket_rails/connection_adapters.rb
 - lib/websocket_rails/connection_adapters/http.rb
 - lib/websocket_rails/connection_adapters/web_socket.rb
+- lib/websocket_rails/connection_adapters.rb
 - lib/websocket_rails/connection_manager.rb
 - lib/websocket_rails/data_store.rb
 - lib/websocket_rails/dispatcher.rb
 - lib/websocket_rails/engine.rb
-- lib/websocket_rails/events.rb
+- lib/websocket_rails/event.rb
+- lib/websocket_rails/event_map.rb
 - lib/websocket_rails/version.rb
-- spec/dummy/Rakefile
+- config/routes.rb
+- bin/thin-socketrails
+- assets/javascripts/http_dispatcher.js
+- assets/javascripts/websocket_dispatcher.js
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/chat_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -178,10 +168,12 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config.ru
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
 - spec/dummy/log/production.log
 - spec/dummy/log/server.log
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -192,10 +184,11 @@ files:
 - spec/dummy/public/javascripts/effects.js
 - spec/dummy/public/javascripts/prototype.js
 - spec/dummy/public/javascripts/rails.js
-- spec/dummy/public/stylesheets/.gitkeep
+- spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/integration/connection_manager_spec.rb
 - spec/spec_helper.rb
+- spec/support/helper_methods.rb
 - spec/support/mock_web_socket.rb
 - spec/unit/connection_adapters/http_spec.rb
 - spec/unit/connection_adapters/web_socket_spec.rb
@@ -203,8 +196,13 @@ files:
 - spec/unit/connection_manager_spec.rb
 - spec/unit/data_store_spec.rb
 - spec/unit/dispatcher_spec.rb
-- spec/unit/events_spec.rb
-- websocket-rails.gemspec
+- spec/unit/event_map_spec.rb
+- spec/unit/event_spec.rb
+- MIT-LICENSE
+- Rakefile
+- Gemfile
+- README.md
+- CHANGELOG.md
 homepage: http://danknox.github.com/websocket-rails/
 licenses: []
 post_install_message: 
@@ -219,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2040378908172396900
+      hash: 1310952573146011562
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -228,9 +226,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2040378908172396900
+      hash: 1310952573146011562
 requirements: []
-rubyforge_project: 
+rubyforge_project: websocket-rails
 rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3

data/.gitignore

@@ -1,11 +0,0 @@
-.yardoc/
-coverage/
-.DS_Store
-.bundle/
-log/*.log
-*.log
-pkg/
-doc/
-test/dummy/db/*.sqlite3
-test/dummy/log/*.log
-test/dummy/tmp/

data/.rspec

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

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3

data/Gemfile.lock

@@ -1,144 +0,0 @@
-PATH
-  remote: .
-  specs:
-    websocket-rails (0.1.2)
-      faye-websocket
-      rack
-      thin
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.5)
-      actionpack (= 3.2.5)
-      mail (~> 2.4.4)
-    actionpack (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.5)
-      activesupport (= 3.2.5)
-      builder (~> 3.0.0)
-    activerecord (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-    activesupport (3.2.5)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
-    daemons (1.1.8)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    eventmachine (1.0.0.beta.4)
-    faye-websocket (0.4.5)
-      eventmachine (>= 0.12.0)
-    ffi (1.0.11)
-    guard (1.1.1)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-rspec (1.0.0)
-      guard (>= 1.1)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.3)
-    listen (0.4.3)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.3.6)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.5)
-      actionmailer (= 3.2.5)
-      actionpack (= 3.2.5)
-      activerecord (= 3.2.5)
-      activeresource (= 3.2.5)
-      activesupport (= 3.2.5)
-      bundler (~> 1.0)
-      railties (= 3.2.5)
-    railties (3.2.5)
-      actionpack (= 3.2.5)
-      activesupport (= 3.2.5)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rb-fchange (0.0.5)
-      ffi
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.10.0)
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.15.2)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  eventmachine (>= 1.0.0.beta.3)
-  faye-websocket
-  guard
-  guard-rspec
-  rails
-  rake
-  rspec-rails
-  simplecov
-  sqlite3
-  websocket-rails!