websocket-rails 0.1.9 → 0.2.0

data/Gemfile

@@ -2,10 +2,10 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rspec-rails"
+gem "rspec-rails", ">=2.12.0"
 gem "therubyrhino"
 gem "therubyracer"
-gem "jasmine"
+gem "jasmine", ">=1.2.0"
 gem "headless"
 gem "coffee-script"
 gem "thin"
@@ -16,6 +16,7 @@ gem "ruby_gntp"
 gem "guard"
 gem "guard-rspec"
 gem "guard-coffeescript"
+gem "rb-fsevent"
 
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', :require => 'jdbc-sqlite3', :require => 'arjdbc'

data/README.md

@@ -33,6 +33,7 @@ Check out the [Example Application](https://github.com/DanKnox/websocket-rails-E
 * [The
   DataStore](https://github.com/DanKnox/websocket-rails/wiki/Using-the-DataStore)
 * [Reloading Controllers In Development](https://github.com/DanKnox/websocket-rails/wiki/Reloading-Controllers-In-Development)
+* [Multiple Servers and Background Jobs](https://github.com/DanKnox/websocket-rails/wiki/Multiple-Servers-and-Background-Jobs)
 
 ## Handle Events With Class
 

data/lib/config.ru

@@ -0,0 +1,3 @@
+require "websocket-rails"
+
+run WebsocketRails::ConnectionManager.new

data/lib/generators/websocket_rails/install/templates/events.rb

@@ -1,3 +1,23 @@
+WebsocketRails.setup do |config|
+
+  # Change to :debug for debugging output
+  config.log_level = :default
+
+  # Change to true to enable standalone server mode
+  # Start the standalone server with rake websocket_rails:start_server
+  # Requires Redis
+  config.standalone = false
+
+  # Change to true to enable channel synchronization between
+  # multiple server instances. Requires Redis.
+  config.synchronize = false
+
+  # Uncomment and edit to point to a different redis instance.
+  # Will not be used unless standalone or synchronization mode
+  # is enabled.
+  #config.redis_options = {:host => 'localhost', :port => '6379'}
+end
+
 WebsocketRails::EventMap.describe do
   # You can use this file to map incoming events to controller actions.
   # One event can be mapped to any number of controller actions. The

data/lib/rails/tasks/websocket_rails.tasks

@@ -0,0 +1,38 @@
+namespace :websocket_rails do
+  desc 'Test rails task'
+  task :start_server do
+    require "thin"
+    load "#{Rails.root}/config/initializers/events.rb"
+
+    options = WebsocketRails.thin_options
+
+    unless WebsocketRails.standalone?
+      warn_standalone_not_enabled!
+    end
+
+    fork do
+      Thin::Controllers::Controller.new(options).start
+    end
+
+    puts "Websocket Rails Standalone Server listening on port #{options[:port]}"
+  end
+
+  task :stop_server do
+    require "thin"
+    load "#{Rails.root}/config/initializers/events.rb"
+
+    options = WebsocketRails.thin_options
+
+    unless WebsocketRails.standalone?
+      warn_standalone_not_enabled!
+    end
+
+    Thin::Controllers::Controller.new(options).stop
+  end
+end
+
+def warn_standalone_not_enabled!
+  puts "Fail!"
+  puts "You must enable standalone mode in your events.rb initializer to use the standalone server."
+  exit 1
+end

data/lib/websocket-rails.rb

@@ -28,7 +28,7 @@ module WebsocketRails
   module_function :synchronize, :synchronize=
 
   def self.synchronize?
-    @synchronize == true
+    (@synchronize == true) || (@standalone == true)
   end
 
   def self.redis_options
@@ -42,6 +42,44 @@ module WebsocketRails
   def self.redis_defaults
     {:host => '127.0.0.1', :port => 6379}
   end
+
+  attr_accessor :standalone
+  module_function :standalone, :standalone=
+
+  def self.standalone?
+    @standalone == true
+  end
+
+  def self.standalone_port
+    @standalone_port ||= '3001'
+  end
+
+  def self.standalone_port=(port)
+    @standalone_port = port
+  end
+
+  def self.thin_options
+    @thin_options ||= thin_defaults
+  end
+
+  def self.thin_options=(options = {})
+    @thin_options = thin_defaults.merge(options)
+  end
+
+  def self.thin_defaults
+    {
+      :port => standalone_port,
+      :pid => "#{Rails.root}/tmp/pids/websocket_rails.pid",
+      :log => "#{Rails.root}/log/websocket_rails.log",
+      :tag => 'websocket_rails',
+      :rackup => "#{Rails.root}/config.ru",
+      :threaded => true,
+      :daemonize => true,
+      :dirname => Rails.root,
+      :max_persistent_conns => 1024,
+      :max_conns => 1024
+    }
+  end
 end
 
 require 'websocket_rails/engine'

data/lib/websocket_rails/engine.rb

@@ -8,5 +8,10 @@ module WebsocketRails
     paths["app/controllers"] << "lib/rails/app/controllers"
     paths["config/routes"]   << "lib/rails/config/routes.rb"
 
+    rake_tasks do
+      require 'websocket-rails'
+      load 'rails/tasks/websocket_rails.tasks'
+    end
+
   end
 end

data/lib/websocket_rails/synchronization.rb

@@ -63,8 +63,6 @@ module WebsocketRails
       remove_server(server_token)
     end
 
-    private
-
     def self.generate_unique_token
       begin
         token = SecureRandom.urlsafe_base64

data/lib/websocket_rails/version.rb

@@ -1,3 +1,3 @@
 module WebsocketRails
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/spec/dummy/log/test.log

@@ -578,3 +578,150 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml

data/spec/integration/connection_manager_spec.rb

@@ -31,6 +31,16 @@ module WebsocketRails
       end
     end
 
+    around do |example|
+      EM.run do
+        example.run
+      end
+    end
+
+    after do
+      EM.stop
+    end
+
     shared_examples "an evented rack server" do
       context "new connections" do
         it "should execute the controller action associated with the 'client_connected' event" do
@@ -68,10 +78,10 @@ module WebsocketRails
           let(:encoded_channel_message) { channel_message.to_json }
 
           it "should subscribe the connection to the correct channel" do
-            #channel = WebsocketRails[:test_chan]
-            #@server.call( env )
-            #channel.should_receive(:subscribe).with(socket)
-            #socket.on_message encoded_channel_message
+            channel = WebsocketRails[:test_chan]
+            @server.call( env )
+            channel.should_receive(:subscribe).with(socket)
+            socket.on_message encoded_channel_message
           end
         end
 

data/spec/spec_helper.rb

@@ -24,21 +24,14 @@ RSpec.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
   config.mock_with :rspec
-  
+
   config.include WebsocketRails::HelperMethods
 
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
-  
-  config.before(:all) do
-    silence_output
-  end
-  
-  config.after(:all) do
-    enable_output
-  end
+
 end
 
 def silence_output

data/spec/unit/synchronization_spec.rb

@@ -58,7 +58,7 @@ module WebsocketRails
     end
 
     describe "#remove_server" do
-      it "should add the unique token to the active_servers key in redis" do
+      it "should remove the unique token from the active_servers key in redis" do
         Redis.any_instance.should_receive(:srem).with("websocket_rails.active_servers", "token")
         subject.remove_server "token"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,10 +171,12 @@ files:
 - lib/assets/javascripts/websocket_rails/main.js
 - lib/assets/javascripts/websocket_rails/websocket_connection.js.coffee
 - lib/assets/javascripts/websocket_rails/websocket_rails.js.coffee
+- lib/config.ru
 - lib/generators/websocket_rails/install/install_generator.rb
 - lib/generators/websocket_rails/install/templates/events.rb
 - lib/rails/app/controllers/websocket_rails/delegation_controller.rb
 - lib/rails/config/routes.rb
+- lib/rails/tasks/websocket_rails.tasks
 - lib/websocket-rails.rb
 - lib/websocket_rails/base_controller.rb
 - lib/websocket_rails/channel.rb
@@ -283,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4523362608196587549
+      hash: -1199514115316704579
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -292,10 +294,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4523362608196587549
+      hash: -1199514115316704579
 requirements: []
 rubyforge_project: websocket-rails
-rubygems_version: 1.8.24
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Plug and play websocket support for ruby on rails. Includes event router