socky-server 0.4.1 → 0.5.0.beta1

data/spec/spec_helper.rb

@@ -1,5 +1,27 @@
 require 'rubygems'
 require 'rspec'
 
-require 'socky'
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+require 'socky/server'
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+def mock_websocket(application)
+  env = {}
+  env['PATH_INFO'] = '/websocket/' + application
+  connection = Socky::Server::WebSocket.new.call(env)
+  connection.stub!(:send_data)
+  connection
+end
+
+def mock_connection(application)
+  websocket = mock_websocket(application)
+  
+  env = { 'PATH_INFO' => '/websocket/' + application }
+  websocket.on_open(env)
+end
+
+def auth_token(socket, channel_name, remains = {})
+  Socky::Authenticator.authenticate({
+    'connection_id' => socket.connection.id,
+    'channel' => channel_name
+  }.merge(remains), :allow_changing_rights => true, :secret => 'test_secret')['auth']
+end

data/spec/support/websocket_application.rb

@@ -0,0 +1,14 @@
+Rack::WebSocket::Application.class_eval do
+  def call(env)
+    @env = env
+    return self
+  end
+  
+  def send_data(data)
+    true
+  end
+  
+  def close_websocket
+    on_close(@env)
+  end
+end

data/spec/unit/socky/server/application_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Socky::Server::Application do
+  
+  context "#find" do
+    it "should return nil if provided application doesn't exists" do
+      described_class.find('invalid').should be_nil
+    end
+    it "should return application if exists" do
+      begin
+        instance = described_class.new('some_app', 'some_secret')
+        described_class.find('some_app').should equal(instance)
+      ensure
+        described_class.list.delete('some_app')
+      end
+    end
+  end
+  
+  context "#new" do
+    it "should save gived application on list" do
+      described_class.list.delete('some_app') # Strange bugs in ree
+      instance = described_class.new('some_app', 'some_secret')
+      described_class.list.delete('some_app').should equal(instance)
+    end
+    it "should not duplicate already exisiting apps" do
+      instance1 = described_class.new('some_app', 'some_secret')
+      instance2 = described_class.new('some_app', 'some_other_secret')
+      described_class.list.delete('some_app').should equal(instance1)
+      described_class.list.keys.should be_empty
+    end
+  end
+  
+  context "instance" do
+    subject { described_class.new('some_app', 'some_secret') }
+    
+    its(:name) { should eql('some_app') }
+    its(:secret) { should eql('some_secret') }
+    its(:connections) { should eql({}) }
+    
+    let(:connection) { mock(Socky::Server::Connection, :id => 'some_id') }
+    
+    it "should be able to add connection to list" do
+      subject.add_connection(connection)
+      subject.connections[connection.id].should equal(connection)
+    end
+    it "should be able to remove connection from list" do
+      subject.add_connection(connection)
+      subject.connections[connection.id].should equal(connection)
+      subject.remove_connection(connection)
+      subject.connections[connection.id].should be_nil
+    end
+  end
+  
+end

data/spec/unit/socky/server/config_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Socky::Server::Config do
+  
+  context "#debug" do
+    it "should enable logger when true provided" do
+      Socky::Server::Logger.should_receive(:enabled=).with(true)
+      described_class.new(:debug => true)
+    end
+    it "should disable logger when false provided" do
+      Socky::Server::Logger.should_receive(:enabled=).with(false)
+      described_class.new(:debug => false)
+    end
+  end
+  
+  context "#applications" do
+    it "should raise if param is not hash" do
+      lambda { described_class.new(:applications => "invalid") }.should raise_error ArgumentError, 'expected Hash'
+    end
+    it "should create application if hash provided" do
+      Socky::Server::Application.should_receive(:new).with('test_app','test_secret')
+      described_class.new(:applications => {'test_app' => 'test_secret'})
+    end
+    it "should convert application name to string if provided in other type" do
+      Socky::Server::Application.should_receive(:new).with('1','test_secret')
+      described_class.new(:applications => {1 => 'test_secret'})
+    end
+    it "should convert application secret to string if provided in other type" do
+      Socky::Server::Application.should_receive(:new).with('test_app','1')
+      described_class.new(:applications => {'test_app' => 1})
+    end
+  end
+  
+  context "#config_file" do
+    it "should raise if non-string provided" do
+      lambda { described_class.new(:config_file => 123) }.should raise_error ArgumentError, 'expected String'
+    end
+    it "should raise if provided file doesn't exists" do
+      lambda { described_class.new(:config_file => 'invalid.yml') }.should raise_error ArgumentError, 'config file not found: invalid.yml'
+    end
+    it "should raise on invalid config file" do
+      lambda { described_class.new(:config_file => File.expand_path(__FILE__)) }.should raise_error ArgumentError, 'invalid config file'
+    end
+    it "should read example config file and set attributes" do
+      Socky::Server::Logger.should_receive(:enabled=).with(true)
+      Socky::Server::Application.should_receive(:new).with('some_test_app','some_test_secret')
+      described_class.new(:config_file => File.expand_path(File.dirname(__FILE__)) + '/../../../fixtures/example_config.yml')
+    end
+  end
+end

