websocket-rails 0.6.2 → 0.7.0

data/spec/unit/base_controller_spec.rb

@@ -29,5 +29,46 @@ module WebsocketRails
       end
     end
 
+    describe "before actions" do
+      class BeforeActionController < WebsocketRails::BaseController
+        before_action                             { self.before_array << :all }
+        before_action(:only => :only)             { self.before_array << :only_1 }
+        before_action(:only => :except)           { self.before_array << :only_2 }
+        before_action(:only => [:main, :only])    { self.before_array << :only_3 }
+        before_action(:only => [:except, :only])  { self.before_array << :only_4 }
+        before_action(:except => :except)         { self.before_array << :except_1 }
+        before_action(:except => :only)           { self.before_array << :except_2 }
+        before_action(:except => [:main, :except]){ self.before_array << :except_3 }
+        before_action(:except => [:only, :except]){ self.before_array << :except_4 }
+
+        attr_accessor :before_array
+
+        def initialize
+          @before_array = []
+        end
+        def main;end
+        def only;end
+        def except;end
+      end
+
+      let(:controller) { BeforeActionController.new }
+      it 'should handle before_action with no args' do
+        controller.instance_variable_set :@_action_name, 'main'
+        controller.process_action(:main, nil)
+        controller.before_array.should == [:all, :only_3, :except_1, :except_2, :except_4]
+      end
+
+      it 'should handle before_action with :only flag' do
+        controller.instance_variable_set :@_action_name, 'only'
+        controller.process_action(:only, nil)
+        controller.before_array.should == [:all, :only_1, :only_3, :only_4, :except_1, :except_3]
+      end
+
+      it 'should handle before_action with :except flag' do
+        controller.instance_variable_set :@_action_name, 'except'
+        controller.process_action(:except, nil)
+        controller.before_array.should == [:all, :only_2, :only_4, :except_2]
+      end
+    end
   end
 end

data/spec/unit/channel_manager_spec.rb

@@ -15,8 +15,29 @@ module WebsocketRails
     end
   end
 
+  describe ".channel_tokens" do
+    it "should delegate to channel manager" do
+      ChannelManager.any_instance.should_receive(:channel_tokens)
+      WebsocketRails.channel_tokens
+    end
+  end
+
   describe ChannelManager do
 
+    describe "#channel_tokens" do
+      it "should return a Hash-like" do
+        subject.channel_tokens.respond_to? :[]
+        subject.channel_tokens.respond_to? :has_key?
+      end
+
+      it 'is used to store Channel\'s token' do
+        ChannelManager.any_instance.should_receive(:channel_tokens)
+          .at_least(:twice).and_call_original
+        token = Channel.new(:my_new_test_channel).token
+        WebsocketRails.channel_tokens[:my_new_test_channel].should == token
+      end
+    end
+
     describe "#[]" do
       context "accessing a channel" do
         it "should create the channel if it does not exist" do

data/spec/unit/channel_spec.rb

@@ -15,6 +15,15 @@ module WebsocketRails
     end
 
     describe "#subscribe" do
+      before do
+        connection.stub(:user).and_return({})
+        WebsocketRails.config.stub(:broadcast_subscriber_events?).and_return(true)
+      end
+      it "should trigger an event when subscriber joins" do
+        subject.should_receive(:trigger).with("subscriber_join", connection.user)
+        subject.subscribe connection
+      end
+
       it "should add the connection to the subscriber pool" do
         subject.subscribe connection
         subject.subscribers.include?(connection).should be_true
@@ -22,6 +31,10 @@ module WebsocketRails
     end
 
     describe "#unsubscribe" do
+      before do
+        connection.stub(:user).and_return({})
+        WebsocketRails.config.stub(:broadcast_subscriber_events?).and_return(true)
+      end
       it "should remove connection from subscriber pool" do
         subject.subscribe connection
         subject.unsubscribe connection
@@ -32,6 +45,12 @@ module WebsocketRails
         subject.unsubscribe connection
         subject.subscribers.include?(connection).should be_false
       end
+
+      it "should trigger an event when subscriber parts" do
+        subject.subscribers << connection
+        subject.should_receive(:trigger).with('subscriber_part', connection.user)
+        subject.unsubscribe connection
+      end
     end
 
     describe "#trigger" do
@@ -43,17 +62,23 @@ module WebsocketRails
           event
         end
         connection.should_receive(:trigger).with(event)
-        subject.subscribe connection
+        subject.subscribers << connection
         subject.trigger 'event', 'data'
       end
     end
 
     describe "#trigger_event" do
-      it "should forward the event to the subscribers" do
-        event = double('event').as_null_object
+      it "should forward the event to subscribers if token matches" do
+        event = Event.new 'awesome_event', {:channel => 'awesome_channel', :token => subject.token}
         subject.should_receive(:send_data).with(event)
         subject.trigger_event event
       end
+
+      it "should ignore the event if the token is invalid" do
+        event = Event.new 'invalid_event', {:channel => 'awesome_channel', :token => 'invalid_token'}
+        subject.should_not_receive(:send_data).with(event)
+        subject.trigger_event event
+      end
     end
 
     context "private channels" do
