websocket-rails 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # WebsocketRails Change Log
 
+## Version 0.2.1
+
+* Fix default redis driver issue that was causing problems when using
+  redis while event machine was not running.
+* Fix undefined data store value issue. Thanks to @burninggramma.
+
+## Version 0.2.0
+
+November 25 2012
+
+* Add standalone server mode to support non event machine
+based web servers.
+
 ## Version 0.1.9
 
 November 19 2012

data/README.md

@@ -8,6 +8,9 @@ If you haven't done so yet, check out the [Project Page](http://danknox.github.c
 
 Check out the [CHANGELOG](https://github.com/DanKnox/websocket-rails/blob/master/CHANGELOG.md) to find out what's new.
 
+As of version 0.2.0, non event machine based web servers such as Phusion
+Passenger are supported through the use of the [Standalone Server Mode](https://github.com/DanKnox/websocket-rails/wiki/Standalone-Server-Mode).
+
 ## Overview
 
 Start treating client side events as first class citizens inside your
@@ -34,6 +37,7 @@ Check out the [Example Application](https://github.com/DanKnox/websocket-rails-E
   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)
+* [Standalone Server Mode](https://github.com/DanKnox/websocket-rails/wiki/Standalone-Server-Mode)
 
 ## Handle Events With Class
 
@@ -79,7 +83,7 @@ end
 Receive the response in the client.
 
 ````javascript
-dispatcher.bind('tasks.create_successful', function(task) {
+dispatcher.bind('tasks.create_success', function(task) {
   console.log('successfully created ' + task.name);
 });
 ````
@@ -93,7 +97,7 @@ var failure = function(task) {
   console.log("Failed to create Product: " + product.name)
 }
 
-dispatcher.trigger('products.create', success, failure);
+dispatcher.trigger('products.create', task, success, failure);
 ````
 
 Then trigger them in your controller:

data/lib/websocket-rails.rb

@@ -40,7 +40,7 @@ module WebsocketRails
   end
 
   def self.redis_defaults
-    {:host => '127.0.0.1', :port => 6379}
+    {:host => '127.0.0.1', :port => 6379, :driver => :synchrony}
   end
 
   attr_accessor :standalone

data/lib/websocket_rails/data_store.rb

@@ -46,7 +46,7 @@ module WebsocketRails
     end
 
     def [](k)
-      @data[cid][k] = Hash.new unless @data[cid]
+      @data[cid] = Hash.new unless @data[cid]
       @data[cid][k]
     end
 

data/lib/websocket_rails/synchronization.rb

@@ -1,33 +1,58 @@
-require "redis"
 require "redis/connection/synchrony"
+require "redis"
+require "redis/connection/ruby"
 
 module WebsocketRails
   class Synchronization
 
+    def self.publish(event)
+      singleton.publish event
+    end
+
+    def self.synchronize!
+      singleton.synchronize!
+    end
+
+    def self.shutdown!
+      singleton.shutdown!
+    end
+
+    def self.singleton
+      @singleton ||= new
+    end
+
     include Logging
 
-    def self.redis
+    def redis
       @redis ||= Redis.new(WebsocketRails.redis_options)
     end
 
-    def self.publish(event)
+    def ruby_redis
+      @ruby_redis ||= begin
+        redis_options = WebsocketRails.redis_options.merge(:driver => :ruby)
+        Redis.new(redis_options)
+      end
+    end
+
+    def publish(event)
       Fiber.new do
+        redis_client = EM.reactor_running? ? redis : ruby_redis
         event.server_token = server_token
-        redis.publish "websocket_rails.events", event.serialize
+        redis_client.publish "websocket_rails.events", event.serialize
       end.resume
     end
 
-    def self.server_token
+    def server_token
       @server_token
     end
 
-    def self.synchronize!
+    def synchronize!
       unless @synchronizing
         @server_token = generate_unique_token
         register_server(@server_token)
 
         synchro = Fiber.new do
-          EM::Synchrony.sleep(0.1)
+          #EM::Synchrony.sleep(0.1)
 
           fiber_redis = Redis.connect(WebsocketRails.redis_options)
           fiber_redis.subscribe "websocket_rails.events" do |on|
@@ -59,11 +84,11 @@ module WebsocketRails
       end
     end
 
-    def self.shutdown!
+    def shutdown!
       remove_server(server_token)
     end
 
-    def self.generate_unique_token
+    def generate_unique_token
       begin
         token = SecureRandom.urlsafe_base64
       end while redis.sismember("websocket_rails.active_servers", token)
@@ -71,14 +96,14 @@ module WebsocketRails
       token
     end
 
-    def self.register_server(token)
+    def register_server(token)
       Fiber.new do
         redis.sadd "websocket_rails.active_servers", token
         log "Server Registered: #{token}"
       end.resume
     end
 
-    def self.remove_server(token)
+    def remove_server(token)
       Fiber.new do
         redis.srem "websocket_rails.active_servers", token
         log "Server Removed: #{token}"

data/lib/websocket_rails/version.rb

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

data/spec/dummy/log/test.log

@@ -725,3 +725,41 @@ 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/unit/data_store_spec.rb

@@ -2,14 +2,38 @@ require 'spec_helper'
 
 module WebsocketRails
   describe DataStore do
+    let(:attribute) {"example_attribute"}
+    let(:value)     {1}
+
     before(:each) do
       @base = double('base_controller')
       @base.stub(:client_id).and_return(1)
+      @data_store = DataStore.new(@base)
     end
     
     it "loads up" do
-      data_store = DataStore.new(@base)
-      data_store.present?.should be_true
+      @data_store.present?.should be_true
+    end
+
+    describe "#[]" do
+      context "with an undefined attribute" do
+        it "returns nil" do
+          @data_store[attribute].should be_nil
+        end
+      end
+
+      context "with a defined attribute" do
+        it "returns its value" do
+          @data_store[attribute] = value
+          @data_store[attribute].should == value
+        end
+      end
+    end
+
+    describe "#[]=" do
+      it "returns the value" do
+        (@data_store[attribute]=value).should == value
+      end
     end
   end
 end

data/spec/unit/synchronization_spec.rb

@@ -18,7 +18,7 @@ module WebsocketRails
       EM.stop
     end
 
-    let(:subject) { Synchronization }
+    let(:subject) { Synchronization.singleton }
 
     describe "#publish" do
       it "should add the serialized event to the websocket_rails.events channel" do
@@ -29,6 +29,26 @@ module WebsocketRails
       end
     end
 
+    describe "#synchronize!" do
+      #before do
+      #  #@synchro = Synchronization.new
+      #end
+
+      #it "should receive remote channel events" do
+      #  event = Event.new(:channel_event, :channel => :channel_one, :data => 'hello channel one')
+
+      #  @redis.should_receive(:subscribe)
+      #  Redis.should_receive(:connect).with(WebsocketRails.redis_options).and_return(@redis)
+
+      #  Synchronization.new.synchronize!
+
+      #  EM::Synchrony.sleep(0.5)
+
+      #  redis = @redis
+      #  EM.next_tick { redis.publish "websocket_rails.events", event.serialize }
+      #end
+    end
+
     describe "#generate_unique_token" do
       before do
         SecureRandom.stub(:urlsafe_base64).and_return(1, 2, 3)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000Z
+date: 2013-01-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -285,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1199514115316704579
+      hash: -982119143149111185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1199514115316704579
+      hash: -982119143149111185
 requirements: []
 rubyforge_project: websocket-rails
 rubygems_version: 1.8.19