socket.io-emitter 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20c7ad7c5bf64297f833e433feff914d1ce62c2d
-  data.tar.gz: 6c18218cf9ad4ab872eff0612b9b1436496bca1a
+  metadata.gz: a0a74de36280d4fb1bb38c3203943bcbe3478df7
+  data.tar.gz: ccc8ceb16873c29cd4d5bc7fc8f56dc018d7e5ab
 SHA512:
-  metadata.gz: 23ac834cd52c6fa0a8f97bd3af6387a98f590028e943c3cd6cfdddcfa241600502e2eca7f489500e760f657602c55cd9f5c215d3517ed299b75d9cf7f420cd0d
-  data.tar.gz: d8efc036e436fcc81fbdd2e6e0666a55cacc6d160a6c3c8f3fa7ca167127eca1b95b793fb466ec92840d6591c520c44017d71222ab3f97d1b84250dcfe55b9a1
+  metadata.gz: eac67277a871d4168ca01324e77028ef0fee3bc4366cdc7d5e5004210222659f93dd0185f828eca8b84bae8c462a3dc56809470557adba54f2d555f7815e322d
+  data.tar.gz: b68ad524adfe3e3fe288f016a614b88168df4c0a5f9bbc5ada3539bd5ac6f0da9ff4004c3a2a07711eefc25d0916e2e74a2807e210ddff9288d4a8a93fd64473

data/.gitignore

@@ -20,4 +20,7 @@ tmp
 *.o
 *.a
 mkmf.log
-vendor/bundle
+vendor/bundle
+
+spec/node_modules
+spec/redis.log

data/.rspec

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

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.1
+  - 2.0

data/Rakefile

@@ -1,2 +1,17 @@
-
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+namespace :npm do
+  desc "npm package install for testing"
+  task :install do
+    dir = File.join(File.expand_path("..", __FILE__), "spec")
+    sh "cd '#{dir}' && npm install"
+  end
+end
+
+task :spec_with_npm_install => ["npm:install", "spec"]
+
+task :default => :spec_with_npm_install
+

data/lib/socket.io-emitter.rb

@@ -0,0 +1 @@
+require 'socket.io/emitter'

data/lib/socket.io/emitter.rb

@@ -1,4 +1,3 @@
-
 require 'socket.io/emitter/version'
 require 'msgpack'
 require 'redis'
@@ -10,6 +9,8 @@ module SocketIO
       BINARY_EVENT = 5
     end
 
+    FLAGS = %w(json volatile broadcast)
+
     def initialize(options = {})
       @redis = options[:redis] || Redis.new
       @key = "#{options[:key] || 'socket.io'}#emitter";
@@ -17,23 +18,18 @@ module SocketIO
       @flags = {}
     end
 
-    def method_missing(name)
-      match = /(?<flag>\S+)\?$/.match(name)
-      unless match.nil?
-        return !!@flags[match[:flag].to_sym]
+    FLAGS.each do |flag|
+      define_method(flag) do
+        @flags[flag.to_sym] = true
+        self
       end
-      @flags[name.to_sym] = true
-      self
     end
 
     def in(room)
       @rooms << room unless @rooms.include?(room)
       self
     end
-
-    def to(room)
-      self.in(room)
-    end
+    alias :to :in
 
     def of(nsp)
       @flags[:nsp] = nsp
@@ -41,21 +37,11 @@ module SocketIO
     end
 
     def emit(*args)
-      data = []
       packet = {}
-      packet[:type] = Type::EVENT
-
-      args.each do |arg|
-        data << arg.to_s
-      end
+      packet[:type] = has_binary?(args) ? Type::BINARY_EVENT : Type::EVENT
+      packet[:data] = args
 
-      if self.binary?
-        packet[:type] = Type::BINARY_EVENT
-      end
-
-      packet[:data] = data
-
-      unless @flags[:nsp].nil?
+      if @flags.has_key?(:nsp)
         packet[:nsp] = @flags[:nsp]
         @flags.delete(:nsp)
       else
@@ -65,10 +51,18 @@ module SocketIO
       packed = MessagePack.pack([packet, { rooms: @rooms, flags: @flags }])
       @redis.publish(@key, packed)
 
-      @rooms = []
-      @flags = {}
+      @rooms.clear
+      @flags.clear
 
       self
     end
+
+    private
+
+    def has_binary?(args)
+      args.select {|x| x.is_a?(String)}.any? {|str|
+        str.encoding == Encoding::ASCII_8BIT && !str.ascii_only?
+      }
+    end
   end
 end

data/lib/socket.io/emitter/version.rb

@@ -1,8 +1,5 @@
-
-require 'socket.io/emitter'
-
 module SocketIO
   class Emitter
-    VERSION = '0.0.1'
+    VERSION = '0.1.0'
   end
 end