@@ -103,6 +128,21 @@ module WebsocketRails
           subject.is_private?.should_not be_true
         end
       end
+
+      describe "#token" do
+        it 'is long enough' do
+          subject.token.length.should > 10
+        end
+
+        it 'remains the same between two call' do
+          subject.token.should == subject.token
+        end
+
+        it 'is the same for two channels with the same name' do
+          subject.token.should == Channel.new(subject.name).token
+        end
+      end
+
     end
   end
 end

data/spec/unit/connection_adapters/http_spec.rb

@@ -3,9 +3,14 @@ require 'spec_helper'
 module WebsocketRails
   module ConnectionAdapters
     describe Http do
-      
-      subject { Http.new( mock_request, double('Dispatcher').as_null_object ) }
-      
+
+      subject {
+        mr = mock_request
+        mr.stub(:protocol).and_return('http://')
+        mr.stub(:raw_host_with_port).and_return('localhost:3000')
+        Http.new(mr , double('Dispatcher').as_null_object )
+      }
+
       it "should be a subclass of ConnectionAdapters::Base" do
         subject.class.superclass.should == ConnectionAdapters::Base
       end
@@ -18,6 +23,22 @@ module WebsocketRails
         subject.headers['Transfer-Encoding'].should == "chunked"
       end
 
+      it "should not set the Access-Control-Allow-Origin header" do
+        subject.headers['Access-Control-Allow-Origin'].should be_blank
+      end
+
+      context "with IE CORS hack enabled" do
+        it "should set the Access-Control-Allow-Origin when passed an array as configuration" do
+          WebsocketRails.config.allowed_origins = ['http://localhost:3000']
+          subject.headers['Access-Control-Allow-Origin'].should == 'http://localhost:3000'
+        end
+
+        it "should set the Access-Control-Allow-Origin when passed a string as configuration" do
+          WebsocketRails.config.allowed_origins = 'http://localhost:3000'
+          subject.headers['Access-Control-Allow-Origin'].should == 'http://localhost:3000'
+        end
+      end
+
       context "#encode_chunk" do
         it "should properly encode strings" do
           subject.__send__(:encode_chunk,"test").should == "4\r\ntest\r\n"

data/spec/unit/connection_adapters_spec.rb

@@ -192,8 +192,8 @@ module WebsocketRails
 
         it "should serialize all events into one array" do
           serialized_array = <<-EOF.strip_heredoc
-            [["queued_event",{"id":null,"channel":null,"user_id":null,"data":"test","success":null,"result":null,"server_token":null}],
-            ["queued_event",{"id":null,"channel":null,"user_id":null,"data":"test","success":null,"result":null,"server_token":null}]]
+            [["queued_event",{"id":null,"channel":null,"user_id":null,"data":"test","success":null,"result":null,"token":null,"server_token":null}],
+            ["queued_event",{"id":null,"channel":null,"user_id":null,"data":"test","success":null,"result":null,"token":null,"server_token":null}]]
           EOF
 
           subject.should_receive(:send).with(serialized_array.gsub(/\n/,'').strip)

data/spec/unit/connection_manager_spec.rb

@@ -72,7 +72,7 @@ module WebsocketRails
     context "new POST event" do
       before(:each) do
         @mock_http = ConnectionAdapters::Http.new(mock_request, dispatcher)
-        @mock_http.id = 1
+        @mock_http.id = 'is_i_as_string'
         app.connections[@mock_http.id] = @mock_http
       end
 

data/spec/unit/event_spec.rb

@@ -6,9 +6,10 @@ module WebsocketRails
     let(:encoded_message_string) { '["new_message",{"id":"1234","data":"this is a message"}]' }
     let(:namespace_encoded_message_string) { '["product.new_message",{"id":"1234","data":"this is a message"}]' }
     let(:namespace_encoded_message) { '["product.new_message",{"id":"1234","data":{"message":"this is a message"}}]' }
-    let(:channel_encoded_message_string) { '["new_message",{"id":"1234","channel":"awesome_channel","user_id":null,"data":"this is a message","success":null,"result":null,"server_token":"1234"}]' }
+    let(:channel_encoded_message_string) { '["new_message",{"id":"1234","channel":"awesome_channel","user_id":null,"data":"this is a message","success":null,"result":null,"token":null,"server_token":"1234"}]' }
     let(:synchronizable_encoded_message) { '["new_message",{"id":"1234","data":{"message":"this is a message"},"server_token":"1234"}]' }
     let(:connection) { double('connection') }
+    let(:wrongly_encoded_message) { '["new_message",[{"id":"1234","data":{"message":"this is a message"}}]]' }
 
     before { connection.stub!(:id).and_return(1) }
 
@@ -31,6 +32,13 @@ module WebsocketRails
           event.data[:message].should == 'this is a message'
         end
       end
+
+      context "invalid messages" do
+        it "should return an invalid event if data is wrongly encoded" do
+          event = Event.new_from_json( wrongly_encoded_message, connection )
+          event.is_invalid?.should be_true
+        end
+      end
     end
 
     describe ".new_on_open" do