data/spec/unit/socky/server/connection_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe Socky::Server::Connection do
+  
+  let(:websocket) { mock_websocket('test_app') }
+  before { @application = Socky::Server::Application.new('test_app', 'test_secret') }
+  after  { Socky::Server::Application.list.delete(@application.name) }
+  
+  context "#new" do
+    it "should assign valid application" do
+      instance = described_class.new(websocket, @application.name)
+      instance.application.should eql(@application)
+    end
+    it "should not assign application if not known" do
+      instance = described_class.new(websocket, 'unknown_app')
+      instance.application.should eql(nil)
+    end
+    it "should assign id" do
+      instance = described_class.new(websocket, @application.name)
+      instance.id.should_not be_nil
+    end
+    it "should add itself to application connection list" do
+      instance = described_class.new(websocket, @application.name)
+      @application.connections[instance.id].should equal(instance)
+    end
+    it "should send initialiation status" do
+      websocket.should_receive(:send_data)
+      instance = described_class.new(websocket, @application.name)
+    end
+  end
+  
+  context "instance" do
+    subject { described_class.new(websocket, @application.name) }
+    
+    its(:channels) { should eql({}) }
+    
+    context "#initialization_status" do
+      it "should return confirmation when application is set" do
+        subject.initialization_status.should eql({ 'event' => 'socky:connection:established', 'connection_id' => subject.id })
+      end
+      it "should return 'unknown app' when application is not set" do
+        subject.application = nil
+        subject.initialization_status.should eql({ 'event' => 'socky:connection:error', 'reason' => 'refused' })
+      end
+    end
+    
+    it "#send_data should send using provided websocket" do
+      websocket.should_receive(:send_data).with({:some => 'data'})
+      subject.send_data(:some => 'data')
+    end
+    
+    context "#destroy" do
+      it "should remove itself from application connection list" do
+        subject.destroy
+        @application.connections[subject.id].should be_nil
+      end
+      it "should remove itself from channels list" do
+        channels = subject.channels.dup
+        subject.destroy
+        channels.each do |channel|
+          channel.subscribers[subject.id].should be_nil
+        end
+      end
+    end
+  end
+  
+end

data/spec/unit/socky/server/message_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe Socky::Server::Message do
+  
+  let(:application) { Socky::Server::Application.new('some_app', 'some_secret') }
+  let(:connection) { mock_connection(application.name) }
+  let(:channel) { mock(Socky::Server::Channel::Base, :subscribe => nil, :unsubscribe => nil, :deliver => nil) }
+  before { Socky::Server::Channel.stub!(:find_or_create).and_return(channel)}
+  
+  context "#new" do
+    it "should get valid instance when json provided" do
+      instance = described_class.new(connection, {'event' => 'some_event'}.to_json)
+      instance.event.should eql('some_event')
+    end
+    it "should get empty instance when non-json provided" do
+      instance = described_class.new(connection, 'event=some_event')
+      instance.event.should eql('')
+    end
+  end
+  
+  context "instance" do
+    subject { described_class.new( connection, {
+                                   'event'   => 'some_event',
+                                   'channel' => 'some_channel',
+                                   'data'    => 'some_user_data',
+                                   'auth'    => 'some_auth',
+                                   'read'    => 'read_value',
+                                   'write'   => 'write_value',
+                                   'hide'    => 'hide_value'
+                                 }.to_json)}
+  
+    its(:event)     { should eql('some_event')     }
+    its(:channel)   { should eql('some_channel')   }
+    its(:user_data) { should eql('some_user_data') }
+    its(:auth)      { should eql('some_auth')      }
+    its(:read)      { should eql('read_value')     }
+    its(:write)     { should eql('write_value')    }
+    its(:hide)      { should eql('hide_value')     }
+    
+    context "#dispath" do
+      it "should call channel.subscribe when 'socky:subscribe' event received" do
+        subject.instance_variable_get('@data')['event'] = 'socky:subscribe'
+        channel.should_receive(:subscribe).with(connection, subject)
+        subject.dispath
+      end
+      it "should call channel.unsubscribe when 'socky:unsubscribe' event received" do
+        subject.instance_variable_get('@data')['event'] = 'socky:unsubscribe'
+        channel.should_receive(:unsubscribe).with(connection, subject)
+        subject.dispath
+      end
+      it "should call channel.deliver when normal event received" do
+        subject.instance_variable_get('@data')['event'] = 'some_event'
+        channel.should_receive(:deliver).with(connection, subject)
+        subject.dispath
+      end
+      it "should not call channel.deliver when unknown socky event received" do
+        subject.instance_variable_get('@data')['event'] = 'socky:unknown'
+        channel.should_not_receive(:deliver).with(connection, subject)
+        subject.dispath
+      end
+    end
+  end
+  
+end