data/socket.io-emitter.gemspec

@@ -1,4 +1,3 @@
-
 # coding: utf-8
 
 lib = File.expand_path('../lib', __FILE__)
@@ -24,4 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/spec/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "socket.io-ruby-emitter-test",
+  "version": "0.0.0",
+  "description": "test server",
+  "main": "testapp.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "joker1007",
+  "license": "MIT",
+  "dependencies": {
+    "socket.io": "^1.0.6",
+    "socket.io-redis": "^0.1.3",
+    "socket.io-client": "~1.0.6"
+  }
+}

data/spec/redis.conf

@@ -0,0 +1,27 @@
+daemonize no
+
+pidfile /tmp/redis-server-socket.io-emitter-test.pid
+
+port 6380
+bind 127.0.0.1
+
+timeout 300
+
+loglevel notice
+logfile stdout
+
+databases 16
+
+dir /tmp
+
+slave-serve-stale-data yes
+
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+list-max-ziplist-entries 512
+list-max-ziplist-value 64
+
+set-max-intset-entries 512
+
+activerehashing yes

data/spec/socket.io/emitter_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'timeout'
+
+describe SocketIO::Emitter do
+  include Timeout
+
+  let(:emitter) { SocketIO::Emitter.new(redis: Redis.new(host: "localhost", port: 6380)) }
+  it 'should be able to emit messages to client' do
+    emitter.emit('broadcast event', 'broadcast payload')
+
+    timeout(1) do
+      expect($child_io.gets.chomp).to eq 'broadcast payload'
+    end
+  end
+
+  it 'should be able to emit messages to namespace' do
+    emitter.of('/nsp').broadcast.emit('broadcast event', 'nsp broadcast payload')
+
+    timeout(1) do
+      expect($child_io.gets.chomp).to eq 'nsp broadcast payload'
+    end
+  end
+
+  it 'should not emit message to all namespace' do
+    emitter.of('/nsp').broadcast.emit('nsp broadcast event', 'nsp broadcast payload')
+
+    timeout(1) do
+      expect($child_io.gets.chomp).to eq 'GOOD'
+    end
+
+    expect {
+      timeout(2) do
+        $child_io.gets
+      end
+    }.to raise_error(TimeoutError)
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,30 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+pwd = File.expand_path('..', __FILE__)
+require 'socket.io-emitter'
+
+RSpec.configure do |config|
+  config.before(:suite) do
+    redis_log = File.open(File.join(pwd, "redis.log"), "w")
+    redis_pid = fork do
+      exec("redis-server #{File.join(pwd, "redis.conf")}", :out => redis_log)
+    end
+
+    sleep 1
+
+    $child_io = IO.popen("node #{File.join(File.dirname(__FILE__), "testapp.js")}")
+
+    sleep 0.5
+
+    at_exit do
+      begin
+        Process.kill(:SIGINT, $child_io.pid)
+        Process.waitpid($child_io.pid)
+        Process.kill(:SIGINT, redis_pid)
+        Process.waitpid(redis_pid)
+        redis_log.close
+      rescue Errno::ESRCH, Errno::ECHILD
+      end
+    end
+  end
+end

data/spec/testapp.js

@@ -0,0 +1,26 @@
+var io = require('socket.io');
+var ioc = require('socket.io-client');
+var redis = require('socket.io-redis');
+
+var srv = io(8125);
+srv.adapter(redis({ host: 'localhost', port: 6380 }));
+
+var cli = ioc('ws://localhost:8125', {forceNew: true});
+
+cli.on('broadcast event', function(payload) {
+  console.log(payload);
+});
+
+cli.on('nsp broadcast event', function(payload) {
+  console.log("BAD");
+});
+
+var cliNsp = ioc('ws://localhost:8125/nsp', {forceNew: true});
+
+cliNsp.on('broadcast event', function(payload) {
+  console.log(payload);
+});
+
+cliNsp.on('nsp broadcast event', function(payload) {
+  console.log("GOOD");
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socket.io-emitter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - nulltask
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - nulltask@gmail.com
@@ -74,12 +88,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Rakefile
 - Readme.md
+- lib/socket.io-emitter.rb
 - lib/socket.io/emitter.rb
 - lib/socket.io/emitter/version.rb
 - socket.io-emitter.gemspec
+- spec/package.json
+- spec/redis.conf
+- spec/socket.io/emitter_spec.rb
+- spec/spec_helper.rb
+- spec/testapp.js
 homepage: https://github.com/nulltask/socket.io-ruby-emitter
 licenses:
 - MIT
@@ -104,4 +126,9 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby Socket.IO emitter implementation.
-test_files: []
+test_files:
+- spec/package.json
+- spec/redis.conf
+- spec/socket.io/emitter_spec.rb
+- spec/spec_helper.rb
+- spec/testapp.js