@@ -87,6 +95,12 @@ module WebsocketRails
         event.channel.should == :awesome_channel
         event.name.should == :event
       end
+
+      it "should not raise an error if the channel name cannot be symbolized" do
+        expect { Event.new "event", :data => {}, :connection => connection, :channel => 5 }.to_not raise_error(NoMethodError)
+        event = Event.new "event", :data => {}, :connection => connection, :channel => 5
+        event.channel.should == :"5"
+      end
     end
 
     describe "#is_channel?" do
@@ -151,6 +165,16 @@ module WebsocketRails
           data[1]['server_token'].should == '1234'
         end
       end
+
+      describe "#as_json" do
+        it "returns a Hash representation of the Event" do
+          hash = { data: { 'test' => 'test'}, channel: :awesome_channel }
+          event = Event.new 'test', hash
+          event.as_json[0].should == :test
+          event.as_json[1][:data].should == hash[:data]
+          event.as_json[1][:channel].should == hash[:channel]
+        end
+      end
     end
 
   end

data/spec/unit/logging_spec.rb

@@ -94,7 +94,7 @@ module WebsocketRails
           object.should_receive(:log_exception).with(exception)
           expect {
             object.log_event(@event) { raise exception }
-          }.to raise_exception(exception)
+          }.to raise_exception(exception.class, exception.message)
         end
       end
     end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Dan Knox
@@ -11,166 +10,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis-objects
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-matchers-matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Seamless Ruby on Rails websocket integration.
@@ -181,6 +174,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- Gemfile
+- MIT-LICENSE
+- README.md
+- Rakefile
+- bin/thin-socketrails
+- lib/assets/javascripts/websocket_rails/abstract_connection.js.coffee
 - lib/assets/javascripts/websocket_rails/channel.js.coffee
 - lib/assets/javascripts/websocket_rails/event.js.coffee
 - lib/assets/javascripts/websocket_rails/http_connection.js.coffee
@@ -202,9 +202,9 @@ files:
 - lib/websocket_rails/channel.rb
 - lib/websocket_rails/channel_manager.rb
 - lib/websocket_rails/configuration.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/controller_factory.rb
 - lib/websocket_rails/data_store.rb
@@ -219,12 +219,13 @@ files:
 - lib/websocket_rails/synchronization.rb
 - lib/websocket_rails/user_manager.rb
 - lib/websocket_rails/version.rb
-- bin/thin-socketrails
+- spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/chat_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/user.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
@@ -240,7 +241,6 @@ 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/development.sqlite3
 - spec/dummy/db/migrate/20130902222552_create_users.rb
 - spec/dummy/db/schema.rb
@@ -259,9 +259,9 @@ files:
 - spec/dummy/public/javascripts/effects.js
 - spec/dummy/public/javascripts/prototype.js
 - spec/dummy/public/javascripts/rails.js
-- spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/integration/connection_manager_spec.rb
+- spec/javascripts/generated/assets/abstract_connection.js
 - spec/javascripts/generated/assets/channel.js
 - spec/javascripts/generated/assets/event.js
 - spec/javascripts/generated/assets/http_connection.js
@@ -269,13 +269,15 @@ files:
 - spec/javascripts/generated/assets/websocket_rails.js
 - spec/javascripts/generated/specs/channel_spec.js
 - spec/javascripts/generated/specs/event_spec.js
+- spec/javascripts/generated/specs/helpers.js
 - spec/javascripts/generated/specs/websocket_connection_spec.js
 - spec/javascripts/generated/specs/websocket_rails_spec.js
 - spec/javascripts/support/jasmine.yml
-- spec/javascripts/support/jasmine_config.rb
+- spec/javascripts/support/jasmine_helper.rb
 - spec/javascripts/support/vendor/sinon-1.7.1.js
 - spec/javascripts/websocket_rails/channel_spec.coffee
 - spec/javascripts/websocket_rails/event_spec.coffee
+- spec/javascripts/websocket_rails/helpers.coffee
 - spec/javascripts/websocket_rails/websocket_connection_spec.coffee
 - spec/javascripts/websocket_rails/websocket_rails_spec.coffee
 - spec/spec_helper.rb
@@ -301,41 +303,29 @@ files:
 - spec/unit/synchronization_spec.rb
 - spec/unit/target_validator_spec.rb
 - spec/unit/user_manager_spec.rb
-- MIT-LICENSE
-- Rakefile
-- Gemfile
-- README.md
-- CHANGELOG.md
-homepage: http://danknox.github.com/websocket-rails/
+homepage: http://websocket-rails.github.io
 licenses:
 - MIT
-post_install_message: Welcome to WebsocketRails v0.6.2!
+metadata: {}
+post_install_message: Welcome to WebsocketRails v0.7.0!
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -822058374610225796
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -822058374610225796
 requirements: []
 rubyforge_project: websocket-rails
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Plug and play websocket support for ruby on rails. Includes event router
   for mapping javascript events to controller actions.
 test_files: []