metadata

@@ -1,171 +1,138 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: socky-server
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.1
+version: !ruby/object:Gem::Version
+  version: 0.5.0.beta1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-12 00:00:00 +02:00
+date: 2011-08-01 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: em-websocket
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: websocket-rack
+  requirement: &70321806627380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70321806627380
+- !ruby/object:Gem::Dependency
+  name: socky-authenticator
+  requirement: &70321806626880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0.beta5
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70321806626880
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70321806626500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70321806626500
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70321806625940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mongrel
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id006
+  version_requirements: *70321806625940
 description: Socky is a WebSocket server and client for Ruby
-email: 
+email:
 - bernard.potocki@imanel.org
-executables: 
-- socky
+executables: []
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
-- bin/socky
-- lib/em-websocket_hacks.rb
-- lib/socky.rb
-- lib/socky/connection.rb
-- lib/socky/connection/authentication.rb
-- lib/socky/connection/finders.rb
-- lib/socky/message.rb
-- lib/socky/misc.rb
-- lib/socky/net_request.rb
-- lib/socky/options.rb
-- lib/socky/options/config.rb
-- lib/socky/options/parser.rb
-- lib/socky/runner.rb
+- config.ru
+- example/config.yml
+- lib/socky/server.rb
+- lib/socky/server/application.rb
+- lib/socky/server/channel.rb
+- lib/socky/server/channel/base.rb
+- lib/socky/server/channel/presence.rb
+- lib/socky/server/channel/private.rb
+- lib/socky/server/channel/public.rb
+- lib/socky/server/channel/stub.rb
+- lib/socky/server/config.rb
+- lib/socky/server/connection.rb
+- lib/socky/server/http.rb
+- lib/socky/server/logger.rb
+- lib/socky/server/message.rb
+- lib/socky/server/misc.rb
+- lib/socky/server/version.rb
+- lib/socky/server/websocket.rb
 - socky-server.gemspec
-- spec/em-websocket_spec.rb
-- spec/files/default.yml
-- spec/files/invalid.yml
-- spec/socky/connection/authentication_spec.rb
-- spec/socky/connection/finders_spec.rb
-- spec/socky/connection_spec.rb
-- spec/socky/message_spec.rb
-- spec/socky/misc_spec.rb
-- spec/socky/net_request_spec.rb
-- spec/socky/options/config_spec.rb
-- spec/socky/options/parser_spec.rb
-- spec/socky/options_spec.rb
-- spec/socky/runner_spec.rb
-- spec/socky_spec.rb
+- spec/fixtures/example_config.yml
+- spec/integration/ws_channels_spec.rb
+- spec/integration/ws_connection_spec.rb
+- spec/integration/ws_presence_spec.rb
+- spec/integration/ws_rights_spec.rb
 - spec/spec_helper.rb
-- spec/support/stallion.rb
+- spec/support/websocket_application.rb
+- spec/unit/socky/server/application_spec.rb
+- spec/unit/socky/server/config_spec.rb
+- spec/unit/socky/server/connection_spec.rb
+- spec/unit/socky/server/message_spec.rb
 has_rdoc: true
 homepage: http://socky.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Socky is a WebSocket server and client for Ruby
-test_files: 
-- spec/em-websocket_spec.rb
-- spec/files/default.yml
-- spec/files/invalid.yml
-- spec/socky/connection/authentication_spec.rb
-- spec/socky/connection/finders_spec.rb
-- spec/socky/connection_spec.rb
-- spec/socky/message_spec.rb
-- spec/socky/misc_spec.rb
-- spec/socky/net_request_spec.rb
-- spec/socky/options/config_spec.rb
-- spec/socky/options/parser_spec.rb
-- spec/socky/options_spec.rb
-- spec/socky/runner_spec.rb
-- spec/socky_spec.rb
+test_files:
+- spec/fixtures/example_config.yml
+- spec/integration/ws_channels_spec.rb
+- spec/integration/ws_connection_spec.rb
+- spec/integration/ws_presence_spec.rb
+- spec/integration/ws_rights_spec.rb
 - spec/spec_helper.rb
-- spec/support/stallion.rb
+- spec/support/websocket_application.rb
+- spec/unit/socky/server/application_spec.rb
+- spec/unit/socky/server/config_spec.rb
+- spec/unit/socky/server/connection_spec.rb
+- spec/unit/socky/server/message_spec.rb